simplify onzoomend function

[chrisu/seepark.git] / owm.py

diff --git a/owm.py b/owm.py
index c57b2422b24550b012bd415458048e99357f2a6a..74fe6c48e2e0fdb30eaa8e3c4aa3a478d0543281 100755 (executable)
--- a/owm.py
+++ b/owm.py
@@ -6,6 +6,8 @@
 # cityid=..
 # 3319578 for Obsteig, AT
 
 # cityid=..
 # 3319578 for Obsteig, AT
 

+# needed packaes: python3-mysqldb python3-sqlalchemy
+

 from pprint import pprint
 import argparse
 import configparser
 from pprint import pprint
 import argparse
 import configparser


@@ -13,11 +15,16 @@ import os
 import csv
 import datetime
 import math
 import csv
 import datetime
 import math

+import json
+import warnings
+import sqlalchemy
+from sqlalchemy import create_engine
+import MySQLdb.cursors

 from seeparklib.openweathermap import openweathermap_json
 
 
 from seeparklib.openweathermap import openweathermap_json
 
 

-def fromtimestamp(timestamp, format):
-    return datetime.datetime.fromtimestamp(timestamp).strftime(format)
+def fromtimestamp(timestamp):
+    return datetime.datetime.fromtimestamp(timestamp)

 
 
 # https://stackoverflow.com/questions/7490660/converting-wind-direction-in-angles-to-text-words
 
 
 # https://stackoverflow.com/questions/7490660/converting-wind-direction-in-angles-to-text-words


@@ -31,26 +38,22 @@ def degToCompass(num):
 
 def extractweatherdata(w):
     data = dict(
 
 def extractweatherdata(w):
     data = dict(

-        datetime = w['dt'],
-        sunrise = w['sys']['sunrise'],
-        sunset = w['sys']['sunset'],
+        datetime = fromtimestamp(w['dt']),
+        sunrise = fromtimestamp(w['sys']['sunrise']),
+        sunset = fromtimestamp(w['sys']['sunset']),

         temp = w['main']['temp'],
         pressure = w['main']['pressure'],
         humidity = w['main']['humidity'],
         temp = w['main']['temp'],
         pressure = w['main']['pressure'],
         humidity = w['main']['humidity'],

-        visibility = w['visibility'],

         weather = w['weather'][0]['description'],
         sky = w['weather'][0]['main'],
         windspeed = w['wind']['speed'],
         cloudiness = w['clouds']['all'],
     )
 
         weather = w['weather'][0]['description'],
         sky = w['weather'][0]['main'],
         windspeed = w['wind']['speed'],
         cloudiness = w['clouds']['all'],
     )
 

-    data['sunrise_t'] = fromtimestamp(data['sunrise'], '%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['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['visibility'] = w.get('visibility', math.nan)

 
     return data
 
 
     return data
 


@@ -60,10 +63,10 @@ def write_csv(csv_file, weather_data):
     with open(csv_file, "a", newline="") as file:
         writer = csv.writer(file, dialect="excel", delimiter=';')
         writer.writerow([
     with open(csv_file, "a", newline="") as file:
         writer = csv.writer(file, dialect="excel", delimiter=';')
         writer.writerow([

-            weather_data['date'],
-            weather_data['time'],
-            weather_data['sunrise_t'],
-            weather_data['sunset_t'],
+            weather_data['datetime'].date(),
+            weather_data['datetime'].time(),
+            weather_data['sunrise'].time(),
+            weather_data['sunset'].time(),

             "{:.2f}".format(weather_data['temp']),
             "{:.2f} mm/h".format(weather_data['precipitation']),
             "{:.1f} km/h {}".format(weather_data['windspeed'], weather_data['winddirection']),
             "{:.2f}".format(weather_data['temp']),
             "{:.2f} mm/h".format(weather_data['precipitation']),
             "{:.1f} km/h {}".format(weather_data['windspeed'], weather_data['winddirection']),


@@ -72,6 +75,29 @@ def write_csv(csv_file, weather_data):
         ])
 
 
         ])
 
 

+def write_db(config, url, weather_json, weather_data):
+    user = config.get('database', 'user')
+    pwd = config.get('database','password')
+    host = config.get('database','hostname')
+    db = config.get('database','database')
+
+    engine = create_engine('mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db), echo=False)
+    conn = engine.connect()
+    row = dict(cityid=config.get('openweathermap', 'cityid'), url=url, result=json.dumps(weather_json))
+    row.update(weather_data)
+    for key, value in row.items():
+        if isinstance(value, float) and math.isnan(value):
+            row[key] = None
+    sql_columns = list(row.keys())
+    sql_values = list(row.values())
+    sql = 'insert ignore into openweathermap ({}) values ({})'.format(', '.join(sql_columns), ','.join(['%s'] * len(sql_columns)))
+    with warnings.catch_warnings():
+        # ignore _mysql_exceptions.Warning: Duplicate entry '3319578-2018-08-01 20:50:00' for key 'cityid_datetime'
+        warnings.simplefilter("ignore", category=MySQLdb.cursors.Warning)
+        conn.execute(sql, *sql_values)
+    conn.close()
+
+

 def main(configfile, debug):
     config = configparser.ConfigParser()
     config.read(configfile)
 def main(configfile, debug):
     config = configparser.ConfigParser()
     config.read(configfile)


@@ -79,18 +105,18 @@ def main(configfile, debug):
     cityid = config.get('openweathermap', 'cityid')
     csvfile = config.get("openweathermap", 'csvfilename')
 
     cityid = config.get('openweathermap', 'cityid')
     csvfile = config.get("openweathermap", 'csvfilename')
 

-    weather_raw = openweathermap_json(apikey, cityid)
+    url, weather_json = openweathermap_json(apikey, cityid)

     if debug:
     if debug:

-        pprint(weather_raw)
-    weather = extractweatherdata(weather_raw)
+        pprint(weather_json)
+    weather_data = extractweatherdata(weather_json)

     if debug:
     if debug:

-        pprint(weather)
+        pprint(weather_data)

 
 

-    # TODO:

     # write to db
     # write to db

+    write_db(config, url, weather_json, weather_data)

 
     # write to csv
 
     # write to csv

-    write_csv(os.path.expanduser(csvfile), weather)
+    write_csv(os.path.expanduser(csvfile), weather_data)

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':