Merge lp:~dpm/ubuntu-weather-app/minor-weather-api-improv into lp:ubuntu-weather-app/obsolete.trunk

[David Planella]

Minor improvements on the weather API: added parameterize() function, added locale parameters to TWC calls, used _servicename consistently

Minor improvements on the weather API:

- Added parameterize() function to avoid code duplication
- Added locale parameters to TWC calls
- Used _servicename consistently for openweathermap

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

FAILED: Continuous integration, rev:190
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/126/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1234/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/124/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/124/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/38/console

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

review: Needs Fixing (continuous-integration)

[Martin Borho (martin-borho)]

David,

would you mind to add "hours=48" as additional param to the TWC call? Then we would have a hourly focecast for 48 instead of 24 hours. Overlooked it and it misses in the TWC branch.

Cheers
Martin

[lp:~dpm/ubuntu-weather-app/minor-weather-api-improv]

191. By David Planella on 2014-02-11

Merged from parent branch

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

FAILED: Continuous integration, rev:191
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/129/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1237
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/41

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

review: Needs Fixing (continuous-integration)

[lp:~dpm/ubuntu-weather-app/minor-weather-api-improv]

192. By David Planella on 2014-02-11

Made hourly forecast to be 48 hours instead of the default 24

[David Planella (dpm)]

Done, made hourly forecast to be 48 hours. Let me know if you need any more changes to this branch.

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

FAILED: Continuous integration, rev:192
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/130/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1244
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/128
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/128
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/42

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

review: Needs Fixing (continuous-integration)

[Martin Borho (martin-borho)]

Looks good to me, thanks!

Glad you'Ve found the way through all the callbacks! ;)

review: Approve

[lp:~dpm/ubuntu-weather-app/minor-weather-api-improv]

193. By David Planella on 2014-02-15

Merged from the latest changes in the TWC client branch

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

PASSED: Continuous integration, rev:193
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/138/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/50

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

review: Approve (continuous-integration)

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2014-02-15 10:47:52 +0000
+++ components/WeatherApi.js	2014-02-15 10:47:52 +0000
@@ -83,6 +83,17 @@
         minutes: locTime.getUTCMinutes()
     }
 }
+// Serialize a JavaScript object to URL parameters
+// E.g. {param1: value1, param2: value2} to "param1=value&param2=value"
+// TODO: it'd be nice to make it work with either passing a single object
+// or several at once
+function parameterize(obj) {
+  var str = [];
+  for(var param in obj) {
+     str.push(encodeURIComponent(param) + "=" + encodeURIComponent(obj[param]));
+  }
+  return str.join("&");
+}
 
 var GeoipApi = (function() {
     var _baseUrl = "http://geoip.ubuntu.com/lookup";
@@ -174,6 +185,8 @@
     */
     var _baseUrl = "http://api.openweathermap.org/data/2.5/";
     //
+    var _serviceName = "openweathermap";
+    //
     var _icon_map = {
         "01d": "clear_day",
         "01n": "clear_night",
@@ -219,7 +232,7 @@
             condition: data.weather[0]
         };
         if(data.id !== undefined) {
-            result["service"] = "openweathermap";
+            result["service"] = _serviceName;
             result["service_id"] =  data.id;
         }
         return result;
@@ -263,8 +276,8 @@
             todayDate;        
         print("["+location.name+"] "+JSON.stringify(localNow))
         // add openweathermap id for faster responses
-        if(location.services && !location.services["openweathermap"] && data["current"].id) {
-            location.services["openweathermap"] = data["current"].id
+        if(location.services && !location.services[_serviceName] && data["current"].id) {
+            location.services[_serviceName] = data["current"].id
         }
         //
         data["daily"]["list"].forEach(function(dayData) {
@@ -306,10 +319,10 @@
             },
             latLongParams = "&lat="+encodeURIComponent(params.location.coord.lat)
                 + "&lon="+encodeURIComponent(params.location.coord.lon);
-        if(params.location.services && params.location.services["openweathermap"]) {
-            urls.current = _baseUrl + "weather?units="+params.units+"&id="+params.location.services["openweathermap"];
-            urls.daily = _baseUrl + "forecast/daily?id="+params.location.services["openweathermap"]+"&cnt=10&units="+params.units
-            urls.forecast = _baseUrl + "forecast?id="+params.location.services["openweathermap"]+"&units="+params.units
+        if(params.location.services && params.location.services[_serviceName]) {
+            urls.current = _baseUrl + "weather?units="+params.units+"&id="+params.location.services[_serviceName];
+            urls.daily = _baseUrl + "forecast/daily?id="+params.location.services[_serviceName]+"&cnt=10&units="+params.units
+            urls.forecast = _baseUrl + "forecast?id="+params.location.services[_serviceName]+"&units="+params.units
 
         } else if (params.location.coord) {
             urls.current = _baseUrl + "weather?units="+params.units+latLongParams;
@@ -534,15 +547,22 @@
     //
     function _getUrl(params) {
         var url, serviceId,
-            units = (params.units === "metric") ? "m" : "e",
-            baseParams = "key="+params.api_key+"&units="+units;
+            baseParams = {
+                key: params.api_key,
+                units: (params.units === "metric") ? "m" : "e",
+                locale: Qt.locale().name,
+                hours: "48",
+            },
+            commands = {
+                "mobileaggregation": "mobile/mobagg/",
+            };
         if(params.location.services && params.location.services[_serviceName]) {
             serviceId = encodeURIComponent(params.location.services[_serviceName]);
-            url = _baseUrl+"mobile/mobagg/"+serviceId+".js?"+baseParams;
+            url = _baseUrl+commands["mobileaggregation"]+serviceId+".js?"+parameterize(baseParams);
         } else if (params.location.coord) {
-            url = _baseUrl+"mobile/mobagg/get.js?"+baseParams+
-                "&lat="+encodeURIComponent(params.location.coord.lat)+
-                "&lng="+encodeURIComponent(params.location.coord.lon);
+            var coord = {lat: params.location.coord.lat, lng: params.location.coord.lon};
+            url = _baseUrl+commands["mobileaggregation"]+"get.js?"+parameterize(baseParams)+"&"+
+                  parameterize(coord);
         }
         return url;
     }
@@ -592,7 +612,7 @@
     function _sendRequest(request, onSuccess, onError) {
         var xmlHttp = new XMLHttpRequest();
         if (xmlHttp) {
-            console.log(request.url);
+            console.log("Sent request URL: " + request.url);
             xmlHttp.open('GET', request.url, true);
             xmlHttp.onreadystatechange = function () {
                 try {