Merge pull request #1302 from GeoscienceAustralia/landcover_rc

Land Cover Processing Configurations

dev/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml

@@ -9,18 +9,18 @@ plugin_config:
     water: 221
     intertidal: 223
     surface: 210
-  measurements: [level_3_4, water_season]
+  measurements: [level_3_4]
 
 product:
-  name: ga_ls5_landcover_inter_class_cyear_3
-  short_name: ga_ls5_landcover_inter_class_cyear_3
-  version: 1.0.0
+  name: ga_ls_landcover_inter_class_cyear_3
+  short_name: ga_ls_landcover_inter_class_cyear_3
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
   collection_number: 3
 
@@ -84,17 +84,18 @@ future_poll_interval: 2
 # Generic product attributes
 cog_opts:
   zlevel: 9
+  overview_resampling: mode
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/derivative/ga_ls5_landcover_inter_class_cyear_3/1-0-0
+  s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0
 
 # save-tasks options
-input_products: ga_ls5t_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-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/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
+input_products: ga_ls5t_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/
 ignore_time:
-  - s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0/
-  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-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/
 optional_products:
   - s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/
-  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
+  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/2-0-0/
 frequency: annual
 grid: au_extended_30

dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml

@@ -9,18 +9,18 @@ plugin_config:
     water: 221
     intertidal: 223
     surface: 210
-  measurements: [level_3_4, water_season]
+  measurements: [level_3_4]
 
 product:
-  name: ga_ls7_landcover_inter_class_cyear_3
-  short_name: ga_ls7_landcover_inter_class_cyear_3
-  version: 1.0.0
+  name: ga_ls_landcover_inter_class_cyear_3
+  short_name: ga_ls_landcover_inter_class_cyear_3
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
   collection_number: 3
 
@@ -84,17 +84,18 @@ future_poll_interval: 2
 # Generic product attributes
 cog_opts:
   zlevel: 9
+  overview_resampling: mode
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/derivative/ga_ls7_landcover_inter_class_cyear_3/1-0-0
+  s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0
 
 # save-tasks options
-input_products: ga_ls7e_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-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/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
+input_products: ga_ls7e_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/
 ignore_time:
-  - s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0/
-  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-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/
 optional_products:
   - s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/
-  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
+  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/2-0-0/
 frequency: annual
 grid: au_extended_30

dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml

@@ -9,18 +9,18 @@ plugin_config:
     water: 221
     intertidal: 223
     surface: 210
-  measurements: [level_3_4, water_season]
+  measurements: [level_3_4]
 
 product:
-  name: ga_ls8ls9_landcover_inter_class_cyear_3
-  short_name: ga_ls8ls9_landcover_inter_class_cyear_3
-  version: 1.0.0
+  name: ga_ls_landcover_inter_class_cyear_3
+  short_name: ga_ls_landcover_inter_class_cyear_3
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
   collection_number: 3
 
@@ -84,17 +84,18 @@ future_poll_interval: 2
 # Generic product attributes
 cog_opts:
   zlevel: 9
+  overview_resampling: mode
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/derivative/ga_ls8ls9_landcover_inter_class_cyear_3/1-0-0
+  s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-1-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/1-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/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
+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/
 ignore_time:
-  - s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0/
-  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-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/
 optional_products:
   - s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/
-  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
+  - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/2-0-0/
 frequency: annual
 grid: au_extended_30

dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml

@@ -2,6 +2,8 @@ plugin: urban_class # this can help system find the relative plugin and plugin v
 plugin_config:
   input_bands: [nbart_blue, nbart_green, nbart_red, nbart_nir, nbart_swir_1, nbart_swir_2]
   model_path: urban_model_tf_2_16_2.tflite
+  # model_name: urban_model_tf_2_16_2.tflite
+  # model_prefix: lccs_models/urban_models/0-0-5/tflite
   output_classes:
     artificial: 215
     natural: 216
@@ -10,13 +12,13 @@ plugin_config:
 product:
   name: ga_ls_landcover_artificial_surface_cyear_3
   short_name: ga_ls_landcover_artificial_surface_cyear_3
-  version: 1.0.0
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
   collection_number: 3
 
@@ -80,9 +82,10 @@ future_poll_interval: 2
 # Generic product attributes
 cog_opts:
   zlevel: 9
+  overview_resampling: mode
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/derivative/ga_ls_landcover_artificial_surface_cyear_3/1-0-0
+  s3://dea-public-data-dev/derivative/ga_ls_landcover_artificial_surface_cyear_3/2-0-0
 
 # save-tasks options
 input_products: ga_ls5t_gm_cyear_3-ga_ls7e_gm_cyear_3-ga_ls8cls9c_gm_cyear_3

dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml

@@ -1,15 +1,15 @@
 plugin: lccs_level34 # this can help system find the relative plugin and plugin version
 plugin_config:
-  input_bands: [pv_pc_50, bs_pc_50, water_frequency, level_3_4, water_season, artificial_surface, cultivated, woody]
+  input_bands: [pv_pc_50, bs_pc_50, frequency, water_frequency, level_3_4, artificial_surface, cultivated, woody]
   measurements: [level3, level4]
   class_def_path: s3://dea-public-data-dev/lccs_validation/c3/data_to_plot/lccs_colour_scheme_golden_dark_au_c3.csv
   # the dependencies of generating level34
   # i.e., the columns in csv `class_def_path`
   class_condition:
     level3: [level1, artificial_surface, cultivated]
-    level4: [level1, level3, woody, water_season, water_frequency, pv_pc_50, bs_pc_50]
-  urban_mask: /vsizip/vsis3/dea-public-data-dev/urban_aux/SA1_2021_AUST_SHP_GDA2020.zip
-  filter_expression: SA4_NAME21 LIKE '%Outback%' AND AREASQKM21 < 5000 OR SA4_NAME21 NOT LIKE '%Outback%' # urban polygons and rural area < 5k km^2
+    level4: [level1, level3, woody, frequency, water_frequency, pv_pc_50, bs_pc_50]
+  urban_mask: /vsizip/vsis3/dea-public-data-dev/lccs_models/urban_aux/SA1_2021_AUST_SHP_GDA2020.zip
+  filter_expression: GCC_NAME21 LIKE '%Rest of%' AND AREASQKM21 < 63 OR GCC_NAME21 NOT LIKE '%Rest of%' # metropolitan polygons and rural area < 63 km^2
   # match the column names from `class_condition` to `input_bands`
   # absent means the same
   data_var_condition:
@@ -18,13 +18,13 @@ plugin_config:
 product:
   name: ga_ls_landcover_class_cyear_3
   short_name: ga_ls_landcover_class_cyear_3
-  version: 1.0.0
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
   collection_number: 3
 
@@ -109,11 +109,12 @@ future_poll_interval: 2
 # Generic product attributes
 cog_opts:
   zlevel: 9
+  overview_resampling: mode
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/test/lccs/ga_ls_landcover_class_cyear_3/0-0-5
+  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+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls8ls9_landcover_inter_class_cyear_3/1-0-0+s3://dea-public-data-dev/test/lccs/ga_ls_landcover_artificial_surface_cyear_3/0-0-5/+s3://dea-public-data-dev/test/lccs/ga_ls_landcover_cultivated_cyear_3/0-0-4/+s3://dea-public-data-dev/test/lccs/ga_ls_landcover_woody_cyear_3/0-0-3/
+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/
 frequency: annual
 grid: au_extended_30

dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml

@@ -1,8 +1,8 @@
 plugin: cultivated_class  # this can help system find the relative plugin and plugin version
 plugin_config:
-  input_bands: [nbart_blue, nbart_green, nbart_red, nbart_nir, nbart_swir_1, nbart_swir_2, sdev, edev, bcdev, classes_l3_l4]
+  input_bands: [nbart_blue, nbart_green, nbart_red, nbart_nir, nbart_swir_1, nbart_swir_2, sdev, edev, bcdev, level_3_4]
   mask_bands:
-    classes_l3_l4: 110
+    level_3_4: 110
   model_path: cultivated_treelite.so
   output_classes:
     cultivated: 111
@@ -15,13 +15,13 @@ plugin_config:
 product:
   name: ga_ls_landcover_cultivated_cyear_3
   short_name: ga_ls_landcover_cultivated_cyear_3
-  version: 1.0.0
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
   collection_number: 3
 
@@ -85,11 +85,12 @@ future_poll_interval: 2
 # Generic product attributes
 cog_opts:
   zlevel: 9
+  overview_resampling: mode
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/test/lccs/ga_ls_landcover_cultivated_cyear_3/0-0-4
+  s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/2-0-0
 
 # save-tasks options
-input_products: ga_ls5t_gm_cyear_3-ga_ls7e_gm_cyear_3-ga_ls8cls9c_gm_cyear_3-s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2/
+input_products: ga_ls5t_gm_cyear_3-ga_ls7e_gm_cyear_3-ga_ls8cls9c_gm_cyear_3-s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0/
 frequency: annual
 grid: au_extended_30

dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml

@@ -7,15 +7,15 @@ plugin_config:
 product:
   name: ga_ls_landcover_nidem_myear_2
   short_name: ga_ls_landcover_nidem_myear_2
-  version: 1.0.0
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
-  collection_number: 3
+  collection_number: 2
 
   inherit_skip_properties:
     - eo:cloud_cover
@@ -79,7 +79,7 @@ cog_opts:
   zlevel: 9
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0
+  s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/2-0-0
 
 # save-tasks options
 input_products: nidem

dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml

@@ -7,18 +7,19 @@ plugin_config:
       - [dilation, 6]
   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]
 
 product:
   name: ga_ls_landcover_vwf_cyear_3
   short_name: ga_ls_landcover_vwf_cyear_3
-  version: 1.0.0
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
   collection_number: 3
 
@@ -84,7 +85,7 @@ cog_opts:
   zlevel: 9
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0
+  s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/2-0-0
 
 # save-tasks options
 input_products: ga_ls_fc_3+ga_ls_wo_3

dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml

@@ -1,8 +1,10 @@
 plugin: woody_cover # this can help system find the relative plugin and plugin version
 plugin_config:
-  input_bands: [nbart_swir_2, nbart_blue, nbart_green, nbart_red, nbart_nir, nbart_swir_1, classes_l3_l4]
+  input_bands: [nbart_swir_2, nbart_blue, nbart_green, nbart_red, nbart_nir, nbart_swir_1, level_3_4]
+  # temporal_coverage:
+  #   ga_ls8cls9c_gm_cyear_3: [2014--P99Y]
   mask_bands:
-    classes_l3_l4: 110
+    level_3_4: 110
   model_path: woody_treelite.so
   output_classes:
     woody: 113
@@ -15,13 +17,13 @@ plugin_config:
 product:
   name: ga_ls_landcover_woody_cyear_3
   short_name: ga_ls_landcover_woody_cyear_3
-  version: 1.0.0
+  version: 2.0.0
   product_family: lc
 
   # -- EO Dataset3 relative section --
   naming_conventions_values: dea_c3
   explorer_path: https://explorer.dea.ga.gov.au/
-  classifier: ard
+  classifier: lc
   maturity: final
   collection_number: 3
 
@@ -85,11 +87,12 @@ future_poll_interval: 2
 # Generic product attributes
 cog_opts:
   zlevel: 9
+  overview_resampling: mode
 apply_eodatasets3: True
 output_location: >-
-  s3://dea-public-data-dev/test/lccs/ga_ls_landcover_woody_cyear_3/0-0-3
+  s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/2-0-0
 
 # save-tasks options
-input_products: ga_ls5t_gm_cyear_3-ga_ls7e_gm_cyear_3-ga_ls8cls9c_gm_cyear_3-s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2/
+input_products: ga_ls5t_gm_cyear_3-ga_ls7e_gm_cyear_3-ga_ls8cls9c_gm_cyear_3-s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0/
 frequency: annual
 grid: au_extended_30