Merge lp:~vthompson/ubuntu-weather-app/reboot-manage-current-location into lp:ubuntu-weather-app

[Victor Thompson]

* Manage current location

Manage current location as the first entry in the Locations List. An additional MP will need to be made to deal with preventing reordering of the first item and preventing the deletion of the first item.

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Two inline code comments while I play about with the app.

review: Needs Fixing

[Victor Thompson (vthompson)]

See inline responses.

[Andrew Hayzen (ahayzen)]

These steps sort of re-enforce/add to/prove the issue of the second inline comment.

1) Start the app wait for location lock
2) Add a custom new location
3) Swipe remove detected location
4) Restart the app
5) Wait for location lock, oh the custom location has been overwritten!

So either we need a way in the model to know if the first location was auto detected or prevent the detected location to be removed. (Note the former is probably required to satisfy data migration anyway?)

[Victor Thompson (vthompson)]

As stated in the description, we'll need additional work to prevent reordering and prevent deletion/overwriting of the user's first location.

[lp:~vthompson/ubuntu-weather-app/reboot-manage-current-location]

48. By Victor Thompson on 2015-06-05

Remove redundant refresh, force is needed.

[Victor Thompson (vthompson)]

I modified the redundant refresh to just do a single refresh with the force flag as true. The force is necessary because the location is possibly changing. Without it the data does not update.

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

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

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

review: Approve (continuous-integration)

[lp:~vthompson/ubuntu-weather-app/reboot-manage-current-location]

49. By Victor Thompson on 2015-06-05

Merge of trunk

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, thanks for the extra changes :-)

review: Approve

=== modified file 'app/components/CurrentLocation.qml'
--- app/components/CurrentLocation.qml	2015-05-20 00:01:46 +0000
+++ app/components/CurrentLocation.qml	2015-06-05 23:10:47 +0000
@@ -20,6 +20,7 @@
 import QtPositioning 5.2
 import QtQuick 2.3
 import Ubuntu.Components 1.1
+import "../data/WeatherApi.js" as WeatherApi
 
 
 Item {
@@ -27,6 +28,26 @@
 
     property string string: "Undefined"
 
+    function searchForLocation(lat, lon) {
+        WeatherApi.sendRequest({
+                                   action: "searchByPoint",
+                                   params: {
+                                       coords: {
+                                           lat: lat,
+                                           lon: lon
+                                       }
+                                   }
+                               }, searchResponseHandler)
+    }
+
+    function searchResponseHandler(msgObject) {
+        if (!msgObject.error) {
+            console.log("Loc to add:", JSON.stringify(msgObject.result.locations[0]))
+            storage.updateCurrentLocation(msgObject.result.locations[0])
+        }
+    }
+
+
     PositionSource {
         id: currentPosition
         updateInterval: 1000
@@ -54,8 +75,9 @@
         onCountChanged: {
             // Update the currentLocation if one is found and it does not match the stored location
             if (count > 0 && currentLocation.string !== geocodeModel.get(0).address.city) {
-                currentLocation.string = geocodeModel.get(0).address.city
-                refreshData(false, true)
+                var loc = geocodeModel.get(0)
+                currentLocation.string = loc.address.city
+                searchForLocation(loc.coordinate.latitude, loc.coordinate.longitude)
             }
         }
     }

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-05-19 01:14:08 +0000
+++ app/ubuntu-weather-app.qml	2015-06-05 23:10:47 +0000
@@ -167,13 +167,25 @@
     Data.Storage {
         id: storage
 
+        // Add or replace the current locaiton to the storage and refresh the
+        // locationList
+        function updateCurrentLocation(location) {
+            if (locationsList == null || locationsList.length == 0) {
+                storage.insertLocation({location: location});
+            } else {
+                storage.updateLocation(locationsList[0].db.id, {location: location});
+            }
+
+            refreshData(false, true);
+        }
+
         // Add the location to the storage and refresh the locationList
         // Return true if a location is added
         function addLocation(location) {
             var exists = checkLocationExists(location)
 
             if(!exists) {
-                if(location.dbId === undefined || location.dbId=== 0) {
+                if(location.dbId === undefined || location.dbId === 0) {
                     storage.insertLocation({location: location});
                 }
                 refreshData();

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-05-20 00:08:32 +0000
+++ app/ui/LocationsPage.qml	2015-06-05 23:10:47 +0000
@@ -139,9 +139,6 @@
         var loc = {}, data = {},
             tempUnits = settings.tempScale === "°C" ? "metric" : "imperial";
 
-        // TODO: Manage the current location as an entry in the locationsList.
-        locationsModel.append({ "name": currentLocation.string, "temp": "0", "icon": "weather-clear-symbolic" })
-
         for (var i=0; i < weatherApp.locationsList.length; i++) {
             data = weatherApp.locationsList[i];
             loc = {