fix: change leadtime to 6-day AB#16463

rodekruis · Nov 30, 2022 · 704b66d · 704b66d
1 parent 31c7b69
commit 704b66d
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 45 deletions.
diff --git a/features/IBF-portal-user/dashboard-page/Use_timeline_section.feature b/features/IBF-portal-user/dashboard-page/Use_timeline_section.feature
@@ -12,8 +12,10 @@ Scenario: View the timeline section with 1 active lead-time in NON-TRIGGERED mod
     And each button contains a mention of month, day and/or time depending on the disaster-type
     And it has one "enabled" and "selected" button, the only "active" lead-time and thus also the "selected" lead-time
     And it varies per country and disaster-type
+        - '3-days' from now for Philippines floods
         - '5-days' from now for Uganda floods
-        - '7-days' from now for Zambia and Ethiopia floods
+        - '6-days' from now for Malawi floods
+        - '7-days' from now for Zambia, Kenya, Ethiopia, South Sudan floods
         - 'Next April' for Zimbabwe droughts (see specific scenario below)
         - 'Calculated time until landfall' for Philippines typhoon (see specific scenario below)
     And because "active" it is in "enabled" mode, slightly darker colored and clickable
@@ -26,6 +28,7 @@ Scenario: View the timeline section with multiple active lead-times in NON-TRIGG
     And they vary per country and disaster-type
         - '3-days', '5-days' and '7-days' from now for Egypt heavy-rain
         - '0-month', '1-month', '2-month' from now for dengue, malaria
+        - Season- and region-based months for Kenya and Ethiopia droughts
     And it has exactly one "selected" button, the "selected lead time"
     And the "selected" lead-time is the most left / earliest of the "active lead times"
 

diff --git a/interfaces/IBF-dashboard/src/assets/i18n/en.json b/interfaces/IBF-dashboard/src/assets/i18n/en.json
@@ -462,7 +462,7 @@
           "floods": "<p>The layer shows each county triggered based on two parameters from the 7-days GLOFAS forecast on a daily basis: the return period of the forecasted flood and the probability of occurrence. The trigger will activate when GloFAS issues a forecast of at least 85% probability of occurrence of a 5 year return period flood within the next 7 days. The GLOFAS flood forecast triggers except in the wards where the False Alarm Ratio (RAR) &gt; 0.5.</p><p><strong>Source link</strong>: <a href='https://www.globalfloods.eu/'>https://www.globalfloods.eu/</a></p><p><strong>Latest updated:&nbsp;</strong>September 2021</p><p><br></p>"
         },
         "MWI": {
-          "floods": "<p>The layer shows each administrative area triggered based on two parameters from the 7-days GLOFAS forecast on a daily basis: the return period of the forecasted flood and the probability of occurrence. The trigger will activate when GloFAS issues a forecast of at least [percentage]% probability of occurrence of a [number of] year return period flood within the next 7 days. The GLOFAS flood forecast triggers except in the Traditional Authorities where the False Alarm Ratio (FAR) exceeds the predetermined maximum value which is [value].</p><p><br></p><p>Source link: <a href='https://www.globalfloods.eu/'>https://www.globalfloods.eu/</a>&nbsp;</p><p><br></p><p>Latest updated: August 2022</p>"
+          "floods": "<p>The layer shows each administrative area triggered based on two parameters from the 6-days GLOFAS forecast on a daily basis: the return period of the forecasted flood and the probability of occurrence. The trigger will activate when GloFAS issues a forecast of at least [percentage]% probability of occurrence of a [number of] year return period flood within the next 6 days. The GLOFAS flood forecast triggers except in the Traditional Authorities where the False Alarm Ratio (FAR) exceeds the predetermined maximum value which is [value].</p><p><br></p><p>Source link: <a href='https://www.globalfloods.eu/'>https://www.globalfloods.eu/</a>&nbsp;</p><p><br></p><p>Latest updated: August 2022</p>"
         },
         "PHL": {
           "dengue": "Administrative divisions that reached alert threshold, in terms of number of potential cases. <br /><br /> See definition at: <a href='https://rodekruis.sharepoint.com/sites/510-CRAVK-510/Gedeelde%20%20documenten/Forms/AllItems.aspx?id=%2Fsites%2F510%2DCRAVK%2D510%2FGedeelde%20%20documenten%2F%5BRD%5D%20Epidemics%20Priority%20Index%2FIBF%2Ddengue%2Fdocuments%2FIBF%5Fdengue%5Ftechnical%5Fnote%2Epdf&parent=%2Fsites%2F510%2DCRAVK%2D510%2FGedeelde%20%20documenten%2F%5BRD%5D%20Epidemics%20Priority%20Index%2FIBF%2Ddengue%2Fdocuments&p=true&originalPath=aHR0cHM6Ly9yb2Rla3J1aXMuc2hhcmVwb2ludC5jb20vc2l0ZXMvNTEwLUNSQVZLLTUxMC9fbGF5b3V0cy8xNS9ndWVzdGFjY2Vzcy5hc3B4P2RvY2lkPTBmOTI0OWIzNWRhNGQ0YzBhOTg1YjMzMzkzZmMzODhkZiZhdXRoa2V5PUFRU0xubmFmR0YtTTJ0MUNHSWcwaGRBJmV4cGlyYXRpb249MjAyMi0wNi0xNFQyMiUzYTAwJTNhMDAuMDAwWiZydGltZT1TS016R0dzeDJVZw'> link to technical documentation</a>",
@@ -610,7 +610,7 @@
           "floods": "This layer provides the location where the Global Flood Awareness System (GLoFAS) forecast is used for the trigger. This forecast is often used by the National Governmental Meteorological Services.<br /><br />GloFAS version 3.1 is a global integrated hydro-meteorological forecast- and monitoring system that delivers global ensemble river discharge forecasts (limited up to 5 days ahead in this layer) for the large river basins (greater than 1000 km2). The GloFAS 3.1 is based on the LISFLOOD hydrological model.<br /><br />Methodology presenting the GloFAS probability levels: Methodology presenting the GloFAS probability levels: The ECMWF-ENS meteorological forecast data contains a 51-member ensemble. The 60/70/80% trigger-threshold discharge levels are presented as 'trigger-alert' levels agreed on in the EAP. The probability is the percentage of the 51 ensemble members that predicts that the discharge is above the threshold. The administrative areas in the corresponding country are mapped to a specific GloFAS Station, and as such it is determined which areas are triggered when the station exceeds the trigger threshold value (for more informatie see the EAP).<br /><br />Source Link: <a href='https://www.globalfloods.eu/'>https://www.globalfloods.eu/</a>"
         },
         "MWI": {
-          "floods": "This layer provides the location where the Global Flood Awareness System (GLoFAS) forecast is used for the trigger. This forecast is often used by the National Governmental Meteorological Services.<br /><br />GloFAS version 3.1 is a global integrated hydro-meteorological forecast- and monitoring system that delivers global ensemble river discharge forecasts (limited up to 7 days ahead in this layer) for the large river basins (greater than 1000 km2). The GloFAS 3.1 is based on the LISFLOOD hydrological model.<br /><br />Methodology presenting the GloFAS probability levels: Methodology presenting the GloFAS probability levels: The ECMWF-ENS meteorological forecast data contains a 51-member ensemble. The [percentage]% trigger-threshold discharge levels are presented as 'trigger-alert' levels agreed on in the EAP. The probability is the percentage of the 51 ensemble members that predicts that the discharge is above the threshold. The administrative areas in the corresponding country are mapped to a specific GloFAS Station, and as such it is determined which areas are triggered when the station exceeds the trigger threshold value (for more informatie see the EAP).<br /><br />Source Link: <a href='https://www.globalfloods.eu/'>https://www.globalfloods.eu/</a>"
+          "floods": "This layer provides the location where the Global Flood Awareness System (GLoFAS) forecast is used for the trigger. This forecast is often used by the National Governmental Meteorological Services.<br /><br />GloFAS version 3.1 is a global integrated hydro-meteorological forecast- and monitoring system that delivers global ensemble river discharge forecasts (limited up to 6 days ahead in this layer) for the large river basins (greater than 1000 km2). The GloFAS 3.1 is based on the LISFLOOD hydrological model.<br /><br />Methodology presenting the GloFAS probability levels: Methodology presenting the GloFAS probability levels: The ECMWF-ENS meteorological forecast data contains a 51-member ensemble. The [percentage]% trigger-threshold discharge levels are presented as 'trigger-alert' levels agreed on in the EAP. The probability is the percentage of the 51 ensemble members that predicts that the discharge is above the threshold. The administrative areas in the corresponding country are mapped to a specific GloFAS Station, and as such it is determined which areas are triggered when the station exceeds the trigger threshold value (for more informatie see the EAP).<br /><br />Source Link: <a href='https://www.globalfloods.eu/'>https://www.globalfloods.eu/</a>"
         },
         "PHL": {
           "floods": "This layer provides the location where the Global Flood Awareness System (GLoFAS) forecast is used for the trigger. This forecast is often used by the National Governmental Meteorological Services.<br /><br />GloFAS version 3.1 is a global integrated hydro-meteorological forecast- and monitoring system that delivers global ensemble river discharge forecasts (limited up to 3 days ahead in this layer) for the large river basins. The GloFAS 3.1 is based on the LISFLOOD hydrological model.<br /><br />Methodology presenting the GloFAS probability levels: Methodology presenting the GloFAS probability levels: The ECMWF-ENS meteorological forecast data contains a 51-member ensemble. The 60/70/80% trigger-threshold discharge levels are presented as 'trigger-alert' levels agreed on in the EAP. The probability is the percentage of the 51 ensemble members that predicts that the discharge is above the threshold. The administrative areas in the corresponding country are mapped to a specific GloFAS Station, and as such it is determined which areas are triggered when the station exceeds the trigger threshold value (for more informatie see the EAP).<br /><br />Source Link: <a href='https://www.globalfloods.eu/'>https://www.globalfloods.eu/</a>"

diff --git a/interfaces/IBF-dashboard/src/assets/i18n/layer-popup-info.xlsx b/interfaces/IBF-dashboard/src/assets/i18n/layer-popup-info.xlsx
diff --git a/...es/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/coveragestore.xml b/...es/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/coveragestore.xml
@@ -0,0 +1,14 @@
+<coverageStore>
+  <id>CoverageStoreInfoImpl--650c962b:184c80e9977:-7ff3</id>
+  <name>flood_extent_6-day_MWI</name>
+  <description>flood_extent_6-day_MWI</description>
+  <type>GeoTIFF</type>
+  <enabled>true</enabled>
+  <workspace>
+    <id>WorkspaceInfoImpl-48cab08a:175ace47603:-7ffb</id>
+  </workspace>
+  <__default>false</__default>
+  <dateCreated>2022-11-30 10:28:21.111 UTC</dateCreated>
+  <dateModified>2022-11-30 10:28:21.774 UTC</dateModified>
+  <url>file:workspaces/ibf-system/ibf-pipeline/output/flood_extents/flood_extent_6-day_MWI.tif</url>
+</coverageStore>
diff --git a/...y_MWI/flood_extent_7-day_MWI/coverage.xml → ...y_MWI/flood_extent_6-day_MWI/coverage.xml b/...y_MWI/flood_extent_7-day_MWI/coverage.xml → ...y_MWI/flood_extent_6-day_MWI/coverage.xml
@@ -1,14 +1,14 @@
 <coverage>
-  <id>CoverageInfoImpl--7318a913:182910ebd85:-7fef</id>
-  <name>flood_extent_7-day_MWI</name>
-  <nativeName>flood_extent_7-day_MWI</nativeName>
+  <id>CoverageInfoImpl--650c962b:184c80e9977:-7ff1</id>
+  <name>flood_extent_6-day_MWI</name>
+  <nativeName>flood_extent_6-day_MWI</nativeName>
   <namespace>
     <id>NamespaceInfoImpl-48cab08a:175ace47603:-7ffa</id>
   </namespace>
-  <title>flood_extent_7-day_MWI</title>
+  <title>flood_extent_6-day_MWI</title>
   <description>Generated from GeoTIFF</description>
   <keywords>
-    <string>flood_extent_7-day_MWI</string>
+    <string>flood_extent_6-day_MWI</string>
     <string>WCS</string>
     <string>GeoTIFF</string>
   </keywords>
@@ -23,17 +23,17 @@
   AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]</nativeCRS>
   <srs>EPSG:4326</srs>
   <nativeBoundingBox>
-    <minx>32.671249884</minx>
-    <maxx>35.914583204</maxx>
-    <miny>-17.127083063</miny>
-    <maxy>-9.363749761</maxy>
+    <minx>32.66667675544794</minx>
+    <maxx>35.933346585956414</maxx>
+    <miny>-17.13323337172775</miny>
+    <maxy>-9.358236628272252</maxy>
     <crs>EPSG:4326</crs>
   </nativeBoundingBox>
   <latLonBoundingBox>
-    <minx>32.671249884</minx>
-    <maxx>35.914583204</maxx>
-    <miny>-17.127083063</miny>
-    <maxy>-9.363749761</maxy>
+    <minx>32.66667675544794</minx>
+    <maxx>35.933346585956414</maxx>
+    <miny>-17.13323337172775</miny>
+    <maxy>-9.358236628272252</maxy>
     <crs>EPSG:4326</crs>
   </latLonBoundingBox>
   <projectionPolicy>REPROJECT_TO_DECLARED</projectionPolicy>
@@ -46,35 +46,35 @@
       </directDownloadSettings>
     </entry>
     <entry key="cachingEnabled">false</entry>
-    <entry key="dirName">flood_extent_7-day_MWI_flood_extent_7-day_MWI</entry>
+    <entry key="dirName">flood_extent_6-day_MWI_flood_extent_6-day_MWI</entry>
   </metadata>
   <store class="coverageStore">
-    <id>CoverageStoreInfoImpl--7318a913:182910ebd85:-7ff0</id>
+    <id>CoverageStoreInfoImpl--650c962b:184c80e9977:-7ff3</id>
   </store>
   <serviceConfiguration>false</serviceConfiguration>
   <simpleConversionEnabled>false</simpleConversionEnabled>
   <nativeFormat>GeoTIFF</nativeFormat>
   <grid dimension="2">
     <range>
       <low>0 0</low>
-      <high>3892 9316</high>
+      <high>392 933</high>
     </range>
     <transform>
-      <scaleX>8.333333299075039E-4</scaleX>
-      <scaleY>-8.333333299699443E-4</scaleY>
+      <scaleX>0.008333341404358359</scaleX>
+      <scaleY>-0.00833332984293194</scaleY>
       <shearX>0.0</shearX>
       <shearY>0.0</shearY>
-      <translateX>32.67166655066495</translateX>
-      <translateY>-9.364166427664985</translateY>
+      <translateX>32.670843426150114</translateX>
+      <translateY>-9.362403293193717</translateY>
     </transform>
     <crs>EPSG:4326</crs>
   </grid>
   <supportedFormats>
+    <string>GEOTIFF</string>
     <string>GIF</string>
     <string>PNG</string>
     <string>JPEG</string>
     <string>TIFF</string>
-    <string>GEOTIFF</string>
   </supportedFormats>
   <interpolationMethods>
     <string>nearest neighbor</string>
@@ -91,7 +91,7 @@
         <max>inf</max>
       </range>
       <nullValues>
-        <double>-3.4E38</double>
+        <double>-3.4028234663852886E38</double>
       </nullValues>
       <dimensionType>
         <name>REAL_32BITS</name>
@@ -118,5 +118,5 @@
       <boolean>true</boolean>
     </entry>
   </parameters>
-  <nativeCoverageName>flood_extent_7-day_MWI</nativeCoverageName>
+  <nativeCoverageName>flood_extent_6-day_MWI</nativeCoverageName>
 </coverage>
diff --git a/...-day_MWI/flood_extent_7-day_MWI/layer.xml → ...-day_MWI/flood_extent_6-day_MWI/layer.xml b/...-day_MWI/flood_extent_7-day_MWI/layer.xml → ...-day_MWI/flood_extent_6-day_MWI/layer.xml
@@ -1,16 +1,16 @@
 <layer>
-  <name>flood_extent_7-day_MWI</name>
-  <id>LayerInfoImpl--7318a913:182910ebd85:-7fee</id>
+  <name>flood_extent_6-day_MWI</name>
+  <id>LayerInfoImpl--650c962b:184c80e9977:-7ff0</id>
   <type>RASTER</type>
   <defaultStyle>
     <id>StyleInfoImpl-48cab08a:175ace47603:-7ff7</id>
   </defaultStyle>
   <resource class="coverage">
-    <id>CoverageInfoImpl--7318a913:182910ebd85:-7fef</id>
+    <id>CoverageInfoImpl--650c962b:184c80e9977:-7ff1</id>
   </resource>
   <attribution>
     <logoWidth>0</logoWidth>
     <logoHeight>0</logoHeight>
   </attribution>
-  <dateCreated>2022-08-12 09:34:29.380 UTC</dateCreated>
+  <dateCreated>2022-11-30 10:28:37.326 UTC</dateCreated>
 </layer>
diff --git a/...es/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/coveragestore.xml b/...es/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/coveragestore.xml
diff --git a/services/API-service/src/scripts/json/countries.json b/services/API-service/src/scripts/json/countries.json
@@ -176,7 +176,7 @@
         "disasterType": "floods",
         "adminLevels": [1, 2, 3],
         "defaultAdminLevel": 3,
-        "activeLeadTimes": ["7-day"],
+        "activeLeadTimes": ["6-day"],
         "eapLink": "https://rodekruis.sharepoint.com/sites/510-CRAVK-510/_layouts/15/guestaccess.aspx?docid=035b1d36a17c94db1855152253a141227&authkey=AePN7DrtvirE98a6YfPlDLM&expiration=2023-08-09T22%3A00%3A00.000Z&e=6YZPE0",
         "eapAlertClasses": {
           "no": {