remove debug rest

[chrisu/seepark.git] / owm.py

diff --git a/owm.py b/owm.py
index f8d6ccbe065cdbc810fd40435e342ac5fce865b8..27b9f08ed51658b3346703c742584e7bbcd4cf5f 100755 (executable)
--- 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):
 
 # 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"]
         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'],
         weather = w['weather'][0]['description'],
         sky = w['weather'][0]['main'],
         windspeed = w['wind']['speed'],

-        winddegrees = w['wind']['deg'],

         cloudiness = w['clouds']['all'],
     )
 
         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['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
 
     data['winddirection'] = degToCompass(data['winddegrees'])
     data['precipitation'] = w['rain']['3h'] if 'rain' in w else math.nan