From 4c943d632634cd06a2db64ab9412ca5e025dd605 Mon Sep 17 00:00:00 2001 From: Kieran Ricardo Date: Mon, 28 Jun 2021 10:11:09 +1000 Subject: [PATCH] swapped the nbar and nbart products and deleted test layers --- prod/services/wms/inventory.json | 78 +------------- .../ows_refactored/sentinel2/ows_ard_cfg.py | 100 +----------------- 2 files changed, 3 insertions(+), 175 deletions(-) diff --git a/prod/services/wms/inventory.json b/prod/services/wms/inventory.json index 7a3209b5a..184feb9ed 100644 --- a/prod/services/wms/inventory.json +++ b/prod/services/wms/inventory.json @@ -320,82 +320,6 @@ "swir2" ] }, - { - "product": [ - "ga_s2a_ard_nbar_granule", - "ga_s2b_ard_nbar_granule" - ], - "styles_count": 17, - "styles_list": [ - "simple_rgb", - "infrared_green", - "ndvi", - "ndwi", - "mndwi", - "ndci", - "aerosol", - "blue", - "green", - "red", - "red_edge_1", - "red_edge_2", - "red_edge_3", - "nir", - "narrow_nir", - "swir1", - "swir2" - ] - }, - { - "product": [ - "ga_s2b_ard_nbar_granule" - ], - "styles_count": 17, - "styles_list": [ - "simple_rgb", - "infrared_green", - "ndvi", - "ndwi", - "mndwi", - "ndci", - "aerosol", - "blue", - "green", - "red", - "red_edge_1", - "red_edge_2", - "red_edge_3", - "nir", - "narrow_nir", - "swir1", - "swir2" - ] - }, - { - "product": [ - "ga_s2a_ard_nbar_granule" - ], - "styles_count": 17, - "styles_list": [ - "simple_rgb", - "infrared_green", - "ndvi", - "ndwi", - "mndwi", - "ndci", - "aerosol", - "blue", - "green", - "red", - "red_edge_1", - "red_edge_2", - "red_edge_3", - "nir", - "narrow_nir", - "swir1", - "swir2" - ] - }, { "product": [ "s2a_ard_granule", @@ -1065,5 +989,5 @@ ] } ], - "total_layers_count": 82 + "total_layers_count": 79 } \ No newline at end of file diff --git a/prod/services/wms/ows_refactored/sentinel2/ows_ard_cfg.py b/prod/services/wms/ows_refactored/sentinel2/ows_ard_cfg.py index 0526b6c13..65c403a62 100644 --- a/prod/services/wms/ows_refactored/sentinel2/ows_ard_cfg.py +++ b/prod/services/wms/ows_refactored/sentinel2/ows_ard_cfg.py @@ -1,26 +1,6 @@ from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_35 from ows_refactored.sentinel2.style_s2_cfg import styles_s2_list -bands_sentinel2_ard_nbar = { - "nbar_coastal_aerosol": [ - "nbar_coastal_aerosol", - "coastal_aerosol", - "nbart_coastal_aerosol", - "nbart_narrow_blue", - "nbar_narrow_blue" "narrow_blue", - ], - "nbar_blue": ["nbar_blue", "blue", "nbart_blue"], - "nbar_green": ["nbar_green", "green", "nbart_green"], - "nbar_red": ["nbar_red", "red", "nbart_red"], - "nbar_red_edge_1": ["nbar_red_edge_1", "red_edge_1", "nbart_red_edge_1"], - "nbar_red_edge_2": ["nbar_red_edge_2", "red_edge_2", "nbart_red_edge_2"], - "nbar_red_edge_3": ["nbar_red_edge_3", "red_edge_3", "nbart_red_edge_3"], - "nbar_nir_1": ["nbar_nir_1", "nir", "nir_1", "nbart_nir_1"], - "nbar_nir_2": ["nbar_nir_2", "nir2", "nbart_nir_2"], - "nbar_swir_2": ["nbar_swir_2", "swir_2", "nbart_swir_2"], - "nbar_swir_3": ["nbar_swir_3", "swir_3", "nbart_swir_3"], -} - bands_sentinel2_ard_nbart = { "nbart_coastal_aerosol": [ "nbar_coastal_aerosol", @@ -61,82 +41,6 @@ Mishra, S., Mishra, D.R., 2012. Normalized difference chlorophyll index: A novel model for remote estimation of chlorophyll-a concentration in turbid productive waters. Remote Sensing of Environment, Remote Sensing of Urban Environments 117, 394–406. https://doi.org/10.1016/j.rse.2011.10.016 For more information see http://pid.geoscience.gov.au/dataset/ga/129684 For service status information, see https://status.dea.ga.gov.au -""", - "multi_product": True, - "product_names": ["ga_s2a_ard_nbar_granule", "ga_s2b_ard_nbar_granule"], - "bands": bands_sentinel2_ard_nbar, - "resource_limits": reslim_wms_min_zoom_35, - "dynamic": True, - "image_processing": { - "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val", - "always_fetch_bands": [], - "manual_merge": False, - }, - "wcs": { - "native_crs": "EPSG:3577", - "native_resolution": [10.0, 10.0], - "default_bands": ["nbar_red", "nbar_green", "nbar_blue"], - }, - "styling": {"default_style": "simple_rgb", "styles": styles_s2_list}, - }, - { - "name": "s2b_ard_granule_nbar_t", - "title": "Sentinel Definitive Surface Reflectance (Sentinel 2B)", - "abstract": """ -This is a definitive archive of daily Sentinel-2 data. This is processed using correct ancillary data to provide a more accurate product than the Near Real Time. The Surface Reflectance product has been corrected to account for variations caused by atmospheric properties, sun position and sensor view angle at time of image capture. These corrections have been applied to all satellite imagery in the Sentinel-2 archive. For more information see http://pid.geoscience.gov.au/dataset/ga/129684 The Normalised Difference Chlorophyll Index (NDCI) is based on the method of Mishra & Mishra 2012, and adapted to bands on the Sentinel-2A & B sensors. The index indicates levels of chlorophyll-a (chl-a) concentrations in complex turbid productive waters such as those encountered in many inland water bodies. The index has not been validated in Australian waters, and there are a range of environmental conditions that may have an effect on the accuracy of the derived index values in this test implementation, including: - Influence on the remote sensing signal from nearby land and/or atmospheric effects - Optically shallow water - Cloud cover Mishra, S., Mishra, D.R., 2012. Normalized difference chlorophyll index: A novel model for remote estimation of chlorophyll-a concentration in turbid productive waters. Remote Sensing of Environment, Remote Sensing of Urban Environments 117, 394–406. https://doi.org/10.1016/j.rse.2011.10.016 For service status information, see https://status.dea.ga.gov.au -""", - "product_name": "ga_s2b_ard_nbar_granule", - "bands": bands_sentinel2_ard_nbar, - "resource_limits": reslim_wms_min_zoom_35, - "dynamic": True, - "image_processing": { - "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val", - "always_fetch_bands": [], - "manual_merge": False, - }, - "wcs": { - "native_crs": "EPSG:3577", - "native_resolution": [10.0, 10.0], - "default_bands": ["nbar_red", "nbar_green", "nbar_blue"], - }, - "styling": {"default_style": "simple_rgb", "styles": styles_s2_list}, - }, - { - "name": "s2a_ard_granule_nbar_t", - "title": "Sentinel Definitive Surface Reflectance (Sentinel 2A)", - "abstract": """ -This is a definitive archive of daily Sentinel-2 data. This is processed using correct ancillary data to provide a more accurate product than the Near Real Time. The Surface Reflectance product has been corrected to account for variations caused by atmospheric properties, sun position and sensor view angle at time of image capture. These corrections have been applied to all satellite imagery in the Sentinel-2 archive. For more information see http://pid.geoscience.gov.au/dataset/ga/129684 The Normalised Difference Chlorophyll Index (NDCI) is based on the method of Mishra & Mishra 2012, and adapted to bands on the Sentinel-2A & B sensors. The index indicates levels of chlorophyll-a (chl-a) concentrations in complex turbid productive waters such as those encountered in many inland water bodies. The index has not been validated in Australian waters, and there are a range of environmental conditions that may have an effect on the accuracy of the derived index values in this test implementation, including: - Influence on the remote sensing signal from nearby land and/or atmospheric effects - Optically shallow water - Cloud cover Mishra, S., Mishra, D.R., 2012. Normalized difference chlorophyll index: A novel model for remote estimation of chlorophyll-a concentration in turbid productive waters. Remote Sensing of Environment, Remote Sensing of Urban Environments 117, 394–406. https://doi.org/10.1016/j.rse.2011.10.016 For service status information, see https://status.dea.ga.gov.au -""", - "product_name": "ga_s2a_ard_nbar_granule", - "bands": bands_sentinel2_ard_nbar, - "resource_limits": reslim_wms_min_zoom_35, - "dynamic": True, - "image_processing": { - "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val", - "always_fetch_bands": [], - "manual_merge": False, - }, - "wcs": { - "native_crs": "EPSG:3577", - "native_resolution": [10.0, 10.0], - "default_bands": ["nbar_red", "nbar_green", "nbar_blue"], - }, - "styling": {"default_style": "simple_rgb", "styles": styles_s2_list}, - }, - { - "name": "s2_ard_granule", - "title": "Sentinel Definitive Surface Reflectance (Sentinel 2 (A and B combined))", - "abstract": """ -This is a definitive archive of daily Sentinel-2 data. This is processed using correct ancillary data to provide a more accurate product than the Near Real Time. -The Surface Reflectance product has been corrected to account for variations caused by atmospheric properties, sun position and sensor view angle at time of image capture. These corrections have been applied to all satellite imagery in the Sentinel-2 archive. -The Normalised Difference Chlorophyll Index (NDCI) is based on the method of Mishra & Mishra 2012, and adapted to bands on the Sentinel-2A & B sensors. -The index indicates levels of chlorophyll-a (chl-a) concentrations in complex turbid productive waters such as those encountered in many inland water bodies. The index has not been validated in Australian waters, and there are a range of environmental conditions that may have an effect on the accuracy of the derived index values in this test implementation, including: -- Influence on the remote sensing signal from nearby land and/or atmospheric effects -- Optically shallow water -- Cloud cover -Mishra, S., Mishra, D.R., 2012. Normalized difference chlorophyll index: A novel model for remote estimation of chlorophyll-a concentration in turbid productive waters. Remote Sensing of Environment, Remote Sensing of Urban Environments 117, 394–406. https://doi.org/10.1016/j.rse.2011.10.016 -For more information see http://pid.geoscience.gov.au/dataset/ga/129684 -For service status information, see https://status.dea.ga.gov.au """, "multi_product": True, "product_names": ["s2a_ard_granule", "s2b_ard_granule"], @@ -156,7 +60,7 @@ "styling": {"default_style": "simple_rgb", "styles": styles_s2_list}, }, { - "name": "s2b_ard_granulet", + "name": "s2b_ard_granule_nbar_t", "title": "Sentinel Definitive Surface Reflectance (Sentinel 2B)", "abstract": """ This is a definitive archive of daily Sentinel-2 data. This is processed using correct ancillary data to provide a more accurate product than the Near Real Time. The Surface Reflectance product has been corrected to account for variations caused by atmospheric properties, sun position and sensor view angle at time of image capture. These corrections have been applied to all satellite imagery in the Sentinel-2 archive. For more information see http://pid.geoscience.gov.au/dataset/ga/129684 The Normalised Difference Chlorophyll Index (NDCI) is based on the method of Mishra & Mishra 2012, and adapted to bands on the Sentinel-2A & B sensors. The index indicates levels of chlorophyll-a (chl-a) concentrations in complex turbid productive waters such as those encountered in many inland water bodies. The index has not been validated in Australian waters, and there are a range of environmental conditions that may have an effect on the accuracy of the derived index values in this test implementation, including: - Influence on the remote sensing signal from nearby land and/or atmospheric effects - Optically shallow water - Cloud cover Mishra, S., Mishra, D.R., 2012. Normalized difference chlorophyll index: A novel model for remote estimation of chlorophyll-a concentration in turbid productive waters. Remote Sensing of Environment, Remote Sensing of Urban Environments 117, 394–406. https://doi.org/10.1016/j.rse.2011.10.016 For service status information, see https://status.dea.ga.gov.au @@ -178,7 +82,7 @@ "styling": {"default_style": "simple_rgb", "styles": styles_s2_list}, }, { - "name": "s2a_ard_granule", + "name": "s2a_ard_granule_nbar_t", "title": "Sentinel Definitive Surface Reflectance (Sentinel 2A)", "abstract": """ This is a definitive archive of daily Sentinel-2 data. This is processed using correct ancillary data to provide a more accurate product than the Near Real Time. The Surface Reflectance product has been corrected to account for variations caused by atmospheric properties, sun position and sensor view angle at time of image capture. These corrections have been applied to all satellite imagery in the Sentinel-2 archive. For more information see http://pid.geoscience.gov.au/dataset/ga/129684 The Normalised Difference Chlorophyll Index (NDCI) is based on the method of Mishra & Mishra 2012, and adapted to bands on the Sentinel-2A & B sensors. The index indicates levels of chlorophyll-a (chl-a) concentrations in complex turbid productive waters such as those encountered in many inland water bodies. The index has not been validated in Australian waters, and there are a range of environmental conditions that may have an effect on the accuracy of the derived index values in this test implementation, including: - Influence on the remote sensing signal from nearby land and/or atmospheric effects - Optically shallow water - Cloud cover Mishra, S., Mishra, D.R., 2012. Normalized difference chlorophyll index: A novel model for remote estimation of chlorophyll-a concentration in turbid productive waters. Remote Sensing of Environment, Remote Sensing of Urban Environments 117, 394–406. https://doi.org/10.1016/j.rse.2011.10.016 For service status information, see https://status.dea.ga.gov.au