From a572d7c87909aac1ee04cb2f1399ff673b53af9f Mon Sep 17 00:00:00 2001 From: "pin.jin@ga.gov.au" Date: Mon, 18 Oct 2021 23:36:22 +0000 Subject: [PATCH 1/4] align text --- dev/services/wms/ows_refactored/ows_root_cfg.py | 1 + .../baseline_satellite_data/sentinel2/ows_nrt_cfg.py | 6 +++--- .../ows_refactored/inland_water/ows_category_root_cfg.py | 2 +- .../land_and_vegetation/fc/ows_fc_albers_cfg.py | 6 +++--- .../ows_refactored/land_and_vegetation/ows_mangrove_cfg.py | 4 ++-- .../wms/ows_refactored/land_and_vegetation/ows_nd_cfg.py | 4 ++-- .../sea_ocean_coast/intertidal/ows_extents_cfg.py | 4 ++-- .../sea_ocean_coast/intertidal/ows_national_cfg.py | 2 +- .../ows_refactored/sea_ocean_coast/ows_category_root_cfg.py | 2 +- .../wms/ows_refactored/sea_ocean_coast/ows_tide_cfg.py | 2 +- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dev/services/wms/ows_refactored/ows_root_cfg.py b/dev/services/wms/ows_refactored/ows_root_cfg.py index 64209cf3c..631bb3903 100644 --- a/dev/services/wms/ows_refactored/ows_root_cfg.py +++ b/dev/services/wms/ows_refactored/ows_root_cfg.py @@ -57,6 +57,7 @@ "australia", "time-series", "fractional-cover", + "burn characteristics", ], "contact_info": { "person": "Digital Earth Australia", diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_nrt_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_nrt_cfg.py index 77502ec23..dca21e6bd 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_nrt_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_nrt_cfg.py @@ -5,7 +5,7 @@ from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_15_cache_rules combined_layer = { - "title": "DEA Surface Reflectance (Sentinel-2) - near real time", + "title": "DEA Surface Reflectance (Sentinel-2 Near Real-Time)", "name": "s2_nrt_granule_nbar_t", "abstract": """Sentinel-2 Multispectral Instrument - Nadir BRDF Adjusted Reflectance + Terrain Illumination Correction near real time (Sentinel-2 MSI) This is a 90-day rolling archive of daily Sentinel-2 Near Real Time data. The Near Real-Time capability provides analysis-ready data that is processed on receipt using the best-available ancillary information at the time to provide atmospheric corrections. @@ -52,7 +52,7 @@ s2b_layer = { "name": "s2b_nrt_granule_nbar_t", - "title": "DEA Surface Reflectance (Sentinel-2B MSI) near real time", + "title": "DEA Surface Reflectance (Sentinel-2B MSI Near Real-Time)", "abstract": """Sentinel-2 Multispectral Instrument - Nadir BRDF Adjusted Reflectance + Terrain Illumination Correction (Sentinel-2B MSI) near real time This is a 90-day rolling archive of daily Sentinel-2 Near Real Time data. The Near Real-Time capability provides analysis-ready data that is processed on receipt using the best-available ancillary information at the time to provide atmospheric corrections. @@ -97,7 +97,7 @@ s2a_layer = { "name": "s2a_nrt_granule_nbar_t", - "title": "DEA Surface Reflectance (Sentinel-2A MSI) near real time", + "title": "DEA Surface Reflectance (Sentinel-2A MSI Near Real-Time)", "abstract": """Sentinel-2 Multispectral Instrument - Nadir BRDF Adjusted Reflectance + Terrain Illumination Correction (Sentinel-2A MSI) near real time This is a 90-day rolling archive of daily Sentinel-2 Near Real Time data. The Near Real-Time capability provides analysis-ready data that is processed on receipt using the best-available ancillary information at the time to provide atmospheric corrections. diff --git a/prod/services/wms/ows_refactored/inland_water/ows_category_root_cfg.py b/prod/services/wms/ows_refactored/inland_water/ows_category_root_cfg.py index 545ddb1a9..79a0c57bf 100644 --- a/prod/services/wms/ows_refactored/inland_water/ows_category_root_cfg.py +++ b/prod/services/wms/ows_refactored/inland_water/ows_category_root_cfg.py @@ -1,5 +1,5 @@ category_layers = { - "title": "Inland Water", + "title": "Inland water", "abstract": "", "layers": [ { diff --git a/prod/services/wms/ows_refactored/land_and_vegetation/fc/ows_fc_albers_cfg.py b/prod/services/wms/ows_refactored/land_and_vegetation/fc/ows_fc_albers_cfg.py index c6f64bd63..f72420ea8 100644 --- a/prod/services/wms/ows_refactored/land_and_vegetation/fc/ows_fc_albers_cfg.py +++ b/prod/services/wms/ows_refactored/land_and_vegetation/fc/ows_fc_albers_cfg.py @@ -22,7 +22,7 @@ "abstract": "", "layers": [ { - "title": "DEA Fractional Cover (Landsat 5, Collection 2)", + "title": "DEA Fractional Cover (Landsat 5 TM, Collection 2)", "name": "ls5_fc_albers", "abstract": """Fractional Cover 25m 2.2.1 (Landsat 5, Collection 2) Fractional Cover version 2.2.1, 25 metre, 100km tile, Australian Albers Equal Area projection (EPSG:3577). Data is only visible at higher resolutions; when zoomed-out the available area will be displayed as a shaded region. @@ -53,7 +53,7 @@ }, }, { - "title": "DEA Fractional Cover (Landsat 7, Collection 2)", + "title": "DEA Fractional Cover (Landsat 7 ETM+, Collection 2)", "name": "ls7_fc_albers", "abstract": """Fractional Cover 25m 2.2.1 (Landsat 7, Collection 2) Fractional Cover version 2.2.1, 25 metre, 100km tile, Australian Albers Equal Area projection (EPSG:3577). Data is only visible at higher resolutions; when zoomed-out the available area will be displayed as a shaded region. @@ -85,7 +85,7 @@ }, }, { - "title": "DEA Fractional Cover (Landsat 8, Collection 2)", + "title": "DEA Fractional Cover (Landsat 8 OLI-TIRS, Collection 2)", "name": "ls8_fc_albers", "abstract": """Fractional Cover 25m 2.2.1 (Landsat 8, Collection 2) Fractional Cover version 2.2.1, 25 metre, 100km tile, Australian Albers Equal Area projection (EPSG:3577). Data is only visible at higher resolutions; when zoomed-out the available area will be displayed as a shaded region. diff --git a/prod/services/wms/ows_refactored/land_and_vegetation/ows_mangrove_cfg.py b/prod/services/wms/ows_refactored/land_and_vegetation/ows_mangrove_cfg.py index db6268f16..005d24051 100644 --- a/prod/services/wms/ows_refactored/land_and_vegetation/ows_mangrove_cfg.py +++ b/prod/services/wms/ows_refactored/land_and_vegetation/ows_mangrove_cfg.py @@ -41,11 +41,11 @@ } layer = { - "title": "DEA Mangrove Canopy Cover", + "title": "DEA Mangroves", "abstract": "", "layers": [ { - "title": "DEA Mangrove Canopy Cover (Landsat)", + "title": "DEA Mangroves (Landsat)", "name": "mangrove_cover_v2_0_2", "abstract": """Mangrove Canopy Cover 25m 2.0.2 (Landsat) Mangrove canopy cover version 2.0.2, 25 metre, 100km tile, Australian Albers Equal Area projection (EPSG:3577). Data is only visible at higher resolutions; when zoomed-out the available area will be displayed as a shaded region. diff --git a/prod/services/wms/ows_refactored/land_and_vegetation/ows_nd_cfg.py b/prod/services/wms/ows_refactored/land_and_vegetation/ows_nd_cfg.py index f1d2fad81..98c42b1ed 100644 --- a/prod/services/wms/ows_refactored/land_and_vegetation/ows_nd_cfg.py +++ b/prod/services/wms/ows_refactored/land_and_vegetation/ows_nd_cfg.py @@ -4,7 +4,7 @@ from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_35 ls8_be_layers = { - "title": "Barest Earth Landsat 8 satellite images", + "title": "GA Barest Earth (Landsat 8 OLI/TIRS)", "name": "ls8_barest_earth_mosaic", "abstract": """ A `weighted geometric median’ approach has been used to estimate the median surface reflectance of the barest state (i.e., least vegetation) observed through Landsat-8 OLI observations from 2013 to September 2018 to generate a six-band Landsat-8 Barest Earth pixel composite mosaic over the Australian continent. @@ -32,7 +32,7 @@ ls30_be_layers = { - "title": "Landsat 30+ Barest Earth Satellite Images (Combined Landsat)", + "title": "GA Barest Earth (Landsat)", "name": "landsat_barest_earth", "abstract": """ An estimate of the spectra of the barest state (i.e., least vegetation) observed from imagery of the Australian continent collected by the Landsat 5, 7, and 8 satellites over a period of more than 30 years (1983 - 2018). diff --git a/prod/services/wms/ows_refactored/sea_ocean_coast/intertidal/ows_extents_cfg.py b/prod/services/wms/ows_refactored/sea_ocean_coast/intertidal/ows_extents_cfg.py index 3509c2f40..7e74e864b 100644 --- a/prod/services/wms/ows_refactored/sea_ocean_coast/intertidal/ows_extents_cfg.py +++ b/prod/services/wms/ows_refactored/sea_ocean_coast/intertidal/ows_extents_cfg.py @@ -149,7 +149,7 @@ } item_v2_00_layer = { - "title": "DEA Intertidal Extents (ITEM, Landsat)", + "title": "DEA Intertidal Extents (ITEM)", "name": "ITEM_V2.0.0", "abstract": """Intertidal Extents Model 25m 2.0.0 (Extents) The Intertidal Extents Model (ITEM v2.0) product analyses GA’s historic archive of satellite imagery to derive a model of the spatial extents of the intertidal zone throughout the tidal cycle. The model can assist in understanding the relative elevation profile of the intertidal zone, @@ -215,7 +215,7 @@ } item_v2_00_conf_layer = { - "title": "A Intertidal Extents Confidence(ITEM, Landsat)", + "title": "DEA Intertidal Extents confidence", "name": "ITEM_V2.0.0_Conf", "abstract": """Intertidal Extents Model 25m 2.0.0 (Confidence) The Intertidal Extents Model (ITEM v2.0) product analyses GA’s historic archive of satellite imagery to derive a model of the spatial extents of the intertidal zone throughout the tidal cycle. The model can assist in understanding the relative elevation profile of the intertidal zone, diff --git a/prod/services/wms/ows_refactored/sea_ocean_coast/intertidal/ows_national_cfg.py b/prod/services/wms/ows_refactored/sea_ocean_coast/intertidal/ows_national_cfg.py index 38bc9c581..578f56cb3 100644 --- a/prod/services/wms/ows_refactored/sea_ocean_coast/intertidal/ows_national_cfg.py +++ b/prod/services/wms/ows_refactored/sea_ocean_coast/intertidal/ows_national_cfg.py @@ -80,7 +80,7 @@ layer = { - "title": "DEA Intertidal Elevation (NIDEM, Landsat)", + "title": "DEA Intertidal Elevation (NIDEM)", "name": "NIDEM", "abstract": """ National Intertidal Digital Elevation Model 25m 1.0.0 diff --git a/prod/services/wms/ows_refactored/sea_ocean_coast/ows_category_root_cfg.py b/prod/services/wms/ows_refactored/sea_ocean_coast/ows_category_root_cfg.py index 9fbd3b0bd..b8e60f941 100644 --- a/prod/services/wms/ows_refactored/sea_ocean_coast/ows_category_root_cfg.py +++ b/prod/services/wms/ows_refactored/sea_ocean_coast/ows_category_root_cfg.py @@ -1,5 +1,5 @@ category_layers = { - "title": "Sea, Occean and Coast", + "title": "Sea, ocean and coast", "abstract": "", "layers": [ { diff --git a/prod/services/wms/ows_refactored/sea_ocean_coast/ows_tide_cfg.py b/prod/services/wms/ows_refactored/sea_ocean_coast/ows_tide_cfg.py index f04b0d686..cd439b9e1 100644 --- a/prod/services/wms/ows_refactored/sea_ocean_coast/ows_tide_cfg.py +++ b/prod/services/wms/ows_refactored/sea_ocean_coast/ows_tide_cfg.py @@ -5,7 +5,7 @@ from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_35 layers = { - "title": "DEA High and Low Tide Imagery (Landsat)", + "title": "DEA High and Low Tide Imagery (HLTC)", "abstract": """ The High and Low Tide Composites product is composed of two surface reflectance composite mosaics of Landsat TM and ETM+ (Landsat 5 and Landsat 7 respectively) and OLI (Landsat 8) From 2e6d04c0551c8033789c780a0c53331df0cda431 Mon Sep 17 00:00:00 2001 From: "pin.jin@ga.gov.au" Date: Tue, 19 Oct 2021 00:05:08 +0000 Subject: [PATCH 2/4] folder structure changes --- .../landsat/ows_c3_cfg.py | 12 +- .../landsat_annual/ows_landsat_annual_cfg.py | 114 ++++++++++++++++-- .../ows_category_root_cfg.py | 8 -- .../sentinel2/ows_ard_cfg.py | 6 +- .../sentinel2/ows_nrt_provisional_cfg.py | 6 +- .../sentinel2/ows_s2_cfg.py | 6 +- 6 files changed, 126 insertions(+), 26 deletions(-) diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat/ows_c3_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat/ows_c3_cfg.py index 70ec658b5..40f6f326a 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat/ows_c3_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat/ows_c3_cfg.py @@ -30,7 +30,7 @@ ) layers = { - "title": "Landsat satellite images", + "title": "DEA Surface Reflectance (Landsat)", "abstract": """Collection 3 represents a consistent processing and upgrade to the Geoscience Australia's Landsat baseline and derivative products. For service status information, see https://status.dea.ga.gov.au""", @@ -180,7 +180,7 @@ "styling": {"default_style": "true_colour", "styles": styles_c3_ls_common}, }, { - "title": "DEA Surface Reflectance (Landsat 8 OLI-TIRS) (provisional)", + "title": "DEA Surface Reflectance (Landsat 8 OLI-TIRS, Provisional)", "abstract": """Geoscience Australia Landsat 8 OLI-TIRS Analysis Ready Data Provisional Collection 3 This product takes Landsat 8 imagery captured over the Australian continent and corrects for inconsistencies across land and coastal fringes. The result is accurate and standardised surface reflectance data, which is instrumental in identifying and quantifying environmental change. @@ -230,7 +230,7 @@ "styling": {"default_style": "true_colour", "styles": styles_c3_ls_8}, }, { - "title": "DEA Surface Reflectance (Landsat 7 ETM+) (provisional)", + "title": "DEA Surface Reflectance (Landsat 7 ETM+, Provisional)", "abstract": """Geoscience Australia Landsat 7 ETM+ Analysis Ready Data Provisional Collection 3 This product takes Landsat 7 Enhanced Thematic Mapper Plus (ETM+) imagery captured over the Australian continent and corrects for inconsistencies across land and coastal fringes. The result is accurate and standardised surface reflectance data, which is instrumental in identifying and quantifying environmental change. @@ -278,6 +278,10 @@ ], "styling": {"default_style": "true_colour", "styles": styles_c3_ls_7}, }, + { + "include": "ows_refactored.baseline_satellite_data.landsat.ows_c3_cfg.combined_provisional_layer", + "type": "python", + }, ], } @@ -335,7 +339,7 @@ } combined_provisional_layer = { - "title": "DEA Surface Reflectance (Landsat) Provisional - near real time", + "title": "DEA Surface Reflectance (Landsat, Provisional)", "name": "ga_ls_ard_provisional_3", "abstract": """Geoscience Australia Landsat Analysis Ready Data Provisional Collection 3 diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py index 9439cee1d..2b0204b22 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py @@ -1,16 +1,20 @@ +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_ls_cfg import ( bands_ls, bands_tmad) +from ows_refactored.baseline_satellite_data.landsat_annual.style_c3_ls_cfg import \ + styles_c3_ls_list from ows_refactored.baseline_satellite_data.landsat_annual.style_ls_cfg import ( styles_ls_list, styles_tmad_list) from ows_refactored.ows_reslim_cfg import (reslim_wms_min_zoom_15, reslim_wms_min_zoom_35) layers = { - "title": "Landsat satellite images - annual", + "title": "DEA Surface Reflectance Calendar Year (Landsat)", "abstract": "", "layers": [ { - "title": "DEA Surface Reflectance Geomedian (Landsat 8 OLI-TIRS)", + "title": "DEA Surface Reflectance Calendar Year (Landsat 8 OLI-TIRS)", "name": "ls8_nbart_geomedian_annual", "abstract": """Surface Reflectance 25m Geomedian 2.0.0 (Landsat 8 OLI-TIRS) The surface reflectance geomedian product provides an average cloud-free image over the given time period. 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. @@ -43,7 +47,7 @@ "styling": {"default_style": "simple_rgb", "styles": styles_ls_list}, }, { - "title": "DEA Surface Reflectance Geomedian (Landsat 7 ETM+)", + "title": "DEA Surface Reflectance Calendar Year (Landsat 7 ETM+)", "name": "ls7_nbart_geomedian_annual", "abstract": """Surface Reflectance 25m Geomedian 2.0.0 (Landsat 7 ETM+) The surface reflectance geomedian product provides an average cloud-free image over the given time period. 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. @@ -76,7 +80,7 @@ "styling": {"default_style": "simple_rgb", "styles": styles_ls_list}, }, { - "title": "DEA Surface Reflectance Geomedian (Landsat 5 TM)", + "title": "DEA Surface Reflectance Calendar Year (Landsat 5 TM)", "name": "ls5_nbart_geomedian_annual", "abstract": """Surface Reflectance 25m Geomedian 2.0.0 (Landsat 5 TM) The surface reflectance geomedian product provides an average cloud-free image over the given time period. 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. @@ -108,7 +112,7 @@ "styling": {"default_style": "simple_rgb", "styles": styles_ls_list}, }, { - "title": "DEA Surface Reflectance Median Absolute Deviation (Landsat 8 OLI-TIRS)", + "title": "DEA Surface Reflectance TMAD Calendar Year (Landsat 8 OLI-TIRS)", "abstract": """Surface Reflectance Euclidean, Spectral and Bray-Curtis Median Absolute Deviation 2.1.0 (Landsat 8 OLI-TIRS) The three layers of the TMAD are calculated by computing the multidimensional distance between each observation in a time series of multispectral (or higher dimensionality such as hyperspectral) satellite imagery with the @@ -141,7 +145,7 @@ }, }, { - "title": "DEA Surface Reflectance Median Absolute Deviation (Landsat 7 ETM+)", + "title": "DEA Surface Reflectance TMAD Calendar Year (Landsat 7 ETM+)", "abstract": """Surface Reflectance Euclidean, Spectral and Bray-Curtis Median Absolute Deviation 2.1.0 (Landsat 7 ETM+) The three layers of the TMAD are calculated by computing the multidimensional distance between each observation in a time series of multispectral (or higher dimensionality such as hyperspectral) satellite imagery with the @@ -174,7 +178,7 @@ }, }, { - "title": "DEA Surface Reflectance Median Absolute Deviation (Landsat 5 TM)", + "title": "DEA Surface Reflectance TMAD Calendar Year (Landsat 5 TM)", "abstract": """Surface Reflectance Euclidean, Spectral and Bray-Curtis Median Absolute Deviation 2.1.0 (Landsat 5 TM) The three layers of the TMAD are calculated by computing the multidimensional distance between each observation in a time series of multispectral (or higher dimensionality such as hyperspectral) satellite imagery with the @@ -206,5 +210,101 @@ "styles": styles_tmad_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://cmi.ga.gov.au/data-products/dea/645/dea-geomad-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": "year", + "resource_limits": reslim_wms_min_zoom_35, + "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://cmi.ga.gov.au/data-products/dea/645/dea-geomad-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": "year", + "resource_limits": reslim_wms_min_zoom_35, + "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://cmi.ga.gov.au/data-products/dea/645/dea-geomad-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": "year", + "resource_limits": reslim_wms_min_zoom_35, + "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}, + } ], } diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/ows_category_root_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/ows_category_root_cfg.py index d07223a75..7c7b66588 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/ows_category_root_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/ows_category_root_cfg.py @@ -6,18 +6,10 @@ "include": "ows_refactored.baseline_satellite_data.landsat.ows_c3_cfg.combined_layer", "type": "python", }, - { - "include": "ows_refactored.baseline_satellite_data.landsat.ows_c3_cfg.combined_provisional_layer", - "type": "python", - }, { "include": "ows_refactored.baseline_satellite_data.sentinel2.ows_nrt_cfg.combined_layer", "type": "python", }, - { - "include": "ows_refactored.baseline_satellite_data.sentinel2.ows_nrt_provisional_cfg.combined_layer", - "type": "python", - }, { "include": "ows_refactored.baseline_satellite_data.sentinel2.ows_ard_cfg.combined_layer", "type": "python", diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_ard_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_ard_cfg.py index c8819f290..a1f9989df 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_ard_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_ard_cfg.py @@ -6,7 +6,7 @@ s2b_layer = { "name": "s2b_ard_granule_nbar_t", - "title": "DEA Surface Reflectance NBART (Sentinel-2B MSI)", + "title": "DEA Surface Reflectance (Sentinel-2B MSI)", "abstract": """Sentinel-2 Multispectral Instrument - Nadir BRDF Adjusted Reflectance + Terrain Illumination Correction (Sentinel-2B MSI) This product has been corrected to account for variations caused by atmospheric properties, sun position and sensor view angle at time of image capture. @@ -48,7 +48,7 @@ s2a_layer = { "name": "s2a_ard_granule_nbar_t", - "title": "DEA Surface Reflectance NBART (Sentinel-2A MSI)", + "title": "DEA Surface Reflectance (Sentinel-2A MSI)", "abstract": """Sentinel-2 Multispectral Instrument - Nadir BRDF Adjusted Reflectance + Terrain Illumination Correction (Sentinel-2A MSI) This product has been corrected to account for variations caused by atmospheric properties, sun position and sensor view angle at time of image capture. @@ -89,7 +89,7 @@ } combined_layer = { - "title": "DEA Surface Reflectance (Sentinel-2 MSI)", + "title": "DEA Surface Reflectance (Sentinel-2)", "name": "s2_ard_granule_nbar_t", "abstract": """Sentinel-2 Multispectral Instrument - Nadir BRDF Adjusted Reflectance + Terrain Illumination Correction (Sentinel-2 MSI) This product has been corrected to account for variations caused by atmospheric properties, sun position and sensor view angle at time of image capture. diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_nrt_provisional_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_nrt_provisional_cfg.py index a0acd36e9..d600b82fe 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_nrt_provisional_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_nrt_provisional_cfg.py @@ -5,7 +5,7 @@ from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_15_cache_rules combined_layer = { - "title": "DEA Surface Reflectance (Sentinel-2) Provisional - near real time", + "title": "DEA Surface Reflectance (Sentinel-2, Provisional)", "name": "s2_nrt_provisional_granule_nbar_t", "abstract": """Geoscience Australia Sentinel-2 MSI Analysis Ready Data Provisional Collection 3 @@ -54,7 +54,7 @@ s2b_layer = { "name": "s2b_nrt_provisional_granule_nbar_t", - "title": "DEA Surface Reflectance (Sentinel-2B MSI) Provisional - near real time", + "title": "DEA Surface Reflectance (Sentinel-2B MSI, Provisional)", "abstract": """Geoscience Australia Sentinel-2B MSI Analysis Ready Data Provisional Collection 3 This product takes Sentinel-2 (MSI) imagery captured over the Australian continent and corrects for inconsistencies across land and coastal fringes. The result is accurate and standardised surface reflectance data, which is instrumental in identifying and quantifying environmental change. @@ -101,7 +101,7 @@ s2a_layer = { "name": "s2a_nrt_provisional_granule_nbar_t", - "title": "DEA Surface Reflectance (Sentinel-2A MSI) Provisional - near real time", + "title": "DEA Surface Reflectance (Sentinel-2A MSI, Provisional)", "abstract": """Geoscience Australia Sentinel-2A MSI Analysis Ready Data Provisional Collection 3 This product takes Sentinel-2 (MSI) imagery captured over the Australian continent and corrects for inconsistencies across land and coastal fringes. The result is accurate and standardised surface reflectance data, which is instrumental in identifying and quantifying environmental change. diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_s2_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_s2_cfg.py index 8534dc711..14ec6bed2 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_s2_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/ows_s2_cfg.py @@ -1,5 +1,5 @@ category_layers = { - "title": "Sentinel-2 satellite images", + "title": "DEA Surface Reflectance (Sentinel-2)", "abstract": "", "layers": [ { @@ -10,6 +10,10 @@ "include": "ows_refactored.baseline_satellite_data.sentinel2.ows_nrt_cfg.s2a_layer", "type": "python", }, + { + "include": "ows_refactored.baseline_satellite_data.sentinel2.ows_nrt_provisional_cfg.combined_layer", + "type": "python", + }, { "include": "ows_refactored.baseline_satellite_data.sentinel2.ows_nrt_provisional_cfg.s2b_layer", "type": "python", From 8e9715a1da3babaa077f060820c7bbcee1537eb0 Mon Sep 17 00:00:00 2001 From: "pin.jin@ga.gov.au" Date: Tue, 19 Oct 2021 00:08:37 +0000 Subject: [PATCH 3/4] remove gcycle years --- .../landsat_annual/ows_landsat_annual_cfg.py | 96 ------------------- 1 file changed, 96 deletions(-) diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py index 2b0204b22..61e0a77d4 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py @@ -209,102 +209,6 @@ "default_style": "arcsec_sdev", "styles": styles_tmad_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://cmi.ga.gov.au/data-products/dea/645/dea-geomad-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": "year", - "resource_limits": reslim_wms_min_zoom_35, - "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://cmi.ga.gov.au/data-products/dea/645/dea-geomad-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": "year", - "resource_limits": reslim_wms_min_zoom_35, - "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://cmi.ga.gov.au/data-products/dea/645/dea-geomad-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": "year", - "resource_limits": reslim_wms_min_zoom_35, - "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}, } ], } From 2bc67ac08e9d0b5ea2e459b51b83f231c0e79891 Mon Sep 17 00:00:00 2001 From: "pin.jin@ga.gov.au" Date: Tue, 19 Oct 2021 00:20:11 +0000 Subject: [PATCH 4/4] fix flake8 import issue --- .../landsat_annual/ows_landsat_annual_cfg.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py index 61e0a77d4..57bcf2ef7 100644 --- a/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py +++ b/prod/services/wms/ows_refactored/baseline_satellite_data/landsat_annual/ows_landsat_annual_cfg.py @@ -1,9 +1,5 @@ -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_ls_cfg import ( bands_ls, bands_tmad) -from ows_refactored.baseline_satellite_data.landsat_annual.style_c3_ls_cfg import \ - styles_c3_ls_list from ows_refactored.baseline_satellite_data.landsat_annual.style_ls_cfg import ( styles_ls_list, styles_tmad_list) from ows_refactored.ows_reslim_cfg import (reslim_wms_min_zoom_15,