Merge lp:~vthompson/ubuntu-weather-app/reboot-allow-adding-duplicate-current-location into lp:ubuntu-weather-app

[Victor Thompson]

Allow adding the current location as a duplicate to the Locations List.

Allow adding the current location as a duplicate to the Locations List.

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

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

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Why do we want to allow the current location as a duplicate to the locations list?

review: Needs Information

[Victor Thompson (vthompson)]

Let's say you travel a lot and have Chicago and NYC on your list of locations. You live in Amsterdam. Work has you traveling to Paris for an event. Upon arrival you decide to also add Paris to your list of locations--however, currently you can not do so because it matches your current location. For this reason, current location shouldn't prevent a duplicate entry, since it is simply a pointer to your current location.

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-06-28 19:04:43 +0000
+++ app/ubuntu-weather-app.qml	2015-06-28 23:49:34 +0000
@@ -211,14 +211,15 @@
             return !exists;
         }
 
-        // Return true if the location given is already in the locationsList
+        // Return true if the location given is already in the locationsList, and is not the same
+        // as the current location.
         function checkLocationExists(location) {
             var exists = false;
 
             for (var i=0; !exists && i < locationsList.length; i++) {
                 var loc = locationsList[i].location;
 
-                if (loc.services.geonames && (loc.services.geonames === location.services.geonames)) {
+                if (loc.services.geonames && (loc.services.geonames === location.services.geonames) && !(settings.addedCurrentLocation && i === 0)) {
                     exists = true;
                 }
             }