Merge lp:~martin-borho/ubuntu-weather-app/reboot-data-fixes into lp:ubuntu-weather-app

[Martin Borho]

Some fixes related to data backend and data format:

* added missing settings.interval value to request parameters in data client
* respect caching after adding a new location
* updated refresh interval choices to maintain netiquette (OWM/TWC): 5 min too small, should be 10min at least (TWC)
* alignment of data format for TWC/OWM for condition-phrase, updated RESPONSE_DATA_VERSION to force a refresh at start
* do refresh only from storage after a unit-setting change

Some fixes related to data backend and data format:

* added missing settings.interval value to request parameters in data client
* respect caching after adding a new location
* updated refresh interval choices to maintain netiquette (OWM/TWC), 5 min too small, should be 10min at least(TWC)
* alignment of data format for TWC/OWM for condition-phrase, updated RESPONSE_DATA_VERSION to force a refresh at start
* do refresh only from storage after a unit-setting change

[lp:~martin-borho/ubuntu-weather-app/reboot-data-fixes]

20. By Martin Borho on 2015-03-07

updated refresh interval choices to maintain netiquette (OWM/TWC)

21. By Martin Borho on 2015-03-07

alignment of data format for TWC/OWM for condition-phrase, updated RESPONSE_DATA_VERSION to force a refresh at start

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

PASSED: Continuous integration, rev:21
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/38/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/38

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I have 2 inline comments:

1. There seems to be excessive spacing at the end of this line. Could you truncate it? There was no actual code change here.
2. Won't this cause the from_storage and force_refresh bools to be undefined when the function is called?

review: Needs Fixing

[lp:~martin-borho/ubuntu-weather-app/reboot-data-fixes]

22. By Martin Borho on 2015-03-08

removed whitespace

23. By Martin Borho on 2015-03-08

set defaults for refreshData params

24. By Martin Borho on 2015-03-08

do refresh only from storage after a unit-setting change

[Martin Borho (martin-borho)]

The two issues are fixed.

Additionally, the locations are going to be refreshed only from storage after a unit-setting change. The data needed is already present.

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

PASSED: Continuous integration, rev:24
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/39/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/39

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

lgtm!

review: Approve

=== modified file 'app/data/WeatherApi.js'
--- app/data/WeatherApi.js	2015-02-11 04:29:28 +0000
+++ app/data/WeatherApi.js	2015-03-08 16:25:37 +0000
@@ -23,7 +23,7 @@
 *  Version of the response data format.
 *  Increase this number to force a refresh.
 */
-var RESPONSE_DATA_VERSION = 20140315;
+var RESPONSE_DATA_VERSION = 20150307;
 
 /**
 * Helper functions
@@ -233,7 +233,7 @@
             windDeg: data.wind.deg,
             windDir: calcWindDir(data.wind.deg),
             icon: _icon_map[data.weather[0].icon],
-            condition: data.weather[0]
+            condition: data.weather[0].main
         };
         if(data.id !== undefined) {
             result["service"] = _serviceName;
@@ -263,7 +263,7 @@
             pressure: data.pressure,
             humidity: data.humidity,
             icon: _icon_map[data.weather[0].icon],
-            condition: data.weather[0],
+            condition: data.weather[0].main,
             windDeg: data.deg,
             windDir: calcWindDir(data.deg),
             hourly: []
@@ -725,7 +725,8 @@
                         db: loc.db,
                         units: 'metric',
                         service: message.params.service,
-                        api_key: message.params.api_key
+                        api_key: message.params.api_key,
+                        interval: message.params.interval
                     },
                     secsFromLastFetch = (now-loc.updated)/1000;
                 if( message.params.force===true || loc.format !== RESPONSE_DATA_VERSION || secsFromLastFetch > params.interval){

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-03-03 18:46:47 +0000
+++ app/ubuntu-weather-app.qml	2015-03-08 16:25:37 +0000
@@ -92,6 +92,8 @@
       API instead.
     */
     function refreshData(from_storage, force_refresh) {
+        from_storage = from_storage || false
+        force_refresh = force_refresh || false
         if(from_storage === true && force_refresh !== true) {
             storage.getLocations(fillPages);
         } else {
@@ -153,9 +155,7 @@
                 if(location.dbId === undefined || location.dbId=== 0) {
                     storage.insertLocation({location: location});
                 }
-
-                refreshData(true, false)  // load new location into models (without data)
-                refreshData(false, true)  // FIXME: can be really slow as it refreshes all models
+                refreshData();
             }
 
             return !exists;

=== modified file 'app/ui/settings/RefreshIntervalPage.qml'
--- app/ui/settings/RefreshIntervalPage.qml	2015-02-10 14:17:08 +0000
+++ app/ui/settings/RefreshIntervalPage.qml	2015-03-08 16:25:37 +0000
@@ -42,7 +42,7 @@
                     text: Math.floor(modelData / 60).toString() + " " + i18n.tr("minutes")
                 }
                 expanded: true
-                model: [300, 600, 900, 1800]
+                model: [600, 900, 1800, 3600]
                 selectedIndex: model.indexOf(settings.refreshInterval)
                 text: i18n.tr("Interval")
 

=== modified file 'app/ui/settings/UnitsPage.qml'
--- app/ui/settings/UnitsPage.qml	2015-02-10 14:17:08 +0000
+++ app/ui/settings/UnitsPage.qml	2015-03-08 16:25:37 +0000
@@ -45,7 +45,7 @@
 
                 onDelegateClicked: {
                     settings.tempScale = model[index]
-                    refreshData()
+                    refreshData(true)
                 }
             }
 
@@ -57,7 +57,7 @@
 
                 onDelegateClicked: {
                     settings.precipUnits = model[index]
-                    refreshData()
+                    refreshData(true)
                 }
             }
 
@@ -69,7 +69,7 @@
 
                 onDelegateClicked: {
                     settings.windUnits = model[index]
-                    refreshData()
+                    refreshData(true)
                 }
             }
         }