Ubuntu Weather App

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

  1. fix-1602691-osm-geocode-needs-useragent
  2. Merge into reboot
Proposed by Andrew Hayzen
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 248
Merged at revision: 248
Proposed branch: lp:~ahayzen/ubuntu-weather-app/fix-1602691-osm-geocode-needs-useragent
Merge into: lp:ubuntu-weather-app
Diff against target: 56 lines (+17/-3)
3 files modified
app/components/CurrentLocation.qml (+6/-0)
debian/changelog (+10/-2)
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-weather-app/fix-1602691-osm-geocode-needs-useragent
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+300452@code.launchpad.net

Commit message

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

Description of the change

* 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.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/CurrentLocation.qml'
2--- app/components/CurrentLocation.qml 2015-11-02 21:28:34 +0000
3+++ app/components/CurrentLocation.qml 2016-07-19 11:33:24 +0000
4@@ -65,6 +65,12 @@
5 Plugin {
6 id: osmPlugin
7 name: "osm"
8+
9+ // Set a useragent so that osm can uniquely identify out requests
10+ PluginParameter {
11+ name: "osm.useragent"
12+ value: "ubuntu-weather-app"
13+ }
14 }
15
16 GeocodeModel {
17
18=== modified file 'debian/changelog'
19--- debian/changelog 2016-06-05 20:16:22 +0000
20+++ debian/changelog 2016-07-19 11:33:24 +0000
21@@ -1,4 +1,12 @@
22-ubuntu-weather-app (3.3ubuntu1) UNRELEASED; urgency=medium
23+ubuntu-weather-app (3.4ubuntu1) UNRELEASED; urgency=medium
24+
25+ [ Andrew Hayzen ]
26+ * Set useragent in geocode so that osm can uniquely identify our requests
27+ * Release 3.3 and bump version to 3.4
28+
29+ -- Andrew Hayzen <ahayzen@gmail.com> Tue, 19 Jul 2016 12:22:57 +0100
30+
31+ubuntu-weather-app (3.3ubuntu1) xenial; urgency=medium
32
33 [ Andrew Hayzen ]
34 * Release 3.2 and bump version to 3.3
35@@ -8,7 +16,7 @@
36 * Update to use new weather API
37 * Change the trimAPIKey function so it only trims the API Key
38
39- -- Andrew Hayzen <ahayzen@gmail.com> Sat, 04 Jun 2016 18:31:29 +0100
40+ -- Andrew Hayzen <ahayzen@gmail.com> Tue, 19 Jul 2016 12:22:35 +0100
41
42 ubuntu-weather-app (3.2ubuntu1) vivid; urgency=medium
43
44
45=== modified file 'manifest.json.in'
46--- manifest.json.in 2016-06-05 20:16:22 +0000
47+++ manifest.json.in 2016-07-19 11:33:24 +0000
48@@ -12,7 +12,7 @@
49 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
50 "name": "@PROJECT_NAME@",
51 "title": "Weather",
52- "version": "3.3.@BZR_REVNO@",
53+ "version": "3.4.@BZR_REVNO@",
54 "x-source": {
55 "vcs-bzr": "@BZR_SOURCE@",
56 "vcs-bzr-revno": "@BZR_REVNO@"

Subscribers

People subscribed via source and target branches

to all changes: