Merge pull request #1304 from GeoscienceAustralia/landcover_rc

Landcover configs and ows updates
GeoscienceAustralia · Dec 18, 2024 · 6dea7a2 · 6dea7a2
2 parents ae573e8 + 5be3d65
commit 6dea7a2
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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/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 %)',

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
@@ -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
@@ -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
@@ -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/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
@@ -20,6 +20,10 @@ measurements:
     dtype: uint8
     nodata: 255
     units: '1'
+  - name: wet_percentage
+    dtype: uint8
+    nodata: 255
+    units: '1'
 
 load:
   crs: 'EPSG:3577'