Merge lp:~popey/ubuntu-weather-app/update-readme-owm-key into lp:ubuntu-weather-app

[Alan Pope 🍺🐧🐱 🦄]

Describe how to get a key in the README. Mention this in the key.js

Describe how to get a key in the README. Mention this in the key.js

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Thanks, LGTM :-)

review: Approve

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

PASSED: Continuous integration, rev:164
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/292/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/292

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:164
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/324/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/32

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Looks ok to me.

review: Approve

=== modified file 'README'
--- README	2015-01-22 21:56:55 +0000
+++ README	2015-11-09 10:48:18 +0000
@@ -4,6 +4,15 @@
     https://wiki.ubuntu.com/Touch/CoreApps/Weather
     https://wiki.ubuntu.com/Touch/CoreApps/DevelopmentGuide
 
+Note: The OpenWeatherMap service now requires an API key where previously
+      it did not. FOSS developers can register for a free API key
+      which needs to be put into app/data/keys.js for the app to 
+      function correctly. Do not commit branches with the key in place
+      as a centrally managed key is injected at build time.
+
+      See http://openweathermap.org/faq#error401 for details and
+      http://openweathermap.org/appid to obtain a personal key.
+
 The following essential packages are required to develop this app:
 - ubuntu-sdk (see http://developer.ubuntu.com/start)
 - intltool - run the `sudo apt-get install intltool` command for installation
 
=== modified file 'app/data/keys.js'
--- app/data/keys.js	2015-10-14 23:31:23 +0000
+++ app/data/keys.js	2015-11-09 10:48:18 +0000
@@ -1,2 +1,2 @@
 var twcKey = "";
-var owmKey = "";  // goto http://openweathermap.org/appid to get a personal API key
+var owmKey = "";  // See README for details on how to obtain a personal API key