Merge lp:~vthompson/ubuntu-clock-app/clock-location into lp:ubuntu-clock-app

[Victor Thompson]

* Use city for location if available

* Use city for location if available

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

PASSED: Continuous integration, rev:278
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/666/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/12
        deb: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/12/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Hi Victor, Thanks for the patch. I swear when I implemented this I discussed extensively with Martin Borho about which variables to use and I vaguely remember him explaining that adminName2 and adminName3 worked well in German cities where it is common for duplicate names to appear. Let me check with him and also try out different locations to see if "name" returns better results than "adminName2".

[Victor Thompson (vthompson)]

If it helps, "name" is the field used at the top of the reboot weather app.
On Jun 16, 2015 3:01 AM, "Nekhelesh Ramananthan" <email address hidden>
wrote:

> Hi Victor, Thanks for the patch. I swear when I implemented this I
> discussed extensively with Martin Borho about which variables to use and I
> vaguely remember him explaining that adminName2 and adminName3 worked well
> in German cities where it is common for duplicate names to appear. Let me
> check with him and also try out different locations to see if "name"
> returns better results than "adminName2".
> --
>
> https://code.launchpad.net/~vthompson/ubuntu-clock-app/clock-location/+merge/262043
> You are the owner of lp:~vthompson/ubuntu-clock-app/clock-location.
>

[Nekhelesh Ramananthan (nik90)]

lgtm during my test. Let's merge this! One minor thing, can you add an entry to the debian changelog pls?

review: Needs Fixing

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

FAILED: Continuous integration, rev:280
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/678/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/24/console

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

I think this minor change is causing jenkins to fail,

=== modified file debian/changelog
--- debian/changelog 2015-06-19 04:30:23 +0000
+++ debian/changelog 2015-06-19 10:06:13 +0000
@@ -6,7 +6,7 @@
   [Victor Thompson]
   * Use city for location if available

--- Nekhelesh Ramananthan <email address hidden> Thu, 18 Jun 2015 20:08:59 +0200
+ -- Nekhelesh Ramananthan <email address hidden> Thu, 18 Jun 2015 20:08:59 +0200

Sry about this. Unable to merge without this minor thing fixed.

review: Needs Fixing

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

PASSED: Continuous integration, rev:281
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/679/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/25
        deb: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/25/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/248/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-autolanding/5/console

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Autolanding failed due to flaky qml test. Top-approving again to merge this MP.

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

review: Approve (continuous-integration)

=== modified file 'backend/modules/GeoLocation/geolocation.cpp'
--- backend/modules/GeoLocation/geolocation.cpp	2014-11-04 15:58:05 +0000
+++ backend/modules/GeoLocation/geolocation.cpp	2015-06-19 16:13:10 +0000
@@ -82,11 +82,11 @@
     foreach (const QVariant &entry, cityData.toMap().value("geonames").toList())
     {
         auto data = entry.toMap();
-        auto adminName2 = data.value("adminName2").toString();
+        auto name = data.value("name").toString();
         auto adminName1 = data.value("adminName1").toString();
 
-        if (!adminName2.isEmpty()) {
-            m_location = adminName2;
+        if (!name.isEmpty()) {
+            m_location = name;
             emit locationChanged();
         }
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-19 14:25:05 +0000
+++ debian/changelog	2015-06-19 16:13:10 +0000
@@ -9,6 +9,9 @@
   [Nekhelesh Ramananthan]
   * Updated version to 3.4 to mark transition to vivid framework
 
+  [Victor Thompson]
+  * Use city for location if available
+
  -- Nekhelesh Ramananthan <[e-mail]>  Thu, 18 Jun 2015 20:08:59 +0200
 
 ubuntu-clock-app (3.3) utopic; urgency=medium