From: Stewart Cossey Date: Thu, 9 Dec 2021 11:35:29 +0000 (+1300) Subject: Fix smart water alert level. (#11734) X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=85929a1d3119f3d8edc18c2662030347cbd44156;p=openhab-addons.git Fix smart water alert level. (#11734) Signed-off-by: Stewart Cossey --- diff --git a/bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/api/SmartWater.java b/bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/api/SmartWater.java index 9d4b9c590d..4f09393fe6 100644 --- a/bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/api/SmartWater.java +++ b/bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/api/SmartWater.java @@ -36,7 +36,7 @@ public class SmartWater implements WaterWebService { private static final String REGION_WAIKATO = "/alert-levels/waikato-district-council"; private static final String REGION_WAIPA = "/alert-levels/waipa-district-council"; - private static final String PATTERN = "/assets/Alert-Level-Images/water-alert-([1-4]|no)-large.svg.*?"; + private static final String PATTERN = "/assets/Alert-Level-Images/(?:water-alert-([1-4]|no)-large|(save)-wai-logo).svg.*?"; private static final Pattern REGEX = Pattern.compile(PATTERN, Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL); @@ -66,8 +66,10 @@ public class SmartWater implements WaterWebService { while (matches.find()) { String level = matches.group(1); + final String altMsgs = matches.group(2); + logger.debug("Data Level {}", level); - if (level.equalsIgnoreCase("no")) { + if ("no".equalsIgnoreCase(level) || "save".equalsIgnoreCase(altMsgs)) { logger.debug("Convert Data Level to 0"); level = "0"; }