GeoMAD LS57 colour ramp and terria (#327)

digitalearthafrica · Oct 28, 2021 · 6650acf · 6650acf
1 parent 39f461d
commit 6650acf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 61 deletions.
diff --git a/services/ows_refactored/surface_reflectance/style_sr_cfg.py b/services/ows_refactored/surface_reflectance/style_sr_cfg.py
@@ -665,53 +665,6 @@
     "legend": {"width": 3.0, "height": 3.0},
 }
 
-
-style_sentinel_count = {
-    "name": "count",
-    "title": "Included observation count",
-    "abstract": "Count of observations included in geomedian/MAD calculations",
-    "index_function": {
-        "function": "datacube_ows.band_utils.single_band",
-        "mapped_bands": True,
-        "kwargs": {
-            "band": "count",
-        },
-    },
-    "needed_bands": ["count"],
-    "include_in_feature_info": False,
-    "color_ramp": [
-        {"value": 0, "color": "#666666", "alpha": 0},
-        {
-            # purely for legend display
-            # we should not get fractional
-            # values in this styles
-            "value": 0.2,
-            "color": "#890000",
-            "alpha": 1,
-        },
-        {"value": 20, "color": "#990000"},
-        {"value": 30, "color": "#E38400"},
-        {"value": 40, "color": "#E3DF00"},
-        {"value": 50, "color": "#A6E300"},
-        {"value": 60, "color": "#00E32D"},
-        {"value": 70, "color": "#00E3C8"},
-        {"value": 80, "color": "#0097E3"},
-        {"value": 90, "color": "#005FE3"},
-        {"value": 100, "color": "#000FE3"},
-        {"value": 110, "color": "#000EA9"},
-        {"value": 120, "color": "#5700E3"},
-    ],
-    "legend": {
-        "begin": "0",
-        "end": "120",
-        "decimal_places": 0,
-        "ticks_every": 20,
-        "tick_labels": {
-            "120": {"prefix": ">"},
-        },
-    },
-}
-
 style_gm_s2_count = {
     "name": "count",
     "title": "Clear observation count",
@@ -761,7 +714,7 @@
 style_gm_ls_count = {
     "name": "count",
     "title": "Clear observation count",
-    "abstract": "Count of observations included in geomedian/MAD calculations",
+    "abstract": "Count of observations included in Geomedian/MAD calculations",
     "index_function": {
         "function": "datacube_ows.band_utils.single_band",
         "mapped_bands": True,
@@ -772,6 +725,7 @@
     "needed_bands": ["count"],
     "include_in_feature_info": False,
     "color_ramp": [
+        # set transparency for no data (0 counts)
         {"value": 0, "color": "#666666", "alpha": 0},
         {
             # purely for legend display
@@ -781,25 +735,23 @@
             "color": "#890000",
             "alpha": 1,
         },
-        {"value": 5, "color": "#990000"},
-        {"value": 10, "color": "#E38400"},
-        {"value": 15, "color": "#E3DF00"},
-        {"value": 20, "color": "#A6E300"},
-        {"value": 25, "color": "#00E32D"},
-        {"value": 30, "color": "#00E3C8"},
-        {"value": 35, "color": "#0097E3"},
-        {"value": 40, "color": "#005FE3"},
-        {"value": 45, "color": "#000FE3"},
-        {"value": 50, "color": "#000EA9"},
-        {"value": 55, "color": "#5700E3"},
+        {"value": 5, "color": "#ffffd9"},
+        {"value": 10, "color": "#edf8b1"},
+        {"value": 15, "color": "#c7e9b4"},
+        {"value": 20, "color": "#7fcdbb"},
+        {"value": 25, "color": "#41b6c4"},
+        {"value": 30, "color": "#1d91c0"},
+        {"value": 35, "color": "#225ea8"},
+        {"value": 40, "color": "#0c2c84"},
     ],
     "legend": {
         "begin": "0",
-        "end": "55",
+        "end": "40",
         "decimal_places": 0,
         "ticks_every": 5,
         "tick_labels": {
-            "55": {"prefix": ">"},
+            "5": {"prefix": "<"},
+            "40": {"prefix": ">"},
         },
     },
 }

diff --git a/terria/africa-prod.json b/terria/africa-prod.json
@@ -164,6 +164,7 @@
                   "layers": "gm_ls8_annual",
                   "linkedWcsUrl": "https://ows.digitalearth.africa/",
                   "linkedWcsCoverage": "gm_ls8_annual",
+                  "timeFilterPropertyName": "data_available_for_dates",
                   "tileErrorHandlingOptions": {
                     "ignoreUnknownTileErrors": true,
                     "thresholdBeforeDisablingItem": 100000
@@ -181,6 +182,7 @@
                   "opacity": 1,
                   "layers": "gm_ls5_ls7_annual",
                   "linkedWcsUrl": "https://ows.digitalearth.africa/",
+                  "timeFilterPropertyName": "data_available_for_dates",
                   "linkedWcsCoverage": "gm_ls5_ls7_annual",
                   "tileErrorHandlingOptions": {
                     "ignoreUnknownTileErrors": true,
@@ -210,6 +212,7 @@
                   "layers": "gm_s2_semiannual",
                   "linkedWcsUrl": "https://ows.digitalearth.africa/",
                   "linkedWcsCoverage": "gm_s2_semiannual",
+                  "timeFilterPropertyName": "data_available_for_dates",
                   "tileErrorHandlingOptions": {
                     "ignoreUnknownTileErrors": true,
                     "thresholdBeforeDisablingItem": 100000