From 24ddd0dd44b36ba0f11ffb5a4b6c8254058ab227 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 10 Apr 2024 03:00:54 +0000 Subject: [PATCH 001/100] update fc percentiles config for reprocessing with dilation --- .../fc_percentile/ga_ls_fc_pc_cyear_3.yaml | 95 +++++++++++++++++++ .../fc_percentile/ga_ls_fc_pc_fyear_3.yaml | 95 +++++++++++++++++++ 2 files changed, 190 insertions(+) create mode 100644 prod/services/odc-stats/fc_percentile/ga_ls_fc_pc_cyear_3.yaml create mode 100644 prod/services/odc-stats/fc_percentile/ga_ls_fc_pc_fyear_3.yaml diff --git a/prod/services/odc-stats/fc_percentile/ga_ls_fc_pc_cyear_3.yaml b/prod/services/odc-stats/fc_percentile/ga_ls_fc_pc_cyear_3.yaml new file mode 100644 index 000000000..b88a9cbae --- /dev/null +++ b/prod/services/odc-stats/fc_percentile/ga_ls_fc_pc_cyear_3.yaml @@ -0,0 +1,95 @@ +plugin: fc-percentiles # 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 + +product: + name: ga_ls_fc_pc_cyear_3 + short_name: ga_ls_fc_pc_cyear_3 + version: 4.0.0 + product_family: fc_percentile + + # -- 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 +s3_acl: public-read +# Generic product attributes +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"} +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_fc_pc_cyear_3/4-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/fc_percentile/ga_ls_fc_pc_fyear_3.yaml b/prod/services/odc-stats/fc_percentile/ga_ls_fc_pc_fyear_3.yaml new file mode 100644 index 000000000..149c7b942 --- /dev/null +++ b/prod/services/odc-stats/fc_percentile/ga_ls_fc_pc_fyear_3.yaml @@ -0,0 +1,95 @@ +plugin: fc-percentiles # 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 + +product: + name: ga_ls_fc_pc_fyear_3 + short_name: ga_ls_fc_pc_fyear_3 + version: 4.0.0 + product_family: fc_percentile + + # -- 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 +s3_acl: public-read +# Generic product attributes +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"} +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_fc_pc_fyear_3/4-0-0 + +# save-tasks options +input_products: ga_ls_fc_3+ga_ls_wo_3 +frequency: annual-fy +grid: au_extended_30 From dbbd427cabf80b950964ee988bc2a59876b31611 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 10 Apr 2024 04:10:01 +0000 Subject: [PATCH 002/100] update tc percentiles config for reprocessing with dilation --- .../tc_percentile/ga_ls_tc_pc_cyear_3.yaml | 96 +++++++++++++++++++ .../tc_percentile/ga_ls_tc_pc_fyear_3.yaml | 96 +++++++++++++++++++ 2 files changed, 192 insertions(+) create mode 100644 prod/services/odc-stats/tc_percentile/ga_ls_tc_pc_cyear_3.yaml create mode 100644 prod/services/odc-stats/tc_percentile/ga_ls_tc_pc_fyear_3.yaml diff --git a/prod/services/odc-stats/tc_percentile/ga_ls_tc_pc_cyear_3.yaml b/prod/services/odc-stats/tc_percentile/ga_ls_tc_pc_cyear_3.yaml new file mode 100644 index 000000000..12f00e802 --- /dev/null +++ b/prod/services/odc-stats/tc_percentile/ga_ls_tc_pc_cyear_3.yaml @@ -0,0 +1,96 @@ +plugin: tcw-percentiles # this can help system find the relative plugin and plugin version +plugin_config: + cloud_filters: + cloud: + - [dilation, 6] + shadow: + - [dilation, 6] + transform_code: EPSG:9688 + area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS + +product: + name: ga_ls_tc_pc_cyear_3 + short_name: ga_ls_tc_pc_cyear_3 + version: 2.0.0 + product_family: tci + + # -- 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: tci_rgb + title: Three-band TCI + abstract: TCI medians - red is brightness, green is greenness and + blue is wetness + components: + red: + bright_pc_50: 1 + green: + green_pc_50: 1 + blue: + wet_pc_50: 1 + scale_range: + - -2000 + - 2000 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +s3_acl: public-read +# Generic product attributes +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"} +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_tc_pc_cyear_3/2-0-0 + +# save-tasks config +input_products: ga_ls5t_ard_3-ga_ls7e_ard_3-ga_ls8c_ard_3 +frequency: annual +grid: au_extended_30 +gqa: 1 diff --git a/prod/services/odc-stats/tc_percentile/ga_ls_tc_pc_fyear_3.yaml b/prod/services/odc-stats/tc_percentile/ga_ls_tc_pc_fyear_3.yaml new file mode 100644 index 000000000..5551e3bed --- /dev/null +++ b/prod/services/odc-stats/tc_percentile/ga_ls_tc_pc_fyear_3.yaml @@ -0,0 +1,96 @@ +plugin: tcw-percentiles # this can help system find the relative plugin and plugin version +plugin_config: + cloud_filters: + cloud: + - [dilation, 6] + shadow: + - [dilation, 6] + transform_code: EPSG:9688 + area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS + +product: + name: ga_ls_tc_pc_fyear_3 + short_name: ga_ls_tc_pc_fyear_3 + version: 2.0.0 + product_family: tci + + # -- 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: tci_rgb + title: Three-band TCI + abstract: TCI medians - red is brightness, green is greenness and + blue is wetness + components: + red: + bright_pc_50: 1 + green: + green_pc_50: 1 + blue: + wet_pc_50: 1 + scale_range: + - -2000 + - 2000 + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +s3_acl: public-read +# Generic product attributes +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"} +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_tc_pc_fyear_3/2-0-0 + +# save-tasks config +input_products: ga_ls5t_ard_3-ga_ls7e_ard_3-ga_ls8c_ard_3 +frequency: annual-fy +grid: au_extended_30 +gqa: 1 From f1ee20ec5524c06c1aebdae076aed5684475c0d3 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Mon, 15 Apr 2024 05:38:55 +0000 Subject: [PATCH 003/100] update mangroves config for reprocessing --- .../ga_ls_mangrove_cover_cyear_3.yaml | 60 +++++++++++++++++++ .../ga_ls_mangrove_cover_fyear_3.yaml | 53 ++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml create mode 100644 prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_fyear_3.yaml diff --git a/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml new file mode 100644 index 000000000..9d62df221 --- /dev/null +++ b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml @@ -0,0 +1,60 @@ +plugin: mangroves # this can help system find the relative plugin and plugin version +product: + name: ga_ls_mangrove_cover_cyear_3 + short_name: ga_ls_mangrove_cover_cyear_3 + version: 4.0.0 + product_family: mangrove_cover + + # -- 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: mangrove + title: Mangrove Cover + abstract: Mangrove canopy cover class + value_map: + canopy_cover_class: + - title: "Not Observed" + abstract: "(Clear Obs < 3)" + values: + - 0 + color: "#BDBDBD" + - title: "Woodland" + abstract: "(20% - 50% cover)" + values: + - 1 + color: "#9FFF4C" + - title: "Open Forest" + abstract: "(50% - 80% cover)" + values: + - 2 + color: "#5ECC00" + - title: "Closed Forest" + abstract: "(>80% cover)" + values: + - 3 + color: "#3B7F00" + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +s3_acl: public-read +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0 + +# save-tasks config +input_products: >- + s3://dea-public-data-dev/derivative/ga_ls_fc_pc_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/ga_ls_tc_pc_cyear_3/2-0-0/ +frequency: annual +grid: au_extended_30 diff --git a/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_fyear_3.yaml b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_fyear_3.yaml new file mode 100644 index 000000000..c0f79288c --- /dev/null +++ b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_fyear_3.yaml @@ -0,0 +1,53 @@ +plugin: mangroves # this can help system find the relative plugin and plugin version +product: + name: ga_ls_mangrove_cover_fyear_3 + short_name: ga_ls_mangrove_cover_fyear_3 + version: 2.0.2 + product_family: mangrove_cover + + # -- 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: mangrove + title: Mangrove Cover + abstract: Mangrove canopy cover class + value_map: + canopy_cover_class: + - title: "Not Observed" + abstract: "(Clear Obs < 3)" + values: + - 0 + color: "#BDBDBD" + - title: "Woodland" + abstract: "(20% - 50% cover)" + values: + - 1 + color: "#9FFF4C" + - title: "Open Forest" + abstract: "(50% - 80% cover)" + values: + - 2 + color: "#5ECC00" + - title: "Closed Forest" + abstract: "(>80% cover)" + values: + - 3 + color: "#3B7F00" + +aws_unsigned: True + +max_processing_time: 1200 +job_queue_max_lease: 300 +renew_safety_margin: 60 +future_poll_interval: 2 +s3_acl: public-read +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +plugin_config: {} From eac3bfc72271b9a49ab3c0c110efe24ad4c45cca Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Mon, 15 Apr 2024 07:26:47 +0000 Subject: [PATCH 004/100] add mangroves shapefile config --- .../odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml index 9d62df221..2a7aaec89 100644 --- a/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml +++ b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml @@ -52,9 +52,11 @@ cog_opts: apply_eodatasets3: True output_location: >- s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0 +# this needs to be overwritten by the path where shapefile presents +plugin_config: {mangroves_extent: maximum_extent_of_mangroves_Apr2019.shp} # save-tasks config input_products: >- - s3://dea-public-data-dev/derivative/ga_ls_fc_pc_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/ga_ls_tc_pc_cyear_3/2-0-0/ + s3://dea-public-data-dev/derivative/ga_ls_fc_pc_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/ga_ls_tc_pc_cyear_3/2-0-0/ frequency: annual grid: au_extended_30 From 4ebda263a9f164006cc85aec99fbe77026d06255 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 24 Apr 2024 10:00:59 +0000 Subject: [PATCH 005/100] new thresholds for mangroves classes --- .../odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml index 2a7aaec89..cf5818878 100644 --- a/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml +++ b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml @@ -1,4 +1,8 @@ plugin: mangroves # this can help system find the relative plugin and plugin version +plugin_config: + mangroves_extent: maximum_extent_of_mangroves_Apr2019.shp # this needs to be overwritten by the path where shapefile presents + pv_thresholds: [14, 40, 62] + product: name: ga_ls_mangrove_cover_cyear_3 short_name: ga_ls_mangrove_cover_cyear_3 @@ -52,8 +56,6 @@ cog_opts: apply_eodatasets3: True output_location: >- s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0 -# this needs to be overwritten by the path where shapefile presents -plugin_config: {mangroves_extent: maximum_extent_of_mangroves_Apr2019.shp} # save-tasks config input_products: >- From fd1e78e686c5b2c4c6ef43204e6f64e8f5cacec6 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Thu, 23 May 2024 06:00:56 +0000 Subject: [PATCH 006/100] add config for landcover stats plugins --- .../odc-stats/lccs/ga_lccs_fc_wo_a0.yaml | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml diff --git a/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml b/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml new file mode 100644 index 000000000..0efd41293 --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.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 + +product: + name: ga_ls_veg_water_cyear_3 + short_name: ga_ls_veg_water_cyear_3 + version: 0.0.1 + product_family: lccs + + # -- 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 +s3_acl: public-read +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-1 + +# save-tasks options +input_products: ga_ls_fc_3+ga_ls_wo_3 +frequency: annual +grid: au_extended_30 From 0ca4b8c596ad322a97e2fa40e922e2d28ae22c52 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 19 Jun 2024 08:41:29 +0000 Subject: [PATCH 007/100] add config for landcover --- .../odc-stats/lccs/ga_lccs_dem_stats.yaml | 92 +++++++++++++++++ .../odc-stats/lccs/ga_lccs_nidem_stats.yaml | 88 +++++++++++++++++ .../odc-stats/lccs/ga_lccs_veg_a1.yaml | 99 +++++++++++++++++++ 3 files changed, 279 insertions(+) create mode 100644 dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml create mode 100644 dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml create mode 100644 dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml diff --git a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml new file mode 100644 index 000000000..279c52864 --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.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: max + input_bands: [dem_h] + chunks: + latitude: -1 + longitude: -1 + +product: + name: ga_ls_dem_3 + short_name: ga_ls_dem_3 + version: 0.0.1 + product_family: lccs + + # -- 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 +s3_acl: public-read +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-1 + +# save-tasks options +input_products: ga_srtm_dem1sv1_0 +frequency: annual +grid: au_extended_30 diff --git a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml new file mode 100644 index 000000000..c9f5a9bb4 --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml @@ -0,0 +1,88 @@ +plugin: dem_in_stats # this can help system find the relative plugin and plugin version +plugin_config: + resampling: max + input_bands: [nidem] + measurements: [elevation] + +product: + name: ga_ls_nidem_3 + short_name: ga_ls_nidem_3 + version: 0.0.1 + product_family: lccs + + # -- 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 +s3_acl: public-read +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1 + +# save-tasks options +input_products: nidem +frequency: all +grid: au_extended_30 diff --git a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml new file mode 100644 index 000000000..7f571b351 --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml @@ -0,0 +1,99 @@ +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: 124 + terrestrial_veg: 110 + water: 221 + intertidal: 223 + surface: 210 + +product: + name: ga_ls_veg_class_l1_cyear_3 + short_name: ga_ls_veg_class_l1_cyear_3 + version: 0.0.1 + product_family: lccs + + # -- 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 +s3_acl: public-read +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/test/lccs/ga_ls_veg_class_l1_cyear_3/0-0-1 + +# save-tasks options +input_products: ga_ls8cls9c_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-1/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-1/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1/ +ignore_time: + - s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-1/ + - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1/ +optional_products: + - s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/ + - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1/ +frequency: annual +grid: au_extended_30 From 1dba70e8596cd422367746da2373dc6ee588b7b5 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Fri, 21 Jun 2024 03:10:33 +0000 Subject: [PATCH 008/100] change landcover processing config --- dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml | 2 +- dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml | 2 +- dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml index 279c52864..2c3533f6e 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml @@ -2,7 +2,7 @@ plugin: dem_in_stats # this can help system find the relative plugin and plugin plugin_config: transform_code: EPSG:9688 area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS - resampling: max + resampling: nearest input_bands: [dem_h] chunks: latitude: -1 diff --git a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml index c9f5a9bb4..b56ce3389 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml @@ -1,6 +1,6 @@ plugin: dem_in_stats # this can help system find the relative plugin and plugin version plugin_config: - resampling: max + resampling: nearest input_bands: [nidem] measurements: [elevation] diff --git a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml index 7f571b351..c8532c811 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml @@ -10,8 +10,8 @@ plugin_config: surface: 210 product: - name: ga_ls_veg_class_l1_cyear_3 - short_name: ga_ls_veg_class_l1_cyear_3 + name: ga_ls_staging_l3_l4_cyear_3 + short_name: ga_ls_staging_l3_l4_cyear_3 version: 0.0.1 product_family: lccs From 701efe6d99af887a4e83749525acdad6a562259b Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Fri, 21 Jun 2024 03:10:33 +0000 Subject: [PATCH 009/100] change landcover processing config --- dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml | 2 +- dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml | 2 +- dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml index 279c52864..2c3533f6e 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml @@ -2,7 +2,7 @@ plugin: dem_in_stats # this can help system find the relative plugin and plugin plugin_config: transform_code: EPSG:9688 area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS - resampling: max + resampling: nearest input_bands: [dem_h] chunks: latitude: -1 diff --git a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml index c9f5a9bb4..b56ce3389 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml @@ -1,6 +1,6 @@ plugin: dem_in_stats # this can help system find the relative plugin and plugin version plugin_config: - resampling: max + resampling: nearest input_bands: [nidem] measurements: [elevation] diff --git a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml index 7f571b351..8769172dd 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml @@ -10,8 +10,8 @@ plugin_config: surface: 210 product: - name: ga_ls_veg_class_l1_cyear_3 - short_name: ga_ls_veg_class_l1_cyear_3 + name: ga_ls_staging_l3_l4_cyear_3 + short_name: ga_ls_staging_l3_l4_cyear_3 version: 0.0.1 product_family: lccs @@ -85,7 +85,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_veg_class_l1_cyear_3/0-0-1 + s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-1 # save-tasks options input_products: ga_ls8cls9c_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-1/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-1/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1/ From 1d93863aee909cbc0289e5991ca14863b36c6d3f Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Thu, 18 Jul 2024 08:10:25 +0000 Subject: [PATCH 010/100] add config for urban model --- .../odc-stats/lccs/ga_lccs_urban.yaml | 90 +++++++++++++++++++ .../ga_ls_mangrove_cover_cyear_3.yaml | 2 +- 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 dev/services/odc-stats/lccs/ga_lccs_urban.yaml diff --git a/dev/services/odc-stats/lccs/ga_lccs_urban.yaml b/dev/services/odc-stats/lccs/ga_lccs_urban.yaml new file mode 100644 index 000000000..2d69d31af --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_lccs_urban.yaml @@ -0,0 +1,90 @@ +plugin: urban_class # this can help system find the relative plugin and plugin version +plugin_config: + input_bands: [nbart_red, nbart_green, nbart_blue, nbart_nir, nbart_swir_1, nbart_swir_2] + model_path: urban_model_tf_2_16_2.tflite + output_classes: + artificial: 215 + natural: 216 + +product: + name: ga_ls_urban_cyear_3 + short_name: ga_ls_urban_cyear_3 + version: 0.0.1 + product_family: lccs + + # -- 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 +s3_acl: public-read +# Generic product attributes +cog_opts: + zlevel: 9 +apply_eodatasets3: True +output_location: >- + s3://dea-public-data-dev/test/lccs/ga_ls_urban_cyear_3/0-0-1 + +# 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/mangroves/ga_ls_mangrove_cover_cyear_3.yaml b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml index cf5818878..1a5e50f25 100644 --- a/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml +++ b/prod/services/odc-stats/mangroves/ga_ls_mangrove_cover_cyear_3.yaml @@ -59,6 +59,6 @@ output_location: >- # save-tasks config input_products: >- - s3://dea-public-data-dev/derivative/ga_ls_fc_pc_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/ga_ls_tc_pc_cyear_3/2-0-0/ + s3://dea-public-data/derivative/ga_ls_fc_pc_cyear_3/4-0-0/+s3://dea-public-data/derivative/ga_ls_tc_pc_cyear_3/2-0-0/ frequency: annual grid: au_extended_30 From 854a1a5aaf4ca3b93cfadce7761cc7c851077e6f Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Fri, 26 Jul 2024 06:41:53 +0000 Subject: [PATCH 011/100] remove acl flags --- dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml | 1 - dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml | 1 - dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml | 1 - dev/services/odc-stats/lccs/ga_lccs_urban.yaml | 1 - dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml | 1 - 5 files changed, 5 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml index 2c3533f6e..d2982e4c0 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml @@ -78,7 +78,6 @@ max_processing_time: 1200 job_queue_max_lease: 300 renew_safety_margin: 60 future_poll_interval: 2 -s3_acl: public-read # Generic product attributes cog_opts: zlevel: 9 diff --git a/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml b/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml index 0efd41293..4435bfc92 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml @@ -78,7 +78,6 @@ max_processing_time: 1200 job_queue_max_lease: 300 renew_safety_margin: 60 future_poll_interval: 2 -s3_acl: public-read # Generic product attributes cog_opts: zlevel: 9 diff --git a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml index b56ce3389..ae7b72518 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml @@ -74,7 +74,6 @@ max_processing_time: 1200 job_queue_max_lease: 300 renew_safety_margin: 60 future_poll_interval: 2 -s3_acl: public-read # Generic product attributes cog_opts: zlevel: 9 diff --git a/dev/services/odc-stats/lccs/ga_lccs_urban.yaml b/dev/services/odc-stats/lccs/ga_lccs_urban.yaml index 2d69d31af..58ac19f5f 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_urban.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_urban.yaml @@ -76,7 +76,6 @@ max_processing_time: 1200 job_queue_max_lease: 300 renew_safety_margin: 60 future_poll_interval: 2 -s3_acl: public-read # Generic product attributes cog_opts: zlevel: 9 diff --git a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml index 8769172dd..d16dce4d7 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml @@ -79,7 +79,6 @@ max_processing_time: 1200 job_queue_max_lease: 300 renew_safety_margin: 60 future_poll_interval: 2 -s3_acl: public-read # Generic product attributes cog_opts: zlevel: 9 From 444e5cfa3f9a020e95df31b1ef02640964d8479c Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Thu, 1 Aug 2024 09:15:36 +0000 Subject: [PATCH 012/100] add configs for cultivated and woody cover for landcover --- .../odc-stats/lccs/ga_lccs_cultivated.yaml | 94 +++++++++++++++++++ .../odc-stats/lccs/ga_lccs_woody_cover.yaml | 94 +++++++++++++++++++ 2 files changed, 188 insertions(+) create mode 100644 dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml create mode 100644 dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml diff --git a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml new file mode 100644 index 000000000..4703c94ab --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml @@ -0,0 +1,94 @@ +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] + mask_bands: + classes_l3_l4: 110 + model_path: cultivated_treelite.so + output_classes: + cultivated: 111 + natural: 112 + chunks: + y: 400 + x: 400 + +product: + name: ga_ls_cultivated_cyear_3 + short_name: ga_ls_cultivated_cyear_3 + version: 0.0.1 + product_family: lccs + + # -- 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/test/lccs/ga_ls_cultivated_cyear_3/0-0-1 + +# 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-1/ +frequency: annual +grid: au_extended_30 diff --git a/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml b/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml new file mode 100644 index 000000000..9e28d1582 --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml @@ -0,0 +1,94 @@ +plugin: woody_cover # 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, classes_l3_l4] + mask_bands: + classes_l3_l4: 110 + model_path: woody_treelite.so + output_classes: + woody: 113 + herbaceous: 114 + chunks: + y: 400 + x: 400 + +product: + name: ga_ls_woody_cover_cyear_3 + short_name: ga_ls_woody_cover_cyear_3 + version: 0.0.1 + product_family: lccs + + # -- 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/test/lccs/ga_ls_woody_cover_cyear_3/0-0-1 + +# 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-1/ +frequency: annual +grid: au_extended_30 From 7d98f3f5014ffc43abaf66da894c6b980e2b0ea9 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:18:02 +1000 Subject: [PATCH 013/100] Update ga_lccs_dem_stats.yaml bump version for next iteration of processing --- dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml index d2982e4c0..a3b68faed 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml @@ -11,7 +11,7 @@ plugin_config: product: name: ga_ls_dem_3 short_name: ga_ls_dem_3 - version: 0.0.1 + version: 0.0.2 product_family: lccs # -- EO Dataset3 relative section -- @@ -83,7 +83,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-1 + s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2 # save-tasks options input_products: ga_srtm_dem1sv1_0 From 3f3c5b748653f96d75412baa968e9a7878e8497f Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:41:28 +1000 Subject: [PATCH 014/100] Update ga_lccs_nidem_stats.yaml Bump version for next iteration of processing --- dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml index ae7b72518..e73a4883c 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml @@ -7,7 +7,7 @@ plugin_config: product: name: ga_ls_nidem_3 short_name: ga_ls_nidem_3 - version: 0.0.1 + version: 0.0.2 product_family: lccs # -- EO Dataset3 relative section -- @@ -79,7 +79,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1 + s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2 # save-tasks options input_products: nidem From 0a290b812cb10bfd7b8cbc1d2d0dd81f781b4d0f Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:36:55 +1000 Subject: [PATCH 015/100] Update ga_lccs_fc_wo_a0.yaml increase version for processing --- dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml b/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml index 4435bfc92..59de92ea7 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml @@ -11,7 +11,7 @@ plugin_config: product: name: ga_ls_veg_water_cyear_3 short_name: ga_ls_veg_water_cyear_3 - version: 0.0.1 + version: 0.0.2 product_family: lccs # -- EO Dataset3 relative section -- @@ -83,7 +83,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-1 + s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-2 # save-tasks options input_products: ga_ls_fc_3+ga_ls_wo_3 From 16b963afdf29c24f585315cc7f4b7498c9c44837 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:17:17 +1000 Subject: [PATCH 016/100] Update ga_lccs_veg_a1.yaml Increment versions for continental run --- dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml index d16dce4d7..ea94040c4 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml @@ -12,7 +12,7 @@ plugin_config: product: name: ga_ls_staging_l3_l4_cyear_3 short_name: ga_ls_staging_l3_l4_cyear_3 - version: 0.0.1 + version: 0.0.2 product_family: lccs # -- EO Dataset3 relative section -- @@ -84,15 +84,15 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-1 + s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2 # save-tasks options -input_products: ga_ls8cls9c_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-1/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-1/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1/ +input_products: ga_ls8cls9c_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-2/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ ignore_time: - - s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-1/ - - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1/ + - s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/ + - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ optional_products: - s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/ - - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-1/ + - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ frequency: annual grid: au_extended_30 From 767de096ffeaf7167c14b3b8534143eae43a1439 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:39:25 +1000 Subject: [PATCH 017/100] Create ga_ls7_lccs_veg_a1.yaml Ls7 option for veg a1 --- .../odc-stats/lccs/ga_ls7_lccs_veg_a1.yaml | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 dev/services/odc-stats/lccs/ga_ls7_lccs_veg_a1.yaml diff --git a/dev/services/odc-stats/lccs/ga_ls7_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_ls7_lccs_veg_a1.yaml new file mode 100644 index 000000000..fad5826a2 --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_ls7_lccs_veg_a1.yaml @@ -0,0 +1,98 @@ +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: 124 + terrestrial_veg: 110 + water: 221 + intertidal: 223 + surface: 210 + +product: + name: ga_ls_staging_l3_l4_cyear_3 + short_name: ga_ls_staging_l3_l4_cyear_3 + version: 0.0.2 + product_family: lccs + + # -- 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/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2 + +# save-tasks options +input_products: ga_ls7e_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-2/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +ignore_time: + - s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/ + - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +optional_products: + - s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/ + - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +frequency: annual +grid: au_extended_30 From 24460d51deb2996cc794535b5fb8429cadc98efa Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:40:26 +1000 Subject: [PATCH 018/100] Rename ga_lccs_veg_a1.yaml to ga_ls8ls9_lccs_veg_a1.yaml update name to reflect ls8ls9 satellite requirement --- .../lccs/{ga_lccs_veg_a1.yaml => ga_ls8ls9_lccs_veg_a1.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev/services/odc-stats/lccs/{ga_lccs_veg_a1.yaml => ga_ls8ls9_lccs_veg_a1.yaml} (100%) diff --git a/dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_ls8ls9_lccs_veg_a1.yaml similarity index 100% rename from dev/services/odc-stats/lccs/ga_lccs_veg_a1.yaml rename to dev/services/odc-stats/lccs/ga_ls8ls9_lccs_veg_a1.yaml From 605c958c782d5754836fdd3b116c8b51fb9f3655 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:47:14 +1000 Subject: [PATCH 019/100] Create ga_ls5_lccs_veg_a1.yaml Ls5 option for veg a1 --- .../odc-stats/lccs/ga_ls5_lccs_veg_a1.yaml | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 dev/services/odc-stats/lccs/ga_ls5_lccs_veg_a1.yaml diff --git a/dev/services/odc-stats/lccs/ga_ls5_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_ls5_lccs_veg_a1.yaml new file mode 100644 index 000000000..4d724c7e7 --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_ls5_lccs_veg_a1.yaml @@ -0,0 +1,98 @@ +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: 124 + terrestrial_veg: 110 + water: 221 + intertidal: 223 + surface: 210 + +product: + name: ga_ls_staging_l3_l4_cyear_3 + short_name: ga_ls_staging_l3_l4_cyear_3 + version: 0.0.2 + product_family: lccs + + # -- 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/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2 + +# save-tasks options +input_products: ga_ls5t_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-2/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +ignore_time: + - s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/ + - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +optional_products: + - s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/ + - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +frequency: annual +grid: au_extended_30 From 25083c203dd92395448e45de80c0ce39ce93cbe8 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 21 Aug 2024 07:05:33 +0000 Subject: [PATCH 020/100] test config for cultivated --- dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml index 4703c94ab..e5de95b1c 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml @@ -86,9 +86,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-1 + s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-1-rc1 # 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-1/ +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/ frequency: annual grid: au_extended_30 From 7883ec92edcf6752a980157b9077b4f60a9ef7ba Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 21 Aug 2024 07:42:44 +0000 Subject: [PATCH 021/100] test config for woody cover --- dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml b/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml index 9e28d1582..0837fde9a 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml @@ -86,9 +86,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_woody_cover_cyear_3/0-0-1 + s3://dea-public-data-dev/test/lccs/ga_ls_woody_cover_cyear_3/0-0-1-rc1 # 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-1/ +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/ frequency: annual grid: au_extended_30 From f7a0893959386149cff5be2f48dca397161f41a8 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 21 Aug 2024 09:11:55 +0000 Subject: [PATCH 022/100] 2nd test --- dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml index e5de95b1c..820686266 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-1-rc1 + s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-1-rc2 # 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/ From f4bbc2b4fb084952328a90890b02d49805541369 Mon Sep 17 00:00:00 2001 From: Toktam Date: Mon, 26 Aug 2024 03:32:46 +0000 Subject: [PATCH 023/100] Update the output prefix. --- dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml b/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml index 0837fde9a..9f178ab25 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml @@ -1,15 +1,15 @@ plugin: woody_cover # 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, classes_l3_l4] - mask_bands: + mask_bands: classes_l3_l4: 110 model_path: woody_treelite.so output_classes: woody: 113 herbaceous: 114 chunks: - y: 400 - x: 400 + y: 400 + x: 400 product: name: ga_ls_woody_cover_cyear_3 @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_woody_cover_cyear_3/0-0-1-rc1 + s3://dea-public-data-dev/test/lccs/ga_ls_woody_cover_cyear_3/0-0-2 # 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/ From 36c441742942cd98f9625eed80274dc466340049 Mon Sep 17 00:00:00 2001 From: Toktam Date: Tue, 27 Aug 2024 04:34:28 +0000 Subject: [PATCH 024/100] Change the output prefix for the culativated model to reflect the new version. --- dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml index 820686266..c1652eb27 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml @@ -1,15 +1,15 @@ 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] - mask_bands: + mask_bands: classes_l3_l4: 110 model_path: cultivated_treelite.so output_classes: cultivated: 111 natural: 112 chunks: - y: 400 - x: 400 + y: 400 + x: 400 product: name: ga_ls_cultivated_cyear_3 @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-1-rc2 + s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-2 # 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/ From 56bff6dcbb6306c43341d205fa2559afa2fbdbb1 Mon Sep 17 00:00:00 2001 From: Toktam Date: Wed, 11 Sep 2024 23:57:31 +0000 Subject: [PATCH 025/100] Added product configuration for land cover level-3. --- .../odc-stats/lccs/ga_lccs_level3.yaml | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 dev/services/odc-stats/lccs/ga_lccs_level3.yaml diff --git a/dev/services/odc-stats/lccs/ga_lccs_level3.yaml b/dev/services/odc-stats/lccs/ga_lccs_level3.yaml new file mode 100644 index 000000000..9ff32348f --- /dev/null +++ b/dev/services/odc-stats/lccs/ga_lccs_level3.yaml @@ -0,0 +1,67 @@ +plugin: lccs_level3 # this can help system find the relative plugin and plugin version +plugin_config: + input_bands: [classes_l3_l4, urban_classes, cultivated_class] +product: + name: ga_ls_lc_level3_cyear_3 + short_name: ga_ls_lc_level3_cyear_3 + version: 2.0.0 + product_family: lccs + + # -- 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 + +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/test/lccs/ga_ls_lc_level3_cyear_3/2-0-0 + +# save-tasks options +input_products: s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2+s3://dea-public-data-dev/test/lccs/ga_ls_urban_cyear_3/0-0-2/+s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-2 +frequency: annual +grid: au_extended_30 From 50f764344b60da60a57d4fcc5929489e5a517ce1 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:22:11 +1100 Subject: [PATCH 026/100] Update ga_lccs_cultivated.yaml --- dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml index c1652eb27..a6383ee79 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml @@ -12,8 +12,8 @@ plugin_config: x: 400 product: - name: ga_ls_cultivated_cyear_3 - short_name: ga_ls_cultivated_cyear_3 + name: ga_ls_landcover_cultivated_cyear_3 + short_name: ga_ls_landcover_cultivated_cyear_3 version: 0.0.1 product_family: lccs @@ -86,9 +86,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-2 + 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/test/lccs/ga_ls_landcover_inter_class_cyear_3/1-0-0/ frequency: annual grid: au_extended_30 From ef794e9a0a5b01850761de82941d3abc96c421df Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:23:09 +1100 Subject: [PATCH 027/100] Update ga_lccs_dem_stats.yaml --- dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml index a3b68faed..7d611a29e 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml @@ -9,9 +9,9 @@ plugin_config: longitude: -1 product: - name: ga_ls_dem_3 - short_name: ga_ls_dem_3 - version: 0.0.2 + name: srtm_landcover_dem + short_name: srtm_landcover_dem + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -83,7 +83,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2 + s3://dea-public-data-dev/derivative/lccs/srtm_landcover_dem/1-0-0 # save-tasks options input_products: ga_srtm_dem1sv1_0 From ad8ac8d205620a52082fdd6e63bdd2535cd886cd Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:23:22 +1100 Subject: [PATCH 028/100] Update ga_lccs_cultivated.yaml --- dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml index a6383ee79..65038ece9 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml @@ -14,7 +14,7 @@ plugin_config: product: name: ga_ls_landcover_cultivated_cyear_3 short_name: ga_ls_landcover_cultivated_cyear_3 - version: 0.0.1 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- From 6128dd4cbead9bc3d6d3263648f4f2846176f93d Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:24:17 +1100 Subject: [PATCH 029/100] Update ga_lccs_fc_wo_a0.yaml --- dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml b/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml index 59de92ea7..8090abf3f 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml +++ b/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml @@ -9,9 +9,9 @@ plugin_config: area_of_interest: [-180, -90, 180, 90] # accommodate the fact of 326xx not intersecting 3577 in LS product: - name: ga_ls_veg_water_cyear_3 - short_name: ga_ls_veg_water_cyear_3 - version: 0.0.2 + name: ga_ls_landcover_vwf_cyear_3 + short_name: ga_ls_landcover_vwf_cyear_3 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -83,7 +83,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_veg_water_cyear_3/0-0-2 + 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 From 39aa6c515058864bbb864ad7841fabb1f2017433 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:26:50 +1100 Subject: [PATCH 030/100] Update and rename ga_lccs_level3.yaml to ga_ls_landcover_class_cyear_3.yaml --- ..._level3.yaml => ga_ls_landcover_class_cyear_3.yaml} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename dev/services/odc-stats/lccs/{ga_lccs_level3.yaml => ga_ls_landcover_class_cyear_3.yaml} (77%) diff --git a/dev/services/odc-stats/lccs/ga_lccs_level3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml similarity index 77% rename from dev/services/odc-stats/lccs/ga_lccs_level3.yaml rename to dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml index 9ff32348f..70fda95c7 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_level3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_class_cyear_3.yaml @@ -2,9 +2,9 @@ plugin: lccs_level3 # this can help system find the relative plugin and plugin v plugin_config: input_bands: [classes_l3_l4, urban_classes, cultivated_class] product: - name: ga_ls_lc_level3_cyear_3 - short_name: ga_ls_lc_level3_cyear_3 - version: 2.0.0 + name: ga_ls_landcover_class_cyear_3 + short_name: ga_ls_landcover_class_cyear_3 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -59,9 +59,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_lc_level3_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: s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2+s3://dea-public-data-dev/test/lccs/ga_ls_urban_cyear_3/0-0-2/+s3://dea-public-data-dev/test/lccs/ga_ls_cultivated_cyear_3/0-0-2 +input_products: 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_urban_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-0-0 frequency: annual grid: au_extended_30 From fd0e38311165063e95202f32ccc2ffcebc59a1d6 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:27:08 +1100 Subject: [PATCH 031/100] Rename ga_lccs_cultivated.yaml to ga_ls_landcover_cultivated_cyear_3.yaml --- ...cs_cultivated.yaml => ga_ls_landcover_cultivated_cyear_3.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev/services/odc-stats/lccs/{ga_lccs_cultivated.yaml => ga_ls_landcover_cultivated_cyear_3.yaml} (100%) diff --git a/dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml similarity index 100% rename from dev/services/odc-stats/lccs/ga_lccs_cultivated.yaml rename to dev/services/odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml From 5d710fe393f15f0e12a50d8385bef3ab57871ab8 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:27:22 +1100 Subject: [PATCH 032/100] Rename ga_lccs_dem_stats.yaml to srtm_landcover_dem.yaml --- .../lccs/{ga_lccs_dem_stats.yaml => srtm_landcover_dem.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev/services/odc-stats/lccs/{ga_lccs_dem_stats.yaml => srtm_landcover_dem.yaml} (100%) diff --git a/dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml similarity index 100% rename from dev/services/odc-stats/lccs/ga_lccs_dem_stats.yaml rename to dev/services/odc-stats/lccs/srtm_landcover_dem.yaml From 4ccd8b987cfa8453627a100ba9aae14a5841209a Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:27:38 +1100 Subject: [PATCH 033/100] Rename ga_lccs_fc_wo_a0.yaml to ga_ls_landcover_vwf_cyear_3.yaml --- .../{ga_lccs_fc_wo_a0.yaml => ga_ls_landcover_vwf_cyear_3.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev/services/odc-stats/lccs/{ga_lccs_fc_wo_a0.yaml => ga_ls_landcover_vwf_cyear_3.yaml} (100%) diff --git a/dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml similarity index 100% rename from dev/services/odc-stats/lccs/ga_lccs_fc_wo_a0.yaml rename to dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml From 5ed3fdf544d32843d5ddd8af1f5cb0b9270627b2 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:28:46 +1100 Subject: [PATCH 034/100] Update and rename ga_lccs_nidem_stats.yaml to ga_ls_landcover_nidem_myear_2.yaml --- ...idem_stats.yaml => ga_ls_landcover_nidem_myear_2.yaml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename dev/services/odc-stats/lccs/{ga_lccs_nidem_stats.yaml => ga_ls_landcover_nidem_myear_2.yaml} (91%) diff --git a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml similarity index 91% rename from dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml rename to dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml index e73a4883c..f7390ff80 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_nidem_stats.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml @@ -5,9 +5,9 @@ plugin_config: measurements: [elevation] product: - name: ga_ls_nidem_3 - short_name: ga_ls_nidem_3 - version: 0.0.2 + name: ga_ls_landcover_nidem_myear_2 + short_name: ga_ls_landcover_nidem_myear_2 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -79,7 +79,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2 + s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0 # save-tasks options input_products: nidem From a42a10c06b5338ee4c47cd43b7e9614dd82cdbd6 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:29:26 +1100 Subject: [PATCH 035/100] Update and rename ga_lccs_urban.yaml to ga_ls_landcover_urban_cyear_3.yaml --- ...lccs_urban.yaml => ga_ls_landcover_urban_cyear_3.yaml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename dev/services/odc-stats/lccs/{ga_lccs_urban.yaml => ga_ls_landcover_urban_cyear_3.yaml} (92%) diff --git a/dev/services/odc-stats/lccs/ga_lccs_urban.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_urban_cyear_3.yaml similarity index 92% rename from dev/services/odc-stats/lccs/ga_lccs_urban.yaml rename to dev/services/odc-stats/lccs/ga_ls_landcover_urban_cyear_3.yaml index 58ac19f5f..4fed4ad1e 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_urban.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_urban_cyear_3.yaml @@ -7,9 +7,9 @@ plugin_config: natural: 216 product: - name: ga_ls_urban_cyear_3 - short_name: ga_ls_urban_cyear_3 - version: 0.0.1 + name: ga_ls_landcover_urban_cyear_3 + short_name: ga_ls_landcover_urban_cyear_3 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -81,7 +81,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_urban_cyear_3/0-0-1 + s3://dea-public-data-dev/derivative/ga_ls_landcover_urban_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 From 7e38762aad68cec7740bc3a49b051f3ab4130013 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:30:46 +1100 Subject: [PATCH 036/100] Update and rename ga_lccs_woody_cover.yaml to ga_ls_landcover_woody_cover_cyear_3.yaml --- ...r.yaml => ga_ls_landcover_woody_cover_cyear_3.yaml} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename dev/services/odc-stats/lccs/{ga_lccs_woody_cover.yaml => ga_ls_landcover_woody_cover_cyear_3.yaml} (88%) diff --git a/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml similarity index 88% rename from dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml rename to dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml index 9f178ab25..c1aed37f1 100644 --- a/dev/services/odc-stats/lccs/ga_lccs_woody_cover.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml @@ -12,9 +12,9 @@ plugin_config: x: 400 product: - name: ga_ls_woody_cover_cyear_3 - short_name: ga_ls_woody_cover_cyear_3 - version: 0.0.1 + name: ga_ls_landcover_woody_cover_cyear_3 + short_name: ga_ls_landcover_woody_cover_cyear_3 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -86,9 +86,9 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_woody_cover_cyear_3/0-0-2 + s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cover_cyear_3/0-0-2 # 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 bd348ace0d9d997747f280647e6d06c8a5be62b9 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:34:46 +1100 Subject: [PATCH 037/100] Update and rename ga_ls5_lccs_veg_a1.yaml to ga_ls5_landcover_inter_class_cyear_3.yaml --- ...=> ga_ls5_landcover_inter_class_cyear_3.yaml} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename dev/services/odc-stats/lccs/{ga_ls5_lccs_veg_a1.yaml => ga_ls5_landcover_inter_class_cyear_3.yaml} (76%) diff --git a/dev/services/odc-stats/lccs/ga_ls5_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml similarity index 76% rename from dev/services/odc-stats/lccs/ga_ls5_lccs_veg_a1.yaml rename to dev/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml index 4d724c7e7..b2afe3984 100644 --- a/dev/services/odc-stats/lccs/ga_ls5_lccs_veg_a1.yaml +++ b/dev/services/odc-stats/lccs/ga_ls5_landcover_inter_class_cyear_3.yaml @@ -10,9 +10,9 @@ plugin_config: surface: 210 product: - name: ga_ls_staging_l3_l4_cyear_3 - short_name: ga_ls_staging_l3_l4_cyear_3 - version: 0.0.2 + name: ga_ls5_landcover_inter_class_cyear_3 + short_name: ga_ls5_landcover_inter_class_cyear_3 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -84,15 +84,15 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2 + s3://dea-public-data-dev/derivative/ga_ls5_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/test/lccs/ga_ls_veg_water_cyear_3/0-0-2/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +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/test/lccs/ga_ls_dem_3/0-0-2/ - - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ + - 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/test/lccs/ga_ls_nidem_3/0-0-2/ + - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/ frequency: annual grid: au_extended_30 From ebb86dd244939e8efd8d41791754171f8d72cbed Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:39:46 +1100 Subject: [PATCH 038/100] Update and rename ga_ls7_lccs_veg_a1.yaml to ga_ls7_landcover_inter_class_cyear_3.yaml --- ...=> ga_ls7_landcover_inter_class_cyear_3.yaml} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename dev/services/odc-stats/lccs/{ga_ls7_lccs_veg_a1.yaml => ga_ls7_landcover_inter_class_cyear_3.yaml} (76%) diff --git a/dev/services/odc-stats/lccs/ga_ls7_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml similarity index 76% rename from dev/services/odc-stats/lccs/ga_ls7_lccs_veg_a1.yaml rename to dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml index fad5826a2..dd38432b5 100644 --- a/dev/services/odc-stats/lccs/ga_ls7_lccs_veg_a1.yaml +++ b/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml @@ -10,9 +10,9 @@ plugin_config: surface: 210 product: - name: ga_ls_staging_l3_l4_cyear_3 - short_name: ga_ls_staging_l3_l4_cyear_3 - version: 0.0.2 + name: ga_ls5_landcover_inter_class_cyear_3 + short_name: ga_ls5_landcover_inter_class_cyear_3 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -84,15 +84,15 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2 + s3://dea-public-data-dev/derivative/ga_ls5_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/test/lccs/ga_ls_veg_water_cyear_3/0-0-2/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +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/test/lccs/ga_ls_dem_3/0-0-2/ - - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ + - 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/test/lccs/ga_ls_nidem_3/0-0-2/ + - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/ frequency: annual grid: au_extended_30 From 29aab6ae85487aee57679d2b972469a39724a00b Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:40:27 +1100 Subject: [PATCH 039/100] Update and rename ga_ls8ls9_lccs_veg_a1.yaml to ga_ls8ls9_landcover_inter_class_cyear_3.yaml --- ...ga_ls8ls9_landcover_inter_class_cyear_3.yaml} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename dev/services/odc-stats/lccs/{ga_ls8ls9_lccs_veg_a1.yaml => ga_ls8ls9_landcover_inter_class_cyear_3.yaml} (76%) diff --git a/dev/services/odc-stats/lccs/ga_ls8ls9_lccs_veg_a1.yaml b/dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml similarity index 76% rename from dev/services/odc-stats/lccs/ga_ls8ls9_lccs_veg_a1.yaml rename to dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml index ea94040c4..9b8ad2b26 100644 --- a/dev/services/odc-stats/lccs/ga_ls8ls9_lccs_veg_a1.yaml +++ b/dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml @@ -10,9 +10,9 @@ plugin_config: surface: 210 product: - name: ga_ls_staging_l3_l4_cyear_3 - short_name: ga_ls_staging_l3_l4_cyear_3 - version: 0.0.2 + name: ga_ls5_landcover_inter_class_cyear_3 + short_name: ga_ls5_landcover_inter_class_cyear_3 + version: 1.0.0 product_family: lccs # -- EO Dataset3 relative section -- @@ -84,15 +84,15 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2 + s3://dea-public-data-dev/derivative/ga_ls5_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/test/lccs/ga_ls_veg_water_cyear_3/0-0-2/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/test/lccs/ga_ls_dem_3/0-0-2/+s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ +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/test/lccs/ga_ls_dem_3/0-0-2/ - - s3://dea-public-data-dev/test/lccs/ga_ls_nidem_3/0-0-2/ + - 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/test/lccs/ga_ls_nidem_3/0-0-2/ + - s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/ frequency: annual grid: au_extended_30 From bcb1d39bc26a87cc21060bb95707a3893b4fefe6 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:18:10 +1100 Subject: [PATCH 040/100] 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 70fda95c7..b6c731399 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,4 +1,4 @@ -plugin: lccs_level3 # this can help system find the relative plugin and plugin version +plugin: lccs_level34 # this can help system find the relative plugin and plugin version plugin_config: input_bands: [classes_l3_l4, urban_classes, cultivated_class] product: From 959f4669e1828867f53c3d36cbf479bd7e79bb2f Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:18:55 +1100 Subject: [PATCH 041/100] 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 65038ece9..ce11283e3 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 @@ -89,6 +89,6 @@ 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/test/lccs/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/1-0-0/ frequency: annual grid: au_extended_30 From a93218889e1218634ca4dd01968c174d578370a5 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:08:37 +1100 Subject: [PATCH 042/100] Create ga_ls_landcover_class_cyear_3_v2.yaml --- .../ga_ls_landcover_class_cyear_3_v2.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.yaml new file mode 100644 index 000000000..f251a2eb6 --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.yaml @@ -0,0 +1,33 @@ +name: ga_ls_landcover_class_cyear_3 + +description: Geoscience Australia Landsat Land Cover Calendar Year Collection 3.0 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls_landcover_class_cyear_3 + +measurements: + - name: level3 + dtype: uint8 + nodata: 255 + units: '1' + - name: level4 + aliases: + - full_classification + dtype: uint8 + nodata: 255 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From 3594adbf32910acd2555ed443de520a7e26cff7e Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:09:22 +1100 Subject: [PATCH 043/100] Rename ga_ls_landcover_class_cyear_3_v2.yaml to ga_ls_landcover_class_cyear_3_v2.odc-product.yaml --- ..._v2.yaml => ga_ls_landcover_class_cyear_3_v2.odc-product.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename products/land_and_vegetation/landcover/{ga_ls_landcover_class_cyear_3_v2.yaml => ga_ls_landcover_class_cyear_3_v2.odc-product.yaml} (100%) diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.odc-product.yaml similarity index 100% rename from products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.yaml rename to products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.odc-product.yaml From 07a294eec65096a5c979ea678f9a90038fdc9abd Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:10:18 +1100 Subject: [PATCH 044/100] Create ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml --- ...cover_woody_cover_cyear_3.odc-product.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml new file mode 100644 index 000000000..1ba4af516 --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml @@ -0,0 +1,27 @@ +name: ga_ls_landcover_woody_cover_cyear_3 + +description: Geoscience Australia Landsat Landcover Woody Cover Calender Year Collection 3 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls_landcover_woody_cover_cyear_3 + +measurements: + - name: woody_cover + dtype: uint8 + nodata: 255 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From 6cf8137b57647277e12359ab5587c587eb4d12ba Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:11:47 +1100 Subject: [PATCH 045/100] Create ga_ls_landcover_cultivated_cyear_3.odc-product.yaml --- ...dcover_cultivated_cyear_3.odc-product.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls_landcover_cultivated_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_cultivated_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_cultivated_cyear_3.odc-product.yaml new file mode 100644 index 000000000..d3691a6ba --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_cultivated_cyear_3.odc-product.yaml @@ -0,0 +1,27 @@ +name: ga_ls_landcover_cultivated_cyear_3 + +description: Geoscience Australia Landsat Landcover Cultivated Calender Year Collection 3 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls_landcover_cultivated_cyear_3 + +measurements: + - name: cultivated + dtype: uint8 + nodata: 255 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From 3a5edf11b81ecddf0e2e248dba5e3b59a5cb597d Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:12:42 +1100 Subject: [PATCH 046/100] Create ga_ls_landcover_urban_cyear_3.odc-product.yaml --- ...s_landcover_urban_cyear_3.odc-product.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls_landcover_urban_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_urban_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_urban_cyear_3.odc-product.yaml new file mode 100644 index 000000000..41cf53ee8 --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_urban_cyear_3.odc-product.yaml @@ -0,0 +1,27 @@ +name: ga_ls_landcover_urban_cyear_3 + +description: Geoscience Australia Landsat Landcover Urban Calender Year Collection 3 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls_landcover_urban_cyear_3 + +measurements: + - name: urban + dtype: uint8 + nodata: 255 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From d070e1416ca150e5ee381db2d45f1c6a01aa2aca Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:14:32 +1100 Subject: [PATCH 047/100] Create ga_ls_landcover_vwf_cyear_3.odc-product.yaml --- ..._ls_landcover_vwf_cyear_3.odc-product.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml new file mode 100644 index 000000000..56b317894 --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml @@ -0,0 +1,27 @@ +name: ga_ls_landcover_vwf_cyear_3 + +description: Geoscience Australia Landsat Landcover Vegetation Water Frequency Calender Year Collection 3 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls_landcover_vwf_cyear_3 + +measurements: + - name: veg_water_frequency + dtype: uint8 + nodata: 255 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From 9488067f48a17126520af22d578d1dae9a66f80b Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:16:31 +1100 Subject: [PATCH 048/100] Create ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml --- ...cover_inter_class_cyear_3.odc-product.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml new file mode 100644 index 000000000..45ecc0ddb --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml @@ -0,0 +1,27 @@ +name: ga_ls5_landcover_inter_class_cyear_3 + +description: Geoscience Australia Landsat 5 Landcover Intermediate Level 3 & 4 Classification Calender Year Collection 3 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls5_landcover_inter_class_cyear_3 + +measurements: + - name: level_3_4 + dtype: uint8 + nodata: 255 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From b22ff101ab2b833c698391f0ce00039e535e6cc6 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:17:06 +1100 Subject: [PATCH 049/100] Create ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml --- ...cover_inter_class_cyear_3.odc-product.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml new file mode 100644 index 000000000..fb618b197 --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml @@ -0,0 +1,27 @@ +name: ga_ls7_landcover_inter_class_cyear_3 + +description: Geoscience Australia Landsat 7 Landcover Intermediate Level 3 & 4 Classification Calender Year Collection 3 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls7_landcover_inter_class_cyear_3 + +measurements: + - name: level_3_4 + dtype: uint8 + nodata: 255 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From 0cc8b77d52d340781b91d670e683bf3a4051b7e9 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:18:21 +1100 Subject: [PATCH 050/100] Create ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml --- ...cover_inter_class_cyear_3.odc-product.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml new file mode 100644 index 000000000..44f87d8fd --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml @@ -0,0 +1,27 @@ +name: ga_ls8ls9_landcover_inter_class_cyear_3 + +description: Geoscience Australia Landsat 8 & 9 Landcover Intermediate Level 3 & 4 Classification Calender Year Collection 3 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls8ls9_landcover_inter_class_cyear_3 + +measurements: + - name: level_3_4 + dtype: uint8 + nodata: 255 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From 6562e8d247934d561d1e26d57eb9738abeb2d0aa Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:19:27 +1100 Subject: [PATCH 051/100] Update and rename ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml to ga_ls_landcover_inter_class_cyear_3.odc-product.yaml --- ...=> ga_ls_landcover_inter_class_cyear_3.odc-product.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename products/land_and_vegetation/landcover/{ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml => ga_ls_landcover_inter_class_cyear_3.odc-product.yaml} (58%) diff --git a/products/land_and_vegetation/landcover/ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_inter_class_cyear_3.odc-product.yaml similarity index 58% rename from products/land_and_vegetation/landcover/ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml rename to products/land_and_vegetation/landcover/ga_ls_landcover_inter_class_cyear_3.odc-product.yaml index 45ecc0ddb..10c3707ec 100644 --- a/products/land_and_vegetation/landcover/ga_ls5_landcover_inter_class_cyear_3.odc-product.yaml +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_inter_class_cyear_3.odc-product.yaml @@ -1,6 +1,6 @@ -name: ga_ls5_landcover_inter_class_cyear_3 +name: ga_ls_landcover_inter_class_cyear_3 -description: Geoscience Australia Landsat 5 Landcover Intermediate Level 3 & 4 Classification Calender Year Collection 3 +description: Geoscience Australia Landsat Landcover Intermediate Level 3 & 4 Classification Calender Year Collection 3 license: CC-BY-4.0 metadata_type: eo3 @@ -9,7 +9,7 @@ metadata: odc:file_format: GeoTIFF odc:product_family: lc product: - name: ga_ls5_landcover_inter_class_cyear_3 + name: ga_ls_landcover_inter_class_cyear_3 measurements: - name: level_3_4 From f72bf1b08f3db62b1932ae15674f5cfe41e503d9 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:19:41 +1100 Subject: [PATCH 052/100] Delete products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml --- ...cover_inter_class_cyear_3.odc-product.yaml | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml deleted file mode 100644 index fb618b197..000000000 --- a/products/land_and_vegetation/landcover/ga_ls7_landcover_inter_class_cyear_3.odc-product.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: ga_ls7_landcover_inter_class_cyear_3 - -description: Geoscience Australia Landsat 7 Landcover Intermediate Level 3 & 4 Classification Calender Year Collection 3 -license: CC-BY-4.0 -metadata_type: eo3 - -metadata: - properties: - odc:file_format: GeoTIFF - odc:product_family: lc - product: - name: ga_ls7_landcover_inter_class_cyear_3 - -measurements: - - name: level_3_4 - dtype: uint8 - nodata: 255 - units: '1' - -load: - crs: 'EPSG:3577' - resolution: - y: -30 - x: 30 - align: - y: 0 - x: 0 From 2f0fdb97b2890987a5030ba71a55ab09ec1bf3e3 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:19:51 +1100 Subject: [PATCH 053/100] Delete products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml --- ...cover_inter_class_cyear_3.odc-product.yaml | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml deleted file mode 100644 index 44f87d8fd..000000000 --- a/products/land_and_vegetation/landcover/ga_ls8ls9_landcover_inter_class_cyear_3.odc-product.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: ga_ls8ls9_landcover_inter_class_cyear_3 - -description: Geoscience Australia Landsat 8 & 9 Landcover Intermediate Level 3 & 4 Classification Calender Year Collection 3 -license: CC-BY-4.0 -metadata_type: eo3 - -metadata: - properties: - odc:file_format: GeoTIFF - odc:product_family: lc - product: - name: ga_ls8ls9_landcover_inter_class_cyear_3 - -measurements: - - name: level_3_4 - dtype: uint8 - nodata: 255 - units: '1' - -load: - crs: 'EPSG:3577' - resolution: - y: -30 - x: 30 - align: - y: 0 - x: 0 From 221ba97ee523287b5cd97e68b981fd9da40424eb Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:22:34 +1100 Subject: [PATCH 054/100] Create ga_ls_landcover_class_cyear_3.odc-product.yaml --- ...s_landcover_class_cyear_3.odc-product.yaml | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml diff --git a/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml b/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml new file mode 100644 index 000000000..642e4986f --- /dev/null +++ b/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml @@ -0,0 +1,75 @@ +name: ga_ls_landcover_class_cyear_3 + +description: Geoscience Australia Landsat Land Cover Calendar Year Collection 3.0 +license: CC-BY-4.0 +metadata_type: eo3 + +metadata: + properties: + odc:file_format: GeoTIFF + odc:product_family: lc + product: + name: ga_ls_landcover_class_cyear_3 + +measurements: + - name: level3 + dtype: uint8 + nodata: 0 + units: '1' + - name: lifeform_veg_cat_l4a + aliases: + - lifeform + dtype: uint8 + nodata: 0 + units: '1' + - name: canopyco_veg_cat_l4d + aliases: + - vegetation_cover + dtype: uint8 + nodata: 0 + units: '1' + - name: watersea_veg_cat_l4a_au + aliases: + - water_seasonality + dtype: uint8 + nodata: 0 + units: '1' + - name: waterstt_wat_cat_l4a + aliases: + - water_state + dtype: uint8 + nodata: 0 + units: '1' + - name: inttidal_wat_cat_l4a + aliases: + - intertidal + dtype: uint8 + nodata: 0 + units: '1' + - name: waterper_wat_cat_l4d_au + aliases: + - water_persistence + dtype: uint8 + nodata: 0 + units: '1' + - name: baregrad_phy_cat_l4d_au + aliases: + - bare_gradation + dtype: uint8 + nodata: 0 + units: '1' + - name: level4 + aliases: + - full_classification + dtype: uint8 + nodata: 0 + units: '1' + +load: + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From bcf200e920e51875d2db4c70045363c153aef580 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:22:45 +1100 Subject: [PATCH 055/100] Delete products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml --- ...s_landcover_class_cyear_3.odc-product.yaml | 75 ------------------- 1 file changed, 75 deletions(-) delete mode 100644 products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml deleted file mode 100644 index 642e4986f..000000000 --- a/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml +++ /dev/null @@ -1,75 +0,0 @@ -name: ga_ls_landcover_class_cyear_3 - -description: Geoscience Australia Landsat Land Cover Calendar Year Collection 3.0 -license: CC-BY-4.0 -metadata_type: eo3 - -metadata: - properties: - odc:file_format: GeoTIFF - odc:product_family: lc - product: - name: ga_ls_landcover_class_cyear_3 - -measurements: - - name: level3 - dtype: uint8 - nodata: 0 - units: '1' - - name: lifeform_veg_cat_l4a - aliases: - - lifeform - dtype: uint8 - nodata: 0 - units: '1' - - name: canopyco_veg_cat_l4d - aliases: - - vegetation_cover - dtype: uint8 - nodata: 0 - units: '1' - - name: watersea_veg_cat_l4a_au - aliases: - - water_seasonality - dtype: uint8 - nodata: 0 - units: '1' - - name: waterstt_wat_cat_l4a - aliases: - - water_state - dtype: uint8 - nodata: 0 - units: '1' - - name: inttidal_wat_cat_l4a - aliases: - - intertidal - dtype: uint8 - nodata: 0 - units: '1' - - name: waterper_wat_cat_l4d_au - aliases: - - water_persistence - dtype: uint8 - nodata: 0 - units: '1' - - name: baregrad_phy_cat_l4d_au - aliases: - - bare_gradation - dtype: uint8 - nodata: 0 - units: '1' - - name: level4 - aliases: - - full_classification - dtype: uint8 - nodata: 0 - units: '1' - -load: - crs: 'EPSG:3577' - resolution: - y: -30 - x: 30 - align: - y: 0 - x: 0 From e89e618dde9bf25772ce0a5db36038b3b2bbbb12 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:23:17 +1100 Subject: [PATCH 056/100] Rename ga_ls_landcover_class_cyear_3_v2.odc-product.yaml to ga_ls_landcover_class_cyear_3.odc-product.yaml --- ...roduct.yaml => ga_ls_landcover_class_cyear_3.odc-product.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename products/land_and_vegetation/landcover/{ga_ls_landcover_class_cyear_3_v2.odc-product.yaml => ga_ls_landcover_class_cyear_3.odc-product.yaml} (100%) diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml similarity index 100% rename from products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3_v2.odc-product.yaml rename to products/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml From dacee1c5499b9cd5fb004d49732db11cbb3e7cc7 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:52:09 +1100 Subject: [PATCH 057/100] Create ga_ls_landcover_nidem_myear_2.odc-product.yaml --- ...s_landcover_nidem_myear_2.odc-product.yaml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml new file mode 100644 index 000000000..0fc9db219 --- /dev/null +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml @@ -0,0 +1,23 @@ +name: ga_ls_landcover_nidem_myear_2 +description: Geoscience Australia Landsat Land Cover National Intertidal Digital Elevation Model Multi Year Collection 2 +license: CC-BY-4.0 +metadata_type: eo + +metadata: + format: + name: GeoTIFF + product_type: ga_ls_landcover_nidem_myear_2 +measurements: +- dtype: float32 + name: 'nidem' + nodata: -9999 + units: 'metres' + +load: + crs: 'EPSG:3577' + resolution: + y: -25 + x: 25 + align: + y: 0 + x: 0 From 50b6222e9e60a5e7904e5f83170039fdc8c64c0e Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:54:03 +1100 Subject: [PATCH 058/100] Create srtm_landcover_dem.odc-product.yaml --- .../srtm_landcover_dem.odc-product.yaml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml diff --git a/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml b/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml new file mode 100644 index 000000000..35d3a8982 --- /dev/null +++ b/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml @@ -0,0 +1,40 @@ +--- +# Product +name: srtm_landcover_dem +metadata_type: eo +description: Shuttle Radar Topography Mission Landcover 1 Arc Second Digital Elevation Model + +license: CC-BY-4.0 + +metadata: + product_type: DEM + platform: + code: Space Shuttle Endeavour + instrument: + name: SIR + +measurements: +- name: dem + dtype: float32 + units: metre + nodata: -340282346638528859811704183484516925440 +- name: dem_s + dtype: float32 + units: metre + nodata: -340282346638528859811704183484516925440 +- name: dem_h + dtype: float32 + units: metre + nodata: -340282346638528859811704183484516925440 + +storage: + crs: EPSG:4326 + resolution: + latitude: -0.00027777777778 + longitude: 0.00027777777778 + +load: + crs: 'EPSG:4326' + resolution: + latitude: -0.00027777777778 + longitude: 0.00027777777778 From ab49bbbb7d6009b1a0194a469b62d8e29f1e4494 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:39:57 +1100 Subject: [PATCH 059/100] Create lc_c3_class_desc.py --- .../landcover/lc_c3_class_desc.py | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py new file mode 100644 index 000000000..d9e8c25c8 --- /dev/null +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py @@ -0,0 +1,100 @@ +level3_labels = { + 255: "No data", + 111: "Cultivated Terrestrial Vegetation", + 112: "Natural Terrestrial Vegetation", + 123: "Cultivated Aquatic Vegetation", + 124: "Natural Aquatic Vegetation", + 215: "Artificial Surface", + 216: "Natural Bare Surface", + 220: "Water" +} + +level4_labels = { + 255: 'No data', + 1: 'Cultivated Terrestrial Vegetated', + 3: 'Cultivated Terrestrial Vegetated: Herbaceous', + 4: 'Cultivated Terrestrial Vegetated: Closed (> 65 %)', + 5: 'Cultivated Terrestrial Vegetated: Open (40 to 65 %)', + 6: 'Cultivated Terrestrial Vegetated: Open (15 to 40 %)', + 7: 'Cultivated Terrestrial Vegetated: Sparse (4 to 15 %)', + 8: 'Cultivated Terrestrial Vegetated: Scattered (1 to 4 %)', + 14: 'Cultivated Terrestrial Vegetated: Herbaceous Closed (> 65 %)', + 15: 'Cultivated Terrestrial Vegetated: Herbaceous Open (40 to 65 %)', + 16: 'Cultivated Terrestrial Vegetated: Herbaceous Open (15 to 40 %)', + 17: 'Cultivated Terrestrial Vegetated: Herbaceous Sparse (4 to 15 %)', + 18: 'Cultivated Terrestrial Vegetated: Herbaceous Scattered (1 to 4 %)', + 19: 'Natural Terrestrial Vegetated', + 20: 'Natural Terrestrial Vegetated: Woody', + 21: 'Natural Terrestrial Vegetated: Herbaceous', + 22: 'Natural Terrestrial Vegetated: Closed (> 65 %)', + 23: 'Natural Terrestrial Vegetated: Open (40 to 65 %)', + 24: 'Natural Terrestrial Vegetated: Open (15 to 40 %)', + 25: 'Natural Terrestrial Vegetated: Sparse (4 to 15 %)', + 26: 'Natural Terrestrial Vegetated: Scattered (1 to 4 %)', + 27: 'Natural Terrestrial Vegetated: Woody Closed (> 65 %)', + 28: 'Natural Terrestrial Vegetated: Woody Open (40 to 65 %)', + 29: 'Natural Terrestrial Vegetated: Woody Open (15 to 40 %)', + 30: 'Natural Terrestrial Vegetated: Woody Sparse (4 to 15 %)', + 31: 'Natural Terrestrial Vegetated: Woody Scattered (1 to 4 %)', + 32: 'Natural Terrestrial Vegetated: Herbaceous Closed (> 65 %)', + 33: 'Natural Terrestrial Vegetated: Herbaceous Open (40 to 65 %)', + 34: 'Natural Terrestrial Vegetated: Herbaceous Open (15 to 40 %)', + 35: 'Natural Terrestrial Vegetated: Herbaceous Sparse (4 to 15 %)', + 36: 'Natural Terrestrial Vegetated: Herbaceous Scattered (1 to 4 %)', + 55: 'Natural Aquatic Vegetated', + 56: 'Natural Aquatic Vegetated: Woody', + 57: 'Natural Aquatic Vegetated: Herbaceous', + 58: 'Natural Aquatic Vegetated: Closed (> 65 %)', + 59: 'Natural Aquatic Vegetated: Open (40 to 65 %)', + 60: 'Natural Aquatic Vegetated: Open (15 to 40 %)', + 61: 'Natural Aquatic Vegetated: Sparse (4 to 15 %)', + 62: 'Natural Aquatic Vegetated: Scattered (1 to 4 %)', + 63: 'Natural Aquatic Vegetated: Woody Closed (> 65 %)', + 64: 'Natural Aquatic Vegetated: Woody Closed (> 65 %) Water > 3 months (semi-) permanent', + 65: 'Natural Aquatic Vegetated: Woody Closed (> 65 %) Water < 3 months (temporary or seasonal)', + 66: 'Natural Aquatic Vegetated: Woody Open (40 to 65 %)', + 67: 'Natural Aquatic Vegetated: Woody Open (40 to 65 %) Water > 3 months (semi-) permanent', + 68: 'Natural Aquatic Vegetated: Woody Open (40 to 65 %) Water < 3 months (temporary or seasonal)', + 69: 'Natural Aquatic Vegetated: Woody Open (15 to 40 %)', + 70: 'Natural Aquatic Vegetated: Woody Open (15 to 40 %) Water > 3 months (semi-) permanent', + 71: 'Natural Aquatic Vegetated: Woody Open (15 to 40 %) Water < 3 months (temporary or seasonal)', + 72: 'Natural Aquatic Vegetated: Woody Sparse (4 to 15 %)', + 73: 'Natural Aquatic Vegetated: Woody Sparse (4 to 15 %) Water > 3 months (semi-) permanent', + 74: 'Natural Aquatic Vegetated: Woody Sparse (4 to 15 %) Water < 3 months (temporary or seasonal)', + 75: 'Natural Aquatic Vegetated: Woody Scattered (1 to 4 %)', + 76: 'Natural Aquatic Vegetated: Woody Scattered (1 to 4 %) Water > 3 months (semi-) permanent', + 77: 'Natural Aquatic Vegetated: Woody Scattered (1 to 4 %) Water < 3 months (temporary or seasonal)', + 78: 'Natural Aquatic Vegetated: Herbaceous Closed (> 65 %)', + 79: 'Natural Aquatic Vegetated: Herbaceous Closed (> 65 %) Water > 3 months (semi-) permanent', + 80: 'Natural Aquatic Vegetated: Herbaceous Closed (> 65 %) Water < 3 months (temporary or seasonal)', + 81: 'Natural Aquatic Vegetated: Herbaceous Open (40 to 65 %)', + 82: 'Natural Aquatic Vegetated: Herbaceous Open (40 to 65 %) Water > 3 months (semi-) permanent', + 83: 'Natural Aquatic Vegetated: Herbaceous Open (40 to 65 %) Water < 3 months (temporary or seasonal)', + 84: 'Natural Aquatic Vegetated: Herbaceous Open (15 to 40 %)', + 85: 'Natural Aquatic Vegetated: Herbaceous Open (15 to 40 %) Water > 3 months (semi-) permanent', + 86: 'Natural Aquatic Vegetated: Herbaceous Open (15 to 40 %) Water < 3 months (temporary or seasonal)', + 87: 'Natural Aquatic Vegetated: Herbaceous Sparse (4 to 15 %)', + 88: 'Natural Aquatic Vegetated: Herbaceous Sparse (4 to 15 %) Water > 3 months (semi-) permanent', + 89: 'Natural Aquatic Vegetated: Herbaceous Sparse (4 to 15 %) Water < 3 months (temporary or seasonal)', + 90: 'Natural Aquatic Vegetated: Herbaceous Scattered (1 to 4 %)', + 91: 'Natural Aquatic Vegetated: Herbaceous Scattered (1 to 4 %) Water > 3 months (semi-) permanent', + 92: 'Natural Aquatic Vegetated: Herbaceous Scattered (1 to 4 %) Water < 3 months (temporary or seasonal)', + 93: 'Artificial Surface', + 94: 'Natural Surface', + 95: 'Natural Surface: Sparsely vegetated', + 96: 'Natural Surface: Very sparsely vegetated', + 97: 'Natural Surface: Bare areas, unvegetated', + 98: 'Water', + 99: 'Water', + 100: 'Water: Tidal area', + 101: 'Water: Perennial (> 9 months)', + 102: 'Water: Non-perennial (7 to 9 months)', + 103: 'Water: Non-perennial (4 to 6 months)', + 104: 'Water: Non-perennial (1 to 3 months)', +} + +def class_labels(data): + return { + "level3_label": level3_labels[data["level3"]], + "level4_label": level4_labels[data["level4"]], + } From 6b39237859cf46f4ea140cd583fb0c91a08374c5 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:30:00 +1100 Subject: [PATCH 060/100] Update ga_ls_landcover_woody_cover_cyear_3.yaml --- .../odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml index c1aed37f1..710985e5f 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_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_woody_cover_cyear_3/0-0-2 + s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cover_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 62b4d146cc05b8696bc8efb369cdd3b35ebb86ec Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:39:05 +1100 Subject: [PATCH 061/100] Update ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml --- .../ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml index 1ba4af516..ee81fb0f7 100644 --- a/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml @@ -12,7 +12,7 @@ metadata: name: ga_ls_landcover_woody_cover_cyear_3 measurements: - - name: woody_cover + - name: woody dtype: uint8 nodata: 255 units: '1' From 2f6cbe6f090a470dbbca987f124c6e19bca86515 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:42:40 +1100 Subject: [PATCH 062/100] Update and rename ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml to ga_ls_landcover_woody_cyear_3.odc-product.yaml --- ...ct.yaml => ga_ls_landcover_woody_cyear_3.odc-product.yaml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename products/land_and_vegetation/landcover/{ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml => ga_ls_landcover_woody_cyear_3.odc-product.yaml} (71%) diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cyear_3.odc-product.yaml similarity index 71% rename from products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml rename to products/land_and_vegetation/landcover/ga_ls_landcover_woody_cyear_3.odc-product.yaml index ee81fb0f7..412dfccb4 100644 --- a/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cover_cyear_3.odc-product.yaml +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_woody_cyear_3.odc-product.yaml @@ -1,6 +1,6 @@ name: ga_ls_landcover_woody_cover_cyear_3 -description: Geoscience Australia Landsat Landcover Woody Cover Calender Year Collection 3 +description: Geoscience Australia Landsat Landcover Woody Calender Year Collection 3 license: CC-BY-4.0 metadata_type: eo3 @@ -9,7 +9,7 @@ metadata: odc:file_format: GeoTIFF odc:product_family: lc product: - name: ga_ls_landcover_woody_cover_cyear_3 + name: ga_ls_landcover_woody_cyear_3 measurements: - name: woody From e4830af63ac2eab85cc1964cacea48e697541c4b Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:43:57 +1100 Subject: [PATCH 063/100] Update and rename ga_ls_landcover_woody_cover_cyear_3.yaml to ga_ls_landcover_woody_cyear_3.yaml --- ...over_cyear_3.yaml => ga_ls_landcover_woody_cyear_3.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename dev/services/odc-stats/lccs/{ga_ls_landcover_woody_cover_cyear_3.yaml => ga_ls_landcover_woody_cyear_3.yaml} (92%) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml similarity index 92% rename from dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml rename to dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml index 710985e5f..f318d7143 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cover_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml @@ -12,8 +12,8 @@ plugin_config: x: 400 product: - name: ga_ls_landcover_woody_cover_cyear_3 - short_name: ga_ls_landcover_woody_cover_cyear_3 + name: ga_ls_landcover_woody_cyear_3 + short_name: ga_ls_landcover_woody_cyear_3 version: 1.0.0 product_family: lccs @@ -86,7 +86,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_woody_cover_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 3a69ad271bd127e816f02e3b1e807a78a7f6b384 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:48:25 +1100 Subject: [PATCH 064/100] Update and rename ga_ls_landcover_urban_cyear_3.yaml to ga_ls_landcover_artificial_surface_cyear_3.yaml --- ...yaml => ga_ls_landcover_artificial_surface_cyear_3.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename dev/services/odc-stats/lccs/{ga_ls_landcover_urban_cyear_3.yaml => ga_ls_landcover_artificial_surface_cyear_3.yaml} (91%) diff --git a/dev/services/odc-stats/lccs/ga_ls_landcover_urban_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml similarity index 91% rename from dev/services/odc-stats/lccs/ga_ls_landcover_urban_cyear_3.yaml rename to dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml index 4fed4ad1e..6f3f4dde7 100644 --- a/dev/services/odc-stats/lccs/ga_ls_landcover_urban_cyear_3.yaml +++ b/dev/services/odc-stats/lccs/ga_ls_landcover_artificial_surface_cyear_3.yaml @@ -7,8 +7,8 @@ plugin_config: natural: 216 product: - name: ga_ls_landcover_urban_cyear_3 - short_name: ga_ls_landcover_urban_cyear_3 + name: ga_ls_landcover_artificial_surface_cyear_3 + short_name: ga_ls_landcover_artificial_surface_cyear_3 version: 1.0.0 product_family: lccs @@ -81,7 +81,7 @@ cog_opts: zlevel: 9 apply_eodatasets3: True output_location: >- - s3://dea-public-data-dev/derivative/ga_ls_landcover_urban_cyear_3/1-0-0 + 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 From caa00cb3fc30230ee2da10c146f8c5224bd233e6 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:49:20 +1100 Subject: [PATCH 065/100] Update ga_ls_landcover_urban_cyear_3.odc-product.yaml --- .../ga_ls_landcover_urban_cyear_3.odc-product.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_urban_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_urban_cyear_3.odc-product.yaml index 41cf53ee8..9ee4f346c 100644 --- a/products/land_and_vegetation/landcover/ga_ls_landcover_urban_cyear_3.odc-product.yaml +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_urban_cyear_3.odc-product.yaml @@ -1,6 +1,6 @@ -name: ga_ls_landcover_urban_cyear_3 +name: ga_ls_landcover_artificial_surface_cyear_3 -description: Geoscience Australia Landsat Landcover Urban Calender Year Collection 3 +description: Geoscience Australia Landsat Landcover Artificial Surface Calender Year Collection 3 license: CC-BY-4.0 metadata_type: eo3 @@ -9,10 +9,10 @@ metadata: odc:file_format: GeoTIFF odc:product_family: lc product: - name: ga_ls_landcover_urban_cyear_3 + name: ga_ls_landcover_artificial_surface_cyear_3 measurements: - - name: urban + - name: artificial_surface dtype: uint8 nodata: 255 units: '1' From 6b249b496168e43a60e1b2aa3d444b40f4a2d73b Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:49:56 +1100 Subject: [PATCH 066/100] 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 b6c731399..009d0596f 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 @@ -62,6 +62,6 @@ output_location: >- s3://dea-public-data-dev/derivative/ga_ls_landcover_class_cyear_3/1-0-0 # save-tasks options -input_products: 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_urban_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_cultivated_cyear_3/1-0-0 +input_products: 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 frequency: annual grid: au_extended_30 From c82841132758d77b083c353d7bc7a3cf48330ffb Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Thu, 7 Nov 2024 05:12:18 +0000 Subject: [PATCH 067/100] correct woody input band sequence --- .../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 f318d7143..b8507eee2 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_blue, nbart_green, nbart_red, nbart_nir, nbart_swir_1, nbart_swir_2, classes_l3_l4] + input_bands: [nbart_swir_2, nbart_blue, nbart_green, nbart_red, nbart_nir, nbart_swir_1, classes_l3_l4] mask_bands: classes_l3_l4: 110 model_path: woody_treelite.so @@ -86,9 +86,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/test/lccs/ga_ls_landcover_woody_cyear_3/0-0-3 # 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/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2/ frequency: annual grid: au_extended_30 From ead3566818cd7b208c172330c130039a713f26ed Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Thu, 7 Nov 2024 05:38:47 +0000 Subject: [PATCH 068/100] using test path --- .../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 ce11283e3..f1c275ee7 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 @@ -86,9 +86,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/test/lccs/ga_ls_landcover_cultivated_cyear_3/0-0-4 # 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/test/lccs/ga_ls_staging_l3_l4_cyear_3/0-0-2/ frequency: annual grid: au_extended_30 From 0bc169cdc7a7afb36a06043c672aecb75fcafed3 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 8 Nov 2024 10:37:20 +1100 Subject: [PATCH 069/100] Create ows_c3_lc_cyear_cfg.py --- .../landcover/ows_c3_lc_cyear_cfg.py | 342 ++++++++++++++++++ 1 file changed, 342 insertions(+) create mode 100644 dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py new file mode 100644 index 000000000..826fe60ab --- /dev/null +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py @@ -0,0 +1,342 @@ +from ows_refactored.ows_reslim_cfg import reslim_for_lccs + +bands_landcover = { + "level3": [], + "level4": [], +} + +bands_eds = { + "lifeform_veg_cat_l4a": ["lifeform"], + "canopyco_veg_cat_l4d": ["canopy_cover"], + "watersea_veg_cat_l4a_au": ["water_seasonality"], + "waterper_wat_cat_l4d_au": ["water_persistence"], + "baregrad_phy_cat_l4d_au": ["bare_gradation"], +} + +style_c3_level3 = { + "name": "level3", + "title": "Basic", + "abstract": "Standardised colouring of Level 3 land cover classes", + "value_map": { + "level3": [ + {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "Cultivated Terrestrial Vegetation", 'abstract': "", 'values': [111], 'color': '#ACBC2D', 'alpha': 1}, + {'title': "Natural Terrestrial Vegetation", 'abstract': "", 'values': [112], 'color': '#0E7912', 'alpha': 1}, + {'title': "Natural Aquatic Vegetation", 'abstract': "", 'values': [124], 'color': '#1EBF79', 'alpha': 1}, + {'title': "Artificial Surface", 'abstract': "", 'values': [215], 'color': '#DA5C69', 'alpha': 1}, + {'title': "Natural Bare Surface", 'abstract': "", 'values': [216], 'color': '#F3AB69', 'alpha': 1}, + {'title': "Water", 'abstract': "", 'values': [220], 'color': '#4D9FDC', 'alpha': 1} + ] + }, + "legend": {"width": 3.0, "height": 1.5}, +} + + +style_c3_level4_lifeform = { + "name": "lifeform", + "title": "Lifeform", + "abstract": "Lifeform (L4): woody / herbaceous", + "value_map": { + "level3": [ + {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "Woody", 'abstract': "", 'values': [20, 38, 56], 'color': '#0E7912', 'alpha': 1}, + {'title': "Herbaceous", 'abstract': "", 'values': [2], 'color': '#77A71E', 'alpha': 1} + ] + }, +} + + +style_c2_level4_canopyco = { + "name": "canopyco", + "title": "Vegetation Cover", + "abstract": "Vegetation Cover (L4)", + "value_map": { + 'canopyco_veg_cat_l4d': [ + {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "Closed Vegetation", 'abstract': "(> 65 %)", 'values': [10], 'color': '#0E7912', 'alpha': 1}, + {'title': "Open Vegetation", 'abstract': "(40 to 65 %)", 'values': [12], 'color': '#2D8D2F', 'alpha': 1}, + {'title': "Open Vegetation", 'abstract': "(15 to 40 %)", 'values': [13], 'color': '#50A052', 'alpha': 1}, + {'title': "Sparse Vegetation", 'abstract': "(4 to 15 %)", 'values': [15], 'color': '#75B476', 'alpha': 1}, + {'title': "Scattered Vegetation", 'abstract': "(1 to 4 %)", 'values': [16], 'color': '#9AC79C', 'alpha': 1} + ] + }, + # "pq_masks": [ + # { + # "band": "land", + # "invert": True, + # "enum": 0, + # } + # ], +} + + +style_c2_level4_watersea = { + "name": "watersea", + "title": "Water Seasonality", + "abstract": "Water Seasonality (L4) in vegetated areas", + "value_map": { + "watersea_veg_cat_l4a_au": [ + {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "> 3 months", 'abstract': "(semi) permanent", 'values': [1], 'color': '#19AD6D', 'alpha': 1}, + {'title': "< 3 months", 'abstract': "temporary or seasonal", 'values': [2], 'color': '#B0DAC9', 'alpha': 1} + ] + }, +} + + +style_c2_level4_waterper = { + "name": "waterper", + "title": "Water Persistence", + "abstract": "Water persistence in non-vegetated areas", + "value_map": { + "waterper_wat_cat_l4d_au": [ + {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "Perennial", 'abstract': "(> 9 months)", 'values': [1], 'color': '#1b55ba', 'alpha': 1}, + {'title': "Non-perennial", 'abstract': "(7 to 9 months)", 'values': [7], 'color': '#3479C9', 'alpha': 1}, + {'title': "Non-perennial", 'abstract': "(4 to 6 months)", 'values': [8], 'color': '#4F9DD9', 'alpha': 1}, + {'title': "Non-perennial", 'abstract': "(1 to 3 months)", 'values': [9], 'color': '#71CAFD', 'alpha': 1} + ] + } +} + + +style_c2_level4_baregrad = { + "name": "baregrad", + "title": "Bare Gradation", + "abstract": "Level of vegetation in predominantly bare areas", + "value_map": { + "baregrad_phy_cat_l4d_au": [ + {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "Sparsely Vegetated", 'abstract': "", 'values': [10], 'color': '#FFE68C', 'alpha': 1}, + {'title': "Very Sparsely Vegetated", 'abstract': "", 'values': [12], 'color': '#FAD26E', 'alpha': 1}, + {'title': "Bare Areas, Unvegetated", 'abstract': "", 'values': [15], 'color': '#F3AB69', 'alpha': 1} + ] + }, + # "pq_masks": [ + # { + # "band": "land", + # "invert": True, + # "enum": 0, + # } + # ], +} + + +style_c2_level4 = { + "name": "level4", + "title": "Detailed", + "abstract": "Standardised colouring of Level 4 land cover classes", + "value_map": { + "level4": [ + {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, + {'title': 'Cultivated Terrestrial Vegetated', 'abstract': '', 'values': [1], 'color': '#97bb1a', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Woody', 'abstract': '', 'values': [2], 'color': '#97bb1a', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Herbaceous', 'abstract': '', 'values': [3], 'color': '#d1e033', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Closed (> 65 %)', 'abstract': '', 'values': [4], 'color': '#c5a847', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Open (40 to 65 %)', 'abstract': '', 'values': [5], 'color': '#cdb54b', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Open (15 to 40 %)', 'abstract': '', 'values': [6], 'color': '#d5c14f', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Sparse (4 to 15 %)', 'abstract': '', 'values': [7], 'color': '#e4d26c', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Scattered (1 to 4 %)', 'abstract': '', 'values': [8], 'color': '#f2e38a', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Woody Closed (> 65 %)', 'abstract': '', 'values': [9], 'color': '#c5a847', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Woody Open (40 to 65 %)', 'abstract': '', 'values': [10], 'color': '#cdb54b', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Woody Open (15 to 40 %)', 'abstract': '', 'values': [11], 'color': '#d5c14f', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Woody Sparse (4 to 15 %)', 'abstract': '', 'values': [12], 'color': '#e4d26c', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Woody Scattered (1 to 4 %)', 'abstract': '', 'values': [13], 'color': '#f2e38a', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Herbaceous Closed (> 65 %)', 'abstract': '', 'values': [14], 'color': '#e4e034', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Herbaceous Open (40 to 65 %)', 'abstract': '', 'values': [15], 'color': '#ebe854', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Herbaceous Open (15 to 40 %)', 'abstract': '', 'values': [16], 'color': '#f2f07f', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Herbaceous Sparse (4 to 15 %)', 'abstract': '', 'values': [17], 'color': '#f9f7ae', 'alpha': 1}, + {'title': 'Cultivated Terrestrial Vegetated: Herbaceous Scattered (1 to 4 %)', 'abstract': '', 'values': [18], 'color': '#fffede', 'alpha': 1}, + {'title': '', 'abstract': '', 'values': [19], 'color': '#0e7912', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Woody', 'abstract': '', 'values': [20], 'color': '#1ab157', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Herbaceous', 'abstract': '', 'values': [21], 'color': '#5eb31f', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Closed (> 65 %)', 'abstract': '', 'values': [22], 'color': '#0e7912', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Open (40 to 65 %)', 'abstract': '', 'values': [23], 'color': '#2d8d2f', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Open (15 to 40 %)', 'abstract': '', 'values': [24], 'color': '#50a052', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Sparse (4 to 15 %)', 'abstract': '', 'values': [25], 'color': '#75b476', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Scattered (1 to 4 %)', 'abstract': '', 'values': [26], 'color': '#9ac79c', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Woody Closed (> 65 %)', 'abstract': '', 'values': [27], 'color': '#0e7912', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Woody Open (40 to 65 %)', 'abstract': '', 'values': [28], 'color': '#2d8d2f', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Woody Open (15 to 40 %)', 'abstract': '', 'values': [29], 'color': '#50a052', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Woody Sparse (4 to 15 %)', 'abstract': '', 'values': [30], 'color': '#75b476', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Woody Scattered (1 to 4 %)', 'abstract': '', 'values': [31], 'color': '#9ac79c', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Herbaceous Closed (> 65 %)', 'abstract': '', 'values': [32], 'color': '#77a71e', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Herbaceous Open (40 to 65 %)', 'abstract': '', 'values': [33], 'color': '#88b633', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Herbaceous Open (15 to 40 %)', 'abstract': '', 'values': [34], 'color': '#99c450', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Herbaceous Sparse (4 to 15 %)', 'abstract': '', 'values': [35], 'color': '#aad471', 'alpha': 1}, + {'title': 'Natural Terrestrial Vegetated: Herbaceous Scattered (1 to 4 %)', 'abstract': '', 'values': [36], 'color': '#bae292', 'alpha': 1}, + {'title': '', 'abstract': '', 'values': [37], 'color': '#56ece7', 'alpha': 1}, + # {'title': 'Cultivated Aquatic Vegetated: Woody', 'abstract': '', 'values': [38], 'color': '#3daa8c', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Herbaceous', 'abstract': '', 'values': [39], 'color': '#52e7ac', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Closed (> 65 %)', 'abstract': '', 'values': [40], 'color': '#2bd2cb', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Open (40 to 65 %)', 'abstract': '', 'values': [41], 'color': '#49ded8', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Open (15 to 40 %)', 'abstract': '', 'values': [42], 'color': '#6ee9e4', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Sparse (4 to 15 %)', 'abstract': '', 'values': [43], 'color': '#95f4f0', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Scattered (1 to 4 %)', 'abstract': '', 'values': [44], 'color': '#bbfffc', 'alpha': 1}, + # {'title': 'Cultivated Aquatic Vegetated: Woody Closed (> 65 %)', 'abstract': '', 'values': [45], 'color': '#2bd2cb', 'alpha': 1}, + # {'title': 'Cultivated Aquatic Vegetated: Woody Open (40 to 65 %)', 'abstract': '', 'values': [46], 'color': '#49ded8', 'alpha': 1}, + # {'title': 'Cultivated Aquatic Vegetated: Woody Open (15 to 40 %)', 'abstract': '', 'values': [47], 'color': '#6ee9e4', 'alpha': 1}, + # {'title': 'Cultivated Aquatic Vegetated: Woody Sparse (4 to 15 %)', 'abstract': '', 'values': [48], 'color': '#95f4f0', 'alpha': 1}, + # {'title': 'Cultivated Aquatic Vegetated: Woody Scattered (1 to 4 %)', 'abstract': '', 'values': [49], 'color': '#bbfffc', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Herbaceous Closed (> 65 %)', 'abstract': '', 'values': [50], 'color': '#52e7c4', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Herbaceous Open (40 to 65 %)', 'abstract': '', 'values': [51], 'color': '#71edd0', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Herbaceous Open (15 to 40 %)', 'abstract': '', 'values': [52], 'color': '#90f3dc', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Herbaceous Sparse (4 to 15 %)', 'abstract': '', 'values': [53], 'color': '#aff9e8', 'alpha': 1}, + {'title': 'Cultivated Aquatic Vegetated: Herbaceous Scattered (1 to 4 %)', 'abstract': '', 'values': [54], 'color': '#cffff4', 'alpha': 1}, + {'title': '', 'abstract': '', 'values': [55], 'color': '#1ebf79', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody', 'abstract': '', 'values': [56], 'color': '#128e94', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous', 'abstract': '', 'values': [57], 'color': '#70ea86', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Closed (> 65 %)', 'abstract': '', 'values': [58], 'color': '#19ad6d', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Open (40 to 65 %)', 'abstract': '', 'values': [59], 'color': '#35b884', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Open (15 to 40 %)', 'abstract': '', 'values': [60], 'color': '#5dc39b', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Sparse (4 to 15 %)', 'abstract': '', 'values': [61], 'color': '#87ceb2', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Scattered (1 to 4 %)', 'abstract': '', 'values': [62], 'color': '#b0dac9', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Closed (> 65 %)', 'abstract': '', 'values': [63], 'color': '#19ad6d', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Closed (> 65 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [64], 'color': '#19ad6d', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Closed (> 65 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [65], 'color': '#19ad6d', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Open (40 to 65 %)', 'abstract': '', 'values': [66], 'color': '#35b884', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Open (40 to 65 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [67], 'color': '#35b884', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Open (40 to 65 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [68], 'color': '#35b884', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Open (15 to 40 %)', 'abstract': '', 'values': [69], 'color': '#5dc39b', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Open (15 to 40 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [70], 'color': '#5dc39b', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Open (15 to 40 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [71], 'color': '#5dc39b', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Sparse (4 to 15 %)', 'abstract': '', 'values': [72], 'color': '#87ceb2', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Sparse (4 to 15 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [73], 'color': '#87ceb2', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Sparse (4 to 15 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [74], 'color': '#87ceb2', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Scattered (1 to 4 %)', 'abstract': '', 'values': [75], 'color': '#b0dac9', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Scattered (1 to 4 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [76], 'color': '#b0dac9', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Woody Scattered (1 to 4 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [77], 'color': '#b0dac9', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Closed (> 65 %)', 'abstract': '', 'values': [78], 'color': '#27cc8b', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Closed (> 65 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [79], 'color': '#27cc8b', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Closed (> 65 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [80], 'color': '#27cc8b', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Open (40 to 65 %)', 'abstract': '', 'values': [81], 'color': '#42d89f', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Open (40 to 65 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [82], 'color': '#42d89f', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Open (40 to 65 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [83], 'color': '#42d89f', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Open (15 to 40 %)', 'abstract': '', 'values': [84], 'color': '#63e3b4', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Open (15 to 40 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [85], 'color': '#63e3b4', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Open (15 to 40 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [86], 'color': '#63e3b4', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Sparse (4 to 15 %)', 'abstract': '', 'values': [87], 'color': '#87efc9', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Sparse (4 to 15 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [88], 'color': '#87efc9', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Sparse (4 to 15 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [89], 'color': '#87efc9', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Scattered (1 to 4 %)', 'abstract': '', 'values': [90], 'color': '#abfadd', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Scattered (1 to 4 %) Water > 3 months (semi-) permenant', 'abstract': '', 'values': [91], 'color': '#abfadd', 'alpha': 1}, + {'title': 'Natural Aquatic Vegetated: Herbaceous Scattered (1 to 4 %) Water < 3 months (temporary or seasonal)', 'abstract': '', 'values': [92], 'color': '#abfadd', 'alpha': 1}, + {'title': 'Artificial Surface', 'abstract': '', 'values': [93], 'color': '#da5c69', 'alpha': 1}, + {'title': '', 'abstract': '', 'values': [94], 'color': '#f3ab69', 'alpha': 1}, + {'title': 'Natural Surface: Sparsely vegetated', 'abstract': '', 'values': [95], 'color': '#ffe68c', 'alpha': 1}, + {'title': 'Natural Surface: Very sparsely vegetated', 'abstract': '', 'values': [96], 'color': '#fad26e', 'alpha': 1}, + {'title': 'Natural Surface: Bare areas, unvegetated', 'abstract': '', 'values': [97], 'color': '#f3ab69', 'alpha': 1}, + {'title': 'Water', 'abstract': '', 'values': [98], 'color': '#4d9fdc', 'alpha': 1}, + {'title': '', 'abstract': '', 'values': [99], 'color': '#4d9fdc', 'alpha': 1}, + {'title': 'Water: Tidal area', 'abstract': '', 'values': [100], 'color': '#bbdce9', 'alpha': 1}, + {'title': 'Water: Perennial (> 9 months)', 'abstract': '', 'values': [101], 'color': '#1b55ba', 'alpha': 1}, + {'title': 'Water: Non-perennial (7 to 9 months)', 'abstract': '', 'values': [102], 'color': '#3479c9', 'alpha': 1}, + {'title': 'Water: Non-perennial (4 to 6 months)', 'abstract': '', 'values': [103], 'color': '#4f9dd9', 'alpha': 1}, + {'title': 'Water: Non-perennial (1 to 3 months)', 'abstract': '', 'values': [104], 'color': '#85cafd', 'alpha': 1}, + # {'title': 'Water: (Snow)', 'abstract': '', 'values': [105], 'color': '#fafafa', 'alpha': 1}, + ] + }, + # "pq_masks": [ + # { + # "band": "land", + # "invert": True, + # "enum": 0, + # } + # ], + "legend": { + "show_legend": True, + "url": "https://data.dea.ga.gov.au/derivative/ga_ls_landcover_class_cyear_2/level4-web-legend.png" + }, +} + + +layers = { + "title": "DEA Land Cover", + "name": "", + "layers": [ + { + "title": "DEA Land Cover Calendar Year (Landsat)", + "name": "ga_ls_landcover", + "abstract": """DEA Land Cover Calendar Year (Landsat) + +Land cover is the observed physical cover on the Earth's surface including trees, shrubs, grasses, soils, exposed rocks, water bodies, plantations, crops and built structures. A consistent, Australia-wide land cover product helps the understanding of how the different parts of the environment change and inter-relate. Earth observation data recorded over a period of time allows the observation of the state of land cover at specific times and therefore the way that land cover changes. + +For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-land-cover-landsat/ + +For service status information, see https://status.dea.ga.gov.au""", + "product_name": "ga_ls_landcover_class_cyear_2", + "bands": bands_landcover, + "time_resolution": "summary", + "resource_limits": reslim_for_lccs, + "dynamic": True, + "native_crs": "EPSG:3577", + "native_resolution": [25, -25], + "image_processing": { + "extent_mask_func": [], + "always_fetch_bands": [], + "manual_merge": False, + }, + # "flags": [ + # { + # "band": "land", + # "product": "geodata_coast_100k", + # "ignore_time": True, + # "ignore_info_flags": [], + # } + # ], + "styling": { + "default_style": "level4", + "styles": [style_c2_level3, style_c2_level4], + }, + "feature_info": { + "include_custom": { + "description": { + "function": "ows_refactored.land_and_vegetation.landcover.lc_class_desc.class_labels", + } + } + } + }, + { + "title": "DEA Land Cover Environmental Descriptors", + "name": "ga_ls_landcover_descriptors", + "abstract": """DEA Land Cover Environmental Descriptors + +Land cover is the observed physical cover on the Earth's surface including trees, shrubs, grasses, soils, exposed rocks, water bodies, plantations, crops and built structures. A consistent, Australia-wide land cover product helps the understanding of how the different parts of the environment change and inter-relate. Earth observation data recorded over a period of time allows the observation of the state of land cover at specific times and therefore the way that land cover changes. + +For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-land-cover-landsat/ + +For service status information, see https://status.dea.ga.gov.au""", + "product_name": "ga_ls_landcover_class_cyear_2", + "bands": bands_eds, + "time_resolution": "summary", + "resource_limits": reslim_for_lccs, + "dynamic": True, + "native_crs": "EPSG:3577", + "native_resolution": [25, -25], + "image_processing": { + "extent_mask_func": [], + "always_fetch_bands": [], + "manual_merge": False, + }, + # "flags": [ + # { + # "band": "land", + # "product": "geodata_coast_100k", + # "ignore_time": True, + # "ignore_info_flags": [], + # } + # ], + "styling": { + "default_style": "canopyco", + "styles": [style_c2_level4_canopyco, style_c2_level4_lifeform, style_c2_level4_watersea, style_c2_level4_waterper, style_c2_level4_baregrad], + }, + "feature_info": { + "include_custom": { + "description": { + "function": "ows_refactored.land_and_vegetation.landcover.lc_class_desc.env_descriptor_labels", + } + } + } + } + ] +} From 1ee6dfdc28cbc0052358ca3b4f75044d54a0e9b4 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 8 Nov 2024 10:47:51 +1100 Subject: [PATCH 070/100] Update ows_c3_lc_cyear_cfg.py --- .../landcover/ows_c3_lc_cyear_cfg.py | 75 +++++-------------- 1 file changed, 19 insertions(+), 56 deletions(-) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py index 826fe60ab..2188f744d 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py @@ -37,36 +37,29 @@ "title": "Lifeform", "abstract": "Lifeform (L4): woody / herbaceous", "value_map": { - "level3": [ + "level4": [ {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "Woody", 'abstract': "", 'values': [20, 38, 56], 'color': '#0E7912', 'alpha': 1}, - {'title': "Herbaceous", 'abstract': "", 'values': [2], 'color': '#77A71E', 'alpha': 1} + {'title': "Woody", 'abstract': "", 'values': [2, 20, 38, 56], 'color': '#0E7912', 'alpha': 1}, + {'title': "Herbaceous", 'abstract': "", 'values': [3, 21, 39, 57], 'color': '#77A71E', 'alpha': 1} ] }, } -style_c2_level4_canopyco = { +style_c3_level4_canopyco = { "name": "canopyco", "title": "Vegetation Cover", "abstract": "Vegetation Cover (L4)", "value_map": { - 'canopyco_veg_cat_l4d': [ + 'level4': [ {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "Closed Vegetation", 'abstract': "(> 65 %)", 'values': [10], 'color': '#0E7912', 'alpha': 1}, - {'title': "Open Vegetation", 'abstract': "(40 to 65 %)", 'values': [12], 'color': '#2D8D2F', 'alpha': 1}, - {'title': "Open Vegetation", 'abstract': "(15 to 40 %)", 'values': [13], 'color': '#50A052', 'alpha': 1}, - {'title': "Sparse Vegetation", 'abstract': "(4 to 15 %)", 'values': [15], 'color': '#75B476', 'alpha': 1}, - {'title': "Scattered Vegetation", 'abstract': "(1 to 4 %)", 'values': [16], 'color': '#9AC79C', 'alpha': 1} + {'title': "Closed Vegetation", 'abstract': "(> 65 %)", 'values': [4,9,14,22,27,32,40,45,50,58,63,64,65,78,79,80], 'color': '#0E7912', 'alpha': 1}, + {'title': "Open Vegetation", 'abstract': "(40 to 65 %)", 'values': [5,10,15,23,28,33,41,46,51,59,66,67,68,81,82,83], 'color': '#2D8D2F', 'alpha': 1}, + {'title': "Open Vegetation", 'abstract': "(15 to 40 %)", 'values': [6,11,16,24,29,34,42,47,52,60,69,70,71,84,85,86], 'color': '#50A052', 'alpha': 1}, + {'title': "Sparse Vegetation", 'abstract': "(4 to 15 %)", 'values': [7,12,17,25,30,35,43,48,53,61,72,73,74,87,88,89], 'color': '#75B476', 'alpha': 1}, + {'title': "Scattered Vegetation", 'abstract': "(1 to 4 %)", 'values': [8,13,18,26,31,36,44,49,54,62,75,76,77,90,91,92], 'color': '#9AC79C', 'alpha': 1} ] }, - # "pq_masks": [ - # { - # "band": "land", - # "invert": True, - # "enum": 0, - # } - # ], } @@ -75,7 +68,7 @@ "title": "Water Seasonality", "abstract": "Water Seasonality (L4) in vegetated areas", "value_map": { - "watersea_veg_cat_l4a_au": [ + "level4": [ {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, {'title': "> 3 months", 'abstract': "(semi) permanent", 'values': [1], 'color': '#19AD6D', 'alpha': 1}, {'title': "< 3 months", 'abstract': "temporary or seasonal", 'values': [2], 'color': '#B0DAC9', 'alpha': 1} @@ -89,7 +82,7 @@ "title": "Water Persistence", "abstract": "Water persistence in non-vegetated areas", "value_map": { - "waterper_wat_cat_l4d_au": [ + "level4": [ {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, {'title': "Perennial", 'abstract': "(> 9 months)", 'values': [1], 'color': '#1b55ba', 'alpha': 1}, {'title': "Non-perennial", 'abstract': "(7 to 9 months)", 'values': [7], 'color': '#3479C9', 'alpha': 1}, @@ -105,20 +98,13 @@ "title": "Bare Gradation", "abstract": "Level of vegetation in predominantly bare areas", "value_map": { - "baregrad_phy_cat_l4d_au": [ + "level4": [ {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, {'title': "Sparsely Vegetated", 'abstract': "", 'values': [10], 'color': '#FFE68C', 'alpha': 1}, {'title': "Very Sparsely Vegetated", 'abstract': "", 'values': [12], 'color': '#FAD26E', 'alpha': 1}, {'title': "Bare Areas, Unvegetated", 'abstract': "", 'values': [15], 'color': '#F3AB69', 'alpha': 1} ] }, - # "pq_masks": [ - # { - # "band": "land", - # "invert": True, - # "enum": 0, - # } - # ], } @@ -236,13 +222,6 @@ # {'title': 'Water: (Snow)', 'abstract': '', 'values': [105], 'color': '#fafafa', 'alpha': 1}, ] }, - # "pq_masks": [ - # { - # "band": "land", - # "invert": True, - # "enum": 0, - # } - # ], "legend": { "show_legend": True, "url": "https://data.dea.ga.gov.au/derivative/ga_ls_landcover_class_cyear_2/level4-web-legend.png" @@ -264,29 +243,21 @@ For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-land-cover-landsat/ For service status information, see https://status.dea.ga.gov.au""", - "product_name": "ga_ls_landcover_class_cyear_2", + "product_name": "ga_ls_landcover_class_cyear_3", "bands": bands_landcover, "time_resolution": "summary", "resource_limits": reslim_for_lccs, "dynamic": True, "native_crs": "EPSG:3577", - "native_resolution": [25, -25], + "native_resolution": [30, -30], "image_processing": { "extent_mask_func": [], "always_fetch_bands": [], "manual_merge": False, }, - # "flags": [ - # { - # "band": "land", - # "product": "geodata_coast_100k", - # "ignore_time": True, - # "ignore_info_flags": [], - # } - # ], "styling": { "default_style": "level4", - "styles": [style_c2_level3, style_c2_level4], + "styles": [style_c3_level3, style_c3_level4], }, "feature_info": { "include_custom": { @@ -306,29 +277,21 @@ For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-land-cover-landsat/ For service status information, see https://status.dea.ga.gov.au""", - "product_name": "ga_ls_landcover_class_cyear_2", + "product_name": "ga_ls_landcover_class_cyear_3", "bands": bands_eds, "time_resolution": "summary", "resource_limits": reslim_for_lccs, "dynamic": True, "native_crs": "EPSG:3577", - "native_resolution": [25, -25], + "native_resolution": [30, -30], "image_processing": { "extent_mask_func": [], "always_fetch_bands": [], "manual_merge": False, }, - # "flags": [ - # { - # "band": "land", - # "product": "geodata_coast_100k", - # "ignore_time": True, - # "ignore_info_flags": [], - # } - # ], "styling": { "default_style": "canopyco", - "styles": [style_c2_level4_canopyco, style_c2_level4_lifeform, style_c2_level4_watersea, style_c2_level4_waterper, style_c2_level4_baregrad], + "styles": [style_c3_level4_canopyco, style_c3_level4_lifeform, style_c3_level4_watersea, style_c3_level4_waterper, style_c3_level4_baregrad], }, "feature_info": { "include_custom": { From ca624f7eaedaa10098eec53f37b2dc0bea3781ab Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:35:58 +1100 Subject: [PATCH 071/100] Update ows_c3_lc_cyear_cfg.py --- .../landcover/ows_c3_lc_cyear_cfg.py | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py index 2188f744d..3be28f7fa 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py @@ -38,9 +38,9 @@ "abstract": "Lifeform (L4): woody / herbaceous", "value_map": { "level4": [ - {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "Woody", 'abstract': "", 'values': [2, 20, 38, 56], 'color': '#0E7912', 'alpha': 1}, - {'title': "Herbaceous", 'abstract': "", 'values': [3, 21, 39, 57], 'color': '#77A71E', 'alpha': 1} + {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "Woody", 'abstract': "", 'values': [2,20,38,56], 'color': '#0E7912', 'alpha': 1}, + {'title': "Herbaceous", 'abstract': "", 'values': [3,21,39,57], 'color': '#77A71E', 'alpha': 1} ] }, } @@ -52,7 +52,7 @@ "abstract": "Vegetation Cover (L4)", "value_map": { 'level4': [ - {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, {'title': "Closed Vegetation", 'abstract': "(> 65 %)", 'values': [4,9,14,22,27,32,40,45,50,58,63,64,65,78,79,80], 'color': '#0E7912', 'alpha': 1}, {'title': "Open Vegetation", 'abstract': "(40 to 65 %)", 'values': [5,10,15,23,28,33,41,46,51,59,66,67,68,81,82,83], 'color': '#2D8D2F', 'alpha': 1}, {'title': "Open Vegetation", 'abstract': "(15 to 40 %)", 'values': [6,11,16,24,29,34,42,47,52,60,69,70,71,84,85,86], 'color': '#50A052', 'alpha': 1}, @@ -69,9 +69,9 @@ "abstract": "Water Seasonality (L4) in vegetated areas", "value_map": { "level4": [ - {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "> 3 months", 'abstract': "(semi) permanent", 'values': [1], 'color': '#19AD6D', 'alpha': 1}, - {'title': "< 3 months", 'abstract': "temporary or seasonal", 'values': [2], 'color': '#B0DAC9', 'alpha': 1} + {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "> 3 months", 'abstract': "(semi) permanent", 'values': [64,67,70,73,76,79,82,85,88,91], 'color': '#19AD6D', 'alpha': 1}, + {'title': "< 3 months", 'abstract': "temporary or seasonal", 'values': [65,68,71,74,77,80,83,86,89,92], 'color': '#B0DAC9', 'alpha': 1} ] }, } @@ -83,11 +83,11 @@ "abstract": "Water persistence in non-vegetated areas", "value_map": { "level4": [ - {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "Perennial", 'abstract': "(> 9 months)", 'values': [1], 'color': '#1b55ba', 'alpha': 1}, - {'title': "Non-perennial", 'abstract': "(7 to 9 months)", 'values': [7], 'color': '#3479C9', 'alpha': 1}, - {'title': "Non-perennial", 'abstract': "(4 to 6 months)", 'values': [8], 'color': '#4F9DD9', 'alpha': 1}, - {'title': "Non-perennial", 'abstract': "(1 to 3 months)", 'values': [9], 'color': '#71CAFD', 'alpha': 1} + {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "Perennial", 'abstract': "(> 9 months)", 'values': [101], 'color': '#1b55ba', 'alpha': 1}, + {'title': "Non-perennial", 'abstract': "(7 to 9 months)", 'values': [102], 'color': '#3479C9', 'alpha': 1}, + {'title': "Non-perennial", 'abstract': "(4 to 6 months)", 'values': [103], 'color': '#4F9DD9', 'alpha': 1}, + {'title': "Non-perennial", 'abstract': "(1 to 3 months)", 'values': [104], 'color': '#71CAFD', 'alpha': 1} ] } } @@ -99,10 +99,10 @@ "abstract": "Level of vegetation in predominantly bare areas", "value_map": { "level4": [ - {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "Sparsely Vegetated", 'abstract': "", 'values': [10], 'color': '#FFE68C', 'alpha': 1}, - {'title': "Very Sparsely Vegetated", 'abstract': "", 'values': [12], 'color': '#FAD26E', 'alpha': 1}, - {'title': "Bare Areas, Unvegetated", 'abstract': "", 'values': [15], 'color': '#F3AB69', 'alpha': 1} + {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "Sparsely Vegetated", 'abstract': "", 'values': [95], 'color': '#FFE68C', 'alpha': 1}, + {'title': "Very Sparsely Vegetated", 'abstract': "", 'values': [96], 'color': '#FAD26E', 'alpha': 1}, + {'title': "Bare Areas, Unvegetated", 'abstract': "", 'values': [97], 'color': '#F3AB69', 'alpha': 1} ] }, } @@ -114,7 +114,7 @@ "abstract": "Standardised colouring of Level 4 land cover classes", "value_map": { "level4": [ - {'title': "", 'abstract': "", 'values': [0], 'color': '#FFFFFF', 'alpha': 0}, + {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, {'title': 'Cultivated Terrestrial Vegetated', 'abstract': '', 'values': [1], 'color': '#97bb1a', 'alpha': 1}, {'title': 'Cultivated Terrestrial Vegetated: Woody', 'abstract': '', 'values': [2], 'color': '#97bb1a', 'alpha': 1}, {'title': 'Cultivated Terrestrial Vegetated: Herbaceous', 'abstract': '', 'values': [3], 'color': '#d1e033', 'alpha': 1}, @@ -230,13 +230,13 @@ layers = { - "title": "DEA Land Cover", + "title": "DEA Land Cover Collection 3", "name": "", "layers": [ { - "title": "DEA Land Cover Calendar Year (Landsat)", - "name": "ga_ls_landcover", - "abstract": """DEA Land Cover Calendar Year (Landsat) + "title": "DEA Land Cover Collection 3 Calendar Year (Landsat)", + "name": "ga_ls_landcover_c3", + "abstract": """DEA Land Cover Collection 3 Calendar Year (Landsat) Land cover is the observed physical cover on the Earth's surface including trees, shrubs, grasses, soils, exposed rocks, water bodies, plantations, crops and built structures. A consistent, Australia-wide land cover product helps the understanding of how the different parts of the environment change and inter-relate. Earth observation data recorded over a period of time allows the observation of the state of land cover at specific times and therefore the way that land cover changes. @@ -269,7 +269,7 @@ }, { "title": "DEA Land Cover Environmental Descriptors", - "name": "ga_ls_landcover_descriptors", + "name": "ga_ls_landcover_c3_descriptors", "abstract": """DEA Land Cover Environmental Descriptors Land cover is the observed physical cover on the Earth's surface including trees, shrubs, grasses, soils, exposed rocks, water bodies, plantations, crops and built structures. A consistent, Australia-wide land cover product helps the understanding of how the different parts of the environment change and inter-relate. Earth observation data recorded over a period of time allows the observation of the state of land cover at specific times and therefore the way that land cover changes. From 2a83667542b0ccd419cda227a6f8856358839805 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:37:58 +1100 Subject: [PATCH 072/100] Update inventory.json --- dev/services/wms/inventory.json | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dev/services/wms/inventory.json b/dev/services/wms/inventory.json index c3cff2d38..dd5bfd858 100644 --- a/dev/services/wms/inventory.json +++ b/dev/services/wms/inventory.json @@ -1,5 +1,5 @@ { - "total_layers_count": 74, + "total_layers_count": 76, "layers": [ { "layer": "s2_ls_combined", @@ -430,6 +430,31 @@ "baregrad" ] }, + { + "layer": "ga_ls_landcover_c3", + "product": [ + "ga_ls_landcover_class_cyear_3" + ], + "styles_count": 2, + "styles_list": [ + "level4", + "level3" + ] + }, + { + "layer": "ga_ls_landcover_c3_descriptors", + "product": [ + "ga_ls_landcover_class_cyear_3" + ], + "styles_count": 5, + "styles_list": [ + "canopyco", + "lifeform", + "watersea", + "waterper", + "baregrad" + ] + }, { "layer": "ga_ls_fc_3", "product": [ From 02e6221d5dedca2db29d26a9875e1abdab501cd4 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:38:52 +1100 Subject: [PATCH 073/100] Update ows_category_root_cfg.py --- .../land_and_vegetation/ows_category_root_cfg.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/ows_category_root_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/ows_category_root_cfg.py index 3e34ce56d..13375cce2 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/ows_category_root_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/ows_category_root_cfg.py @@ -6,6 +6,10 @@ "include": "ows_refactored.land_and_vegetation.landcover.ows_c2_lc_cyear_cfg.layers", "type": "python", }, + { + "include": "ows_refactored.land_and_vegetation.landcover.ows_c3_lc_cyear_cfg.layers", + "type": "python", + }, { "include": "ows_refactored.land_and_vegetation.fc.ows_fc_cfg.layers", "type": "python", From 05da8820e94604b964916eb52594476570bd13bb Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 8 Nov 2024 12:28:37 +1100 Subject: [PATCH 074/100] Update ows_c3_lc_cyear_cfg.py --- .../landcover/ows_c3_lc_cyear_cfg.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py index 3be28f7fa..0b925018d 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py @@ -5,14 +5,6 @@ "level4": [], } -bands_eds = { - "lifeform_veg_cat_l4a": ["lifeform"], - "canopyco_veg_cat_l4d": ["canopy_cover"], - "watersea_veg_cat_l4a_au": ["water_seasonality"], - "waterper_wat_cat_l4d_au": ["water_persistence"], - "baregrad_phy_cat_l4d_au": ["bare_gradation"], -} - style_c3_level3 = { "name": "level3", "title": "Basic", @@ -278,7 +270,7 @@ For service status information, see https://status.dea.ga.gov.au""", "product_name": "ga_ls_landcover_class_cyear_3", - "bands": bands_eds, + "bands": bands_landcover, "time_resolution": "summary", "resource_limits": reslim_for_lccs, "dynamic": True, From 64c864145bd5655cf85ccf1eb33ec0099cd9daac Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Fri, 8 Nov 2024 13:14:28 +1100 Subject: [PATCH 075/100] Update ows_c3_lc_cyear_cfg.py --- .../landcover/ows_c3_lc_cyear_cfg.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py index 0b925018d..864781f8e 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py @@ -285,13 +285,14 @@ "default_style": "canopyco", "styles": [style_c3_level4_canopyco, style_c3_level4_lifeform, style_c3_level4_watersea, style_c3_level4_waterper, style_c3_level4_baregrad], }, - "feature_info": { - "include_custom": { - "description": { - "function": "ows_refactored.land_and_vegetation.landcover.lc_class_desc.env_descriptor_labels", - } - } - } + # Remove labels for now while testing new styling + # "feature_info": { + # "include_custom": { + # "description": { + # "function": "ows_refactored.land_and_vegetation.landcover.lc_class_desc.env_descriptor_labels", + # } + # } + # } } ] } From fa15ca37feff6e341489f387bf1431f00fb75451 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:26:42 +1100 Subject: [PATCH 076/100] Update ga_ls_landcover_class_cyear_3.odc-product.yaml --- ...s_landcover_class_cyear_3.odc-product.yaml | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml b/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml index 642e4986f..c788aae6a 100644 --- a/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml +++ b/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml @@ -16,48 +16,6 @@ measurements: dtype: uint8 nodata: 0 units: '1' - - name: lifeform_veg_cat_l4a - aliases: - - lifeform - dtype: uint8 - nodata: 0 - units: '1' - - name: canopyco_veg_cat_l4d - aliases: - - vegetation_cover - dtype: uint8 - nodata: 0 - units: '1' - - name: watersea_veg_cat_l4a_au - aliases: - - water_seasonality - dtype: uint8 - nodata: 0 - units: '1' - - name: waterstt_wat_cat_l4a - aliases: - - water_state - dtype: uint8 - nodata: 0 - units: '1' - - name: inttidal_wat_cat_l4a - aliases: - - intertidal - dtype: uint8 - nodata: 0 - units: '1' - - name: waterper_wat_cat_l4d_au - aliases: - - water_persistence - dtype: uint8 - nodata: 0 - units: '1' - - name: baregrad_phy_cat_l4d_au - aliases: - - bare_gradation - dtype: uint8 - nodata: 0 - units: '1' - name: level4 aliases: - full_classification From cab80b44987b11ea4809256d36cb609e77b41757 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:28:17 +1100 Subject: [PATCH 077/100] Update ga_ls_landcover_class_cyear_3.odc-product.yaml --- ...s_landcover_class_cyear_3.odc-product.yaml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml b/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml index c788aae6a..642e4986f 100644 --- a/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml +++ b/products/decommissioned/land_and_vegetation/landcover/ga_ls_landcover_class_cyear_3.odc-product.yaml @@ -16,6 +16,48 @@ measurements: dtype: uint8 nodata: 0 units: '1' + - name: lifeform_veg_cat_l4a + aliases: + - lifeform + dtype: uint8 + nodata: 0 + units: '1' + - name: canopyco_veg_cat_l4d + aliases: + - vegetation_cover + dtype: uint8 + nodata: 0 + units: '1' + - name: watersea_veg_cat_l4a_au + aliases: + - water_seasonality + dtype: uint8 + nodata: 0 + units: '1' + - name: waterstt_wat_cat_l4a + aliases: + - water_state + dtype: uint8 + nodata: 0 + units: '1' + - name: inttidal_wat_cat_l4a + aliases: + - intertidal + dtype: uint8 + nodata: 0 + units: '1' + - name: waterper_wat_cat_l4d_au + aliases: + - water_persistence + dtype: uint8 + nodata: 0 + units: '1' + - name: baregrad_phy_cat_l4d_au + aliases: + - bare_gradation + dtype: uint8 + nodata: 0 + units: '1' - name: level4 aliases: - full_classification From 62be8291510e42df1a3cc6dc9886fce7aabcf5fa Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 11 Nov 2024 14:03:11 +1100 Subject: [PATCH 078/100] Update ows_c3_lc_cyear_cfg.py --- .../landcover/ows_c3_lc_cyear_cfg.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py index 864781f8e..c360dd9a4 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py @@ -31,8 +31,8 @@ "value_map": { "level4": [ {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "Woody", 'abstract': "", 'values': [2,20,38,56], 'color': '#0E7912', 'alpha': 1}, - {'title': "Herbaceous", 'abstract': "", 'values': [3,21,39,57], 'color': '#77A71E', 'alpha': 1} + {'title': "Woody", 'abstract': "", 'values': [2, 20 ,38 ,56], 'color': '#0E7912', 'alpha': 1}, + {'title': "Herbaceous", 'abstract': "", 'values': [3, 21, 39, 57], 'color': '#77A71E', 'alpha': 1} ] }, } @@ -45,11 +45,11 @@ "value_map": { 'level4': [ {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "Closed Vegetation", 'abstract': "(> 65 %)", 'values': [4,9,14,22,27,32,40,45,50,58,63,64,65,78,79,80], 'color': '#0E7912', 'alpha': 1}, - {'title': "Open Vegetation", 'abstract': "(40 to 65 %)", 'values': [5,10,15,23,28,33,41,46,51,59,66,67,68,81,82,83], 'color': '#2D8D2F', 'alpha': 1}, - {'title': "Open Vegetation", 'abstract': "(15 to 40 %)", 'values': [6,11,16,24,29,34,42,47,52,60,69,70,71,84,85,86], 'color': '#50A052', 'alpha': 1}, - {'title': "Sparse Vegetation", 'abstract': "(4 to 15 %)", 'values': [7,12,17,25,30,35,43,48,53,61,72,73,74,87,88,89], 'color': '#75B476', 'alpha': 1}, - {'title': "Scattered Vegetation", 'abstract': "(1 to 4 %)", 'values': [8,13,18,26,31,36,44,49,54,62,75,76,77,90,91,92], 'color': '#9AC79C', 'alpha': 1} + {'title': "Closed Vegetation", 'abstract': "(> 65 %)", 'values': [4, 9, 14, 22, 27, 32, 40, 45, 50, 58, 63, 64, 65, 78, 79, 80], 'color': '#0E7912', 'alpha': 1}, + {'title': "Open Vegetation", 'abstract': "(40 to 65 %)", 'values': [5, 10, 15, 23, 28, 33, 41, 46, 51, 59, 66, 67, 68, 81, 82, 83], 'color': '#2D8D2F', 'alpha': 1}, + {'title': "Open Vegetation", 'abstract': "(15 to 40 %)", 'values': [6, 11, 16, 24, 29, 34, 42, 47, 52, 60, 69, 70, 71, 84, 85, 86], 'color': '#50A052', 'alpha': 1}, + {'title': "Sparse Vegetation", 'abstract': "(4 to 15 %)", 'values': [7, 12, 17, 25, 30, 35, 43, 48, 53, 61, 72, 73, 74, 87, 88, 89], 'color': '#75B476', 'alpha': 1}, + {'title': "Scattered Vegetation", 'abstract': "(1 to 4 %)", 'values': [8, 13, 18, 26, 31, 36, 44, 49, 54, 62, 75, 76, 77, 90, 91, 92], 'color': '#9AC79C', 'alpha': 1} ] }, } @@ -62,8 +62,8 @@ "value_map": { "level4": [ {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "> 3 months", 'abstract': "(semi) permanent", 'values': [64,67,70,73,76,79,82,85,88,91], 'color': '#19AD6D', 'alpha': 1}, - {'title': "< 3 months", 'abstract': "temporary or seasonal", 'values': [65,68,71,74,77,80,83,86,89,92], 'color': '#B0DAC9', 'alpha': 1} + {'title': "> 3 months", 'abstract': "(semi) permanent", 'values': [64, 67, 70, 73, 76, 79, 82, 85, 88, 91], 'color': '#19AD6D', 'alpha': 1}, + {'title': "< 3 months", 'abstract': "temporary or seasonal", 'values': [65, 68, 71, 74, 77, 80, 83, 86, 89, 92], 'color': '#B0DAC9', 'alpha': 1} ] }, } From 3e24c0002e15a21413d68979b965b49e958c6f90 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 11 Nov 2024 14:04:57 +1100 Subject: [PATCH 079/100] Update ows_c3_lc_cyear_cfg.py --- .../land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py index c360dd9a4..83c4cde48 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py @@ -55,7 +55,7 @@ } -style_c2_level4_watersea = { +style_c3_level4_watersea = { "name": "watersea", "title": "Water Seasonality", "abstract": "Water Seasonality (L4) in vegetated areas", @@ -69,7 +69,7 @@ } -style_c2_level4_waterper = { +style_c3_level4_waterper = { "name": "waterper", "title": "Water Persistence", "abstract": "Water persistence in non-vegetated areas", @@ -85,7 +85,7 @@ } -style_c2_level4_baregrad = { +style_c3_level4_baregrad = { "name": "baregrad", "title": "Bare Gradation", "abstract": "Level of vegetation in predominantly bare areas", @@ -100,7 +100,7 @@ } -style_c2_level4 = { +style_c3_level4 = { "name": "level4", "title": "Detailed", "abstract": "Standardised colouring of Level 4 land cover classes", From c4de1a52ffe8efdf1073b1dcd324746ef3112cd2 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 11 Nov 2024 14:11:21 +1100 Subject: [PATCH 080/100] Update ows_c3_lc_cyear_cfg.py --- .../land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py index 83c4cde48..3cb8cca8e 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py @@ -31,7 +31,7 @@ "value_map": { "level4": [ {'title': "", 'abstract': "", 'values': [255], 'color': '#FFFFFF', 'alpha': 0}, - {'title': "Woody", 'abstract': "", 'values': [2, 20 ,38 ,56], 'color': '#0E7912', 'alpha': 1}, + {'title': "Woody", 'abstract': "", 'values': [2, 20, 38, 56], 'color': '#0E7912', 'alpha': 1}, {'title': "Herbaceous", 'abstract': "", 'values': [3, 21, 39, 57], 'color': '#77A71E', 'alpha': 1} ] }, From d1b618dc2d8d9c9e0b5710d5b04ba28ecd45bac3 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 11 Nov 2024 14:38:42 +1100 Subject: [PATCH 081/100] Update lc_c3_class_desc.py --- .../land_and_vegetation/landcover/lc_c3_class_desc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py index d9e8c25c8..83cdd3ac6 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/landcover/lc_c3_class_desc.py @@ -93,6 +93,7 @@ 104: 'Water: Non-perennial (1 to 3 months)', } + def class_labels(data): return { "level3_label": level3_labels[data["level3"]], From 260bed67146718443b65cf0f487e94643e2e40eb Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Mon, 11 Nov 2024 14:45:51 +1100 Subject: [PATCH 082/100] Update ows_category_root_cfg.py --- .../ows_refactored/land_and_vegetation/ows_category_root_cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/services/wms/ows_refactored/land_and_vegetation/ows_category_root_cfg.py b/dev/services/wms/ows_refactored/land_and_vegetation/ows_category_root_cfg.py index 13375cce2..9d0ec3e06 100644 --- a/dev/services/wms/ows_refactored/land_and_vegetation/ows_category_root_cfg.py +++ b/dev/services/wms/ows_refactored/land_and_vegetation/ows_category_root_cfg.py @@ -9,7 +9,7 @@ { "include": "ows_refactored.land_and_vegetation.landcover.ows_c3_lc_cyear_cfg.layers", "type": "python", - }, + }, { "include": "ows_refactored.land_and_vegetation.fc.ows_fc_cfg.layers", "type": "python", From 15e13c23bbb8d794e7f8cd3da484a8450e43e429 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:06:00 +1100 Subject: [PATCH 083/100] 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 b2afe3984..e7b9f3cbf 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 @@ -13,7 +13,7 @@ product: name: ga_ls5_landcover_inter_class_cyear_3 short_name: ga_ls5_landcover_inter_class_cyear_3 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From 9d4af37172127eb397c9699086b86efc1e7acaa6 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:06:10 +1100 Subject: [PATCH 084/100] 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 dd38432b5..735f22997 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 @@ -13,7 +13,7 @@ product: name: ga_ls5_landcover_inter_class_cyear_3 short_name: ga_ls5_landcover_inter_class_cyear_3 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From 60b7da34bd4a373ed91bc1fc804072dc0d9e946d Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:06:21 +1100 Subject: [PATCH 085/100] 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 9b8ad2b26..db761d4d9 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 @@ -13,7 +13,7 @@ product: name: ga_ls5_landcover_inter_class_cyear_3 short_name: ga_ls5_landcover_inter_class_cyear_3 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From 5975bd93e9ba800cab567d375314d59731446aa1 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:06:36 +1100 Subject: [PATCH 086/100] 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 6f3f4dde7..de03b25a7 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 @@ -10,7 +10,7 @@ product: name: ga_ls_landcover_artificial_surface_cyear_3 short_name: ga_ls_landcover_artificial_surface_cyear_3 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From 4cb0ff66c30d6f9cbd7cc3e35673f053abc32266 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:06:47 +1100 Subject: [PATCH 087/100] 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 009d0596f..80be197c9 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 @@ -5,7 +5,7 @@ product: name: ga_ls_landcover_class_cyear_3 short_name: ga_ls_landcover_class_cyear_3 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From adeea042322983dcf1432fe82e5512cd4c5704fd Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:07:30 +1100 Subject: [PATCH 088/100] 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 f1c275ee7..7e7b2a155 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 @@ product: name: ga_ls_landcover_cultivated_cyear_3 short_name: ga_ls_landcover_cultivated_cyear_3 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From 756d925200bb1353bcc700dd468e735359cb780a Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:07:43 +1100 Subject: [PATCH 089/100] Update ga_ls_landcover_nidem_myear_2.yaml --- dev/services/odc-stats/lccs/ga_ls_landcover_nidem_myear_2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f7390ff80..7e31913e4 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 @@ -8,7 +8,7 @@ product: name: ga_ls_landcover_nidem_myear_2 short_name: ga_ls_landcover_nidem_myear_2 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From b0aa749975ba65cda908673f10c6ed229366bd38 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:08:20 +1100 Subject: [PATCH 090/100] Update ga_ls_landcover_vwf_cyear_3.yaml --- 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 8090abf3f..996035b1b 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 @@ product: name: ga_ls_landcover_vwf_cyear_3 short_name: ga_ls_landcover_vwf_cyear_3 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From 06575e03a805d93b4a06b9503f1de12c929de1bd Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:08:33 +1100 Subject: [PATCH 091/100] 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 b8507eee2..f10ba1848 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 @@ product: name: ga_ls_landcover_woody_cyear_3 short_name: ga_ls_landcover_woody_cyear_3 version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From 57a1e7182835abd1d4e5e7130b37866d4619b1d2 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:08:43 +1100 Subject: [PATCH 092/100] 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 7d611a29e..1322af282 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 @@ product: name: srtm_landcover_dem short_name: srtm_landcover_dem version: 1.0.0 - product_family: lccs + product_family: lc # -- EO Dataset3 relative section -- naming_conventions_values: dea_c3 From 42cd612918881ab0616828afb3bd267dac000133 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:25:38 +1100 Subject: [PATCH 093/100] Update dev-products.csv --- workspaces/dev-products.csv | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workspaces/dev-products.csv b/workspaces/dev-products.csv index 756cab9a7..44186e8a1 100644 --- a/workspaces/dev-products.csv +++ b/workspaces/dev-products.csv @@ -26,8 +26,7 @@ fc_percentile_albers_annual,https://raw.githubusercontent.com/GeoscienceAustrali fc_percentile_albers_seasonal,https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/9c12bb30bff1f81ccd2a94e2c5052288688c55d1/products/fc/fc_percentile_albers_seasonal_product.yaml,s3://dea-public-data/fractional-cover/fc-percentile/seasonal/v2.2.0/combined ga_ls5t_ard_3,https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/c3/ard_ls5.odc-product.yaml,s3://dea-public-data/baseline/ga_ls5t_ard_3/ ga_ls7e_ard_3,https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/c3/ard_ls7.odc-product.yaml,s3://dea-public-data/baseline/ga_ls7e_ard_3/ -ga_ls7e_ard_provisional_3,https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/provisional/ard_ls7_provisional.odc-product.yaml, -s3:/dea-public-data/baseline/ga_ls7e_ard_3 +ga_ls7e_ard_provisional_3,https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/provisional/ard_ls7_provisional.odc-product.yaml,s3:/dea-public-data/baseline/ga_ls7e_ard_3 ga_ls8c_ard_3,https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/c3/ard_ls8.odc-product.yaml,s3://dea-public-data/baseline/ga_ls8c_ard_3/ ga_ls8c_ard_provisional_3,https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/provisional/ard_ls8_provisional.odc-product.yaml,s3:/dea-public-data/baseline/ga_ls8c_ard_provisional_3 ga_ls8c_nbart_gm_cyear_3,https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/geomedian-au/ga_ls8c_nbart_gm_cyear_3.yaml,s3:/ From 5bffa2c5bfae451f7cfa61e14fe72895ee02a0ad Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Tue, 12 Nov 2024 00:10:40 +0000 Subject: [PATCH 094/100] change the input band sequence of urban model --- .../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 de03b25a7..44e448303 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,6 +1,6 @@ plugin: urban_class # this can help system find the relative plugin and plugin version plugin_config: - input_bands: [nbart_red, nbart_green, nbart_blue, nbart_nir, nbart_swir_1, nbart_swir_2] + 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 output_classes: artificial: 215 From eba8f2d6646aa85a5388985fea1b19f82b1cb0c5 Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Tue, 12 Nov 2024 04:43:46 +0000 Subject: [PATCH 095/100] make output band name an option --- .../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 | 2 ++ .../odc-stats/lccs/ga_ls_landcover_cultivated_cyear_3.yaml | 1 + dev/services/odc-stats/lccs/ga_ls_landcover_vwf_cyear_3.yaml | 1 + dev/services/odc-stats/lccs/ga_ls_landcover_woody_cyear_3.yaml | 1 + dev/services/odc-stats/lccs/srtm_landcover_dem.yaml | 1 + 9 files changed, 10 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 e7b9f3cbf..17a0c10fc 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 @@ -8,6 +8,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 + measurements: [level_3_4, water_season] product: name: ga_ls5_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 735f22997..9fb002e17 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 @@ -8,6 +8,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 + measurements: [level_3_4, water_season] product: name: ga_ls5_landcover_inter_class_cyear_3 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 db761d4d9..34153d030 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 @@ -8,6 +8,7 @@ plugin_config: water: 221 intertidal: 223 surface: 210 + measurements: [level_3_4, water_season] product: name: ga_ls5_landcover_inter_class_cyear_3 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 44e448303..6a50b2593 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 @@ -5,6 +5,7 @@ plugin_config: output_classes: artificial: 215 natural: 216 + measurements: [artificial_surface] product: name: ga_ls_landcover_artificial_surface_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 80be197c9..0e13651a1 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,6 +1,8 @@ plugin: lccs_level34 # this can help system find the relative plugin and plugin version plugin_config: input_bands: [classes_l3_l4, urban_classes, cultivated_class] + measurements: [level3, level4] + product: name: ga_ls_landcover_class_cyear_3 short_name: ga_ls_landcover_class_cyear_3 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 7e7b2a155..c2203cfb0 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 @@ -7,6 +7,7 @@ plugin_config: output_classes: cultivated: 111 natural: 112 + measurements: [cultivated] chunks: y: 400 x: 400 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 996035b1b..11e57da9f 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 + measurements: [veg_frequency, water_frequency] product: name: ga_ls_landcover_vwf_cyear_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 f10ba1848..7bf2e5d26 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 @@ -7,6 +7,7 @@ plugin_config: output_classes: woody: 113 herbaceous: 114 + measurements: [woody] chunks: y: 400 x: 400 diff --git a/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml index 1322af282..1402f6acb 100644 --- a/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml +++ b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml @@ -4,6 +4,7 @@ plugin_config: 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 From 0b92557ec605c8a28047909ffea70fe49f3cc1b3 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:04:14 +1100 Subject: [PATCH 096/100] Update srtm_landcover_dem.odc-product.yaml --- .../srtm_landcover_dem.odc-product.yaml | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml b/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml index 35d3a8982..90b0c471d 100644 --- a/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml +++ b/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml @@ -14,27 +14,16 @@ metadata: name: SIR measurements: -- name: dem - dtype: float32 - units: metre - nodata: -340282346638528859811704183484516925440 -- name: dem_s - dtype: float32 - units: metre - nodata: -340282346638528859811704183484516925440 - name: dem_h dtype: float32 units: metre - nodata: -340282346638528859811704183484516925440 - -storage: - crs: EPSG:4326 - resolution: - latitude: -0.00027777777778 - longitude: 0.00027777777778 + nodata: nan load: - crs: 'EPSG:4326' - resolution: - latitude: -0.00027777777778 - longitude: 0.00027777777778 + crs: 'EPSG:3577' + resolution: + y: -30 + x: 30 + align: + y: 0 + x: 0 From 01655de695d3449461ff53057c8953e69befa858 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:05:11 +1100 Subject: [PATCH 097/100] Update ga_ls_landcover_nidem_myear_2.odc-product.yaml --- .../ga_ls_landcover_nidem_myear_2.odc-product.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml index 0fc9db219..aa5e8f8a5 100644 --- a/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml @@ -9,15 +9,15 @@ metadata: product_type: ga_ls_landcover_nidem_myear_2 measurements: - dtype: float32 - name: 'nidem' - nodata: -9999 + name: elevation + nodata: nan units: 'metres' load: crs: 'EPSG:3577' resolution: - y: -25 - x: 25 + y: -30 + x: 30 align: y: 0 x: 0 From 58bba00acc1a42d25971e512f35946991e64e01a Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:05:57 +1100 Subject: [PATCH 098/100] Update ga_ls_landcover_vwf_cyear_3.odc-product.yaml --- .../landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml index 56b317894..5d065b9cb 100644 --- a/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_vwf_cyear_3.odc-product.yaml @@ -12,7 +12,11 @@ metadata: name: ga_ls_landcover_vwf_cyear_3 measurements: - - name: veg_water_frequency + - name: veg_frequency + dtype: uint8 + nodata: 255 + units: '1' + - name: water_frequency dtype: uint8 nodata: 255 units: '1' From fa6557ddd29d67667b230a5b59d88a87e2189bcf Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:07:33 +1100 Subject: [PATCH 099/100] Update srtm_landcover_dem.odc-product.yaml --- .../landcover/srtm_landcover_dem.odc-product.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml b/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml index 90b0c471d..fe8424c20 100644 --- a/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml +++ b/products/land_and_vegetation/landcover/srtm_landcover_dem.odc-product.yaml @@ -16,8 +16,8 @@ metadata: measurements: - name: dem_h dtype: float32 - units: metre - nodata: nan + units: "metres" + nodata: .nan load: crs: 'EPSG:3577' From f520d290a0da109ac3bb97632432d4c9ff827098 Mon Sep 17 00:00:00 2001 From: James Miller <49048036+JM-GA@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:07:50 +1100 Subject: [PATCH 100/100] Update ga_ls_landcover_nidem_myear_2.odc-product.yaml --- .../landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml b/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml index aa5e8f8a5..92c8c72e8 100644 --- a/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml +++ b/products/land_and_vegetation/landcover/ga_ls_landcover_nidem_myear_2.odc-product.yaml @@ -10,7 +10,7 @@ metadata: measurements: - dtype: float32 name: elevation - nodata: nan + nodata: .nan units: 'metres' load: