Merge lp:~martin-borho/ubuntu-weather-app/twc_5day_forecast into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Limiting TWC forecast to 5 days according guidelines

Limiting TWC forecast to 5 days according guidelines

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

PASSED: Continuous integration, rev:228
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/184/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/86
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/182
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/182
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/96

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks great, thanks Martin!

review: Approve

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2014-03-31 14:53:17 +0000
+++ components/WeatherApi.js	2014-04-10 18:08:52 +0000
@@ -518,10 +518,11 @@
         if(location.services && !location.services[_serviceName] && data["location"].key) {
             location.services[_serviceName] = data["location"].key
         }                
-        //
-        data["daily"].forEach(function(dayData) {
-            var date = getLocationTime(((dayData.validDate*1000)-1000)+offset), // minus 1 sec to handle +/-12 TZ
-                day = date.year+"-"+date.month+"-"+date.date;
+        // only 5 days of forecast for TWC
+        for(var x=0;x<5;x++) {
+            var dayData = data["daily"][x],
+                date = getLocationTime(((dayData.validDate*1000)-1000)+offset); // minus 1 sec to handle +/-12 TZ
+            day = date.year+"-"+date.month+"-"+date.date;
             if(!todayDate) {
                 if(localNow.year+"-"+localNow.month+"-"+localNow.date > day) {
                     // skip "yesterday"
@@ -530,7 +531,7 @@
                 todayDate = date;
             }
             tmpResult[day] = _buildDayFormat(date, dayData, nowMs);
-        })
+        }
         //
         if(data["current"]) {
             var today = todayDate.year+"-"+todayDate.month+"-"+todayDate.date