Merge pull request #1299 from GeoscienceAustralia/landcover

Landcover Release Dev Test
GeoscienceAustralia · Nov 19, 2024 · 4b05f39 · 4b05f39
2 parents 9f47092 + 045f589
commit 4b05f39
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 17 deletions.
diff --git a/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml b/dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": "<div style='width:480px'><h3 style='font-weight:normal'>Digital Earth Australia Land Cover</h3>Annual land cover for selected location, {{#terria.formatDateTime}}{format: \"yyyy\"}{{data.0.time}}{{/terria.formatDateTime}}<br/><br/>Base class: {{data.0.description.level3_label}}<br/><br/>Full classification: {{data.0.description.level4_label}}<br/><br/></div>"
+                                    },
+                                    "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": "<div style='width:480px'><h3 style='font-weight:normal'>Digital Earth Australia Land Cover</h3>Annual land cover for selected location, {{#terria.formatDateTime}}{format: \"yyyy\"}{{data.0.time}}{{/terria.formatDateTime}}<br/><br/>Base class: {{data.0.description.level3_label}}<br/><br/>Full classification: {{data.0.description.level4_label}}<br/><br/></div>"
+                                    },
+                                    "dateFormat": "'Year: 'yyyy",
+                                    "id": "wejk59"
                                 }
                             ]
                         },