NINA alerts

@sodoku 👀 branch for testing new alerts

config.template

@@ -134,27 +134,33 @@ UseMeteoWxAPI = False
 # NOAA Hydrology unique identifiers, LID or USGS ID
 riverListDefault = 
 
-# EAS Alert Broadcast
+# NOAA EAS Alert Broadcast
 wxAlertBroadcastEnabled = False
 # EAS Alert Broadcast Channels
 wxAlertBroadcastCh = 2
 # Add extra location to the weather alert
 enableExtraLocationWx = False
 
-# Goverment IPAWS/CAP Alert Broadcast
+# Goverment Alert Broadcast defaults to FEMA IPAWS
 eAlertBroadcastEnabled = False
-# Goverment Emergency IPAWS/CAP Alert Broadcast Channels
+# Goverment Alert Broadcast Channels
 eAlertBroadcastCh = 2
+
+# FEMA Alert Broadcast Settings
 # Ignore any headline that includes the word Test
 ignoreFEMAtest = True
 # comma separated list of codes (e.g., SAME,FIPS,ZIP) trigger local alert.
 # find your SAME https://www.weather.gov/nwr/counties
 mySAME = 053029,053073
+
+# Use UK Alert Broadcast Data
 enableGBalerts = False
+
+# Use DE Alert Broadcast Data
 enableDEalerts = False
 # comma separated list of regional codes trigger local alert.
 # find your regional codet at https://www.xrepository.de/api/xrepository/urn:de:bund:destatis:bevoelkerungsstatistik:schluessel:rs_2021-07-31/download/Regionalschl_ssel_2021-07-31.json
-myRegionalKeys = 110000000000,120510000000
+myRegionalKeysDE = 110000000000,120510000000
 
 # Satalite Pass Prediction
 # Register for free API https://www.n2yo.com/login/

modules/globalalert.py

@@ -32,25 +32,17 @@ def get_nina_alerts():
     try:
         # get api.bund.dev alerts
         alerts = []
-
-        for regionalKey in myRegionalKeys:
-
-            url = (
-                "https://nina.api.proxy.bund.dev/api31/dashboard/" + regionalKey + ".json"
-            )
+        for regionalKey in myRegionalKeysDE:
+            url = ("https://nina.api.proxy.bund.dev/api31/dashboard/" + regionalKey + ".json")
             response = requests.get(url)
             data = response.json()
 
-
             for item in data:
                 title = item["i18nTitle"]["de"]
                 alerts.append(f"🚨 {title}")
-
-
         return "\n".join(alerts) if alerts else NO_ALERTS
-
     except Exception as e:
-        logger.warning("Error getting NINA alerts: " + str(e))
+        logger.warning("Error getting NINA DE alerts: " + str(e))
         return NO_ALERTS
 
 def get_wxUKgov():

modules/settings.py

@@ -244,7 +244,7 @@ try:
     enableDEalerts = config['location'].getboolean('enableDEalerts', False) # default False
     wxAlertsEnabled = config['location'].getboolean('NOAAalertsEnabled', True) # default True
     mySAME = config['location'].get('mySAME', '').split(',') # default empty
-    myRegionalKeys = config['location'].get('myRegionalKeys', '110000000000').split(',') # default city Berlin
+    myRegionalKeysDE = config['location'].get('myRegionalKeysDE', '110000000000').split(',') # default city Berlin
     forecastDuration = config['location'].getint('NOAAforecastDuration', 4) # NOAA forcast days
     numWxAlerts = config['location'].getint('NOAAalertCount', 2) # default 2 alerts
     enableExtraLocationWx = config['location'].getboolean('enableExtraLocationWx', False) # default False