X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/09830d4750321b5596030c890134bf7037e4c16f..5ec23d237a6f87fe54a47f04c9a27fe157f59c40:/owm.py?ds=inline

diff --git a/owm.py b/owm.py
index f8d6ccb..27b9f08 100755
--- a/owm.py
+++ b/owm.py
@@ -40,7 +40,7 @@ def fromtimestamp(timestamp, format):
 
 # https://stackoverflow.com/questions/7490660/converting-wind-direction-in-angles-to-text-words
 def degToCompass(num):
-    if num is None:
+    if num is None or num is math.nan:
         return 'N/A'
     val=int((num/22.5)+.5)
     arr=["N","NNO","NO","ONO","O","OSO", "SO", "SSO","S","SSW","SW","WSW","W","WNW","NW","NNW"]
@@ -59,7 +59,6 @@ def extractweatherdata(w):
         weather = w['weather'][0]['description'],
         sky = w['weather'][0]['main'],
         windspeed = w['wind']['speed'],
-        winddegrees = w['wind']['deg'],
         cloudiness = w['clouds']['all'],
     )
 
@@ -67,6 +66,7 @@ def extractweatherdata(w):
     data['sunset_t'] = fromtimestamp(data['sunset'], '%H:%M:%S')
     data['date'] = fromtimestamp(data['datetime'], '%Y-%m-%d')
     data['time'] = fromtimestamp(data['datetime'], '%H:%M:%S')
+    data['winddegrees'] = w['wind']['deg'] if 'deg' in w['wind'] else math.nan
     data['winddirection'] = degToCompass(data['winddegrees'])
     data['precipitation'] = w['rain']['3h'] if 'rain' in w else math.nan