From b735a6fb2b179b184719a3fe6823d727f39770a3 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:31:45 +1100 Subject: [PATCH 1/4] Update ga_ls8ls9_landcover_inter_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml index 818b4e5e..6636c573 100644 --- a/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml @@ -87,7 +87,7 @@ cog_opts: overview_resampling: mode apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-1-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0 # save-tasks options input_products: ga_ls8cls9c_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/srtm_landcover_dem/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/2-0-0/ From 50b4dca7954330e7c45a492406e9e3e509aac36e Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Tue, 17 Dec 2024 01:39:48 +0000 Subject: [PATCH 2/4] add an additional band in landcover level0 product --- .../odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 2 +- .../odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 2 +- .../lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 4 ++-- dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 2 +- .../odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 2 +- .../odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 2 +- .../lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 2 +- .../odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 2 +- prod/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 2 +- .../landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml | 4 ++++ 10 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml index 98fd98ed..5ee333f5 100644 --- a/dev/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml @@ -1,6 +1,6 @@ plugin: veg_class_l1 # this can help system find the relative plugin and plugin version plugin_config: - input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, frequency, dem_h] + input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, wet_percentage, frequency, dem_h] optional_bands: [canopy_cover_class, elevation] output_classes: aquatic_veg_wood: 124 diff --git a/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml index a3250046..a5e7d106 100644 --- a/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml @@ -1,6 +1,6 @@ plugin: veg_class_l1 # this can help system find the relative plugin and plugin version plugin_config: - input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, frequency, dem_h] + input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, wet_percentage, frequency, dem_h] optional_bands: [canopy_cover_class, elevation] output_classes: aquatic_veg_wood: 124 diff --git a/dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml index 818b4e5e..bda47488 100644 --- a/dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml @@ -1,6 +1,6 @@ plugin: veg_class_l1 # this can help system find the relative plugin and plugin version plugin_config: - input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, frequency, dem_h] + input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, wet_percentage, frequency, dem_h] optional_bands: [canopy_cover_class, elevation] output_classes: aquatic_veg_wood: 124 @@ -87,7 +87,7 @@ cog_opts: overview_resampling: mode apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-1-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0 # save-tasks options input_products: ga_ls8cls9c_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/srtm_landcover_dem/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/2-0-0/ diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml index 1c147c4b..08559f03 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml @@ -8,7 +8,7 @@ plugin_config: transform_code: EPSG:9688 area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS ue_threshold: 40 - measurements: [veg_frequency, water_frequency] + measurements: [veg_frequency, water_frequency, wet_percentage] product: name: ga_ls_landcover_vwf_cyear_3 diff --git a/prod/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml index 98fd98ed..5ee333f5 100644 --- a/prod/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml @@ -1,6 +1,6 @@ plugin: veg_class_l1 # this can help system find the relative plugin and plugin version plugin_config: - input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, frequency, dem_h] + input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, wet_percentage, frequency, dem_h] optional_bands: [canopy_cover_class, elevation] output_classes: aquatic_veg_wood: 124 diff --git a/prod/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml index a3250046..a5e7d106 100644 --- a/prod/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml @@ -1,6 +1,6 @@ plugin: veg_class_l1 # this can help system find the relative plugin and plugin version plugin_config: - input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, frequency, dem_h] + input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, wet_percentage, frequency, dem_h] optional_bands: [canopy_cover_class, elevation] output_classes: aquatic_veg_wood: 124 diff --git a/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml index 6636c573..bda47488 100644 --- a/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml @@ -1,6 +1,6 @@ plugin: veg_class_l1 # this can help system find the relative plugin and plugin version plugin_config: - input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, frequency, dem_h] + input_bands: [nbart_red, nbart_green, nbart_blue, veg_frequency, wet_percentage, frequency, dem_h] optional_bands: [canopy_cover_class, elevation] output_classes: aquatic_veg_wood: 124 diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 25fa9cdf..c3c8b0b7 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -112,7 +112,7 @@ cog_opts: overview_resampling: mode apply_eodatasets3: True output_location: >- - s3://dea-public-data/derivative/ga_ls_landcover_class_cyear_3/2-0-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/2-0-0 # save-tasks options input_products: ga_ls_fc_pc_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0+s3://dea-public-data-dev/derivative/ga_ls_landcover_artificial_surface_cyear_3/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/2-0-0/ diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml index 1c147c4b..08559f03 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml @@ -8,7 +8,7 @@ plugin_config: transform_code: EPSG:9688 area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS ue_threshold: 40 - measurements: [veg_frequency, water_frequency] + measurements: [veg_frequency, water_frequency, wet_percentage] product: name: ga_ls_landcover_vwf_cyear_3 diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml index 5d065b9c..be62932a 100644 --- a/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml @@ -20,6 +20,10 @@ measurements: dtype: uint8 nodata: 255 units: '1' + - name: wet_percentage + dtype: uint8 + nodata: 255 + units: '1' load: crs: 'EPSG:3577' From c92883f27177eaabe697958178beff276c944301 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 17 Dec 2024 14:25:08 +1100 Subject: [PATCH 3/4] Update ga_ls_landcover_class_cyear_3.yaml --- prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index c3c8b0b7..25fa9cdf 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -112,7 +112,7 @@ cog_opts: overview_resampling: mode apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/2-0-0 + s3://dea-public-data/derivative/ga_ls_landcover_class_cyear_3/2-0-0 # save-tasks options input_products: ga_ls_fc_pc_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0+s3://dea-public-data-dev/derivative/ga_ls_landcover_artificial_surface_cyear_3/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/2-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/2-0-0/ From 5be3d651095fdf4c84487b7b61114a9be79115e5 Mon Sep 17 00:00:00 2001 From: James Miller Date: Wed, 18 Dec 2024 03:04:52 +0000 Subject: [PATCH 4/4] add woody labels l4 --- .../land_and_vegetation/landcover/lc_c3_class_desc.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py index 83cdd3ac..5a15aa0b 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py @@ -18,6 +18,11 @@ 6: 'Cultivated Terrestrial Vegetated: Open (15 to 40 %)', 7: 'Cultivated Terrestrial Vegetated: Sparse (4 to 15 %)', 8: 'Cultivated Terrestrial Vegetated: Scattered (1 to 4 %)', + 9: 'Cultivated Terrestrial Vegetated: Woody Closed (> 65 %)', + 10: 'Cultivated Terrestrial Vegetated: Woody Open (40 to 65 %)', + 11: 'Cultivated Terrestrial Vegetated: Woody Open (15 to 40 %)', + 12: 'Cultivated Terrestrial Vegetated: Woody Sparse (4 to 15 %)', + 13: 'Cultivated Terrestrial Vegetated: Woody Scattered (1 to 4 %)', 14: 'Cultivated Terrestrial Vegetated: Herbaceous Closed (> 65 %)', 15: 'Cultivated Terrestrial Vegetated: Herbaceous Open (40 to 65 %)', 16: 'Cultivated Terrestrial Vegetated: Herbaceous Open (15 to 40 %)',