Merge lp:~martin-borho/ubuntu-weather-app/refactored-weather-api into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

changed internal data format, refactored weather api.

* changed internal data format
* refactored weather api, data provider can now be easier added/replaced
* changed displayed data in location tab, removed doubled temperature
* updated test data with new data format

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:81
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/25/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/24
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/24
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/17

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/25/rebuild

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

Good work, Martin!

review: Approve

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-07-20 16:52:37 +0000
+++ components/CurrentWeather.qml	2013-07-27 16:53:26 +0000
@@ -12,6 +12,7 @@
     property int currentTemp
     property int minTemp
     property int maxTemp
+    property bool showMaxTemp
     property string scale: (mainView.settings["units"] === "imperial") ? "F" : "C"
 
     width: parent.width
@@ -51,14 +52,15 @@
             id: column1
             width: units.gu(5)
             height: units.gu(5)
-            anchors.rightMargin: 0
+            anchors.rightMargin: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter
             anchors.right: tempCurrent.left
+            visible: showMaxTemp
 
             Label {
                 text: i18n.tr("Max.")
                 anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: FontUtils.sizeToPixels("x-small")
+                font.pixelSize: FontUtils.sizeToPixels("small")
                 horizontalAlignment: Text.AlignHCenter
             }
 
@@ -66,7 +68,7 @@
                 id: tempMax
                 text: maxTemp+"°"+currentWeather.scale
                 anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: FontUtils.sizeToPixels("medium")
+                font.pixelSize: FontUtils.sizeToPixels("large")
                 horizontalAlignment: Text.AlignHCenter
                 color: Theme.palette.normal.baseText
             }
@@ -83,6 +85,7 @@
             font.family: "Ubuntu"
             verticalAlignment: Text.AlignVCenter
             anchors.horizontalCenter: parent.horizontalCenter
+            anchors.horizontalCenterOffset: (showMaxTemp) ? 0 : -units.gu(4)
             anchors.verticalCenter: parent.verticalCenter
             font.pointSize: 52
             horizontalAlignment: Text.AlignHCenter
@@ -93,7 +96,7 @@
             id: column2
             width: units.gu(5)
             height: units.gu(5)
-            anchors.leftMargin: 0
+            anchors.leftMargin: (showMaxTemp) ? units.gu(2) : units.gu(4)
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: tempCurrent.right
 
@@ -101,7 +104,7 @@
                 text: i18n.tr("Min.")
                 horizontalAlignment: Text.AlignHCenter
                 anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: FontUtils.sizeToPixels("x-small")
+                font.pixelSize: FontUtils.sizeToPixels("small")
                 color: Theme.palette.normal.baseText
             }
 
@@ -110,7 +113,7 @@
                 text: minTemp+"°"+currentWeather.scale
                 horizontalAlignment: Text.AlignHCenter
                 anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: FontUtils.sizeToPixels("medium")
+                font.pixelSize: FontUtils.sizeToPixels("large")
                 color: Theme.palette.normal.baseText
             }
         }

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-07-22 21:41:32 +0000
+++ components/LocationTab.qml	2013-07-27 16:53:26 +0000
@@ -41,9 +41,8 @@
 
     Component.onCompleted: {
         var locData = mainView.locationsList[locationIndex],
-            currentData = locData.current.results,
             units = (mainView.settings.units === 'imperial') ? 'imperial' : 'metric',
-            dailyForecasts = locData.daily.results,
+            dailyForecasts = locData.data,
             dailyLength = dailyForecasts.length,
             todayForeCast = dailyForecasts[0];
 
@@ -55,9 +54,11 @@
             dayForecastModel.append({
                 dateRel: "",//Tomorrow",
                 date: formatTimestamp(dailyForecasts[x].timestamp, 'dddd, dd MMMM yyyy'),
-                temp: dailyForecasts[x][units].max,
-                tempMin: dailyForecasts[x][units].min,
-                tempMax: dailyForecasts[x][units].max,
+                temp: (dailyForecasts[x]["current"] === undefined) ? dailyForecasts[x][units].tempMax :
+                                            dailyForecasts[x]["current"][units].temp,
+                tempMin: dailyForecasts[x][units].tempMin,
+                tempMax: (dailyForecasts[x]["current"] !== undefined) ? dailyForecasts[x][units].tempMax :
+                                            null,
                 cond: dailyForecasts[x].condition.id,
                 condIcon: dailyForecasts[x].condition.icon
             });
@@ -84,7 +85,6 @@
             snapMode: ListView.SnapOneItem
             verticalLayoutDirection: ListView.TopToBottom
             flickableDirection: Flickable.VerticalFlick
-
             clip: true
 
             delegate: Item {
@@ -112,6 +112,7 @@
                         icon: condIcon
                         condition: cond
                         anchors.top: dateComponent.bottom
+                        showMaxTemp: (index === 0)
                     }
                 }
             }

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2013-07-10 19:53:11 +0000
+++ components/WeatherApi.js	2013-07-27 16:53:26 +0000
@@ -3,7 +3,7 @@
 *  Version of the response data format.
 *  Increase this number to force a refresh.
 */
-var RESPONSE_DATA_VERSION = 1;
+var RESPONSE_DATA_VERSION = 20130727;
 
 /**
 * Helper functions
@@ -22,10 +22,7 @@
     var _baseUrl = "http://api.openweathermap.org/data/2.5/";
     //
     function _buildSearchResult(request, data) {
-        var searchResult = {
-            locations: [],
-            request: request
-        }
+        var searchResult = { locations: [], request: request };
         if(data.cod === "200" && data.list) {
             data.list.forEach(function(r) {
                searchResult.locations.push({
@@ -44,17 +41,9 @@
         // TODO add snow or rain data
         var result = {
             timestamp: data.dt,
-            date: (data.date !== undefined) ? data.date : ((data.dt_txt !== undefined) ? data.dt_txt: null),
-            metric: {
-                temp:data.main.temp,
-                temp_min: data.main.temp_min,
-                temp_max: data.main.temp_max
-            },
-            imperial: {
-                temp: calcFahrenheit(data.main.temp),
-                temp_min: calcFahrenheit(data.main.temp_min),
-                temp_max: calcFahrenheit(data.main.temp_max)
-            },
+            date: Qt.formatDateTime(new Date(data.dt*1000), "yyyy-MM-dd hh:mm"),
+            metric: { temp:data.main.temp },
+            imperial: { temp: calcFahrenheit(data.main.temp) },
             humidity: data.main.humidity,
             pressure: data.main.pressure,
             wind_speed_kmh: data.wind.speed,
@@ -65,113 +54,113 @@
         if(data.id !== undefined) {
             result["service"] = "openweathermap";
             result["service_id"] =  data.id;
-
-        }
-        return result;
-    }
-    //
-    function _buildCurrentCondition(request, data) {
-        var currentResult = {
-            results: _buildDataPoint(data),
-            request: request
-        }
-        return currentResult;
-    }
-    //
-    function _buildForecast(request, data) {
-        var forecastResult = {
-            results: [],
-            request: request
-        }
-        data.list.forEach(function(f) {
-            forecastResult.results.push(_buildDataPoint(f));
-        });
-        return forecastResult;
-    }
-    //
-    function _buildDailyForecast(request, data) {
-        var forecastResult = {
-            results: [],
-            request: request
-        }
-        data.list.forEach(function(f) {
-            // TODO date_txt
-            forecastResult.results.push({
-                timestamp: f.dt,
-                metric: {
-                    day: f.temp.day,
-                    min: f.temp.min,
-                    max: f.temp.max,
-                    night: f.temp.night,
-                    eve: f.temp.eve,
-                    morn: f.temp.morn
-                },
-                imperial: {
-                    day: calcFahrenheit(f.temp.day),
-                    min: calcFahrenheit(f.temp.min),
-                    max: calcFahrenheit(f.temp.max),
-                    night: calcFahrenheit(f.temp.night),
-                    eve: calcFahrenheit(f.temp.eve),
-                    morn: calcFahrenheit(f.temp.morn)
-                },
-                pressure: f.pressure,
-                humidity: f.humidity,
-                condition: f.weather[0],
-                wind_speed: f.speed,
-                wind_deg: f.deg
-            });
-        });
-        return forecastResult;
+        }
+        return result;
+    }
+    //
+    function _buildDayFormat(date, data) {
+        var result = {
+            date: date,
+            timestamp: data.dt,
+            metric: {
+                tempMin: data.temp.min,
+                tempMax: data.temp.max
+            },
+            imperial: {
+                tempMin: calcFahrenheit(data.temp.min),
+                tempMax: calcFahrenheit(data.temp.max)
+            },
+            pressure: data.pressure,
+            humidity: data.humidity,
+            condition: data.weather[0],
+            wind_speed: data.speed,
+            wind_deg: data.deg,
+            hourly: []
+        }
+        return result;
+    }
+    //
+    function formatResult(data) {
+        var tmpResult = {},
+            result = [],
+            day=null,
+            today = Qt.formatDateTime(new Date(), "yyyy-MM-dd");
+        data["daily"]["list"].forEach(function(dayData) {
+            day = Qt.formatDateTime(new Date(dayData.dt*1000), "yyyy-MM-dd")
+            tmpResult[day] = _buildDayFormat(day, dayData);
+        })
+        tmpResult[today]["current"] = _buildDataPoint(data["current"]);
+        if(data["forecast"] !== undefined) {
+            data["forecast"]["list"].forEach(function(hourData) {
+                var date = new Date(hourData.dt*1000)
+                day = Qt.formatDateTime(date, "yyyy-MM-dd");
+                tmpResult[day]["hourly"].push(_buildDataPoint(hourData));
+            })
+        }
+        for(var d in tmpResult) {
+            result.push(tmpResult[d]);
+        }
+        return result;
     }
     //
     return {
         //
-        getSearchByNameRequest: function(params) {
-            var request = {
-                type: "search",
-                url: _baseUrl+"find?q="+encodeURIComponent(params.name)+"&units="+params.units,
-                formatter: _buildSearchResult
-            }
-            return request;
-        },
-        //
-        getSearchByPointRequest: function(params) {
-            var url = _baseUrl+"find?lat="+encodeURIComponent(params.coords.lat)
-                    +"&lon="+encodeURIComponent(params.coords.lon)+"&units="+params.units,
-                request = {
-                    type: "search",
-                    url: url,
-                    formatter: _buildSearchResult
+        search: function(mode, params, apiCaller, onSuccess, onError) {
+            var request,
+                retryHandler = (function(err) {
+                        console.log("search retry of "+err.request.url);
+                        apiCaller(request, searchResponseHandler, onError);
+                }),
+                searchResponseHandler = function(request, data) {
+                    onSuccess(_buildSearchResult(request, data));
                 };
-            return request;
-        },
-        //
-        getCurrentConditionRequest: function(params) {
-            var request = {
-                type: "current",
-                url: _baseUrl + "weather?id="+params.location.service_id+"&units="+params.units,
-                formatter: _buildCurrentCondition
-            }
-            return request;
-        },
-        //
-        getForecastRequest: function(params) {
-            var request = {
-                type: "forecast",
-                url: _baseUrl + "forecast?id="+params.location.service_id+"&units="+params.units,
-                formatter: _buildForecast
-            }
-            return request;
-        },
-        //
-        getDailyForecastRequest: function(params) {
-            var request = {
-                type: "daily",
-                url: _baseUrl + "forecast/daily?id="+params.location.service_id
-                     +"&cnt=10&units="+params.units,
-                formatter: _buildDailyForecast
-            }
-            return request;
+            if(mode === "point") {
+                request = { type: "search",
+                            url: _baseUrl+"find?lat="+encodeURIComponent(params.coords.lat)
+                                +"&lon="+encodeURIComponent(params.coords.lon)+"&units="+params.units}
+            } else {
+                request = { type: "search",
+                            url: _baseUrl+"find?q="+encodeURIComponent(params.name)+"&units="+params.units}
+            }
+            apiCaller(request, searchResponseHandler, retryHandler);
+        },
+        //
+        getData: function(params, apiCaller, onSuccess, onError) {
+            var handlerMap = {
+                current: { type: "current",
+                           url: _baseUrl + "weather?id="+params.location.service_id+"&units="+params.units},
+                daily: { type: "daily",
+                         url: _baseUrl + "forecast/daily?id="+params.location.service_id
+                                +"&cnt=10&units="+params.units},
+                forecast: { type: "forecast",
+                            url: _baseUrl + "forecast?id="+params.location.service_id+"&units="+params.units}},
+            response = {
+                location: params.location,
+                db: (params.db) ? params.db : null,
+                format: RESPONSE_DATA_VERSION
+            },
+            respData = {},
+            addDataToResponse = (function(request, data) {
+                var formattedResult;
+                respData[request.type] = data;
+                if(respData["current"] !== undefined
+                        //&& respData["forecast"] !== undefined
+                            && respData["daily"] !== undefined) {
+                    response["data"] = formatResult(respData)
+                    onSuccess(response);
+                }
+            }),
+            onErrorHandler = (function(err) {
+                onError(err);
+            }),
+            retryHandler = (function(err) {
+                console.log("retry of "+err.request.url);
+                var retryFunc = handlerMap[err.request.type];
+                apiCaller(retryFunc, addDataToResponse, onErrorHandler);
+            })
+            apiCaller(handlerMap.current, addDataToResponse, retryHandler);
+            //apiCaller(handlerMap.forecast, addDataToResponse, retryHandler);
+            apiCaller(handlerMap.daily, addDataToResponse, retryHandler);
         }
     }
 
@@ -200,8 +189,7 @@
                             //console.log(xmlHttp.responseText);
                             var json = JSON.parse(xmlHttp.responseText);
                             if(xmlHttp.status === 200) {
-                                var result = request.formatter(request,json);
-                                onSuccess(result);
+                                onSuccess(request,json);
                             } else {
                                 onError({
                                     msg: "wrong response http code, got "+xmlHttp.status,
@@ -218,72 +206,16 @@
     }
     //
     return  {
-        getForecast: function(params, onSuccess, onError) {
-            var request = _getService().getForecastRequest(params);
-            _sendRequest(request, onSuccess, onError);
-        },
-        //
-        getDailyForecast: function(params, onSuccess, onError) {
-            var request = _getService().getDailyForecastRequest(params);
-            _sendRequest(request, onSuccess, onError);
-        },
-        //
-        getCurrentCondition: function(params, onSuccess, onError) {
-            var request = _getService().getCurrentConditionRequest(params);
-            _sendRequest(request, onSuccess, onError);
-        },
-        //
-        searchLocationByName: function(params, onSuccess, onError) {
-            var request = _getService().getSearchByNameRequest(params);
-            _sendRequest(request, onSuccess, onError);
-        },
-        //
-        searchLocationByPoint: function(params, onSuccess, onError) {
-            var request = _getService().getSearchByPointRequest(params);
-            _sendRequest(request, onSuccess, onError);
-        },
-        //
-        search: function(mode, params, onSuccess, onError) {
-            var searchFunc = (mode === "point") ? this.searchLocationByPoint: this.searchLocationByName,
-                retryHandler = (function(err) {
-                    console.log("search retry of "+err.request.url);
-                    searchFunc(params, onSuccess, onError);
-            });
-            searchFunc(params, onSuccess, retryHandler);
+        //
+        search: function(mode, params, onSuccess, onError) {            
+            var service = _getService();
+            service.search(mode, params, _sendRequest, onSuccess, onError);
         },
         //
         getLocationData: function(params, onSuccess, onError) {
-            var retryMap = {
-                current:this.getCurrentCondition,
-                daily:this.getDailyForecast,
-                forecast:this.getForecast
-            },
-            response = {
-                location: params.location,
-                db: (params.db) ? params.db : null,
-                format: RESPONSE_DATA_VERSION
-            },
-            addDataToResponse = (function(data) {
-                response[data.request.type] = data;
-                if(response["current"] !== undefined
-                        //&& response["forecast"] !== undefined
-                            && response["daily"] !== undefined) {
-                    onSuccess(response);
-                }
-            }),
-            onErrorHandler = (function(err) {
-                onError(err);
-            }),
-            retryHandler = (function(err) {
-                console.log("retry of "+err.request.url);
-                var retryFunc = retryMap[err.request.type];
-                retryFunc(params, addDataToResponse, onErrorHandler);
-            })
-
-            this.getCurrentCondition(params, addDataToResponse, retryHandler);
-            //this.getForecast(params, addDataToResponse, retryHandler);
-            this.getDailyForecast(params, addDataToResponse, retryHandler);
-        }
+            var service = _getService();
+            service.getData(params, _sendRequest, onSuccess, onError);
+        },
     }
 })({
     "openweathermap": OpenWeatherMapApi

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-07-03 19:41:03 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-07-27 16:53:26 +0000
@@ -52,7 +52,7 @@
         # get the dates from the test data
         curr_dates = self.main_window.get_objects('Label','DayDateLabel')
         tab1_curr_date = curr_dates[0].text
-        tab2_curr_date = curr_dates[1].text
+        tab2_curr_date = curr_dates[2].text
 
         # refresh and wait till loading has finished
         self.main_window.click_toolbar_button("RefreshButton")
@@ -62,4 +62,4 @@
         # get the data from the refreshed tabs, have to be new
         refreshed_dates = self.main_window.get_objects('Label','DayDateLabel')
         self.assertNotEqual(tab1_curr_date, refreshed_dates[0].text)
-        self.assertNotEqual(tab2_curr_date, refreshed_dates[1].text)
+        self.assertNotEqual(tab2_curr_date, refreshed_dates[2].text)

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-07-20 11:39:51 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-07-27 16:53:26 +0000
@@ -39,11 +39,11 @@
         """Checks selected units by values from the first location tab"""
         current_temps = self.main_window.get_objects('QQuickText', 'CurrentTempText')
         if units == "imperial":
-            self.assertThat(current_temps[0].text, Eventually(Equals(u'69°F')))
-            self.assertThat(current_temps[1].text, Eventually(Equals(u'78°F')))
+            self.assertThat(current_temps[0].text, Eventually(Equals(u'76°F')))
+            self.assertThat(current_temps[2].text, Eventually(Equals(u'78°F')))
         else:
-            self.assertThat(current_temps[0].text, Eventually(Equals(u'21°C')))
-            self.assertThat(current_temps[1].text, Eventually(Equals(u'26°C')))
+            self.assertThat(current_temps[0].text, Eventually(Equals(u'25°C')))
+            self.assertThat(current_temps[2].text, Eventually(Equals(u'25°C')))
 
     def test_switch_scale(self):
         """Tests switching the scale in the settings"""

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/weatherdata.py'
--- tests/autopilot/ubuntu_weather_app/tests/weatherdata.py	2013-06-18 16:13:13 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/weatherdata.py	2013-07-27 16:53:26 +0000
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 locations_data = []
-locations_data.append( """{"daily":{"request":{"type":"daily","url":"http://api.openweathermap.org/data/2.5/forecast/daily?id=2643743&cnt=10&units=metric"},"results":[{"timestamp":1371556800,"pressure":1018.07,"metric":{"eve":18.45,"morn":20.61,"night":12.92,"max":20.61,"day":20.61,"min":12.92},"wind_speed":1.77,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":99,"humidity":77,"imperial":{"eve":65.21000000000001,"morn":69.098,"night":55.256,"max":69.098,"day":69.098,"min":55.256}},{"timestamp":1371643200,"pressure":1018.59,"metric":{"eve":19.63,"morn":14.05,"night":15.99,"max":20.92,"day":18.54,"min":14.05},"wind_speed":1.63,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":31,"humidity":97,"imperial":{"eve":67.334,"morn":57.290000000000006,"night":60.782,"max":69.656,"day":65.372,"min":57.290000000000006}},{"timestamp":1371729600,"pressure":1016.49,"metric":{"eve":18.31,"morn":16.07,"night":14.48,"max":19.64,"day":16.82,"min":14.48},"wind_speed":1.76,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":211,"humidity":92,"imperial":{"eve":64.958,"morn":60.926,"night":58.064,"max":67.352,"day":62.275999999999996,"min":58.064}},{"timestamp":1371816000,"pressure":1015.82,"metric":{"eve":18.09,"morn":13.73,"night":14.89,"max":18.65,"day":17.55,"min":13.73},"wind_speed":3.27,"condition":{"icon":"03d","description":"scattered clouds","id":802,"main":"Clouds"},"wind_deg":257,"humidity":78,"imperial":{"eve":64.562,"morn":56.714,"night":58.80200000000001,"max":65.57,"day":63.59,"min":56.714}},{"timestamp":1371902400,"pressure":1003.45,"metric":{"eve":13.5,"morn":12.02,"night":13.04,"max":13.98,"day":13.98,"min":12.02},"wind_speed":6.11,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":215,"humidity":84,"imperial":{"eve":56.3,"morn":53.635999999999996,"night":55.471999999999994,"max":57.164,"day":57.164,"min":53.635999999999996}},{"timestamp":1371988800,"pressure":1011.26,"metric":{"eve":13.66,"morn":12.54,"night":12.4,"max":15.18,"day":15.18,"min":12.4},"wind_speed":4.46,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":290,"humidity":82,"imperial":{"eve":56.588,"morn":54.572,"night":54.32,"max":59.324,"day":59.324,"min":54.32}},{"timestamp":1372075200,"pressure":1018.06,"metric":{"eve":14.96,"morn":11.73,"night":12.42,"max":14.96,"day":14.62,"min":11.73},"wind_speed":6.44,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":292,"humidity":0,"imperial":{"eve":58.928,"morn":53.114000000000004,"night":54.356,"max":58.928,"day":58.316,"min":53.114000000000004}},{"timestamp":1372161600,"pressure":1023.37,"metric":{"eve":15.08,"morn":12.04,"night":11.13,"max":15.8,"day":15.8,"min":11.13},"wind_speed":5.25,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":294,"humidity":0,"imperial":{"eve":59.144000000000005,"morn":53.672,"night":52.034000000000006,"max":60.44,"day":60.44,"min":52.034000000000006}},{"timestamp":1372248000,"pressure":1023.86,"metric":{"eve":14.99,"morn":11.59,"night":11.29,"max":15.91,"day":15.91,"min":11.29},"wind_speed":4.64,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":247,"humidity":0,"imperial":{"eve":58.982,"morn":52.862,"night":52.322,"max":60.638000000000005,"day":60.638000000000005,"min":52.322}},{"timestamp":1372334400,"pressure":1022.68,"metric":{"eve":14.6,"morn":11.33,"night":10.22,"max":15.73,"day":15.73,"min":10.22},"wind_speed":4.34,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":294,"humidity":0,"imperial":{"eve":58.28,"morn":52.394000000000005,"night":50.396,"max":60.314,"day":60.314,"min":50.396}}]},"format":1,"current":{"request":{"type":"current","url":"http://api.openweathermap.org/data/2.5/weather?id=2643743&units=metric"},"results":{"timestamp":1371568737,"pressure":1013,"service_id":2643743,"metric":{"temp_min":19,"temp":20.61,"temp_max":22.22},"date":null,"condition":{"icon":"03d","description":"scattered clouds","id":802,"main":"Clouds"},"wind_deg":98.5007,"humidity":80,"wind_speed_mph":1.0998249,"imperial":{"temp_min":66.2,"temp":69.098,"temp_max":71.99600000000001},"service":"openweathermap","wind_speed_kmh":1.77}},"location":{"service_id":2643743,"name":"London","country":"GB","service":"openweathermap"}}""")
-
-locations_data.append("""{"daily":{"request":{"type":"daily","url":"http://api.openweathermap.org/data/2.5/forecast/daily?id=2911298&cnt=10&units=metric"},"results":[{"timestamp":1371553200,"pressure":1026.02,"metric":{"eve":24.71,"morn":25.5,"night":18.12,"max":25.5,"day":25.5,"min":18.12},"wind_speed":2.52,"condition":{"icon":"01d","description":"sky is clear","id":800,"main":"Clear"},"wind_deg":89,"humidity":70,"imperial":{"eve":76.47800000000001,"morn":77.9,"night":64.616,"max":77.9,"day":77.9,"min":64.616}},{"timestamp":1371639600,"pressure":1023.37,"metric":{"eve":29.17,"morn":20.41,"night":22.73,"max":30.39,"day":29.24,"min":20.41},"wind_speed":5.28,"condition":{"icon":"02d","description":"few clouds","id":801,"main":"Clouds"},"wind_deg":147,"humidity":69,"imperial":{"eve":84.506,"morn":68.738,"night":72.914,"max":86.702,"day":84.632,"min":68.738}},{"timestamp":1371726000,"pressure":1015.84,"metric":{"eve":25.49,"morn":24.61,"night":19.26,"max":29.68,"day":26.55,"min":19.26},"wind_speed":4.91,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":197,"humidity":84,"imperial":{"eve":77.882,"morn":76.298,"night":66.668,"max":85.424,"day":79.78999999999999,"min":66.668}},{"timestamp":1371812400,"pressure":1016.63,"metric":{"eve":17.09,"morn":16.63,"night":14.89,"max":19.75,"day":19.75,"min":14.89},"wind_speed":6.37,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":217,"humidity":91,"imperial":{"eve":62.762,"morn":61.934,"night":58.80200000000001,"max":67.55000000000001,"day":67.55000000000001,"min":58.80200000000001}},{"timestamp":1371898800,"pressure":1017.64,"metric":{"eve":18.15,"morn":16.27,"night":14.89,"max":19.34,"day":18.23,"min":14.89},"wind_speed":5.96,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":197,"humidity":83,"imperial":{"eve":64.67,"morn":61.286,"night":58.80200000000001,"max":66.812,"day":64.814,"min":58.80200000000001}},{"timestamp":1371985200,"pressure":1011.58,"metric":{"eve":15.16,"morn":14.29,"night":14.3,"max":15.93,"day":15.43,"min":14.29},"wind_speed":7.46,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":211,"humidity":86,"imperial":{"eve":59.288,"morn":57.721999999999994,"night":57.74,"max":60.674,"day":59.774,"min":57.721999999999994}},{"timestamp":1372071600,"pressure":1021.31,"metric":{"eve":17.86,"morn":14.88,"night":13.72,"max":17.97,"day":17.97,"min":13.72},"wind_speed":4.75,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":205,"humidity":0,"imperial":{"eve":64.148,"morn":58.784000000000006,"night":56.696,"max":64.346,"day":64.346,"min":56.696}},{"timestamp":1372158000,"pressure":1026.21,"metric":{"eve":16.23,"morn":13.89,"night":12.53,"max":16.75,"day":16.75,"min":12.53},"wind_speed":3.7,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":277,"humidity":0,"imperial":{"eve":61.214,"morn":57.002,"night":54.554,"max":62.150000000000006,"day":62.150000000000006,"min":54.554}},{"timestamp":1372244400,"pressure":1028.72,"metric":{"eve":16.24,"morn":13.84,"night":12.09,"max":16.71,"day":16.71,"min":12.09},"wind_speed":5.86,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":249,"humidity":0,"imperial":{"eve":61.232,"morn":56.912,"night":53.762,"max":62.078,"day":62.078,"min":53.762}},{"timestamp":1372330800,"pressure":1024.91,"metric":{"eve":16.15,"morn":12.93,"night":10.44,"max":16.33,"day":16.33,"min":10.44},"wind_speed":3.21,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":271,"humidity":0,"imperial":{"eve":61.06999999999999,"morn":55.274,"night":50.792,"max":61.394,"day":61.394,"min":50.792}}]},"db":{"updated":"2013-06-18T16:03:34.203Z","id":2},"format":1,"current":{"request":{"type":"current","url":"http://api.openweathermap.org/data/2.5/weather?id=2911298&units=metric"},"results":{"timestamp":1371568800,"pressure":1016,"service_id":2911298,"metric":{"temp_min":25,"temp":25.5,"temp_max":26},"date":null,"condition":{"icon":"01d","description":"Sky is Clear","id":800,"main":"Clear"},"wind_deg":100,"humidity":53,"wind_speed_mph":2.8583019999999997,"imperial":{"temp_min":77,"temp":77.9,"temp_max":78.80000000000001},"service":"openweathermap","wind_speed_kmh":4.6}},"location":{"service_id":2911298,"name":"Hamburg","country":"DE","service":"openweathermap"}}""")
+
+locations_data.append("""{"location":{"service_id":2643743,"name":"London","country":"GB","service":"openweathermap"},"db":{"updated":"2013-07-27T16:06:14.606Z","id":1},"format":20130727,"data":[{"date":"2013-07-27","timestamp":1374926400,"metric":{"tempMin":15.55,"tempMax":24.5},"imperial":{"tempMin":59.99,"tempMax":76.1},"pressure":1009.81,"humidity":63,"condition":{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"},"wind_speed":3.3,"wind_deg":101,"hourly":[],"current":{"timestamp":1374940874,"date":"2013-07-27 18:01","metric":{"temp":24.5},"imperial":{"temp":76.1},"humidity":64,"pressure":1004,"wind_speed_kmh":6.2,"wind_speed_mph":3.852494,"wind_deg":110,"condition":{"id":520,"main":"Rain","description":"light intensity shower rain","icon":"09d"},"service":"openweathermap","service_id":2643743}},{"date":"2013-07-28","timestamp":1375012800,"metric":{"tempMin":14.7,"tempMax":19.86},"imperial":{"tempMin":58.46,"tempMax":67.74799999999999},"pressure":1013.76,"humidity":91,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":4.46,"wind_deg":213,"hourly":[]},{"date":"2013-07-29","timestamp":1375099200,"metric":{"tempMin":14.67,"tempMax":17.63},"imperial":{"tempMin":58.406,"tempMax":63.733999999999995},"pressure":1016.16,"humidity":95,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":4.73,"wind_deg":213,"hourly":[]},{"date":"2013-07-30","timestamp":1375185600,"metric":{"tempMin":14.29,"tempMax":19.79},"imperial":{"tempMin":57.721999999999994,"tempMax":67.622},"pressure":1023.8,"humidity":70,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":3.98,"wind_deg":252,"hourly":[]},{"date":"2013-07-31","timestamp":1375272000,"metric":{"tempMin":15.19,"tempMax":24.08},"imperial":{"tempMin":59.342,"tempMax":75.344},"pressure":1021.26,"humidity":69,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"wind_speed":4.3,"wind_deg":217,"hourly":[]},{"date":"2013-08-01","timestamp":1375358400,"metric":{"tempMin":19.05,"tempMax":28.47},"imperial":{"tempMin":66.28999999999999,"tempMax":83.24600000000001},"pressure":1018.91,"humidity":59,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"wind_speed":3.45,"wind_deg":176,"hourly":[]},{"date":"2013-08-02","timestamp":1375444800,"metric":{"tempMin":14.26,"tempMax":18.83},"imperial":{"tempMin":57.668,"tempMax":65.894},"pressure":1016.86,"humidity":0,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":7.11,"wind_deg":207,"hourly":[]},{"date":"2013-08-03","timestamp":1375531200,"metric":{"tempMin":13.28,"tempMax":20.37},"imperial":{"tempMin":55.903999999999996,"tempMax":68.666},"pressure":1024.05,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":3.05,"wind_deg":249,"hourly":[]},{"date":"2013-08-04","timestamp":1375617600,"metric":{"tempMin":14.07,"tempMax":21.59},"imperial":{"tempMin":57.326,"tempMax":70.862},"pressure":1020.85,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":3.55,"wind_deg":165,"hourly":[]},{"date":"2013-08-05","timestamp":1375704000,"metric":{"tempMin":13.76,"tempMax":19.47},"imperial":{"tempMin":56.768,"tempMax":67.04599999999999},"pressure":1014.62,"humidity":0,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":5.38,"wind_deg":196,"hourly":[]}],"save":true}""")
+
+locations_data.append( """{"location":{"coord":{"lon":10,"lat":53.549999},"service_id":2911298,"name":"Hamburg","country":"DE","service":"openweathermap"},"db":{"updated":"2013-07-27T16:06:14.628Z","id":2},"format":20130727,"data":[{"date":"2013-07-27","timestamp":1374922800,"metric":{"tempMin":16.77,"tempMax":25.3},"imperial":{"tempMin":62.186,"tempMax":77.53999999999999},"pressure":1018.72,"humidity":66,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":2.15,"wind_deg":102,"hourly":[],"current":{"timestamp":1374940200,"date":"2013-07-27 17:50","metric":{"temp":25.3},"imperial":{"temp":77.53999999999999},"humidity":94,"pressure":1009,"wind_speed_kmh":6.2,"wind_speed_mph":3.852494,"wind_deg":240,"condition":{"id":200,"main":"Thunderstorm","description":"thunderstorm with light rain","icon":"11d"},"service":"openweathermap","service_id":2911298}},{"date":"2013-07-28","timestamp":1375009200,"metric":{"tempMin":17.73,"tempMax":22.74},"imperial":{"tempMin":63.914,"tempMax":72.93199999999999},"pressure":1020.48,"humidity":87,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"wind_speed":6.21,"wind_deg":249,"hourly":[]},{"date":"2013-07-29","timestamp":1375095600,"metric":{"tempMin":15.53,"tempMax":23.35},"imperial":{"tempMin":59.954,"tempMax":74.03},"pressure":1024.02,"humidity":82,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":2.05,"wind_deg":172,"hourly":[]},{"date":"2013-07-30","timestamp":1375182000,"metric":{"tempMin":15.57,"tempMax":18.14},"imperial":{"tempMin":60.025999999999996,"tempMax":64.652},"pressure":1022.58,"humidity":95,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":7.5,"wind_deg":267,"hourly":[]},{"date":"2013-07-31","timestamp":1375268400,"metric":{"tempMin":15.09,"tempMax":23.08},"imperial":{"tempMin":59.162,"tempMax":73.544},"pressure":1028.48,"humidity":78,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"wind_speed":5,"wind_deg":258,"hourly":[]},{"date":"2013-08-01","timestamp":1375354800,"metric":{"tempMin":19.15,"tempMax":27.67},"imperial":{"tempMin":66.47,"tempMax":81.80600000000001},"pressure":1030.67,"humidity":73,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"wind_speed":0.85,"wind_deg":99,"hourly":[]},{"date":"2013-08-02","timestamp":1375441200,"metric":{"tempMin":13.19,"tempMax":18.78},"imperial":{"tempMin":55.742000000000004,"tempMax":65.804},"pressure":1022.53,"humidity":0,"condition":{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"},"wind_speed":6.02,"wind_deg":253,"hourly":[]},{"date":"2013-08-03","timestamp":1375527600,"metric":{"tempMin":14.58,"tempMax":21.82},"imperial":{"tempMin":58.244,"tempMax":71.27600000000001},"pressure":1027.5,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":3.21,"wind_deg":261,"hourly":[]},{"date":"2013-08-04","timestamp":1375614000,"metric":{"tempMin":12.47,"tempMax":19.72},"imperial":{"tempMin":54.446,"tempMax":67.49600000000001},"pressure":1027.54,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":2.71,"wind_deg":1,"hourly":[]},{"date":"2013-08-05","timestamp":1375700400,"metric":{"tempMin":13.23,"tempMax":21.94},"imperial":{"tempMin":55.814,"tempMax":71.492},"pressure":1023.33,"humidity":0,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"wind_speed":2.09,"wind_deg":94,"hourly":[]}],"save":true}""")
+
+