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

[Martin Borho]

own icon codes added, ActivityIndicator is shown while searching for location, notification when http calls are failing

* added ActivityIndicator for location search
* showing a notification when http calls are failing
* using own icon-codes in weather data
* added assertions to detect when network connection is missing

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

PASSED: Continuous integration, rev:88
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/31/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/23

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

review: Approve (continuous-integration)

[lp:~martin-borho/ubuntu-weather-app/icon_codes]

89. By Martin Borho on 2013-08-10

autopilot: added assertions to detect when network connection is missing

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

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

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Going to try this out -- is this ready to merge?

[Nicholas Skaggs (nskaggs)]

review: Approve

[Nicholas Skaggs (nskaggs)]

Martin, I'll wait for you on this.. Can we bump all the timeout's to like 2 mins? Look at where it's failing in the smoke tests and bump those timeouts to 2 mins just in case there's SOME odd reason the lab device is running really really slow.

[lp:~martin-borho/ubuntu-weather-app/icon_codes]

90. By Martin Borho on 2013-08-12

autopilot: increased timeouts to 120 secs

[Martin Borho (martin-borho)]

Nicholas, the timeouts now 120 seconds!

=== modified file 'components/AddLocationSheet.qml'
--- components/AddLocationSheet.qml	2013-08-02 22:35:44 +0000
+++ components/AddLocationSheet.qml	2013-08-12 18:18:29 +0000
@@ -34,26 +34,24 @@
             id: searchWorker
             source: "./WeatherApi.js"
             onMessage: {
+                searching.running = false;
                 if(!messageObject.error) {
                     listView.visible = true
                     messageObject.result.locations.forEach(function(loc) {
                         citiesModel.append(loc);
                         noCityError.visible = false
                     });
+                    if (!citiesModel.count) {
+                        noCityError.visible = true
+                        noCityError.text = i18n.tr("No location was found for ") + locationString.text
+                    }
                 } else {
                     console.log(messageObject.error.msg+" / "+messageObject.error.request.url)
-                }
-                if (!citiesModel.count) {
-                    noCityError.visible = true
-                    noCityError.text = i18n.tr("No location was found for ") + locationString.text
+                    httpFailedDialog.show();
                 }
             }
         }
 
-        Component.onCompleted: {
-
-        }
-
         function clear() {
             locationString.text = '';
             citiesModel.clear();
@@ -81,6 +79,7 @@
                     hasClearButton: true
                     onAccepted: {
                         citiesModel.clear();
+                        searching.running = true;
                         searchWorker.sendMessage({
                             action: "searchByName",
                             params: {name:locationString.text, units:"metric"}
@@ -116,11 +115,8 @@
                         progression: true;
                         onClicked: {
                             var location = citiesModel.get(index)
-                            //locationManager.addLocation(location)
-                            //mainView.newLocationAdded(location)
                             locationManagerSheet.addLocation(location)
                             PopupUtils.close(addLocationSheet)
-                            //pageStack.pop()
                             clear()
                         }
                     }
@@ -129,6 +125,12 @@
                         align: Qt.AlignTrailing;
                     }
                 }
+                ActivityIndicator{
+                    id:searching
+                    objectName: "SearchingSpinner"
+                    running: false
+                    anchors.centerIn: parent
+                }
             }
         }
     }
 
=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-08-05 18:53:33 +0000
+++ components/LocationTab.qml	2013-08-12 18:18:29 +0000
@@ -81,7 +81,7 @@
                 tempMax: (dailyForecasts[x]["current"] !== undefined) ? dailyForecasts[x][units].tempMax :
                                             null,
                 cond: dailyForecasts[x].condition.id,
-                condIcon: dailyForecasts[x].condition.icon,
+                condIcon: dailyForecasts[x].icon,
                 wind_speed: dailyForecasts[x][units].windSpeed,
                 wind_dir: direction,
                 humid: dailyForecasts[x].humidity,
 
=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2013-08-05 18:53:33 +0000
+++ components/WeatherApi.js	2013-08-12 18:18:29 +0000
@@ -3,7 +3,7 @@
 *  Version of the response data format.
 *  Increase this number to force a refresh.
 */
-var RESPONSE_DATA_VERSION = 20130801;
+var RESPONSE_DATA_VERSION = 20130808;
 
 /**
 * Helper functions
@@ -21,12 +21,35 @@
     return ms*3.6;
 }
 
+
+
 var OpenWeatherMapApi = (function() {
     /**
       provides neccessary methods for requesting and preparing data from OpenWeatherMap.org
     */
     var _baseUrl = "http://api.openweathermap.org/data/2.5/";
     //
+    var _icon_map = {
+        "01d": "clear_day",
+        "01n": "clear_night",
+        "02d": "few_clouds_day",
+        "02n": "few_clouds_night",
+        "03d": "scattered_clouds_day",
+        "03n": "scattered_clouds_night",
+        "04d": "broken_clouds_day",
+        "04n": "broken_clouds_night",
+        "09d": "shower_rain_day",
+        "09n": "shower_rain_night",
+        "10d": "rain_day",
+        "10n": "rain_night",
+        "11d": "thunderstorm_day",
+        "11n": "thunderstorm_night",
+        "13d": "snow_day",
+        "13n": "snow_night",
+        "50d": "mist_day",
+        "50n": "mist_night"
+    }
+    //
     function _buildSearchResult(request, data) {
         var searchResult = { locations: [], request: request };
         if(data.cod === "200" && data.list) {
@@ -53,6 +76,7 @@
             humidity: data.main.humidity,
             pressure: data.main.pressure,
             windDeg: data.main.deg,
+            icon: _icon_map[data.weather[0].icon],
             condition: data.weather[0]
         };
         if(data.id !== undefined) {
@@ -80,6 +104,7 @@
             },
             pressure: data.pressure,
             humidity: data.humidity,
+            icon: _icon_map[data.weather[0].icon],
             condition: data.weather[0],
             windDeg: data.deg,
             hourly: []
 
=== modified file 'components/WeatherConditionIconComponent.qml'
--- components/WeatherConditionIconComponent.qml	2013-06-14 15:34:09 +0000
+++ components/WeatherConditionIconComponent.qml	2013-08-12 18:18:29 +0000
@@ -19,9 +19,6 @@
     property bool __fog: false
 
     onConditionChanged: {
-        // hotfix for inaccurate api data
-        // see http://bugs.openweathermap.org/issues/72
-        if(condition === "10") condition ="10d"
         weatherCondition.state = condition
     }
 
@@ -575,7 +572,7 @@
 
     states: [
         State {
-            name: "01d"
+            name: "clear_day"
             StateChangeScript {
                 script: {
                     if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start();
@@ -590,7 +587,7 @@
             }
         },
         State {
-            name: "01n"
+            name: "clear_night"
             StateChangeScript {
                 script: {
                     if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start();
@@ -605,7 +602,7 @@
             }
         },
         State {
-            name: "02d"
+            name: "few_clouds_day"
             StateChangeScript {
                 script: {
                     if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start();
@@ -620,7 +617,7 @@
             }
         },
         State {
-            name: "02n"
+            name: "few_clouds_night"
             StateChangeScript {
                 script: {
                     if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start();
@@ -640,195 +637,195 @@
             }
         },
         State {
-            name: "03d"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__rain) anim_rainOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__broken) anim_brokenCloudsOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__scattered) anim_scatCloudsIn.start();
-                }
-            }
-        },
-        State {
-            name: "03n"
-            StateChangeScript {
-                script: {
-                    if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__rain) anim_rainOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__broken) anim_brokenCloudsOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__scattered) anim_scatCloudsIn.start();
-                }
-            }
-        },
-        State {
-            name: "04d"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moonOut.start();
-                    if(__sun) anim_sunOut.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__scattered) anim_scatCloudsOut.start();
-                    if(__rain) anim_rainOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__broken) anim_brokenCloudsIn.start();
-                }
-            }
-        },
-        State {
-            name: "04n"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moonOut.start();
-                    if(__sun) anim_sunOut.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__scattered) anim_scatCloudsOut.start();
-                    if(__rain) anim_rainOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__broken) anim_brokenCloudsIn.start();
-                }
-            }
-        },
-        State {
-            name: "09d"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moonOut.start();
-                    if(__sun) anim_sunOut.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__scattered) anim_scatCloudsOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__broken) anim_brokenCloudsIn.start();
-                    if(!__rain) anim_rainIn.start();
-                }
-            }
-        },
-        State {
-            name: "09n"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moonOut.start();
-                    if(__sun) anim_sunOut.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__scattered) anim_scatCloudsOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__broken) anim_brokenCloudsIn.start();
-                    if(!__rain) anim_rainIn.start();
-                }
-            }
-        },
-        State {
-            name: "10d"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__broken) anim_brokenCloudsOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__scattered) anim_scatCloudsIn.start();
-                    if(!__rain) anim_rainIn.start();
-                }
-            }
-        },
-        State {
-            name: "10n"
-            StateChangeScript {
-                script: {
-                    if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__broken) anim_brokenCloudsOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__scattered) anim_scatCloudsIn.start();
-                    if(!__rain) anim_rainIn.start();
-                }
-            }
-        },
-        State {
-            name: "11d"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moonOut.start();
-                    if(__sun) anim_sunOut.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__scattered) anim_scatCloudsOut.start();
-                    if(__rain) anim_rainOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__broken) anim_brokenCloudsIn.start();
-                    if(!__storm) anim_stormIn.start();
-                }
-            }
-        },
-        State {
-            name: "11n"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moonOut.start();
-                    if(__sun) anim_sunOut.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__scattered) anim_scatCloudsOut.start();
-                    if(__rain) anim_rainOut.start();
-                    if(__snow) anim_snowOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__broken) anim_brokenCloudsIn.start();
-                    if(!__storm) anim_stormIn.start();
-                }
-            }
-        },
-        State {
-            name: "13d"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moonOut.start();
-                    if(__sun) anim_sunOut.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__scattered) anim_scatCloudsOut.start();
-                    if(__rain) anim_rainOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__broken) anim_brokenCloudsIn.start();
-                    if(!__snow) anim_snowIn.start();
-                }
-            }
-        },
-        State {
-            name: "13n"
-            StateChangeScript {
-                script: {
-                    if(__moon) anim_moonOut.start();
-                    if(__sun) anim_sunOut.start();
-                    if(__fewClouds) anim_fewCloudsOut.start();
-                    if(__scattered) anim_scatCloudsOut.start();
-                    if(__rain) anim_rainOut.start();
-                    if(__storm) anim_stormOut.start();
-                    if(__fog) anim_fogOut.start();
-                    if(!__broken) anim_brokenCloudsIn.start();
-                    if(!__snow) anim_snowIn.start();
-                }
-            }
-        },
-        State {
-            name: "50d"
+            name: "scattered_clouds_day"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__rain) anim_rainOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__broken) anim_brokenCloudsOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__scattered) anim_scatCloudsIn.start();
+                }
+            }
+        },
+        State {
+            name: "scattered_clouds_night"
+            StateChangeScript {
+                script: {
+                    if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__rain) anim_rainOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__broken) anim_brokenCloudsOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__scattered) anim_scatCloudsIn.start();
+                }
+            }
+        },
+        State {
+            name: "broken_clouds_day"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moonOut.start();
+                    if(__sun) anim_sunOut.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__scattered) anim_scatCloudsOut.start();
+                    if(__rain) anim_rainOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__broken) anim_brokenCloudsIn.start();
+                }
+            }
+        },
+        State {
+            name: "broken_clouds_night"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moonOut.start();
+                    if(__sun) anim_sunOut.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__scattered) anim_scatCloudsOut.start();
+                    if(__rain) anim_rainOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__broken) anim_brokenCloudsIn.start();
+                }
+            }
+        },
+        State {
+            name: "shower_rain_day"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moonOut.start();
+                    if(__sun) anim_sunOut.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__scattered) anim_scatCloudsOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__broken) anim_brokenCloudsIn.start();
+                    if(!__rain) anim_rainIn.start();
+                }
+            }
+        },
+        State {
+            name: "shower_rain_night"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moonOut.start();
+                    if(__sun) anim_sunOut.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__scattered) anim_scatCloudsOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__broken) anim_brokenCloudsIn.start();
+                    if(!__rain) anim_rainIn.start();
+                }
+            }
+        },
+        State {
+            name: "rain_day"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__broken) anim_brokenCloudsOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__scattered) anim_scatCloudsIn.start();
+                    if(!__rain) anim_rainIn.start();
+                }
+            }
+        },
+        State {
+            name: "rain_night"
+            StateChangeScript {
+                script: {
+                    if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__broken) anim_brokenCloudsOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__scattered) anim_scatCloudsIn.start();
+                    if(!__rain) anim_rainIn.start();
+                }
+            }
+        },
+        State {
+            name: "thunderstorm_day"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moonOut.start();
+                    if(__sun) anim_sunOut.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__scattered) anim_scatCloudsOut.start();
+                    if(__rain) anim_rainOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__broken) anim_brokenCloudsIn.start();
+                    if(!__storm) anim_stormIn.start();
+                }
+            }
+        },
+        State {
+            name: "thunderstorm_night"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moonOut.start();
+                    if(__sun) anim_sunOut.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__scattered) anim_scatCloudsOut.start();
+                    if(__rain) anim_rainOut.start();
+                    if(__snow) anim_snowOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__broken) anim_brokenCloudsIn.start();
+                    if(!__storm) anim_stormIn.start();
+                }
+            }
+        },
+        State {
+            name: "snow_day"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moonOut.start();
+                    if(__sun) anim_sunOut.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__scattered) anim_scatCloudsOut.start();
+                    if(__rain) anim_rainOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__broken) anim_brokenCloudsIn.start();
+                    if(!__snow) anim_snowIn.start();
+                }
+            }
+        },
+        State {
+            name: "snow_night"
+            StateChangeScript {
+                script: {
+                    if(__moon) anim_moonOut.start();
+                    if(__sun) anim_sunOut.start();
+                    if(__fewClouds) anim_fewCloudsOut.start();
+                    if(__scattered) anim_scatCloudsOut.start();
+                    if(__rain) anim_rainOut.start();
+                    if(__storm) anim_stormOut.start();
+                    if(__fog) anim_fogOut.start();
+                    if(!__broken) anim_brokenCloudsIn.start();
+                    if(!__snow) anim_snowIn.start();
+                }
+            }
+        },
+        State {
+            name: "mist_day"
             StateChangeScript {
                 script: {
                     if(__moon) anim_moonOut.start();
@@ -844,7 +841,7 @@
             }
         },
         State {
-            name: "50n"
+            name: "mist_night"
             StateChangeScript {
                 script: {
                     if(__moon) anim_moonOut.start();
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-08-04 11:09:32 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-08-12 18:18:29 +0000
@@ -88,11 +88,11 @@
     """A mixin to to give access to common sheet elements"""
     def _click_sheet_confirm(self):
         """Clicks the confirm button"""
-        self.pointing_device.click_object(self.main_window.select_many('Button')[1])
+        self.pointing_device.click_object(self.main_window.select_many('Button')[2])
 
     def _click_sheet_cancel(self):
         """Clicks the cancel button"""
-        self.pointing_device.click_object(self.main_window.select_many('Button')[0])
+        self.pointing_device.click_object(self.main_window.select_many('Button')[1])
 
 class DatabaseMixin(object):
 
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-08-09 21:01:16 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-08-12 18:18:29 +0000
@@ -73,8 +73,12 @@
         self.search_for_city("London")
 
         # wait for results and click on the first item
+        http_failed = self.main_window.get_object('Dialog', 'HTTPFailedDialog')
+        self.assertThat(lambda: http_failed.visible, Eventually(NotEquals(True)))
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'SearchingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         resultsList = self.main_window.get_object('QQuickListView', 'SearchResultList')
-        self.assertThat(resultsList.visible, Eventually(Equals(True), timeout=30))
+        self.assertThat(resultsList.visible, Eventually(Equals(True)))
         firstResult = self.main_window.get_object('Standard', 'searchResult0')
         self.assertThat(lambda: firstResult, Eventually(NotEquals(None)))
         self.pointing_device.move_to_object(firstResult)
@@ -106,8 +110,12 @@
         searchField = self.search_for_city("London")
 
         # wait for results and click on the first item
+        http_failed = self.main_window.get_object('Dialog', 'HTTPFailedDialog')
+        self.assertThat(lambda: http_failed.visible, Eventually(NotEquals(True)))
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'SearchingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         resultsList = self.main_window.get_object('QQuickListView', 'SearchResultList')
-        self.assertThat(resultsList.visible, Eventually(Equals(True), timeout=30))
+        self.assertThat(resultsList.visible, Eventually(Equals(True)))
         firstResult = self.select_single_retry("Standard", objectName="searchResult0")
         self.assertThat(lambda: firstResult, Eventually(NotEquals(None)))
         self.assertThat(firstResult.text, Eventually(Equals("London, GB")))
@@ -121,7 +129,9 @@
         self.pointing_device.click_object(searchField)
         self.keyboard.type("Hamburg")
         self.keyboard.press_and_release('Enter')
-        self.assertThat(resultsList.visible, Eventually(Equals(True), timeout=30))
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'SearchingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
+        self.assertThat(resultsList.visible, Eventually(Equals(True)))
         firstResult = self.select_single_retry("Standard", objectName="searchResult0")
         self.assertThat(lambda: firstResult, Eventually(NotEquals(None)))
         self.assertThat(firstResult.text, Eventually(Equals("Hamburg, DE")))
@@ -141,8 +151,12 @@
         self.search_for_city("UbuntuCity")
 
         # wait for result and look if label is shown
+        http_failed = self.main_window.get_object('Dialog', 'HTTPFailedDialog')
+        self.assertThat(lambda: http_failed.visible, Eventually(NotEquals(True)))
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'SearchingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         errorLabel = self.main_window.get_object('Label', 'noCityError')
-        self.assertThat(errorLabel.visible, Eventually(Equals(True), timeout=30))
+        self.assertThat(errorLabel.visible, Eventually(Equals(True)))
 
 
 class TestLocationManagerWithLocation(WeatherTestCase, DatabaseMixin, SheetMixin):
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-08-09 21:01:16 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-08-12 18:18:29 +0000
@@ -60,7 +60,7 @@
         # refresh and wait till loading has finished
         self.main_window.open_toolbar().click_button("RefreshButton")
         load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
 
         # get the data from the refreshed tabs, have to be new
         refreshed_dates = self.main_window.get_objects('Label','DayDateLabel')
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-08-07 17:27:32 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-08-12 18:18:29 +0000
@@ -39,10 +39,10 @@
         current_temps = self.main_window.get_objects('QQuickText', 'CurrentTempText')
         if units == "imperial":
             self.assertThat(current_temps[0].text, Eventually(Equals(u'70°F')))
-            self.assertThat(current_temps[2].text, Eventually(Equals(u'72°F')))
+            self.assertThat(current_temps[2].text, Eventually(Equals(u'73°F')))
         else:
             self.assertThat(current_temps[0].text, Eventually(Equals(u'21°C')))
-            self.assertThat(current_temps[2].text, Eventually(Equals(u'22°C')))
+            self.assertThat(current_temps[2].text, Eventually(Equals(u'23°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-08-06 19:35:53 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/weatherdata.py	2013-08-12 18:18:29 +0000
@@ -6,7 +6,7 @@
 # by the Free Software Foundation.
 locations_data = []
 
-locations_data.append("""{"location":{"service_id":2643743,"name":"London","country":"GB","service":"openweathermap"},"db":{"updated":"2013-08-06T18:31:16.155Z","id":1},"format":20130801,"data":[{"date":"2013-08-06","timestamp":1375738207,"metric":{"tempMin":17.38,"tempMax":21.29,"windSpeed":5.22},"imperial":{"tempMin":63.284,"tempMax":70.322,"windSpeed":3.248,"rain":null},"pressure":1020.63,"humidity":58,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":272,"hourly":[],"current":{"timestamp":1375813805,"date":"2013-08-06 20:30","metric":{"temp":21.29,"windSpeed":null},"imperial":{"temp":70.322,"windSpeed":null,"rain":null},"humidity":56,"pressure":1013,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"service":"openweathermap","service_id":2643743}},{"date":"2013-08-07","timestamp":1375876800,"metric":{"tempMin":14.25,"tempMax":22.14,"windSpeed":9.54},"imperial":{"tempMin":57.650000000000006,"tempMax":71.852,"windSpeed":5.936,"rain":null},"pressure":1019.36,"humidity":58,"condition":{"id":803,"main":"Clouds","description":"broken clouds","icon":"04d"},"windDeg":66,"hourly":[]},{"date":"2013-08-08","timestamp":1375963200,"metric":{"tempMin":13.13,"tempMax":22.86,"windSpeed":5.796},"imperial":{"tempMin":55.634,"tempMax":73.148,"windSpeed":3.6064000000000007,"rain":null},"pressure":1026.02,"humidity":58,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"windDeg":357,"hourly":[]},{"date":"2013-08-09","timestamp":1376049600,"metric":{"tempMin":14.09,"tempMax":23.71,"windSpeed":12.276000000000002},"imperial":{"tempMin":57.362,"tempMax":74.678,"windSpeed":7.638400000000001,"rain":null},"pressure":1025.05,"humidity":56,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"windDeg":260,"hourly":[]},{"date":"2013-08-10","timestamp":1376136000,"metric":{"tempMin":11.82,"tempMax":21.31,"windSpeed":9.395999999999999,"rain":1},"imperial":{"tempMin":53.275999999999996,"tempMax":70.358,"windSpeed":5.8464,"rain":0.03937007874015748},"pressure":1026.7,"humidity":69,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":224,"hourly":[]},{"date":"2013-08-11","timestamp":1376222400,"metric":{"tempMin":15.38,"tempMax":22.5,"windSpeed":11.916},"imperial":{"tempMin":59.684,"tempMax":72.5,"windSpeed":7.4144000000000005,"rain":null},"pressure":1021.58,"humidity":61,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":255,"hourly":[]},{"date":"2013-08-12","timestamp":1376308800,"metric":{"tempMin":12.79,"tempMax":20.71,"windSpeed":14.148000000000001,"rain":1.14},"imperial":{"tempMin":55.022,"tempMax":69.278,"windSpeed":8.8032,"rain":0.04488188976377953},"pressure":1025.21,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":40,"hourly":[]},{"date":"2013-08-13","timestamp":1376395200,"metric":{"tempMin":11.61,"tempMax":22.22,"windSpeed":11.448,"rain":0.73},"imperial":{"tempMin":52.897999999999996,"tempMax":71.99600000000001,"windSpeed":7.123200000000001,"rain":0.02874015748031496},"pressure":1025.5,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":201,"hourly":[]},{"date":"2013-08-14","timestamp":1376481600,"metric":{"tempMin":16.09,"tempMax":22.97,"windSpeed":28.08,"rain":0.21},"imperial":{"tempMin":60.962,"tempMax":73.346,"windSpeed":17.472,"rain":0.00826771653543307},"pressure":1023.75,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":252,"hourly":[]},{"date":"2013-08-15","timestamp":1376568000,"metric":{"tempMin":14.36,"tempMax":22.61,"windSpeed":16.02,"rain":1.08},"imperial":{"tempMin":57.848,"tempMax":72.69800000000001,"windSpeed":9.968000000000002,"rain":0.042519685039370085},"pressure":1023.89,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":229,"hourly":[]}],"save":true}""")
+locations_data.append("""{"updated":1375990401745,"save":false,"db":{"updated":"2013-08-08T19:33:21.745Z","id":1},"data":[{"icon":"broken_clouds_day","timestamp":1375963200,"hourly":[],"windDeg":233,"pressure":1023.82,"current":{"icon":"clear_day","timestamp":1375987800,"pressure":1019,"service_id":2643743,"metric":{"temp":21.25,"windSpeed":null},"date":"2013-08-08 20:50","condition":{"icon":"01d","description":"Sky is Clear","id":800,"main":"Clear"},"humidity":53,"imperial":{"rain":null,"temp":70.25,"windSpeed":null},"service":"openweathermap"},"metric":{"tempMin":16.51,"windSpeed":13.5,"tempMax":21.25},"date":"2013-08-08","condition":{"icon":"04d","description":"overcast clouds","id":804,"main":"Clouds"},"humidity":44,"imperial":{"rain":null,"tempMin":61.718,"windSpeed":8.4,"tempMax":70.25}},{"icon":"rain_day","timestamp":1376049600,"hourly":[],"windDeg":269,"pressure":1022.18,"metric":{"rain":1.5,"tempMin":14.27,"windSpeed":7.416,"tempMax":22.75},"date":"2013-08-09","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":68,"imperial":{"rain":0.05905511811023623,"tempMin":57.686,"windSpeed":4.614400000000001,"tempMax":72.95}},{"icon":"few_clouds_day","timestamp":1376136000,"hourly":[],"windDeg":275,"pressure":1027.61,"metric":{"tempMin":11.26,"windSpeed":5.796,"tempMax":21.17},"date":"2013-08-10","condition":{"icon":"02d","description":"few clouds","id":801,"main":"Clouds"},"humidity":63,"imperial":{"rain":null,"tempMin":52.268,"windSpeed":3.6064000000000007,"tempMax":70.106}},{"icon":"rain_day","timestamp":1376222400,"hourly":[],"windDeg":218,"pressure":1021.06,"metric":{"rain":1.5,"tempMin":14.67,"windSpeed":16.956,"tempMax":20.26},"date":"2013-08-11","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":80,"imperial":{"rain":0.05905511811023623,"tempMin":58.406,"windSpeed":10.550400000000002,"tempMax":68.468}},{"icon":"few_clouds_day","timestamp":1376308800,"hourly":[],"windDeg":293,"pressure":1024.95,"metric":{"tempMin":10.61,"windSpeed":10.44,"tempMax":19.58},"date":"2013-08-12","condition":{"icon":"02d","description":"few clouds","id":801,"main":"Clouds"},"humidity":62,"imperial":{"rain":null,"tempMin":51.098,"windSpeed":6.496,"tempMax":67.244}},{"icon":"broken_clouds_day","timestamp":1376395200,"hourly":[],"windDeg":241,"pressure":1025.32,"metric":{"tempMin":10.71,"windSpeed":12.96,"tempMax":21.34},"date":"2013-08-13","condition":{"icon":"04d","description":"broken clouds","id":803,"main":"Clouds"},"humidity":60,"imperial":{"rain":null,"tempMin":51.278000000000006,"windSpeed":8.064000000000002,"tempMax":70.412}},{"icon":"clear_day","timestamp":1376481600,"hourly":[],"windDeg":327,"pressure":1031.59,"metric":{"tempMin":11.87,"windSpeed":14.832,"tempMax":21.43},"date":"2013-08-14","condition":{"icon":"01d","description":"sky is clear","id":800,"main":"Clear"},"humidity":0,"imperial":{"rain":null,"tempMin":53.366,"windSpeed":9.228800000000001,"tempMax":70.574}},{"icon":"rain_day","timestamp":1376568000,"hourly":[],"windDeg":247,"pressure":1032.73,"metric":{"tempMin":11.77,"windSpeed":15.840000000000002,"tempMax":23.18},"date":"2013-08-15","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":0,"imperial":{"rain":null,"tempMin":53.186,"windSpeed":9.856000000000002,"tempMax":73.724}},{"icon":"clear_day","timestamp":1376654400,"hourly":[],"windDeg":294,"pressure":1031.85,"metric":{"tempMin":15.81,"windSpeed":12.708,"tempMax":24.87},"date":"2013-08-16","condition":{"icon":"01d","description":"sky is clear","id":800,"main":"Clear"},"humidity":0,"imperial":{"rain":null,"tempMin":60.458,"windSpeed":7.9072000000000005,"tempMax":76.766}},{"icon":"rain_day","timestamp":1376740800,"hourly":[],"windDeg":295,"pressure":1029.08,"metric":{"rain":1.02,"tempMin":16.39,"windSpeed":12.024,"tempMax":25.05},"date":"2013-08-17","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":0,"imperial":{"rain":0.040157480314960636,"tempMin":61.502,"windSpeed":7.4816,"tempMax":77.09}}],"format":20130808,"location":{"service_id":2643743,"name":"London","country":"GB","service":"openweathermap"}}""")
 
-locations_data.append("""{"location":{"coord":{"lon":10,"lat":53.549999},"service_id":2911298,"name":"Hamburg","country":"DE","service":"openweathermap"},"db":{"updated":"2013-08-06T18:35:14.332Z","id":2},"format":20130801,"data":[{"date":"2013-08-06","timestamp":1375738207,"metric":{"tempMin":13.37,"tempMax":20,"windSpeed":18.18},"imperial":{"tempMin":56.066,"tempMax":68,"windSpeed":11.312000000000001,"rain":null},"pressure":1024.52,"humidity":55,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":302,"hourly":[],"current":{"timestamp":1375813203,"date":"2013-08-06 20:20","metric":{"temp":20,"windSpeed":null},"imperial":{"temp":68,"windSpeed":null,"rain":null},"humidity":64,"pressure":1015,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"service":"openweathermap","service_id":2911298}},{"date":"2013-08-07","timestamp":1375873200,"metric":{"tempMin":11.38,"tempMax":16.98,"windSpeed":13.860000000000001,"rain":22},"imperial":{"tempMin":52.484,"tempMax":62.564,"windSpeed":8.624,"rain":0.8661417322834646},"pressure":1025.03,"humidity":100,"condition":{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"},"windDeg":7,"hourly":[]},{"date":"2013-08-08","timestamp":1375959600,"metric":{"tempMin":13.56,"tempMax":15.36,"windSpeed":15.515999999999998,"rain":13},"imperial":{"tempMin":56.408,"tempMax":59.647999999999996,"windSpeed":9.6544,"rain":0.5118110236220472},"pressure":1026.42,"humidity":100,"condition":{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"},"windDeg":31,"hourly":[]},{"date":"2013-08-09","timestamp":1376046000,"metric":{"tempMin":11.19,"tempMax":20.06,"windSpeed":14.436},"imperial":{"tempMin":52.141999999999996,"tempMax":68.108,"windSpeed":8.9824,"rain":null},"pressure":1030.49,"humidity":91,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":304,"hourly":[]},{"date":"2013-08-10","timestamp":1376132400,"metric":{"tempMin":13.81,"tempMax":21.32,"windSpeed":17.136},"imperial":{"tempMin":56.858000000000004,"tempMax":70.376,"windSpeed":10.6624,"rain":null},"pressure":1030.51,"humidity":80,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":250,"hourly":[]},{"date":"2013-08-11","timestamp":1376218800,"metric":{"tempMin":16.51,"tempMax":23.68,"windSpeed":22.715999999999998,"rain":3},"imperial":{"tempMin":61.718,"tempMax":74.624,"windSpeed":14.134400000000001,"rain":0.11811023622047245},"pressure":1024.9,"humidity":68,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":238,"hourly":[]},{"date":"2013-08-12","timestamp":1376305200,"metric":{"tempMin":14.79,"tempMax":20.61,"windSpeed":10.044,"rain":0.59},"imperial":{"tempMin":58.622,"tempMax":69.098,"windSpeed":6.249600000000001,"rain":0.023228346456692913},"pressure":1028.45,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":275,"hourly":[]},{"date":"2013-08-13","timestamp":1376391600,"metric":{"tempMin":13.23,"tempMax":21.47,"windSpeed":5.184},"imperial":{"tempMin":55.814,"tempMax":70.646,"windSpeed":3.2256,"rain":null},"pressure":1029.35,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":48,"hourly":[]},{"date":"2013-08-14","timestamp":1376478000,"metric":{"tempMin":15.49,"tempMax":22.37,"windSpeed":7.704000000000001,"rain":0.33},"imperial":{"tempMin":59.882000000000005,"tempMax":72.266,"windSpeed":4.7936000000000005,"rain":0.01299212598425197},"pressure":1027.6,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":226,"hourly":[]},{"date":"2013-08-15","timestamp":1376564400,"metric":{"tempMin":15.3,"tempMax":23.26,"windSpeed":26.316},"imperial":{"tempMin":59.540000000000006,"tempMax":73.868,"windSpeed":16.3744,"rain":null},"pressure":1027.33,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":253,"hourly":[]}],"save":true}""")
+locations_data.append("""{"updated":1375990401770,"save":false,"db":{"updated":"2013-08-08T19:33:21.770Z","id":2},"data":[{"icon":"broken_clouds_day","timestamp":1375959600,"hourly":[],"windDeg":293,"pressure":1025.28,"current":{"icon":"scattered_clouds_day","timestamp":1375987800,"pressure":1018,"service_id":2911298,"metric":{"temp":17.5,"windSpeed":null},"date":"2013-08-08 20:50","condition":{"icon":"03d","description":"scattered clouds","id":802,"main":"Clouds"},"humidity":67,"imperial":{"rain":null,"temp":63.5,"windSpeed":null},"service":"openweathermap"},"metric":{"tempMin":13.44,"windSpeed":21.06,"tempMax":16.5},"date":"2013-08-08","condition":{"icon":"04d","description":"broken clouds","id":803,"main":"Clouds"},"humidity":71,"imperial":{"rain":null,"tempMin":56.192,"windSpeed":13.104000000000001,"tempMax":61.7}},{"icon":"few_clouds_day","timestamp":1376046000,"hourly":[],"windDeg":262,"pressure":1028.74,"metric":{"tempMin":13.02,"windSpeed":13.895999999999999,"tempMax":18.91},"date":"2013-08-09","condition":{"icon":"02d","description":"few clouds","id":801,"main":"Clouds"},"humidity":79,"imperial":{"rain":null,"tempMin":55.436,"windSpeed":8.6464,"tempMax":66.03800000000001}},{"icon":"rain_day","timestamp":1376132400,"hourly":[],"windDeg":228,"pressure":1028.09,"metric":{"rain":1,"tempMin":12.4,"windSpeed":14.076,"tempMax":20.13},"date":"2013-08-10","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":80,"imperial":{"rain":0.03937007874015748,"tempMin":54.32,"windSpeed":8.758400000000002,"tempMax":68.23400000000001}},{"icon":"rain_day","timestamp":1376218800,"hourly":[],"windDeg":249,"pressure":1028.28,"metric":{"rain":1,"tempMin":15.2,"windSpeed":12.636,"tempMax":20.18},"date":"2013-08-11","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":87,"imperial":{"rain":0.03937007874015748,"tempMin":59.36,"windSpeed":7.8624,"tempMax":68.324}},{"icon":"broken_clouds_day","timestamp":1376305200,"hourly":[],"windDeg":283,"pressure":1022.93,"metric":{"tempMin":14.51,"windSpeed":29.880000000000003,"tempMax":19.23},"date":"2013-08-12","condition":{"icon":"04d","description":"overcast clouds","id":804,"main":"Clouds"},"humidity":84,"imperial":{"rain":null,"tempMin":58.117999999999995,"windSpeed":18.592000000000002,"tempMax":66.614}},{"icon":"rain_day","timestamp":1376391600,"hourly":[],"windDeg":275,"pressure":1027.51,"metric":{"rain":1,"tempMin":14.66,"windSpeed":24.3,"tempMax":18.18},"date":"2013-08-13","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":79,"imperial":{"rain":0.03937007874015748,"tempMin":58.388000000000005,"windSpeed":15.120000000000001,"tempMax":64.724}},{"icon":"rain_day","timestamp":1376478000,"hourly":[],"windDeg":306,"pressure":1029.36,"metric":{"rain":2.46,"tempMin":13.09,"windSpeed":25.2,"tempMax":17.76},"date":"2013-08-14","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":0,"imperial":{"rain":0.09685039370078741,"tempMin":55.562,"windSpeed":15.680000000000001,"tempMax":63.968}},{"icon":"rain_day","timestamp":1376564400,"hourly":[],"windDeg":275,"pressure":1034.36,"metric":{"rain":3.75,"tempMin":15.32,"windSpeed":15.048,"tempMax":19.03},"date":"2013-08-15","condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"humidity":0,"imperial":{"rain":0.14763779527559057,"tempMin":59.576,"windSpeed":9.3632,"tempMax":66.254}},{"icon":"rain_day","timestamp":1376650800,"hourly":[],"windDeg":286,"pressure":1027.6,"metric":{"rain":2.84,"tempMin":15.45,"windSpeed":27.791999999999998,"tempMax":20.46},"date":"2013-08-16","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":0,"imperial":{"rain":0.11181102362204724,"tempMin":59.81,"windSpeed":17.2928,"tempMax":68.828}},{"icon":"rain_day","timestamp":1376737200,"hourly":[],"windDeg":297,"pressure":1028.67,"metric":{"rain":2.18,"tempMin":14.79,"windSpeed":28.836,"tempMax":19.03},"date":"2013-08-17","condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"humidity":0,"imperial":{"rain":0.08582677165354331,"tempMin":58.622,"windSpeed":17.942400000000003,"tempMax":66.254}}],"format":20130808,"location":{"coord":{"lon":10,"lat":53.549999},"service_id":2911298,"name":"Hamburg","country":"DE","service":"openweathermap"}}""")
 
 
=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-07-20 16:52:37 +0000
+++ ubuntu-weather-app.qml	2013-08-12 18:18:29 +0000
@@ -55,6 +55,8 @@
                 }
             } else {
                 console.log(messageObject.error.msg+" / "+messageObject.error.request.url)
+                httpFailedDialog.show();
+                refreshData(true, null);
             }
         }
     }
@@ -149,4 +151,17 @@
         height:parent.height
     }
 
+    Dialog {
+        id:httpFailedDialog
+        objectName: "HTTPFailedDialog"
+        title: i18n.tr("Something went wrong!")
+        text: i18n.tr("Please make sure, you are connected to the internet.")
+        z:10
+        Button {
+            text: i18n.tr("OK")
+            onClicked: PopupUtils.close(httpFailedDialog)
+        }
+    }
+
+
 }