Create API for openweathermap data.

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 7f39c15eec9e07140c827e93a5b9151e8198d540..4814d0fb22493f6381dfdbd79918aa31aaf3f66d 100644 (file)
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -61,6 +61,10 @@ class Sensors(db.Model):
     __tablename__ = 'sensors'
 
 
     __tablename__ = 'sensors'
 
 

+class OpenWeatherMap(db.Model):
+    __tablename__ = 'openweathermap'
+
+

 def select_sensordata(sensor_id, sensor_type, begin, end, mode):
     query = Sensors.query
     if sensor_id is not None:
 def select_sensordata(sensor_id, sensor_type, begin, end, mode):
     query = Sensors.query
     if sensor_id is not None:


@@ -96,6 +100,37 @@ def select_sensordata(sensor_id, sensor_type, begin, end, mode):
     return query.all()
 
 
     return query.all()
 
 

+def select_openweatherdata(cityid, begin, end, mode):
+    query = OpenWeatherMap.query.filter(OpenWeatherMap.cityid == cityid)
+    if begin is not None:
+        query = query.filter(OpenWeatherMap.datetime >= begin)
+    if end is not None:
+        query = query.filter(OpenWeatherMap.datetime <= end)
+    if mode == 'consolidated' and begin is None and end is None:
+        # copied from munin/master/_bin/munin-cgi-graph.in
+        # interval in seconds for data points
+        resolutions = dict(
+            day   =   300,
+            week  =  1800,
+            month =  7200,
+            year  = 86400,
+        )
+        duration = (end - begin).total_seconds()
+        day = 60 * 60 * 24
+        if duration < day:
+            resolution = resolutions['day']
+        elif duration < 7 * day:
+            resolution = resolutions['week']
+        elif duration < 31 * day:
+            resolution = resolutions['month']
+        else:
+            resolution = resolutions['year']
+        # TODO: filter out samples from 'result'
+        # something like 
+        # select to_seconds(datetime) DIV (60*60*24) as interval_id, min(datetime), max(datetime), min(temp), avg(temp), max(temp), count(temp) from openweathermap group by interval_id order by interval_id;
+    return query.all()
+
+

 def convert_to_c3(result):
     c3result = defaultdict(list)
     for row in result:
 def convert_to_c3(result):
     c3result = defaultdict(list)
     for row in result:


@@ -118,6 +153,19 @@ def sensordata(sensor_id=None, sensor_type=None):
     return result
 
 
     return result
 
 

+def openweathermapdata(cityid):
+    begin = request.args.get('begin', None, parse_datetime)
+    end = request.args.get('end', None, parse_datetime)
+    mode = request.args.get('mode', 'full')
+    format = request.args.get('format', 'default')
+
+    result = select_openweatherdata(cityid, begin, end, mode)
+
+    if format == 'c3':
+        return convert_to_c3(result)
+    return result
+
+

 def currentairtemperature(apikey, cityid):
     """Retruns the tuple temperature, datetime (as float, datetime) in case of success, otherwise None, None."""
     try:
 def currentairtemperature(apikey, cityid):
     """Retruns the tuple temperature, datetime (as float, datetime) in case of success, otherwise None, None."""
     try:


@@ -167,6 +215,20 @@ def sensortype(version, sensor_type):
     return jsonify(result)
 
 
     return jsonify(result)
 
 

+@app.route('/api/<version>/openweathermap/cities')
+def openweathermap_cities(version):
+    """List all city IDs found in the database"""
+    result = db.session.query(OpenWeatherMap.cityid).distinct().all()
+    return jsonify(result)
+
+
+@app.route('/api/<version>/openweathermap/city/<cityid>')
+def openweathermap_city(version, cityid):
+    """List all data found for a city"""
+    result = openweathermapdata(cityid=cityid)
+    return jsonify(result)
+
+

 @app.route('/data/', defaults={'timespan': 1})
 @app.route("/data/<int:timespan>", methods=['GET'])
 def data(timespan):
 @app.route('/data/', defaults={'timespan': 1})
 @app.route("/data/<int:timespan>", methods=['GET'])
 def data(timespan):