]> git.basschouten.com Git - openhab-addons.git/commitdiff
Fix smart water alert level. (#11734)
authorStewart Cossey <stewart.cossey@gmail.com>
Thu, 9 Dec 2021 11:35:29 +0000 (00:35 +1300)
committerGitHub <noreply@github.com>
Thu, 9 Dec 2021 11:35:29 +0000 (12:35 +0100)
Signed-off-by: Stewart Cossey <stewart.cossey@gmail.com>
bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/api/SmartWater.java

index 9d4b9c590d39c0515fb52b4eb4a1427f3cecedb3..4f09393fe64460cde22dc66774d57aeef7072813 100644 (file)
@@ -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";
             }