Merge lp:~ahayzen/ubuntu-weather-app/fix-1602691-osm-geocode-needs-useragent into lp:ubuntu-weather-app

[Andrew Hayzen]

* Set useragent in geocode so that osm can uniquely identify our requests

* Set useragent in geocode so that osm can uniquely identify our requests

This fixes the issue of location not being detected within the weather-app.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:248
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/66/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/955/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/66/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM

review: Approve

=== modified file 'app/components/CurrentLocation.qml'
--- app/components/CurrentLocation.qml	2015-11-02 21:28:34 +0000
+++ app/components/CurrentLocation.qml	2016-07-19 11:33:24 +0000
@@ -65,6 +65,12 @@
     Plugin {
         id: osmPlugin
         name: "osm"
+
+        // Set a useragent so that osm can uniquely identify out requests
+        PluginParameter {
+            name: "osm.useragent"
+            value: "ubuntu-weather-app"
+        }
     }
 
     GeocodeModel {
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-06-05 20:16:22 +0000
+++ debian/changelog	2016-07-19 11:33:24 +0000
@@ -1,4 +1,12 @@
-ubuntu-weather-app (3.3ubuntu1) UNRELEASED; urgency=medium
+ubuntu-weather-app (3.4ubuntu1) UNRELEASED; urgency=medium
+
+  [ Andrew Hayzen ]
+  * Set useragent in geocode so that osm can uniquely identify our requests
+  * Release 3.3 and bump version to 3.4
+
+ -- Andrew Hayzen <[e-mail]>  Tue, 19 Jul 2016 12:22:57 +0100
+
+ubuntu-weather-app (3.3ubuntu1) xenial; urgency=medium
 
   [ Andrew Hayzen ]
   * Release 3.2 and bump version to 3.3
@@ -8,7 +16,7 @@
   * Update to use new weather API
   * Change the trimAPIKey function so it only trims the API Key
 
- -- Andrew Hayzen <[e-mail]>  Sat, 04 Jun 2016 18:31:29 +0100
+ -- Andrew Hayzen <[e-mail]>  Tue, 19 Jul 2016 12:22:35 +0100
 
 ubuntu-weather-app (3.2ubuntu1) vivid; urgency=medium
 
 
=== modified file 'manifest.json.in'
--- manifest.json.in	2016-06-05 20:16:22 +0000
+++ manifest.json.in	2016-07-19 11:33:24 +0000
@@ -12,7 +12,7 @@
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "@PROJECT_NAME@",
     "title": "Weather",
-    "version": "3.3.@BZR_REVNO@",
+    "version": "3.4.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"