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 392b34c47..319940c4f 100644
--- a/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml
+++ b/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml
@@ -12,8 +12,8 @@ plugin_config:
measurements: [level_3_4, water_season]
product:
- name: ga_ls5_landcover_inter_class_cyear_3
- short_name: ga_ls5_landcover_inter_class_cyear_3
+ name: ga_ls7_landcover_inter_class_cyear_3
+ short_name: ga_ls7_landcover_inter_class_cyear_3
version: 1.0.0
product_family: lc
@@ -86,7 +86,7 @@ cog_opts:
zlevel: 9
apply_eodatasets3: True
output_location: >-
- s3://dea-public-data-dev/derivative/ga_ls5_landcover_inter_class_cyear_3/1-0-0
+ s3://dea-public-data-dev/derivative/ga_ls7_landcover_inter_class_cyear_3/1-0-0
# save-tasks options
input_products: ga_ls7e_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
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 ca53b2515..90375037a 100644
--- a/dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml
+++ b/dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml
@@ -12,8 +12,8 @@ plugin_config:
measurements: [level_3_4, water_season]
product:
- name: ga_ls5_landcover_inter_class_cyear_3
- short_name: ga_ls5_landcover_inter_class_cyear_3
+ name: ga_ls8ls9_landcover_inter_class_cyear_3
+ short_name: ga_ls8ls9_landcover_inter_class_cyear_3
version: 1.0.0
product_family: lc
@@ -86,7 +86,7 @@ cog_opts:
zlevel: 9
apply_eodatasets3: True
output_location: >-
- s3://dea-public-data-dev/derivative/ga_ls5_landcover_inter_class_cyear_3/1-0-0
+ s3://dea-public-data-dev/derivative/ga_ls8ls9_landcover_inter_class_cyear_3/1-0-0
# save-tasks options
input_products: ga_ls8cls9c_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
diff --git a/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml
index 1402f6acb..982be7578 100644
--- a/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml
+++ b/dev/services/odc-stats/lccs/srtm_landcover_dem.yaml
@@ -84,7 +84,7 @@ cog_opts:
zlevel: 9
apply_eodatasets3: True
output_location: >-
- s3://dea-public-data-dev/derivative/lccs/srtm_landcover_dem/1-0-0
+ s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0
# save-tasks options
input_products: ga_srtm_dem1sv1_0
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 3cb8cca8e..c4a2ebce9 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,14 +285,13 @@
"default_style": "canopyco",
"styles": [style_c3_level4_canopyco, style_c3_level4_lifeform, style_c3_level4_watersea, style_c3_level4_waterper, style_c3_level4_baregrad],
},
- # 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",
- # }
- # }
- # }
+ "feature_info": {
+ "include_custom": {
+ "description": {
+ "function": "ows_refactored.land_and_vegetation.landcover.lc_class_desc.class_labels",
+ }
+ }
+ }
}
]
}
diff --git a/dev/terria/terria-cube-v8.json b/dev/terria/terria-cube-v8.json
index f229c7e09..169a4f27a 100644
--- a/dev/terria/terria-cube-v8.json
+++ b/dev/terria/terria-cube-v8.json
@@ -394,7 +394,7 @@
"members": [
{
"type": "wms",
- "name": "DEA Land Cover (Landsat)",
+ "name": "DEA Land Cover C2 (Landsat)",
"url": "https://ows.dev.dea.ga.gov.au/",
"opacity": 1,
"layers": "ga_ls_landcover",
@@ -415,7 +415,7 @@
},
{
"type": "wms",
- "name": "DEA Land Cover Descriptors (Landsat)",
+ "name": "DEA Land Cover Descriptors C2 (Landsat)",
"url": "https://ows.dev.dea.ga.gov.au/",
"opacity": 1,
"layers": "ga_ls_landcover_descriptors",
@@ -432,6 +432,47 @@
},
"dateFormat": "'Year: 'yyyy",
"id": "wejk58"
+ },
+ {
+ "type": "wms",
+ "name": "DEA Land Cover C3 (Landsat)",
+ "url": "https://ows.dev.dea.ga.gov.au/",
+ "opacity": 1,
+ "layers": "ga_ls_landcover_c3",
+ "styles": "level4",
+ "linkedWcsUrl": "https://ows.dev.dea.ga.gov.au/",
+ "linkedWcsCoverage": "ga_ls_landcover_c3",
+ "chartColor": "white",
+ "leafletUpdateInterval": 750,
+ "chartType": "momentPoints",
+ "tileErrorHandlingOptions": {
+ "ignoreUnknownTileErrors": true
+ },
+ "featureInfoTemplate": {
+ "template": "Digital Earth Australia Land Cover
Annual land cover for selected location, {{#terria.formatDateTime}}{format: \"yyyy\"}{{data.0.time}}{{/terria.formatDateTime}}
Base class: {{data.0.description.level3_label}}
Full classification: {{data.0.description.level4_label}}
"
+ },
+ "dateFormat": "'Year: 'yyyy",
+ "id": "546erz"
+ },
+ {
+ "type": "wms",
+ "name": "DEA Land Cover Descriptors C3 (Landsat)",
+ "url": "https://ows.dev.dea.ga.gov.au/",
+ "opacity": 1,
+ "layers": "ga_ls_landcover_c3_descriptors",
+ "linkedWcsUrl": "https://ows.dev.dea.ga.gov.au/",
+ "linkedWcsCoverage": "ga_ls_landcover_c3_descriptors_c3",
+ "chartColor": "white",
+ "leafletUpdateInterval": 750,
+ "chartType": "momentPoints",
+ "tileErrorHandlingOptions": {
+ "ignoreUnknownTileErrors": true
+ },
+ "featureInfoTemplate": {
+ "template": "Digital Earth Australia Land Cover
Annual land cover for selected location, {{#terria.formatDateTime}}{format: \"yyyy\"}{{data.0.time}}{{/terria.formatDateTime}}
Base class: {{data.0.description.level3_label}}
Full classification: {{data.0.description.level4_label}}
"
+ },
+ "dateFormat": "'Year: 'yyyy",
+ "id": "wejk59"
}
]
},