Fix fmc on maps

dev/services/wms/inventory.json

@@ -1158,7 +1158,7 @@
             ],
             "styles_count": 1,
             "styles_list": [
-                "style_fmc"
+                "FMC_daily"
             ]
         },
         {
@@ -1168,7 +1168,7 @@
             ],
             "styles_count": 1,
             "styles_list": [
-                "style_fmc"
+                "FMC_mosaic"
             ]
         },
         {

dev/services/wms/ows_refactored/hazards/dea_fmc/ows_fmc_cfg.py

@@ -0,0 +1,15 @@
+layers = {
+    "title": "DEA Fuel Moisture Content",
+    "abstract": "Digital Earth Australia (DEA) Fuel Moisture Content (FMC)",
+    "layers": [
+        {
+            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_combined_cfg.ga_s2_fmc_layer",
+            "type": "python",
+        },
+        {
+            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_combined_cfg.ga_s2m_fmc_mosaic_layer",
+            "type": "python",
+        },
+
+    ],
+}

dev/services/wms/ows_refactored/hazards/dea_fmc/ows_fmc_combined_cfg.py

@@ -4,10 +4,35 @@
     "fmc": ["fmc"],
 }
 
-style_fmc = {
-    "name": "style_fmc",
-    "title": "Fuel Moisture Content",
-    "abstract": "the percentage of water in vegetation by weight",
+FMC_daily = {
+    "name": "FMC_daily",
+    "title": "DEA FMC Sentinel-2 (A, B & C)",
+    "abstract": "Fuel Moisture Content observations grouped by day of collection.",
+    "needed_bands": ["fmc"],
+
+    "index_function": {
+        "function": "datacube_ows.band_utils.single_band",
+        "kwargs": {"band": "fmc"}},
+    "color_ramp": [{"value": 0, "color": "#ca0020"},
+                   {"value": 75, "color": "#FFFFBA"},
+                   {"value": 150, "color": "#0571b0"}],
+    "pq_masks": [{"band": "land",
+                  "invert": True,
+                  "values": [0]}],
+    "legend": {
+        "title": "Fuel Moisture Content (Weight Percent)",
+        "begin": "0",
+        "end": "150",
+        "ticks": ["0", "50", "100", "150"],
+        "tick_labels": {
+            "default": {
+                "suffix": "%"}}}
+}
+
+FMC_mosaic = {
+    "name": "FMC_mosaic",
+    "title": "DEA FMC Sentinel-2 Most Recent Observation",
+    "abstract": "displays the most recently processed data for DEA FMC as a continental mosaic",
     "needed_bands": ["fmc"],
 
     "index_function": {
@@ -30,15 +55,17 @@
 }
 
 ga_s2_fmc_layer = {
-    "title": "DEA Fuel Moisture Content (Sentinel-2A, 2B & 2C)",
+    "title": "DEA FMC Sentinel-2 (A, B & C)",
     "name": "ga_s2_fmc_layer",
-    "abstract": """DEA Fuel Moisture Content (Sentinel-2A, 2B & 2C)
+    "abstract": """DEA FMC Sentinel-2 (A, B & C)
+
+This product calculates the Fuel Moisture Content (FMC) of vegetation which is the percentage of water mass relative to dry mass in living vegetation.
 
-This product is a remotely sensed proxy for FUel Mosture Content (FMC). Fuel moisture content (FMC) is a metric used to understand flammability and fire risk. It describes the water contained within the leaf material of plants and it changes seasonally and with climate variations. FMC is traditionally determined by collecting plant sample in the field and analysing them in a laboratory. DEA FMC is  based on satellite imagery. It provides consistent, continent wide information on fuel condition that can be used in combination with other information to understanding vegetation flammability and fire potential.
+Values range from 0–300%, representing, by weight percent, the amount of water in leaves compared to dry plant material. A value of 0% would indicate that there is no water content. A value of 100% indicates there is an equal weight of water and dry plant material. A value of 300% would mean there is approximately three times as much water as dry plant material. Values in the range of 0–150% are particularly relevant to fire behaviour analysis, as this range is strongly associated with changes in vegetation flammability and the likelihood of ignition.
 
-DEA FMC is presented as a weight percentage. This meas the value given represent the weight of water in leaf material relative to non-water mateial. Values range from 0 – 300, where 300 would mean there is three times as much water (by weight) than dry plant material.
+This product presents pixel-level FMC values for each corresponding Sentinel-2 (A, B and C) scene since July 2015.
 
-This product presents the calculated FMC values for each individual Sentinel-2 (A, B and C) satellite image on each individual day since 2015.
+For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-fuel-moisture-content/
 
 For service status information, see https://status.dea.ga.gov.au""",
     "multi_product": False,
@@ -51,7 +78,7 @@
     "image_processing": {
         "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
         "always_fetch_bands": [],
-        "manual_merge": True
+        "manual_merge": False
     },
     "flags": [{
         "band": "land",
@@ -60,21 +87,25 @@
         "ignore_info_flags": []
     }],
     "styling": {
-        "default_style": "style_fmc",
-        "styles": [style_fmc]
+        "default_style": "FMC_daily",
+        "styles": [FMC_daily]
     }
 }
 
 ga_s2m_fmc_mosaic_layer = {
-    "title": "DEA Fuel Moisture Content Most Recent Available Data Mosaic (Sentinel 2 a, b & c)",
+    "title": "DEA FMC Sentinel-2 Most Recent Observation",
     "name": "ga_s2m_fmc_mosaic",
-    "abstract": """DEA Fuel Moisture Content (Sentinel-2A, 2B & 2C) Most Recent Mosaic
+    "abstract": """DEA FMC Sentinel-2 (A, B & C) Most Recent Observation
 
-This product is a remotely sensed proxy for FUel Mosture Content (FMC). Fuel moisture content (FMC) is a metric used to understand flammability and fire risk. It describes the water contained within the leaf material of plants and it changes seasonally and with climate variations. FMC is traditionally determined by collecting plant sample in the field and analysing them in a laboratory. DEA FMC is  based on satellite imagery. It provides consistent, continent wide information on fuel condition that can be used in combination with other information to understanding vegetation flammability and fire potential.
+This product calculates the Fuel Moisture Content (FMC) of vegetation which is the percentage of water mass relative to dry mass in living vegetation.
 
-DEA FMC is presented as a weight percentage. This meas the value given represent the weight of water in leaf material relative to non-water mateial. Values range from 0 – 300, where 300 would mean there is three times as much water (by weight) than dry plant material.
+Values range from 0–300%, representing, by weight percent, the amount of water in leaves compared to dry plant material. A value of 0% would indicate that there is no water content. A value of 100% indicates there is an equal weight of water and dry plant material. A value of 300% would mean there is approximately three times as much water as dry plant material. Values in the range of 0–150% are particularly relevant to fire behaviour analysis, as this range is strongly associated with changes in vegetation flammability and the likelihood of ignition.
 
-This layer displays the most recently processed FMC observation from the Sentinel 2 satelites for every part of Australia.""",
+This product is a mosaic of the most recent available data from Sentinel-2 satellites (A, B and C) captured over the Australian continent. You can click on the map to view date of observation information for each pixel.
+
+For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-fuel-moisture-content/
+
+For service status information, see https://status.dea.ga.gov.au""",
     "multi_product": False,
     "product_name": "ga_s2_fmc_3_v1",
     "mosaic_date_func": {
@@ -86,7 +117,7 @@
         "function": "datacube_ows.ogc_utils.rolling_window_ndays",
         "pass_layer_cfg": True,
         "kwargs": {
-            "ndays": 6,
+            "ndays": 10,
         }
     },
     "bands": bands_fmc,
@@ -106,7 +137,7 @@
         "ignore_info_flags": []
     }],
     "styling": {
-        "default_style": "style_fmc",
-        "styles": [style_fmc]
+        "default_style": "FMC_mosaic",
+        "styles": [FMC_mosaic]
     }
 }

dev/services/wms/ows_refactored/hazards/ows_category_root_cfg.py

@@ -11,11 +11,7 @@
             "type": "python",
         },
         {
-            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_combined_cfg.ga_s2_fmc_layer",
-            "type": "python",
-        },
-        {
-            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_combined_cfg.ga_s2m_fmc_mosaic_layer",
+            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_cfg.layers",
             "type": "python",
         },
         {

prod/services/wms/ows_refactored/hazards/dea_fmc/ows_fmc_cfg.py

@@ -0,0 +1,15 @@
+layers = {
+    "title": "DEA Fuel Moisture Content",
+    "abstract": "Digital Earth Australia (DEA) Fuel Moisture Content (FMC)",
+    "layers": [
+        {
+            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_combined_cfg.ga_s2_fmc_layer",
+            "type": "python",
+        },
+        {
+            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_combined_cfg.ga_s2m_fmc_mosaic_layer",
+            "type": "python",
+        },
+
+    ],
+}

prod/services/wms/ows_refactored/hazards/dea_fmc/ows_fmc_combined_cfg.py

@@ -6,7 +6,7 @@
 
 FMC_daily = {
     "name": "FMC_daily",
-    "title": "DEA Fuel Moisture Content (Sentinel-2A, 2B & 2C)",
+    "title": "DEA FMC Sentinel-2 (A, B & C)",
     "abstract": "Fuel Moisture Content observations grouped by day of collection.",
     "needed_bands": ["fmc"],
 
@@ -55,15 +55,18 @@
 }
 
 ga_s2_fmc_layer = {
-    "title": "DEA Fuel Moisture Content (Sentinel-2A, 2B & 2C)",
+    "title": "DEA FMC Sentinel-2 (A, B & C)",
     "name": "ga_s2_fmc_layer",
-    "abstract": """DEA Fuel Moisture Content (Sentinel-2A, 2B & 2C)
+    "abstract": """DEA FMC Sentinel-2 (A, B & C)
 
 This product calculates the Fuel Moisture Content (FMC) of vegetation which is the percentage of water mass relative to dry mass in living vegetation.
-FMC is presented as a percentage, by weight, of the non-water plant material. Values range from 0 – 300%, where 300% would mean there is three times as much water (by weight) than dry plant material.
+
+Values range from 0–300%, representing, by weight percent, the amount of water in leaves compared to dry plant material. A value of 0% would indicate that there is no water content. A value of 100% indicates there is an equal weight of water and dry plant material. A value of 300% would mean there is approximately three times as much water as dry plant material. Values in the range of 0–150% are particularly relevant to fire behaviour analysis, as this range is strongly associated with changes in vegetation flammability and the likelihood of ignition.
 
 This product presents pixel-level FMC values for each corresponding Sentinel-2 (A, B and C) scene since July 2015.
 
+For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-fuel-moisture-content/
+
 For service status information, see https://status.dea.ga.gov.au""",
     "multi_product": False,
     "product_name": "ga_s2_fmc_3_v1",
@@ -75,7 +78,7 @@
     "image_processing": {
         "extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
         "always_fetch_bands": [],
-        "manual_merge": True
+        "manual_merge": False
     },
     "flags": [{
         "band": "land",
@@ -92,13 +95,16 @@
 ga_s2m_fmc_mosaic_layer = {
     "title": "DEA FMC Sentinel-2 Most Recent Observation",
     "name": "ga_s2m_fmc_mosaic",
-    "abstract": """DEA Fuel Moisture Content (Sentinel-2A, 2B & 2C) Most Recent Observation
+    "abstract": """DEA FMC Sentinel-2 (A, B & C) Most Recent Observation
 
 This product calculates the Fuel Moisture Content (FMC) of vegetation which is the percentage of water mass relative to dry mass in living vegetation.
-FMC is presented as a percentage, by weight, of the non-water plant material. Values range from 0 – 300%, where 300% would mean there is three times as much water (by weight) than dry plant material.
+
+Values range from 0–300%, representing, by weight percent, the amount of water in leaves compared to dry plant material. A value of 0% would indicate that there is no water content. A value of 100% indicates there is an equal weight of water and dry plant material. A value of 300% would mean there is approximately three times as much water as dry plant material. Values in the range of 0–150% are particularly relevant to fire behaviour analysis, as this range is strongly associated with changes in vegetation flammability and the likelihood of ignition.
 
 This product is a mosaic of the most recent available data from Sentinel-2 satellites (A, B and C) captured over the Australian continent. You can click on the map to view date of observation information for each pixel.
 
+For more information, see https://knowledge.dea.ga.gov.au/data/product/dea-fuel-moisture-content/
+
 For service status information, see https://status.dea.ga.gov.au""",
     "multi_product": False,
     "product_name": "ga_s2_fmc_3_v1",

prod/services/wms/ows_refactored/hazards/ows_category_root_cfg.py

@@ -7,11 +7,7 @@
             "type": "python",
         },
         {
-            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_combined_cfg.ga_s2_fmc_layer",
-            "type": "python",
-        },
-        {
-            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_combined_cfg.ga_s2m_fmc_mosaic_layer",
+            "include": "ows_refactored.hazards.dea_fmc.ows_fmc_cfg.layers",
             "type": "python",
         },
     ]