switch from 5 minutes to 10 minutes

[chrisu/seepark.git] / web / seepark_web.py

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 59e0c8b0264d8d0a0a9067afea2e2f9c1dc82e9c..d9c61c3a7a5a0d57acf0de7ada4c96b21b1096ba 100644 (file)
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -62,8 +62,9 @@ class OpenWeatherMap(db.Model):
 def calc_grouping_resolution(begin, end):
     """How many data points should be between the timestamps begin and end?"""
     # copied from munin/master/_bin/munin-cgi-graph.in
+    # except day: 300 -> 600
     resolutions = dict(
-        day   =   300,
+        day   =   600,
         week  =  1800,
         month =  7200,
         year  = 86400,
@@ -262,6 +263,18 @@ def openweathermap_city(version, cityid):
     return jsonify(result)
 
 
+@app.route('/api/<version>/currentairtemperature')
+def currentair(version):
+    value, timestamp = currentairtemperature(cityid)
+    return jsonify({"value": value, "timestamp": timestamp})
+
+
+@app.route('/api/<version>/currentwatertemperature')
+def currentwater(version):
+    value, timestamp = currentwatertemperature(mainsensor)
+    return jsonify({"value": value, "timestamp": timestamp})
+
+
 @app.route("/")
 def index():
     airvalue, airtime     = currentairtemperature(cityid)