From b90e77a783a1de20b0ff9676c580f67aa5cb3902 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:34:33 +1100 Subject: [PATCH 01/67] Update ga_ls_landcover_woody_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 7bf2e5d26..3b438125b 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -87,9 +87,9 @@ cog_opts: zlevel: 9 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/test/lccs/ga_ls_landcover_woody_cyear_3/1-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_ls5_landcover_inter_class_cyear_3/1-0-0/-s3://dea-public-data-dev/derivative/ga_ls7_landcover_inter_class_cyear_3/1-0-0/-s3://dea-public-data-dev/derivative/ga_ls8ls9_landcover_inter_class_cyear_3/1-0-0/ frequency: annual grid: au_extended_30 From 780501c520ebedcd6c49cf97154ea0c54c72fd93 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:42:23 +1100 Subject: [PATCH 02/67] Update ga_ls_landcover_artificial_surface_cyear_3.yaml --- .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index 6a50b2593..a64404e80 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -1,7 +1,9 @@ plugin: urban_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] - model_path: urban_model_tf_2_16_2.tflite + # 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 From 6d45ef9efa4d353617c478d93ed0ab6a5a5c5b97 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:15:06 +1100 Subject: [PATCH 03/67] Update ga_ls_landcover_artificial_surface_cyear_3.yaml --- .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index a64404e80..288ad427d 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -1,7 +1,7 @@ plugin: urban_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] - # model_path: urban_model_tf_2_16_2.tflite + 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: From 4bbb4604d20079aa1e2b1b22a5925a056f789bfc Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:18:13 +1100 Subject: [PATCH 04/67] Update ga_ls_landcover_artificial_surface_cyear_3.yaml --- .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index 288ad427d..aa33c6df3 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -2,8 +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 + # 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 From c6a368bcce53946fb5c117adb47f52b57ef093d5 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:30:05 +1100 Subject: [PATCH 05/67] Update ga_ls5_landcover_inter_class_cyear_3.yaml --- .../lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 332cbe50b..38ba5978e 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 @@ -12,8 +12,8 @@ plugin_config: measurements: [level_3_4, water_season] product: - name: ga_ls5_landcover_inter_class_cyear_3 - short_name: ga_ls5_landcover_inter_class_cyear_3 + name: ga_ls_landcover_inter_class_cyear_3 + short_name: ga_ls_landcover_inter_class_cyear_3 version: 1.0.0 product_family: lc @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 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/1-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/ From 8617b7bfff472b9569b41d72f7d4ea4ef1177146 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:30:33 +1100 Subject: [PATCH 06/67] Update ga_ls7_landcover_inter_class_cyear_3.yaml --- .../lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 319940c4f..9174f1371 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 @@ -12,8 +12,8 @@ plugin_config: measurements: [level_3_4, water_season] product: - name: ga_ls7_landcover_inter_class_cyear_3 - short_name: ga_ls7_landcover_inter_class_cyear_3 + name: ga_ls_landcover_inter_class_cyear_3 + short_name: ga_ls_landcover_inter_class_cyear_3 version: 1.0.0 product_family: lc @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 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/1-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/ From 085b6629adf41101885738ecd31058980a1b58b2 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:31:02 +1100 Subject: [PATCH 07/67] Update ga_ls8ls9_landcover_inter_class_cyear_3.yaml --- .../lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 90375037a..9202bd8fe 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 @@ -12,8 +12,8 @@ plugin_config: measurements: [level_3_4, water_season] product: - name: ga_ls8ls9_landcover_inter_class_cyear_3 - short_name: ga_ls8ls9_landcover_inter_class_cyear_3 + name: ga_ls_landcover_inter_class_cyear_3 + short_name: ga_ls_landcover_inter_class_cyear_3 version: 1.0.0 product_family: lc @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 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-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/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/ From 166b9360507d92d98c93861d4fc7c3fcdb88437e Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:40:02 +1100 Subject: [PATCH 08/67] Update ga_ls_landcover_woody_cyear_3.yaml --- dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 3b438125b..893283147 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -90,6 +90,6 @@ output_location: >- s3://dea-public-data-dev/test/lccs/ga_ls_landcover_woody_cyear_3/1-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/derivative/ga_ls5_landcover_inter_class_cyear_3/1-0-0/-s3://dea-public-data-dev/derivative/ga_ls7_landcover_inter_class_cyear_3/1-0-0/-s3://dea-public-data-dev/derivative/ga_ls8ls9_landcover_inter_class_cyear_3/1-0-0/ +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/1-0-0/ frequency: annual grid: au_extended_30 From d2ef90a19fa852acb62c821fad6ffb343152bcba Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:40:33 +1100 Subject: [PATCH 09/67] Update ga_ls_landcover_woody_cyear_3.yaml --- dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 893283147..5d9816b6d 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -87,7 +87,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_landcover_woody_cyear_3/1-0-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-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/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0/ From f81182c5addc6e09fd961226dcb02e26eeccd279 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 13:51:49 +1100 Subject: [PATCH 10/67] Update ga_ls_landcover_cultivated_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index c2203cfb0..9cfe8e83b 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -87,9 +87,9 @@ cog_opts: zlevel: 9 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/1-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/1-0-0/ frequency: annual grid: au_extended_30 From 2ea7698c23c304bee837af58d23cd6324c5b56b8 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:21:47 +1100 Subject: [PATCH 11/67] Update ga_ls_landcover_cultivated_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index 9cfe8e83b..b21ec3f6b 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -1,6 +1,6 @@ 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 model_path: cultivated_treelite.so From 117682ad7956a80f97981ef3ac7f9e12528806c9 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:21:56 +1100 Subject: [PATCH 12/67] Update ga_ls_landcover_woody_cyear_3.yaml --- dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 5d9816b6d..dedd6e817 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -1,6 +1,6 @@ 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] mask_bands: classes_l3_l4: 110 model_path: woody_treelite.so From 2a001bb36dbd9fd6da16d6ccdd12470161fc0d2f Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:39:39 +1100 Subject: [PATCH 13/67] Update ga_ls_landcover_woody_cyear_3.yaml --- dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index dedd6e817..26ba8a2eb 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -2,7 +2,7 @@ plugin: woody_cover # this can help system find the relative plugin and plugin v plugin_config: input_bands: [nbart_swir_2, nbart_blue, nbart_green, nbart_red, nbart_nir, nbart_swir_1, level_3_4] mask_bands: - classes_l3_l4: 110 + level_3_4: 110 model_path: woody_treelite.so output_classes: woody: 113 From faadc983833043815bcbe53cdf6381266e7c9504 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:41:29 +1100 Subject: [PATCH 14/67] Update ga_ls_landcover_cultivated_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index b21ec3f6b..5041a292f 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -2,7 +2,7 @@ plugin: cultivated_class # this can help system find the relative plugin and pl plugin_config: 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 From 3122949a9d05743eb021182aa9a256e71afbff53 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:48:17 +1100 Subject: [PATCH 15/67] Update ga_ls_landcover_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index ca6b62951..3c492d536 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -63,9 +63,9 @@ cog_opts: zlevel: 9 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/1-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+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0+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_cultivated_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-0-0/ frequency: annual grid: au_extended_30 From 265d4199eefe5a5052c0181d3d0181681426b365 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 09:58:46 +1100 Subject: [PATCH 16/67] Update ga_ls_landcover_class_cyear_3.yaml --- .../lccs/ga_ls_landcover_class_cyear_3.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 3c492d536..806ab58b3 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -2,8 +2,18 @@ plugin: lccs_level34 # this can help system find the relative plugin and plugin plugin_config: input_bands: [pv_pc_50, bs_pc_50, water_frequency, level_3_4, water_season, 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 + # match the column names from `class_condition` to `input_bands` + # absent means the same + data_var_condition: + level1: level_3_4 product: name: ga_ls_landcover_class_cyear_3 @@ -18,6 +28,44 @@ product: maturity: final collection_number: 3 + preview_image_ows_style: + name: landcover + title: Landcover + abstract: Landcover level3 + value_map: + level3: + - title: "CTV" + abstract: "Cultivated Terrestrial Vegetated" + values: + - 111 + color: "#97BB1A" + - title: "NTV" + abstract: "Natural Terrestrial Vegetated" + values: + - 112 + color: "#0E7912" + - title: "NAV" + abstract: "Natural Aquatic Vegetated" + values: + - 124 + color: "#1EBF79" + - title: "AS" + abstract: "Artificial Surface" + values: + - 215 + color: "#DA5C69" + - title: "NS" + abstract: "Natural Surface" + values: + - 216 + color: "#F3AB69" + - title: "Water" + abstract: "Water" + values: + - 220 + color: "#4D9FDC" + + inherit_skip_properties: - eo:cloud_cover - fmask:clear From 8742736f54ab721e504fda2912ebea44b7ff403f Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:24:02 +1100 Subject: [PATCH 17/67] Create ga_ls_landcover_class_cyear_3.yaml --- .../lccs/ga_ls_landcover_class_cyear_3.yaml | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml 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 new file mode 100644 index 000000000..82e26ae61 --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -0,0 +1,119 @@ +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] + 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 + # match the column names from `class_condition` to `input_bands` + # absent means the same + data_var_condition: + level1: level_3_4 + +product: + name: ga_ls_landcover_class_cyear_3 + short_name: ga_ls_landcover_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 + maturity: final + collection_number: 3 + + preview_image_ows_style: + name: landcover + title: Landcover + abstract: Landcover level3 + value_map: + level3: + - title: "CTV" + abstract: "Cultivated Terrestrial Vegetated" + values: + - 111 + color: "#97BB1A" + - title: "NTV" + abstract: "Natural Terrestrial Vegetated" + values: + - 112 + color: "#0E7912" + - title: "NAV" + abstract: "Natural Aquatic Vegetated" + values: + - 124 + color: "#1EBF79" + - title: "AS" + abstract: "Artificial Surface" + values: + - 215 + color: "#DA5C69" + - title: "NS" + abstract: "Natural Surface" + values: + - 216 + color: "#F3AB69" + - title: "Water" + abstract: "Water" + values: + - 220 + color: "#4D9FDC" + + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + +aws_unsigned: True +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + 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+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 From bc48b935cea84bad0ff27a7ef87cb281c68eb97e Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:34:44 +1100 Subject: [PATCH 18/67] Add files via upload --- .../ga_ls5_landcover_inter_class_cyear_3.yaml | 100 ++++++++++++++++++ .../ga_ls7_landcover_inter_class_cyear_3.yaml | 100 ++++++++++++++++++ ..._ls8ls9_landcover_inter_class_cyear_3.yaml | 100 ++++++++++++++++++ ..._landcover_artificial_surface_cyear_3.yaml | 92 ++++++++++++++++ .../ga_ls_landcover_cultivated_cyear_3.yaml | 95 +++++++++++++++++ .../lccs/ga_ls_landcover_nidem_myear_2.yaml | 87 +++++++++++++++ .../lccs/ga_ls_landcover_vwf_cyear_3.yaml | 92 ++++++++++++++++ .../lccs/ga_ls_landcover_woody_cyear_3.yaml | 95 +++++++++++++++++ .../odc-stats/lccs/srtm_landcover_dem.yaml | 92 ++++++++++++++++ 9 files changed, 853 insertions(+) create mode 100644 prod/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml create mode 100644 prod/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml create mode 100644 prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml create mode 100644 prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml create mode 100644 prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml create mode 100644 prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml create mode 100644 prod/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml create mode 100644 prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml create mode 100644 prod/services/odc-stats/lccs/srtm_landcover_dem.yaml 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 new file mode 100644 index 000000000..38ba5978e --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml @@ -0,0 +1,100 @@ +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] + optional_bands: [canopy_cover_class, elevation] + output_classes: + aquatic_veg_wood: 124 + aquatic_veg_herb: 125 + terrestrial_veg: 110 + water: 221 + intertidal: 223 + surface: 210 + measurements: [level_3_4, water_season] + +product: + name: ga_ls_landcover_inter_class_cyear_3 + short_name: ga_ls_landcover_inter_class_cyear_3 + version: 1.0.0 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-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/ +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/ +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/ +frequency: annual +grid: au_extended_30 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 new file mode 100644 index 000000000..9174f1371 --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml @@ -0,0 +1,100 @@ +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] + optional_bands: [canopy_cover_class, elevation] + output_classes: + aquatic_veg_wood: 124 + aquatic_veg_herb: 125 + terrestrial_veg: 110 + water: 221 + intertidal: 223 + surface: 210 + measurements: [level_3_4, water_season] + +product: + name: ga_ls_landcover_inter_class_cyear_3 + short_name: ga_ls_landcover_inter_class_cyear_3 + version: 1.0.0 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-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/ +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/ +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/ +frequency: annual +grid: au_extended_30 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 new file mode 100644 index 000000000..9202bd8fe --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml @@ -0,0 +1,100 @@ +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] + optional_bands: [canopy_cover_class, elevation] + output_classes: + aquatic_veg_wood: 124 + aquatic_veg_herb: 125 + terrestrial_veg: 110 + water: 221 + intertidal: 223 + surface: 210 + measurements: [level_3_4, water_season] + +product: + name: ga_ls_landcover_inter_class_cyear_3 + short_name: ga_ls_landcover_inter_class_cyear_3 + version: 1.0.0 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-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/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/ +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/ +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/ +frequency: annual +grid: au_extended_30 diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml new file mode 100644 index 000000000..aa33c6df3 --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -0,0 +1,92 @@ +plugin: urban_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] + 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 + measurements: [artificial_surface] + +product: + name: ga_ls_landcover_artificial_surface_cyear_3 + short_name: ga_ls_landcover_artificial_surface_cyear_3 + version: 1.0.0 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_landcover_artificial_surface_cyear_3/1-0-0 + +# save-tasks options +input_products: ga_ls5t_gm_cyear_3-ga_ls7e_gm_cyear_3-ga_ls8cls9c_gm_cyear_3 +frequency: annual +grid: au_extended_30 diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml new file mode 100644 index 000000000..5041a292f --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -0,0 +1,95 @@ +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, level_3_4] + mask_bands: + level_3_4: 110 + model_path: cultivated_treelite.so + output_classes: + cultivated: 111 + natural: 112 + measurements: [cultivated] + chunks: + y: 400 + x: 400 + +product: + name: ga_ls_landcover_cultivated_cyear_3 + short_name: ga_ls_landcover_cultivated_cyear_3 + version: 1.0.0 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-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/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0/ +frequency: annual +grid: au_extended_30 diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml new file mode 100644 index 000000000..7e31913e4 --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml @@ -0,0 +1,87 @@ +plugin: dem_in_stats # this can help system find the relative plugin and plugin version +plugin_config: + resampling: nearest + input_bands: [nidem] + measurements: [elevation] + +product: + name: ga_ls_landcover_nidem_myear_2 + short_name: ga_ls_landcover_nidem_myear_2 + version: 1.0.0 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0 + +# save-tasks options +input_products: nidem +frequency: all +grid: au_extended_30 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 new file mode 100644 index 000000000..11e57da9f --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml @@ -0,0 +1,92 @@ +plugin: veg_count # this can help system find the relative plugin and plugin version +plugin_config: + cloud_filters: + cloud: + - [dilation, 6] + cloud_shadow: + - [dilation, 6] + transform_code: EPSG:9688 + area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS + 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 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0 + +# save-tasks options +input_products: ga_ls_fc_3+ga_ls_wo_3 +frequency: annual +grid: au_extended_30 diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml new file mode 100644 index 000000000..26ba8a2eb --- /dev/null +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -0,0 +1,95 @@ +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, level_3_4] + mask_bands: + level_3_4: 110 + model_path: woody_treelite.so + output_classes: + woody: 113 + herbaceous: 114 + measurements: [woody] + chunks: + y: 400 + x: 400 + +product: + name: ga_ls_landcover_woody_cyear_3 + short_name: ga_ls_landcover_woody_cyear_3 + version: 1.0.0 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-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/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0/ +frequency: annual +grid: au_extended_30 diff --git a/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml b/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml new file mode 100644 index 000000000..982be7578 --- /dev/null +++ b/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml @@ -0,0 +1,92 @@ +plugin: dem_in_stats # this can help system find the relative plugin and plugin version +plugin_config: + transform_code: EPSG:9688 + area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS + resampling: nearest + input_bands: [dem_h] + measurements: [dem_h] + chunks: + latitude: -1 + longitude: -1 + +product: + name: srtm_landcover_dem + short_name: srtm_landcover_dem + version: 1.0.0 + product_family: lc + + # -- EO Dataset3 relative section -- + naming_conventions_values: dea_c3 + explorer_path: https://explorer.dea.ga.gov.au/ + classifier: ard + maturity: final + collection_number: 3 + + inherit_skip_properties: + - eo:cloud_cover + - fmask:clear + - fmask:snow + - fmask:cloud + - fmask:water + - fmask:cloud_shadow + - eo:sun_elevation + - eo:sun_azimuth + - gqa:iterative_stddev_x + - gqa:iterative_stddev_y + - gqa:iterative_stddev_xy + - gqa:stddev_xy + - gqa:stddev_x + - gqa:stddev_y + - gqa:mean_xy + - gqa:mean_x + - gqa:mean_y + - gqa:abs_xy + - gqa:abs_x + - gqa:abs_y + - gqa:abs_iterative_mean_y + - gqa:abs_iterative_mean_x + - gqa:abs_iterative_mean_xy + - gqa:iterative_mean_xy + - gqa:iterative_mean_x + - gqa:iterative_mean_y + - gqa:cep90 + - landsat:landsat_product_id + - landsat:landsat_scene_id + - landsat:collection_category + - landsat:collection_number + - landsat:wrs_path + - landsat:wrs_row + + # preview_image_ows_style: + # name: fc_rgb + # title: Three-band fractional cover + # abstract: Fractional cover medians - red is bare soil, green is green vegetation and + # blue is non-green vegetation + # components: + # red: + # bs_pc_50: 1 + # green: + # pv_pc_50: 1 + # blue: + # npv_pc_50: 1 + # scale_range: + # - 0 + # - 100 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0 + +# save-tasks options +input_products: ga_srtm_dem1sv1_0 +frequency: annual +grid: au_extended_30 From 2b20d46ff59fabd183ce60783d57f60aa9c07cf8 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:35:51 +1100 Subject: [PATCH 19/67] Update ga_ls5_landcover_inter_class_cyear_3.yaml --- .../lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 38ba5978e..6337b04d6 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 @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_inter_class_cyear_3 short_name: ga_ls_landcover_inter_class_cyear_3 - version: 1.0.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -86,10 +86,10 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_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/ From 94b30011dd9e09285386de19f88ea759a46c0f33 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:36:31 +1100 Subject: [PATCH 20/67] Update ga_ls7_landcover_inter_class_cyear_3.yaml --- .../lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 9174f1371..6092a7c0d 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 @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_inter_class_cyear_3 short_name: ga_ls_landcover_inter_class_cyear_3 - version: 1.0.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -89,12 +89,12 @@ output_location: >- s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-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 From 57b6af5ed7735fc940823909f0d0074e54e17365 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:36:47 +1100 Subject: [PATCH 21/67] Update ga_ls5_landcover_inter_class_cyear_3.yaml --- .../lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6337b04d6..0b526bde2 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 @@ -91,10 +91,10 @@ output_location: >- # 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/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 From 8a2e9cfd66e18bb71a05b549d3ccf5bee31299a1 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:37:42 +1100 Subject: [PATCH 22/67] Update ga_ls8ls9_landcover_inter_class_cyear_3.yaml --- .../ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 9202bd8fe..1807273e4 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 @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_inter_class_cyear_3 short_name: ga_ls_landcover_inter_class_cyear_3 - version: 1.0.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -86,15 +86,15 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_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_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 From 830aec873167223df34c5c20dd21efbdfb849295 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:38:10 +1100 Subject: [PATCH 23/67] Update ga_ls_landcover_artificial_surface_cyear_3.yaml --- .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index aa33c6df3..889e5c37e 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -12,7 +12,7 @@ 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 -- @@ -84,7 +84,7 @@ cog_opts: zlevel: 9 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 From 2d3196e23cc5805a078c7175020aea934e71ff41 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:38:36 +1100 Subject: [PATCH 24/67] Update ga_ls_landcover_cultivated_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index 5041a292f..16fa3efd5 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -15,7 +15,7 @@ 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 -- @@ -87,9 +87,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-0-0 + 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/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0/ +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 From 915e6e8c47e1922c9426f0019cf73da145004bb1 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:38:56 +1100 Subject: [PATCH 25/67] Update ga_ls_landcover_nidem_myear_2.yaml --- .../odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml index 7e31913e4..e0685904a 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml @@ -7,7 +7,7 @@ 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 -- @@ -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 From fe0b806b74662b16d8621e17871a3a84c4bca184 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:39:12 +1100 Subject: [PATCH 26/67] Update ga_ls_landcover_vwf_cyear_3.yaml --- prod/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 11e57da9f..d43002ae8 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 @@ -12,7 +12,7 @@ plugin_config: 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 -- @@ -84,7 +84,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 From 40aaadcf71291236c4d3b4ec005aa1b018facaec Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:39:32 +1100 Subject: [PATCH 27/67] Update ga_ls_landcover_woody_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 26ba8a2eb..499f1c9b2 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -15,7 +15,7 @@ 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 -- @@ -87,9 +87,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-0-0 + 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/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0/ +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 From fc961b122c96ffe3b64e2a472ffc7fe232e7d55d Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:39:46 +1100 Subject: [PATCH 28/67] Update srtm_landcover_dem.yaml --- prod/services/odc-stats/lccs/srtm_landcover_dem.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml b/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml index 982be7578..d2f31b3fe 100644 --- a/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml +++ b/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml @@ -12,7 +12,7 @@ plugin_config: product: name: srtm_landcover_dem short_name: srtm_landcover_dem - version: 1.0.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -84,7 +84,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0 + s3://dea-public-data-dev/derivative/srtm_landcover_dem/2-0-0 # save-tasks options input_products: ga_srtm_dem1sv1_0 From 6b78d430e2548c277fe43f624b104ded23a15b5d Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:44:48 +1100 Subject: [PATCH 29/67] Add files via upload --- .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index aa33c6df3..889e5c37e 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -12,7 +12,7 @@ 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 -- @@ -84,7 +84,7 @@ cog_opts: zlevel: 9 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 From dc67abf518042a29bfefe8a810a8f8d101623b7d Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:45:31 +1100 Subject: [PATCH 30/67] Add files via upload --- .../lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 12 ++++++------ .../lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 10 +++++----- .../ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 12 ++++++------ .../lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 6 +++--- .../lccs/ga_ls_landcover_nidem_myear_2.yaml | 4 ++-- .../odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 4 ++-- .../lccs/ga_ls_landcover_woody_cyear_3.yaml | 6 +++--- dev/services/odc-stats/lccs/srtm_landcover_dem.yaml | 4 ++-- 8 files changed, 29 insertions(+), 29 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 38ba5978e..0b526bde2 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 @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_inter_class_cyear_3 short_name: ga_ls_landcover_inter_class_cyear_3 - version: 1.0.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -86,15 +86,15 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_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 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 9174f1371..6092a7c0d 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 @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_inter_class_cyear_3 short_name: ga_ls_landcover_inter_class_cyear_3 - version: 1.0.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -89,12 +89,12 @@ output_location: >- s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-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 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 9202bd8fe..1807273e4 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 @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_inter_class_cyear_3 short_name: ga_ls_landcover_inter_class_cyear_3 - version: 1.0.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -86,15 +86,15 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_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_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 diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index 5041a292f..16fa3efd5 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -15,7 +15,7 @@ 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 -- @@ -87,9 +87,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-0-0 + 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/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0/ +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 diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml index 7e31913e4..e0685904a 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml @@ -7,7 +7,7 @@ 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 -- @@ -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 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 11e57da9f..d43002ae8 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 @@ -12,7 +12,7 @@ plugin_config: 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 -- @@ -84,7 +84,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 diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 26ba8a2eb..499f1c9b2 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -15,7 +15,7 @@ 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 -- @@ -87,9 +87,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-0-0 + 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/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0/ +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 diff --git a/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml index 982be7578..d2f31b3fe 100644 --- a/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml +++ b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml @@ -12,7 +12,7 @@ plugin_config: product: name: srtm_landcover_dem short_name: srtm_landcover_dem - version: 1.0.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -84,7 +84,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0 + s3://dea-public-data-dev/derivative/srtm_landcover_dem/2-0-0 # save-tasks options input_products: ga_srtm_dem1sv1_0 From 337b71d5949fc7cb5ee4125a1e41119bc3dba665 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:46:39 +1100 Subject: [PATCH 31/67] Update ga_ls7_landcover_inter_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6092a7c0d..2c57ee100 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 @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_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/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 43f1d32bed27ae41f8c950ba79ca972e384bb9fa Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:47:01 +1100 Subject: [PATCH 32/67] Update ga_ls7_landcover_inter_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6092a7c0d..2c57ee100 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 @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_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/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 190c52604869a2c59a71bcfbc811dcaa3e38ef95 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:48:01 +1100 Subject: [PATCH 33/67] Update ga_ls_landcover_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 806ab58b3..55e364499 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -111,9 +111,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/1-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+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0+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_cultivated_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-0-0/ +input_products: ga_ls_fc_pc_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 From 604fd9d0140e1f1a5954cdf6fbc822bf6f0fb051 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:19:11 +1100 Subject: [PATCH 34/67] Update ga_ls_landcover_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 55e364499..0ae0bad5c 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -8,7 +8,7 @@ plugin_config: 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 + urban_mask: /vsizip/vsis3/dea-public-data-dev/lccs_models/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 # match the column names from `class_condition` to `input_bands` # absent means the same @@ -111,9 +111,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/2-0-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/1-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/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/ +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_ls_landcover_inter_class_cyear_3/1-0-0+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_cultivated_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-0-0/ frequency: annual grid: au_extended_30 From fbf3366b9aeb1a5960961edda435682891f063f1 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:24:42 +1100 Subject: [PATCH 35/67] 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 82e26ae61..58cbc2a71 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 @@ -8,7 +8,7 @@ plugin_config: 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 + urban_mask: /vsizip/vsis3/dea-public-data-dev/lccs_models/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 # match the column names from `class_condition` to `input_bands` # absent means the same From afaeac8eddafb0c46841ef745f22ec24bbc9644f Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Mon, 2 Dec 2024 06:07:09 +0000 Subject: [PATCH 36/67] filter landcover level0 by sensors --- dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 4 ++++ 1 file changed, 4 insertions(+) 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 d43002ae8..bc412f56e 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 @@ -83,6 +83,10 @@ future_poll_interval: 2 cog_opts: zlevel: 9 apply_eodatasets3: True +dataset_filters: >- + {"datetime": "1987-01--P17Y"}|{"datetime": "2004-01--P6Y", "eo:platform": "landsat-5"}| + {"datetime": "2010-01--P3Y"}|{"datetime": "2013-01--P5M"}|{"eo:platform": "landsat-8"}| + {"eo:platform": "landsat-9"} output_location: >- s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/2-0-0 From b098a050e8a24e7b8cf3b7b603937e79900407a8 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Mon, 2 Dec 2024 06:14:42 +0000 Subject: [PATCH 37/67] remove water_season from level1 --- .../odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1807273e4..93716f750 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 @@ -9,7 +9,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 - measurements: [level_3_4, water_season] + measurements: [level_3_4] product: name: ga_ls_landcover_inter_class_cyear_3 From 2fc5a1924c0cb0f48150c40b81bbb1f37fb4d31f Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Mon, 2 Dec 2024 06:49:16 +0000 Subject: [PATCH 38/67] update config for landcover inter and level34 classes --- .../lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 2 +- .../lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 2 +- .../odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 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 0b526bde2..1c049b28a 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 @@ -9,7 +9,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 - measurements: [level_3_4, water_season] + measurements: [level_3_4] product: name: ga_ls_landcover_inter_class_cyear_3 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 2c57ee100..fd6081f08 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 @@ -9,7 +9,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 - measurements: [level_3_4, water_season] + measurements: [level_3_4] product: name: ga_ls_landcover_inter_class_cyear_3 diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 0ae0bad5c..4ea2cbd4e 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -1,13 +1,13 @@ 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] + 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: SA4_NAME21 LIKE '%Outback%' AND AREASQKM21 < 5000 OR SA4_NAME21 NOT LIKE '%Outback%' # urban polygons and rural area < 5k km^2 # match the column names from `class_condition` to `input_bands` @@ -114,6 +114,6 @@ output_location: >- s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/1-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_ls_landcover_inter_class_cyear_3/1-0-0+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_cultivated_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-0-0/ +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/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0+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_cultivated_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-0-0/ frequency: annual grid: au_extended_30 From 63862ae185a906f150b8070e28d323db33ad0e07 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Tue, 3 Dec 2024 01:04:03 +0000 Subject: [PATCH 39/67] ga_ls_landcover_vwf_cyear_3.yaml --- dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 bc412f56e..2ad7c4295 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 @@ -7,6 +7,7 @@ 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: 45 measurements: [veg_frequency, water_frequency] product: @@ -83,10 +84,6 @@ future_poll_interval: 2 cog_opts: zlevel: 9 apply_eodatasets3: True -dataset_filters: >- - {"datetime": "1987-01--P17Y"}|{"datetime": "2004-01--P6Y", "eo:platform": "landsat-5"}| - {"datetime": "2010-01--P3Y"}|{"datetime": "2013-01--P5M"}|{"eo:platform": "landsat-8"}| - {"eo:platform": "landsat-9"} output_location: >- s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/2-0-0 From 48c52a7cf684fe541f7811198fe868abc57f1a44 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:49:32 +1100 Subject: [PATCH 40/67] Update ga_ls_landcover_vwf_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 2ad7c4295..2e546e0a0 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 @@ -7,13 +7,13 @@ 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: 45 + ue_threshold: 35 measurements: [veg_frequency, water_frequency] product: name: ga_ls_landcover_vwf_cyear_3 short_name: ga_ls_landcover_vwf_cyear_3 - version: 2.0.0 + version: 1.0.1 product_family: lc # -- EO Dataset3 relative section -- @@ -85,7 +85,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/2-0-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-1 # save-tasks options input_products: ga_ls_fc_3+ga_ls_wo_3 From d3ef3d2727cd23acbc6567fa84f32da1851d5b06 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Thu, 5 Dec 2024 05:04:08 +0000 Subject: [PATCH 41/67] update ue_threshold --- dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2e546e0a0..9b9b096ad 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 @@ -7,7 +7,7 @@ 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: 35 + ue_threshold: 40 measurements: [veg_frequency, water_frequency] product: From 5c7f1b3a95eac626844c644d8632b444c118705c Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Fri, 6 Dec 2024 01:28:59 +0000 Subject: [PATCH 42/67] update urban mask condition --- dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 4ea2cbd4e..8037e94da 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -9,7 +9,7 @@ plugin_config: level3: [level1, artificial_surface, cultivated] 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: SA4_NAME21 LIKE '%Outback%' AND AREASQKM21 < 5000 OR SA4_NAME21 NOT LIKE '%Outback%' # urban polygons and rural area < 5k km^2 + filter_expression: GCC_NAME21 LIKE '%Rest of%' AND AREASQKM21 < 500 OR GCC_NAME21 NOT LIKE '%Rest of%' # metropolitan polygons and rural area < 500 km^2 # match the column names from `class_condition` to `input_bands` # absent means the same data_var_condition: From 3a1eaebfc78ee749e606c248fd63a83e0528bd56 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:42:41 +1100 Subject: [PATCH 43/67] Update ga_ls_landcover_vwf_cyear_3.yaml --- dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9b9b096ad..b6d0329b4 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 @@ -13,7 +13,7 @@ plugin_config: product: name: ga_ls_landcover_vwf_cyear_3 short_name: ga_ls_landcover_vwf_cyear_3 - version: 1.0.1 + version: 1.1.0 product_family: lc # -- EO Dataset3 relative section -- @@ -85,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-1 + s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-1-0 # save-tasks options input_products: ga_ls_fc_3+ga_ls_wo_3 From 7c8716242ad9167447e772388758eb70cc16a106 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:59:25 +1100 Subject: [PATCH 44/67] Update ga_ls_landcover_artificial_surface_cyear_3.yaml --- .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index 889e5c37e..0c5675b1b 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -12,7 +12,7 @@ plugin_config: product: name: ga_ls_landcover_artificial_surface_cyear_3 short_name: ga_ls_landcover_artificial_surface_cyear_3 - version: 2.0.0 + version: 1.1.0 product_family: lc # -- EO Dataset3 relative section -- @@ -84,7 +84,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - 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_artificial_surface_cyear_3/1-1-0 # save-tasks options input_products: ga_ls5t_gm_cyear_3-ga_ls7e_gm_cyear_3-ga_ls8cls9c_gm_cyear_3 From 85305776fd6d5f20f2f3029cd48a7d88f157283b Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:20:00 +1100 Subject: [PATCH 45/67] Update ga_ls8ls9_landcover_inter_class_cyear_3.yaml --- .../ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 93716f750..84c59aa1a 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 @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_inter_class_cyear_3 short_name: ga_ls_landcover_inter_class_cyear_3 - version: 2.0.0 + version: 1.1.0 product_family: lc # -- EO Dataset3 relative section -- @@ -86,15 +86,15 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - 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_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/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/ +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-1-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/ ignore_time: - - 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/ + - 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/ 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/2-0-0/ + - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/ frequency: annual grid: au_extended_30 From 0464bb63a0ba491aeb1fa0236b8de90cbfb8df7d Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:02:33 +1100 Subject: [PATCH 46/67] Update ga_ls_landcover_cultivated_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index 16fa3efd5..ab935a9f5 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -15,7 +15,7 @@ plugin_config: product: name: ga_ls_landcover_cultivated_cyear_3 short_name: ga_ls_landcover_cultivated_cyear_3 - version: 2.0.0 + version: 1.1.0 product_family: lc # -- EO Dataset3 relative section -- @@ -87,9 +87,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/2-0-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-1-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/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0/ +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/1-1-0/ frequency: annual grid: au_extended_30 From e28ed1396955413d969a1555f3ffbed15b782bf4 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:09:24 +1100 Subject: [PATCH 47/67] Update ga_ls_landcover_woody_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 499f1c9b2..838d758ff 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -15,7 +15,7 @@ plugin_config: product: name: ga_ls_landcover_woody_cyear_3 short_name: ga_ls_landcover_woody_cyear_3 - version: 2.0.0 + version: 1.1.0 product_family: lc # -- EO Dataset3 relative section -- @@ -87,9 +87,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/2-0-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-1-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/derivative/ga_ls_landcover_inter_class_cyear_3/2-0-0/ +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/1-1-0/ frequency: annual grid: au_extended_30 From 08e2b51d507b3a5c624b757a2eada49d4ad53966 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:45:27 +1100 Subject: [PATCH 48/67] Update ga_ls_landcover_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 8037e94da..08ef5cabe 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -18,7 +18,7 @@ plugin_config: product: name: ga_ls_landcover_class_cyear_3 short_name: ga_ls_landcover_class_cyear_3 - version: 1.0.0 + version: 1.1.0 product_family: lc # -- EO Dataset3 relative section -- @@ -111,9 +111,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/1-0-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/1-1-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/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_inter_class_cyear_3/1-0-0+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_cultivated_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-0-0/ +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/1-1-0/+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_artificial_surface_cyear_3/1-1-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-1-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-1-0/ frequency: annual grid: au_extended_30 From 068fea9d591db608e3a8bbb083c7888b350b5242 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Sun, 8 Dec 2024 23:38:25 +0000 Subject: [PATCH 49/67] add sensor selection option --- dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 838d758ff..27ff95082 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -1,6 +1,8 @@ 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, level_3_4] + # temporal_coverage: + # ga_ls8cls9c_gm_cyear_3: [2014--P99Y] mask_bands: level_3_4: 110 model_path: woody_treelite.so From acc750359e4b705bb869776a05472d8bcc22b7ee Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 11 Dec 2024 01:40:58 +0000 Subject: [PATCH 50/67] reduce urban mask area --- dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 08ef5cabe..57b31a474 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -9,7 +9,7 @@ plugin_config: level3: [level1, artificial_surface, cultivated] 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 < 500 OR GCC_NAME21 NOT LIKE '%Rest of%' # metropolitan polygons and rural area < 500 km^2 + 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: From 06cdd3fecd57b9e54390ed648cec5f2a855ef2cb Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 11 Dec 2024 03:13:10 +0000 Subject: [PATCH 51/67] correct overview resampling method for categorical results --- .../odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 1 + .../odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 1 + .../odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 1 + .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 1 + dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 1 + .../odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 1 + dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 1 + 7 files changed, 7 insertions(+) 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 1c049b28a..667b2b63e 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 @@ -84,6 +84,7 @@ 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_inter_class_cyear_3/2-0-0 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 fd6081f08..7326150c8 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 @@ -84,6 +84,7 @@ 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_inter_class_cyear_3/2-0-0 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 84c59aa1a..bf47a70dc 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 @@ -84,6 +84,7 @@ 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_inter_class_cyear_3/1-1-0 diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index 0c5675b1b..222ec8657 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -82,6 +82,7 @@ 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-1-0 diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 57b31a474..5309aa1bb 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -109,6 +109,7 @@ 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_class_cyear_3/1-1-0 diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index ab935a9f5..e56813251 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -85,6 +85,7 @@ 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_cultivated_cyear_3/1-1-0 diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 27ff95082..4e497cd47 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -87,6 +87,7 @@ 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_woody_cyear_3/1-1-0 From c5eaf90f5c5acbcc8b4114bc350003358c5cde51 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 14:23:44 +1100 Subject: [PATCH 52/67] Update ga_ls_landcover_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 5309aa1bb..e4bd9ed77 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -18,7 +18,7 @@ plugin_config: product: name: ga_ls_landcover_class_cyear_3 short_name: ga_ls_landcover_class_cyear_3 - version: 1.1.0 + version: 1.1.1 product_family: lc # -- EO Dataset3 relative section -- @@ -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/1-1-0 + s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/1-1-1 # 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/1-1-0/+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_artificial_surface_cyear_3/1-1-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-1-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-1-0/ From 125cd9ed39132b4961086f43b5bf1ca2d40e3b44 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 14:28:41 +1100 Subject: [PATCH 53/67] Update ga_ls_landcover_class_cyear_3.yaml --- dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index e4bd9ed77..9cd092544 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -24,7 +24,7 @@ product: # -- 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 From c30e4c5681dd07d80ee649442b84c497f21aab01 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:25:42 +1100 Subject: [PATCH 54/67] Update ga_ls8ls9_landcover_inter_class_cyear_3.yaml --- .../lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 bf47a70dc..b217a14a1 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 @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_inter_class_cyear_3 short_name: ga_ls_landcover_inter_class_cyear_3 - version: 1.1.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -90,12 +90,12 @@ output_location: >- 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-1-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 From 08acdd6b3f4c765c2b56dabca421b672e0a160ed Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:26:02 +1100 Subject: [PATCH 55/67] Update ga_ls_landcover_artificial_surface_cyear_3.yaml --- .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index 222ec8657..3026ad3de 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -12,7 +12,7 @@ plugin_config: product: name: ga_ls_landcover_artificial_surface_cyear_3 short_name: ga_ls_landcover_artificial_surface_cyear_3 - version: 1.1.0 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -85,7 +85,7 @@ cog_opts: overview_resampling: mode apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_artificial_surface_cyear_3/1-1-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 From c25194ffda4ab83446032754680b618df9dfa454 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:27:00 +1100 Subject: [PATCH 56/67] Update ga_ls_landcover_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 9cd092544..c3c8b0b7a 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -18,7 +18,7 @@ plugin_config: product: name: ga_ls_landcover_class_cyear_3 short_name: ga_ls_landcover_class_cyear_3 - version: 1.1.1 + version: 2.0.0 product_family: lc # -- EO Dataset3 relative section -- @@ -112,9 +112,9 @@ cog_opts: overview_resampling: mode apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/1-1-1 + 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/1-1-0/+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_artificial_surface_cyear_3/1-1-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-1-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-1-0/ +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 From 8db976ddfb7bc0bacd64e418addb612f1641d047 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:27:16 +1100 Subject: [PATCH 57/67] Update ga_ls5_landcover_inter_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 667b2b63e..98fd98ed4 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 @@ -20,7 +20,7 @@ product: # -- 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 From 15b44af21835c6e7f5c82f992a116a529b740dcd Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:27:31 +1100 Subject: [PATCH 58/67] Update ga_ls7_landcover_inter_class_cyear_3.yaml --- .../odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7326150c8..a32500469 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 @@ -20,7 +20,7 @@ product: # -- 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 From 4ad3551cab4cdb4ed4c4c40c0d85c0ad67d02cc5 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:27:43 +1100 Subject: [PATCH 59/67] 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/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 b217a14a1..818b4e5ec 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 @@ -20,7 +20,7 @@ product: # -- 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 From 19dc9dabf279e3e69d457fa13e065becd44142a8 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:28:22 +1100 Subject: [PATCH 60/67] Update ga_ls_landcover_artificial_surface_cyear_3.yaml --- .../lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index 3026ad3de..f462edda3 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -18,7 +18,7 @@ product: # -- 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 From 634fe7c442e87c607d6f8ecf460f936fefb83182 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:28:53 +1100 Subject: [PATCH 61/67] Update ga_ls_landcover_cultivated_cyear_3.yaml --- .../lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index e56813251..57dcb77b2 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -15,13 +15,13 @@ plugin_config: product: name: ga_ls_landcover_cultivated_cyear_3 short_name: ga_ls_landcover_cultivated_cyear_3 - version: 1.1.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 @@ -88,9 +88,9 @@ cog_opts: overview_resampling: mode apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-1-0 + 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/derivative/ga_ls_landcover_inter_class_cyear_3/1-1-0/ +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 From 544b36ff3cc7984b8e09e08459483196806c8b10 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:29:16 +1100 Subject: [PATCH 62/67] Update ga_ls_landcover_nidem_myear_2.yaml --- .../odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml index e0685904a..a2e45dc7b 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml @@ -13,9 +13,9 @@ product: # -- 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 From 4d5e25e19eb1410d5479327de6d7962f3b26a466 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:29:41 +1100 Subject: [PATCH 63/67] Update ga_ls_landcover_vwf_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 b6d0329b4..1c147c4bc 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 @@ -13,13 +13,13 @@ plugin_config: product: name: ga_ls_landcover_vwf_cyear_3 short_name: ga_ls_landcover_vwf_cyear_3 - version: 1.1.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,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-1-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 From ddcf201eae35ebdede3518aff9428bafdff38144 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:30:07 +1100 Subject: [PATCH 64/67] Update ga_ls_landcover_woody_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 4e497cd47..7290bfb39 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -17,13 +17,13 @@ plugin_config: product: name: ga_ls_landcover_woody_cyear_3 short_name: ga_ls_landcover_woody_cyear_3 - version: 1.1.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 @@ -90,9 +90,9 @@ cog_opts: overview_resampling: mode apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cyear_3/1-1-0 + 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/derivative/ga_ls_landcover_inter_class_cyear_3/1-1-0/ +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 From 1f8d8e2a41f6b2fa0ae5e69c0f70d2809de4f4bf Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:30:23 +1100 Subject: [PATCH 65/67] Update srtm_landcover_dem.yaml --- dev/services/odc-stats/lccs/srtm_landcover_dem.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml index d2f31b3fe..52c5033cc 100644 --- a/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml +++ b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml @@ -18,7 +18,7 @@ product: # -- 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 From 21815d7307d05f4d29ec63fce5df03af53292661 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:31:56 +1100 Subject: [PATCH 66/67] Add files via upload --- .../lccs/ga_ls5_landcover_inter_class_cyear_3.yaml | 5 +++-- .../lccs/ga_ls7_landcover_inter_class_cyear_3.yaml | 5 +++-- .../ga_ls8ls9_landcover_inter_class_cyear_3.yaml | 7 ++++--- .../ga_ls_landcover_artificial_surface_cyear_3.yaml | 3 ++- .../lccs/ga_ls_landcover_class_cyear_3.yaml | 13 +++++++------ .../lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 3 ++- .../lccs/ga_ls_landcover_nidem_myear_2.yaml | 4 ++-- .../odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 3 ++- .../lccs/ga_ls_landcover_woody_cyear_3.yaml | 5 ++++- .../services/odc-stats/lccs/srtm_landcover_dem.yaml | 2 +- 10 files changed, 30 insertions(+), 20 deletions(-) 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 0b526bde2..98fd98ed4 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 @@ -9,7 +9,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 - measurements: [level_3_4, water_season] + measurements: [level_3_4] product: name: ga_ls_landcover_inter_class_cyear_3 @@ -20,7 +20,7 @@ product: # -- 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,6 +84,7 @@ 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_inter_class_cyear_3/2-0-0 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 2c57ee100..a32500469 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 @@ -9,7 +9,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 - measurements: [level_3_4, water_season] + measurements: [level_3_4] product: name: ga_ls_landcover_inter_class_cyear_3 @@ -20,7 +20,7 @@ product: # -- 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,6 +84,7 @@ 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_inter_class_cyear_3/2-0-0 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 1807273e4..818b4e5ec 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 @@ -9,7 +9,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 - measurements: [level_3_4, water_season] + measurements: [level_3_4] product: name: ga_ls_landcover_inter_class_cyear_3 @@ -20,7 +20,7 @@ product: # -- 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,9 +84,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_inter_class_cyear_3/2-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/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_artificial_surface_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index 889e5c37e..f462edda3 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -18,7 +18,7 @@ product: # -- 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 @@ -82,6 +82,7 @@ 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/2-0-0 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 58cbc2a71..c3c8b0b7a 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 @@ -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] + 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: SA4_NAME21 LIKE '%Outback%' AND AREASQKM21 < 5000 OR SA4_NAME21 NOT LIKE '%Outback%' # urban polygons and rural area < 5k km^2 + 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: @@ -24,7 +24,7 @@ product: # -- 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/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+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/ +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 diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml index 16fa3efd5..57dcb77b2 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml @@ -21,7 +21,7 @@ product: # -- 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,6 +85,7 @@ 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_cultivated_cyear_3/2-0-0 diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml index e0685904a..a2e45dc7b 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml @@ -13,9 +13,9 @@ product: # -- 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 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 d43002ae8..1c147c4bc 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 @@ -7,6 +7,7 @@ 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: @@ -18,7 +19,7 @@ product: # -- 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 diff --git a/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml b/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 499f1c9b2..7290bfb39 100644 --- a/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml +++ b/prod/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -1,6 +1,8 @@ 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, level_3_4] + # temporal_coverage: + # ga_ls8cls9c_gm_cyear_3: [2014--P99Y] mask_bands: level_3_4: 110 model_path: woody_treelite.so @@ -21,7 +23,7 @@ product: # -- 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,6 +87,7 @@ 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_woody_cyear_3/2-0-0 diff --git a/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml b/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml index d2f31b3fe..52c5033cc 100644 --- a/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml +++ b/prod/services/odc-stats/lccs/srtm_landcover_dem.yaml @@ -18,7 +18,7 @@ product: # -- 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 From 6a08f856f0f323b20ebaa4bba65bf48548cb405d Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:32:36 +1100 Subject: [PATCH 67/67] 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 c3c8b0b7a..25fa9cdf9 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/