Merge pull request #1289 from GeoscienceAustralia/geomad-decom-prod

GEOMAD Decommission Production Web Services
GeoscienceAustralia · Sep 30, 2024 · 49864c4 · 49864c4
2 parents 648d4bb + d605e62
commit 49864c4
Show file tree

Hide file tree

Showing 7 changed files with 408 additions and 683 deletions.
diff --git a/dev/terria/terria-cube-v8.json b/dev/terria/terria-cube-v8.json
@@ -2239,7 +2239,7 @@
                             "members": [
                                 {
                                     "type": "wms",
-                                    "name": "DEA GeoMAD (Landsat 8 & 9 OLI-TIRS, version 4)",
+                                    "name": "DEA GeoMAD (Landsat 8 & 9 OLI-TIRS)",
                                     "url": "https://ows.dea.ga.gov.au/",
                                     "opacity": 1,
                                     "layers": "ga_ls8cls9c_gm_cyear_3",
@@ -2267,7 +2267,7 @@
                                 },
                                 {
                                     "type": "wms",
-                                    "name": "DEA GeoMAD (Landsat 7 ETM+, version 4)",
+                                    "name": "DEA GeoMAD (Landsat 7 ETM+)",
                                     "url": "https://ows.dea.ga.gov.au/",
                                     "opacity": 1,
                                     "layers": "ga_ls7e_gm_cyear_3",
@@ -2295,7 +2295,7 @@
                                 },
                                 {
                                     "type": "wms",
-                                    "name": "DEA GeoMAD (Landsat 5 TM, version 4)",
+                                    "name": "DEA GeoMAD (Landsat 5 TM)",
                                     "url": "https://ows.dea.ga.gov.au/",
                                     "opacity": 1,
                                     "layers": "ga_ls5t_gm_cyear_3",
@@ -2320,90 +2320,6 @@
                                     },
                                     "dateFormat": "'Year: 'yyyy",
                                     "id": "ATY87B"
-                                },
-                                {
-                                    "type": "wms",
-                                    "name": "DEA GeoMAD (Landsat 8 OLI-TIRS, version 3)",
-                                    "url": "https://ows.dea.ga.gov.au/",
-                                    "opacity": 1,
-                                    "layers": "ga_ls8c_nbart_gm_cyear_3",
-                                    "linkedWcsUrl": "https://ows.dea.ga.gov.au/",
-                                    "linkedWcsCoverage": "ga_ls8c_nbart_gm_cyear_3",
-                                    "chartColor": "white",
-                                    "leafletUpdateInterval": 750,
-                                    "chartType": "momentPoints",
-                                    "featureInfoTemplate": {
-                                        "template": "<table>  <tr><td><b>Time</b></td><td>{{data.0.time}}</td></tr>  <tr><td><b>Blue - 480</b></td><td>{{data.0.bands.blue}}</td></tr>  <tr><td><b>Green - 560</b></td><td>{{data.0.bands.green}}</td></tr>  <tr><td><b>Red - 660</b></td><td>{{data.0.bands.red}}</td></tr>  <tr><td><b>Near Infrared (NIR) - 870</b></td><td>{{data.0.bands.nir}}</td></tr>  <tr><td><b>Shortwave Infrared (SWIR) - 1610</b></td><td>{{data.0.bands.swir1}}</td></tr>  <tr><td><b>Shortwave Infrared (SWIR) - 2200</b></td><td>{{data.0.bands.swir2}}</td></tr>  <tr><td><b>NDVI - Red, NIR</b></td><td>{{data.0.band_derived.ndvi}}</td></tr>  <tr><td><b>NDWI - Green, SWIR</b></td><td>{{data.0.band_derived.ndwi}}</td></tr><tr><td><b>MNDWI - Green, SWIR</b></td><td>{{data.0.band_derived.mndwi}}</td></tr></table><p><chart id='{{lat}}{{lon}}{{time}}' title='NBART at {{lat}},{{lon}}' column-units='Wavelength (nm), Reflectance x 10k' preview-x-label='NBART Reflectance'>nm,NBART Reflectance\n480,{{data.0.bands.blue}}\n560,{{data.0.bands.green}}\n660,{{data.0.bands.red}}\n870,{{data.0.bands.nir}}\n1610,{{data.0.bands.swir1}}\n2200,{{data.0.bands.swir2}}</chart></p><p><b>Imagery available for dates:</b>{{#data_available_for_dates}}<br/>{{.}}{{/data_available_for_dates}}</p>",
-                                        "formats": {
-                                            "lat": {
-                                                "maximumFractionDigits": 5
-                                            },
-                                            "lon": {
-                                                "maximumFractionDigits": 5
-                                            }
-                                        }
-                                    },
-                                    "tileErrorHandlingOptions": {
-                                        "ignoreUnknownTileErrors": true
-                                    },
-                                    "dateFormat": "'Year: 'yyyy",
-                                    "id": "pju767prod"
-                                },
-                                {
-                                    "type": "wms",
-                                    "name": "DEA GeoMAD (Landsat 7 ETM+, version 3)",
-                                    "url": "https://ows.dea.ga.gov.au/",
-                                    "opacity": 1,
-                                    "layers": "ga_ls7e_nbart_gm_cyear_3",
-                                    "linkedWcsUrl": "https://ows.dea.ga.gov.au/",
-                                    "linkedWcsCoverage": "ga_ls7e_nbart_gm_cyear_3",
-                                    "chartColor": "white",
-                                    "leafletUpdateInterval": 750,
-                                    "chartType": "momentPoints",
-                                    "featureInfoTemplate": {
-                                        "template": "<table>  <tr><td><b>Time</b></td><td>{{data.0.time}}</td></tr>  <tr><td><b>Blue - 480</b></td><td>{{data.0.bands.blue}}</td></tr>  <tr><td><b>Green - 560</b></td><td>{{data.0.bands.green}}</td></tr>  <tr><td><b>Red - 660</b></td><td>{{data.0.bands.red}}</td></tr>  <tr><td><b>Near Infrared (NIR) - 870</b></td><td>{{data.0.bands.nir}}</td></tr>  <tr><td><b>Shortwave Infrared (SWIR) - 1610</b></td><td>{{data.0.bands.swir1}}</td></tr>  <tr><td><b>Shortwave Infrared (SWIR) - 2200</b></td><td>{{data.0.bands.swir2}}</td></tr>  <tr><td><b>NDVI - Red, NIR</b></td><td>{{data.0.band_derived.ndvi}}</td></tr>  <tr><td><b>NDWI - Green, SWIR</b></td><td>{{data.0.band_derived.ndwi}}</td></tr><tr><td><b>MNDWI - Green, SWIR</b></td><td>{{data.0.band_derived.mndwi}}</td></tr></table><p><chart id='{{lat}}{{lon}}{{time}}' title='NBART at {{lat}},{{lon}}' column-units='Wavelength (nm), Reflectance x 10k' preview-x-label='NBART Reflectance'>nm,NBART Reflectance\n480,{{data.0.bands.blue}}\n560,{{data.0.bands.green}}\n660,{{data.0.bands.red}}\n870,{{data.0.bands.nir}}\n1610,{{data.0.bands.swir1}}\n2200,{{data.0.bands.swir2}}</chart></p><p><b>Imagery available for dates:</b>{{#data_available_for_dates}}<br/>{{.}}{{/data_available_for_dates}}</p>",
-                                        "formats": {
-                                            "lat": {
-                                                "maximumFractionDigits": 5
-                                            },
-                                            "lon": {
-                                                "maximumFractionDigits": 5
-                                            }
-                                        }
-                                    },
-                                    "tileErrorHandlingOptions": {
-                                        "ignoreUnknownTileErrors": true
-                                    },
-                                    "dateFormat": "'Year: 'yyyy",
-                                    "id": "DFG421prod"
-                                },
-                                {
-                                    "type": "wms",
-                                    "name": "DEA GeoMAD (Landsat 5 TM, version 3)",
-                                    "url": "https://ows.dea.ga.gov.au/",
-                                    "opacity": 1,
-                                    "layers": "ga_ls5t_nbart_gm_cyear_3",
-                                    "linkedWcsUrl": "https://ows.dea.ga.gov.au/",
-                                    "linkedWcsCoverage": "ga_ls5t_nbart_gm_cyear_3",
-                                    "chartColor": "white",
-                                    "leafletUpdateInterval": 750,
-                                    "chartType": "momentPoints",
-                                    "featureInfoTemplate": {
-                                        "template": "<table>  <tr><td><b>Time</b></td><td>{{data.0.time}}</td></tr>  <tr><td><b>Blue - 480</b></td><td>{{data.0.bands.blue}}</td></tr>  <tr><td><b>Green - 560</b></td><td>{{data.0.bands.green}}</td></tr>  <tr><td><b>Red - 660</b></td><td>{{data.0.bands.red}}</td></tr>  <tr><td><b>Near Infrared (NIR) - 870</b></td><td>{{data.0.bands.nir}}</td></tr>  <tr><td><b>Shortwave Infrared (SWIR) - 1610</b></td><td>{{data.0.bands.swir1}}</td></tr>  <tr><td><b>Shortwave Infrared (SWIR) - 2200</b></td><td>{{data.0.bands.swir2}}</td></tr>  <tr><td><b>NDVI - Red, NIR</b></td><td>{{data.0.band_derived.ndvi}}</td></tr>  <tr><td><b>NDWI - Green, SWIR</b></td><td>{{data.0.band_derived.ndwi}}</td></tr><tr><td><b>MNDWI - Green, SWIR</b></td><td>{{data.0.band_derived.mndwi}}</td></tr></table><p><chart id='{{lat}}{{lon}}{{time}}' title='NBART at {{lat}},{{lon}}' column-units='Wavelength (nm), Reflectance x 10k' preview-x-label='NBART Reflectance'>nm,NBART Reflectance\n480,{{data.0.bands.blue}}\n560,{{data.0.bands.green}}\n660,{{data.0.bands.red}}\n870,{{data.0.bands.nir}}\n1610,{{data.0.bands.swir1}}\n2200,{{data.0.bands.swir2}}</chart></p><p><b>Imagery available for dates:</b>{{#data_available_for_dates}}<br/>{{.}}{{/data_available_for_dates}}</p>",
-                                        "formats": {
-                                            "lat": {
-                                                "maximumFractionDigits": 5
-                                            },
-                                            "lon": {
-                                                "maximumFractionDigits": 5
-                                            }
-                                        }
-                                    },
-                                    "tileErrorHandlingOptions": {
-                                        "ignoreUnknownTileErrors": true
-                                    },
-                                    "dateFormat": "'Year: 'yyyy",
-                                    "id": "FTY879prod"
                                 }
                             ],
                             "shareKeys": [

diff --git a/prod/services/wms/inventory.json b/prod/services/wms/inventory.json
@@ -145,9 +145,9 @@
             ]
         },
         {
-            "layer": "ga_ls8c_nbart_gm_cyear_3",
+            "layer": "ga_ls8cls9c_gm_cyear_3",
             "product": [
-                "ga_ls8c_nbart_gm_cyear_3"
+                "ga_ls8cls9c_gm_cyear_3"
             ],
             "styles_count": 17,
             "styles_list": [
@@ -171,9 +171,9 @@
             ]
         },
         {
-            "layer": "ga_ls7e_nbart_gm_cyear_3",
+            "layer": "ga_ls7e_gm_cyear_3",
             "product": [
-                "ga_ls7e_nbart_gm_cyear_3"
+                "ga_ls7e_gm_cyear_3"
             ],
             "styles_count": 17,
             "styles_list": [
@@ -197,9 +197,9 @@
             ]
         },
         {
-            "layer": "ga_ls5t_nbart_gm_cyear_3",
+            "layer": "ga_ls5t_gm_cyear_3",
             "product": [
-                "ga_ls5t_nbart_gm_cyear_3"
+                "ga_ls5t_gm_cyear_3"
             ],
             "styles_count": 17,
             "styles_list": [

diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/band_c3_ls_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/band_c3_ls_cfg.py
diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/band_ls_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/band_ls_cfg.py
@@ -6,3 +6,9 @@
     "swir1": ["swir1", "shortwave_infrared_1", "near_shortwave_infrared"],
     "swir2": ["swir2", "shortwave_infrared_2", "far_shortwave_infrared"],
 }
+
+bands_tmad = {
+    "sdev": [],
+    "edev": [],
+    "bcdev": [],
+}
diff --git a/...vices/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py b/...vices/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py
@@ -1,5 +1,3 @@
-from ows_refactored.baseline_satellite_data.landsat_annual.band_c3_ls_cfg import \
-    bands_c3_ls
 from ows_refactored.baseline_satellite_data.landsat_annual.band_c3_ls_nbart_cfg import \
     bands_c3_ls_nbart
 from ows_refactored.baseline_satellite_data.landsat_annual.style_c3_ls_cfg import \
@@ -124,105 +122,6 @@
                 "manual_merge": False,
             },
             "styling": {"default_style": "simple_rgb", "styles": styles_c3_ls_list},
-        },
-        {
-            "title": "DEA GeoMAD (Landsat 8 OLI-TIRS)",
-            "name": "ga_ls8c_nbart_gm_cyear_3",
-            "abstract": """DEA Geometric Median and Median Absolute Deviation (Landsat 8 OLI-TIRS)
-
-This product provides statistical tools to exploit the time series of Earth Observation data available in Digital Earth Australia, providing annual images of general conditions and how much an area changes for a given year.
-
-The geomedian part of the product provides an "average" cloud-free image over the given year. The geomedian image is calculated with a multi-dimensional median, using all the spectral measurements from the satellite imagery at the same time in order to maintain the relationships among the measurements.
-
-The median absolute deviation part of the product uses three measures of variance, each of which provides a 'second order' high dimensional statistical composite for the given year. The three variance measures show much an area varies from the "average" in terms of 'distance' based on factors such as brightness and spectra:
-
-Euclidean distance (EMAD)
-Cosine (spectral) distance (SMAD)
-Bray Curtis dissimilarity (BCMAD)
-Together, they provide information on variance in the landscape over the given year and are useful for change detection applications.
-
-For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-geometric-median-and-median-absolute-deviation-landsat/
-
-For service status information, see https://status.dea.ga.gov.au
-                    """,
-            "product_name": "ga_ls8c_nbart_gm_cyear_3",
-            "bands": bands_c3_ls,
-            "time_resolution": "summary",
-            "resource_limits": reslim_standard,
-            "native_crs": "EPSG:3577",
-            "native_resolution": [30, -30],
-            "image_processing": {
-                "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
-                "always_fetch_bands": [],
-                "manual_merge": False,
-            },
-            "styling": {"default_style": "simple_rgb", "styles": styles_c3_ls_list},
-        },
-        {
-            "title": "DEA GeoMAD (Landsat 7 ETM+)",
-            "name": "ga_ls7e_nbart_gm_cyear_3",
-            "abstract": """DEA Geometric Median and Median Absolute Deviation (Landsat 7 ETM+)
-
-This product provides statistical tools to exploit the time series of Earth Observation data available in Digital Earth Australia, providing annual images of general conditions and how much an area changes for a given year.
-
-The geomedian part of the product provides an "average" cloud-free image over the given year. The geomedian image is calculated with a multi-dimensional median, using all the spectral measurements from the satellite imagery at the same time in order to maintain the relationships among the measurements.
-
-The median absolute deviation part of the product uses three measures of variance, each of which provides a 'second order' high dimensional statistical composite for the given year. The three variance measures show much an area varies from the "average" in terms of 'distance' based on factors such as brightness and spectra:
-
-Euclidean distance (EMAD)
-Cosine (spectral) distance (SMAD)
-Bray Curtis dissimilarity (BCMAD)
-Together, they provide information on variance in the landscape over the given year and are useful for change detection applications.
-
-For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-geometric-median-and-median-absolute-deviation-landsat/
-
-For service status information, see https://status.dea.ga.gov.au
-                    """,
-            "product_name": "ga_ls7e_nbart_gm_cyear_3",
-            "bands": bands_c3_ls,
-            "time_resolution": "summary",
-            "resource_limits": reslim_standard,
-            "native_crs": "EPSG:3577",
-            "native_resolution": [30, -30],
-            "image_processing": {
-                "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
-                "always_fetch_bands": [],
-                "manual_merge": False,
-            },
-            "styling": {"default_style": "simple_rgb", "styles": styles_c3_ls_list},
-        },
-        {
-            "title": "DEA GeoMAD (Landsat 5 TM)",
-            "name": "ga_ls5t_nbart_gm_cyear_3",
-            "abstract": """DEA Geometric Median and Median Absolute Deviation (Landsat 5 TM)
-
-This product provides statistical tools to exploit the time series of Earth Observation data available in Digital Earth Australia, providing annual images of general conditions and how much an area changes for a given year.
-
-The geomedian part of the product provides an "average" cloud-free image over the given year. The geomedian image is calculated with a multi-dimensional median, using all the spectral measurements from the satellite imagery at the same time in order to maintain the relationships among the measurements.
-
-The median absolute deviation part of the product uses three measures of variance, each of which provides a 'second order' high dimensional statistical composite for the given year. The three variance measures show much an area varies from the "average" in terms of 'distance' based on factors such as brightness and spectra:
-
-Euclidean distance (EMAD)
-Cosine (spectral) distance (SMAD)
-Bray Curtis dissimilarity (BCMAD)
-Together, they provide information on variance in the landscape over the given year and are useful for change detection applications.
-
-For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-geometric-median-and-median-absolute-deviation-landsat/
-
-For service status information, see https://status.dea.ga.gov.au
-                    """,
-            "product_name": "ga_ls5t_nbart_gm_cyear_3",
-            "bands": bands_c3_ls,
-            "time_resolution": "summary",
-            "resource_limits": reslim_standard,
-            "native_crs": "EPSG:3577",
-            "native_resolution": [30, -30],
-            "image_processing": {
-                "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
-                "always_fetch_bands": [],
-                "manual_merge": False,
-            },
-            "styling": {"default_style": "simple_rgb", "styles": styles_c3_ls_list},
         }
     ],
 }