diff --git a/features/IBF-portal-user/dashboard-page/Use_timeline_section.feature b/features/IBF-portal-user/dashboard-page/Use_timeline_section.feature
index f933e172c4..54e38ce321 100644
--- 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
index c7ef5e348c..fd84699086 100644
--- a/interfaces/IBF-dashboard/src/assets/i18n/en.json
+++ b/interfaces/IBF-dashboard/src/assets/i18n/en.json
@@ -462,7 +462,7 @@
"floods": "
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) > 0.5.
Source link: https://www.globalfloods.eu/
Latest updated: September 2021
"
},
"MWI": {
- "floods": "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].
Source link: https://www.globalfloods.eu/
Latest updated: August 2022
"
+ "floods": "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].
Source link: https://www.globalfloods.eu/
Latest updated: August 2022
"
},
"PHL": {
"dengue": "Administrative divisions that reached alert threshold, in terms of number of potential cases.
See definition at: link to technical documentation",
@@ -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.
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.
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).
Source Link: https://www.globalfloods.eu/"
},
"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.
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.
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).
Source Link: https://www.globalfloods.eu/"
+ "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.
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.
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).
Source Link: https://www.globalfloods.eu/"
},
"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.
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.
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).
Source Link: https://www.globalfloods.eu/"
diff --git a/interfaces/IBF-dashboard/src/assets/i18n/layer-popup-info.xlsx b/interfaces/IBF-dashboard/src/assets/i18n/layer-popup-info.xlsx
index 5500d89f30..b4c852f6a7 100644
Binary files a/interfaces/IBF-dashboard/src/assets/i18n/layer-popup-info.xlsx and b/interfaces/IBF-dashboard/src/assets/i18n/layer-popup-info.xlsx differ
diff --git a/services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/coveragestore.xml b/services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/coveragestore.xml
new file mode 100644
index 0000000000..fb93baefcc
--- /dev/null
+++ b/services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/coveragestore.xml
@@ -0,0 +1,14 @@
+
+ CoverageStoreInfoImpl--650c962b:184c80e9977:-7ff3
+ flood_extent_6-day_MWI
+ flood_extent_6-day_MWI
+ GeoTIFF
+ true
+
+ WorkspaceInfoImpl-48cab08a:175ace47603:-7ffb
+
+ <__default>false
+ 2022-11-30 10:28:21.111 UTC
+ 2022-11-30 10:28:21.774 UTC
+ file:workspaces/ibf-system/ibf-pipeline/output/flood_extents/flood_extent_6-day_MWI.tif
+
\ No newline at end of file
diff --git a/services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/flood_extent_7-day_MWI/coverage.xml b/services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/flood_extent_6-day_MWI/coverage.xml
similarity index 75%
rename from services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/flood_extent_7-day_MWI/coverage.xml
rename to services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/flood_extent_6-day_MWI/coverage.xml
index f50ec22e2f..0dcf4666fd 100644
--- a/services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/flood_extent_7-day_MWI/coverage.xml
+++ b/services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/flood_extent_6-day_MWI/coverage.xml
@@ -1,14 +1,14 @@
- CoverageInfoImpl--7318a913:182910ebd85:-7fef
- flood_extent_7-day_MWI
- flood_extent_7-day_MWI
+ CoverageInfoImpl--650c962b:184c80e9977:-7ff1
+ flood_extent_6-day_MWI
+ flood_extent_6-day_MWI
NamespaceInfoImpl-48cab08a:175ace47603:-7ffa
- flood_extent_7-day_MWI
+ flood_extent_6-day_MWI
Generated from GeoTIFF
- flood_extent_7-day_MWI
+ flood_extent_6-day_MWI
WCS
GeoTIFF
@@ -23,17 +23,17 @@
AUTHORITY["EPSG","4326"]]
EPSG:4326
- 32.671249884
- 35.914583204
- -17.127083063
- -9.363749761
+ 32.66667675544794
+ 35.933346585956414
+ -17.13323337172775
+ -9.358236628272252
EPSG:4326
- 32.671249884
- 35.914583204
- -17.127083063
- -9.363749761
+ 32.66667675544794
+ 35.933346585956414
+ -17.13323337172775
+ -9.358236628272252
EPSG:4326
REPROJECT_TO_DECLARED
@@ -46,10 +46,10 @@
false
- flood_extent_7-day_MWI_flood_extent_7-day_MWI
+ flood_extent_6-day_MWI_flood_extent_6-day_MWI
- CoverageStoreInfoImpl--7318a913:182910ebd85:-7ff0
+ CoverageStoreInfoImpl--650c962b:184c80e9977:-7ff3
false
false
@@ -57,24 +57,24 @@
0 0
- 3892 9316
+ 392 933
- 8.333333299075039E-4
- -8.333333299699443E-4
+ 0.008333341404358359
+ -0.00833332984293194
0.0
0.0
- 32.67166655066495
- -9.364166427664985
+ 32.670843426150114
+ -9.362403293193717
EPSG:4326
+ GEOTIFF
GIF
PNG
JPEG
TIFF
- GEOTIFF
nearest neighbor
@@ -91,7 +91,7 @@
inf
- -3.4E38
+ -3.4028234663852886E38
REAL_32BITS
@@ -118,5 +118,5 @@
true
- flood_extent_7-day_MWI
+ flood_extent_6-day_MWI
\ No newline at end of file
diff --git a/services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/flood_extent_7-day_MWI/layer.xml b/services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/flood_extent_6-day_MWI/layer.xml
similarity index 56%
rename from services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/flood_extent_7-day_MWI/layer.xml
rename to services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/flood_extent_6-day_MWI/layer.xml
index a506c8e359..8f75800b34 100644
--- a/services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/flood_extent_7-day_MWI/layer.xml
+++ b/services/API-service/geoserver-volume/geoserver-layers/flood_extent_6-day_MWI/flood_extent_6-day_MWI/layer.xml
@@ -1,16 +1,16 @@
- flood_extent_7-day_MWI
- LayerInfoImpl--7318a913:182910ebd85:-7fee
+ flood_extent_6-day_MWI
+ LayerInfoImpl--650c962b:184c80e9977:-7ff0
RASTER
StyleInfoImpl-48cab08a:175ace47603:-7ff7
- CoverageInfoImpl--7318a913:182910ebd85:-7fef
+ CoverageInfoImpl--650c962b:184c80e9977:-7ff1
0
0
- 2022-08-12 09:34:29.380 UTC
+ 2022-11-30 10:28:37.326 UTC
\ No newline at end of file
diff --git a/services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/coveragestore.xml b/services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/coveragestore.xml
deleted file mode 100644
index ee8c3954c7..0000000000
--- a/services/API-service/geoserver-volume/geoserver-layers/flood_extent_7-day_MWI/coveragestore.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- CoverageStoreInfoImpl--7318a913:182910ebd85:-7ff0
- flood_extent_7-day_MWI
- flood_extent_7-day_MWI
- GeoTIFF
- true
-
- WorkspaceInfoImpl-48cab08a:175ace47603:-7ffb
-
- <__default>false
- 2022-08-12 09:34:11.11 UTC
- 2022-08-19 14:37:54.663 UTC
- file:workspaces/ibf-system/ibf-pipeline/output/flood_extents/flood_extent_7-day_MWI.tif
-
\ No newline at end of file
diff --git a/services/API-service/src/scripts/json/countries.json b/services/API-service/src/scripts/json/countries.json
index d26fa94247..f10a1b3793 100644
--- 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": {