Merge branch 'master' into AddBarestEarth

GeoscienceAustralia · Jul 30, 2021 · 45330af · 45330af
2 parents e9a04ad + 6c5c96b
commit 45330af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/dev/services/wms/ows_refactored/sentinel2/ows_ard_cfg.py b/dev/services/wms/ows_refactored/sentinel2/ows_ard_cfg.py
@@ -1,4 +1,4 @@
-from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_35
+from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_15_cache_rules
 from ows_refactored.sentinel2.style_s2_cfg import styles_s2_list
 
 bands_sentinel2_ard_nbart = {
@@ -47,7 +47,7 @@
             "multi_product": True,
             "product_names": ["s2a_ard_granule", "s2b_ard_granule"],
             "bands": bands_sentinel2_ard_nbart,
-            "resource_limits": reslim_wms_min_zoom_35,
+            "resource_limits": reslim_wms_min_zoom_15_cache_rules,
             "dynamic": True,
             "image_processing": {
                 "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
@@ -83,7 +83,7 @@
 """,
             "product_name": "s2b_ard_granule",
             "bands": bands_sentinel2_ard_nbart,
-            "resource_limits": reslim_wms_min_zoom_35,
+            "resource_limits": reslim_wms_min_zoom_15_cache_rules,
             "dynamic": True,
             "image_processing": {
                 "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
@@ -119,7 +119,7 @@
 """,
             "product_name": "s2a_ard_granule",
             "bands": bands_sentinel2_ard_nbart,
-            "resource_limits": reslim_wms_min_zoom_35,
+            "resource_limits": reslim_wms_min_zoom_15_cache_rules,
             "dynamic": True,
             "image_processing": {
                 "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",

diff --git a/dev/services/wms/ows_refactored/sentinel2/style_s2_cfg.py b/dev/services/wms/ows_refactored/sentinel2/style_s2_cfg.py
@@ -22,7 +22,7 @@
 
 style_s2_ndvi = {
     "name": "ndvi",
-    "title": "NDVI - Red, NIR",
+    "title": "Normalised Difference Vegetation Index - Red, NIR",
     "abstract": "Normalised Difference Vegetation Index - a derived index that correlates well with the existence of vegetation",
     "index_function": {
         "function": "datacube_ows.band_utils.norm_diff",
@@ -114,7 +114,7 @@
 
 style_s2_ndwi = {
     "name": "ndwi",
-    "title": "NDWI - Green, NIR",
+    "title": "Normalised Difference Water Index - Green, NIR",
     "abstract": "Normalised Difference Water Index - a derived index that correlates well with the existence of water (McFeeters 1996)",
     "index_function": {
         "function": "datacube_ows.band_utils.norm_diff",
@@ -224,7 +224,7 @@
 style_s2_mndwi = {
     # Cannot reuse landsat as we need swir_2 to landsat's swir_1
     "name": "mndwi",
-    "title": "MNDWI - Green, SWIR",
+    "title": "Modified Normalised Difference Water Index - Green, SWIR",
     "abstract": "Modified Normalised Difference Water Index - a derived index that correlates well with the existence of water (Xu 2006)",
     "index_function": {
         "function": "datacube_ows.band_utils.norm_diff",
@@ -311,7 +311,7 @@
 
 style_s2_ndci = {
     "name": "ndci",
-    "title": "NDCI - Red Edge, Red",
+    "title": "Normalised Difference Chlorophyll Index - Red Edge, Red",
     "abstract": "Normalised Difference Chlorophyll Index - a derived index that correlates well with the existence of chlorophyll",
     "index_function": {
         "function": "datacube_ows.band_utils.sentinel2_ndci",
@@ -362,7 +362,7 @@
 
 style_s2_nbr = {
     "name": "nbr",
-    "title": "Normalised Burn Ratio",
+    "title": "Normalised Burn Ratio - NIR, SWIR",
     "abstract": "Normalised Burn Ratio - a derived index that that uses the differences in the way health green vegetation and burned vegetation reflect light to find burned area",
     "index_function": {
         "function": "datacube_ows.band_utils.norm_diff",