From b9a296d312cb8113067eb5990593a1918cc95303 Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Wed, 19 Mar 2025 17:56:47 -0400
Subject: [PATCH] Improve filter phrases for warnings

---
 weather/alerts_filter.js | 9 ++++++---
 weather/defiance.js      | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/weather/alerts_filter.js b/weather/alerts_filter.js
index c20fcbb..928d3df 100644
--- a/weather/alerts_filter.js
+++ b/weather/alerts_filter.js
@@ -1,10 +1,13 @@
+const severeWarningEvents = ["Severe Thunderstorm Warning","Destructive Severe Thunderstorm Warning","Considerable Destructive Severe Thunderstorm Warning"]
+const tornadoWarningEvents = ["Tornado Warning","Radar Indicated Tornado Warning","Confirmed Tornado Warning","Tornado Emergency"]
+
 let alerts = msg.payload
 
 // Filter for Severe Thunderstorm Warnings
 
 let ts = alerts.filter(function(alert) {
     if (alert.raw.properties &&
-    (alert.raw.properties.event === "Severe Thunderstorm Warning" || alert.raw.properties.event === "Considerable Destructive Severe Thunderstorm Warning")) {
+    severeWarningEvents.includes(alert.raw.properties.event)) {
         return true
     }
 })
@@ -14,7 +17,7 @@ let ts = alerts.filter(function(alert) {
 
 let tstp = alerts.filter(function(alert) {
     if (alert.raw.properties &&
-    (alert.raw.properties.event === "Severe Thunderstorm Warning" || alert.raw.properties.event === "Considerable Destructive Severe Thunderstorm Warning") &&
+    severeWarningEvents.includes(alert.raw.properties.event) &&
     alert.raw.properties.parameters &&
     alert.raw.properties.parameters.tornadoDetection &&
     alert.raw.properties.parameters.tornadoDetection.length > 0) {
@@ -36,7 +39,7 @@ let cdst = alerts.filter(function(alert) {
 
 let tornado = alerts.filter(function(alert) {
     if (alert.raw.properties &&
-    (alert.raw.properties.event === "Tornado Warning" || alert.raw.properties.event === "Confirmed Tornado Warning")) {
+    tornadoWarningEvents.includes(alert.raw.properties.event)) {
         return true
     }
 })
diff --git a/weather/defiance.js b/weather/defiance.js
index 032fa1c..a753314 100644
--- a/weather/defiance.js
+++ b/weather/defiance.js
@@ -1,3 +1,6 @@
+const severeWarningEvents = ["Severe Thunderstorm Warning","Destructive Severe Thunderstorm Warning","Considerable Destructive Severe Thunderstorm Warning"]
+const tornadoWarningEvents = ["Tornado Warning","Radar Indicated Tornado Warning","Confirmed Tornado Warning","Tornado Emergency"]
+
 let alerts = msg.payload.features
 let tornado_possible = false
 let considerable_destructive = false
@@ -7,7 +10,7 @@ let confirmed = false
 
 let ts = alerts.filter(function(alert) {
     if (alert.properties &&
-    (alert.properties.event === "Severe Thunderstorm Warning" || alert.properties.event === "Considerable Destructive Severe Thunderstorm Warning")) {
+    severeWarningEvents.includes(alert.properties.event)) {
         return true
     }
 })
@@ -17,7 +20,7 @@ let ts = alerts.filter(function(alert) {
 
 let tstp = alerts.filter(function(alert) {
     if (alert.properties &&
-    (alert.properties.event === "Severe Thunderstorm Warning" || alert.properties.event === "Considerable Destructive Severe Thunderstorm Warning") &&
+    severeWarningEvents.includes(alert.properties.event) &&
     alert.properties.parameters &&
     alert.properties.parameters.tornadoDetection &&
     alert.properties.parameters.tornadoDetection.length > 0) {
@@ -47,7 +50,7 @@ if (cdst.length > 0) {
 
 let tornado = alerts.filter(function(alert) {
     if (alert.properties &&
-    (alert.properties.event === "Tornado Warning" || alert.properties.event === "Confirmed Tornado Warning")) {
+    tornadoWarningEvents.includes(alert.properties.event)) {
         return true
     }
 })