Merge lp:~vthompson/ubuntu-weather-app/adjust-sunrise-sunset-tz into lp:ubuntu-weather-app

[Victor Thompson]

* Use the timezone of the Location to display sunrise/sunset times.

* Use the timezone of the Location to display sunrise/sunset times.

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

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

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Currently, I don't see an easy way of determining if a given location is under daylight savings time. Putting this on hold.

[Victor Thompson (vthompson)]

Currently this MP works in all cases except when the user's location is in DST and an added location is no longer in DST. For instance, DST ends in Amsterdam on October 25th. For those in the US, a location added for Amsterdam will have the incorrect sunrise/sunset from October 25th until DST ends in the US as well, on November 1st. After this period of disagreement in DST status the times are once again correct.

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Ok we are going to land this as is, I'll report a bug later to track the slight gap.

review: Approve

=== modified file 'app/data/WeatherApi.js'
--- app/data/WeatherApi.js	2015-10-14 23:53:23 +0000
+++ app/data/WeatherApi.js	2015-10-20 01:39:21 +0000
@@ -552,10 +552,13 @@
                 todayDate = date;
             }
             tmpResult[day] = _buildDayFormat(date, dayData, nowMs);
-            var sunrise = new Date(sunRiseSet.rise*1000);
-            var sunset = new Date(sunRiseSet.set*1000);
-            tmpResult[day].sunrise = sunrise.toLocaleTimeString();
-            tmpResult[day].sunset = sunset.toLocaleTimeString();
+            var timezoneOffset = new Date().getTimezoneOffset();
+            var offset = (location.timezone && location.timezone.dstOffset !== undefined) ? (location.timezone.dstOffset*60 + timezoneOffset)*60*1000: 0
+            var sunrise = new Date(sunRiseSet.rise*1000 + offset);
+            var sunset = new Date(sunRiseSet.set*1000 + offset);
+            var options = { timeZone: location.timezone.timeZoneId, timeZoneName: 'long' };
+            tmpResult[day].sunrise = sunrise.toLocaleTimeString(Qt.locale().name, options);
+            tmpResult[day].sunset = sunset.toLocaleTimeString(Qt.locale().name, options);
         }
         //
         if(data["forecast"] !== undefined) {
 
=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml	2015-10-15 14:15:10 +0000
+++ app/ui/LocationPane.qml	2015-10-20 01:39:21 +0000
@@ -140,6 +140,11 @@
 
     function getDayData(data) {
         var tempUnits = settings.tempScale === "°C" ? "metric" : "imperial"
+        var timezoneOffset = new Date().getTimezoneOffset();
+        var offset = (data.location.timezone && data.location.timezone.dstOffset !== undefined) ? (data.location.timezone.dstOffset*60 + timezoneOffset)*60*1000: 0
+        var options = { timeZone: data.location.timezone.timeZoneId, timeZoneName: 'long' };
+        var sunrise = new Date(SunCalc.SunCalc.getTimes(getDate(data.date), data.location.coord.lat, data.location.coord.lon).sunrise.getTime() + offset);
+        var sunset = new Date(SunCalc.SunCalc.getTimes(getDate(data.date), data.location.coord.lat, data.location.coord.lon).sunset.getTime() + offset);
 
         return {
             day: formatTimestamp(data.date, 'dddd'),
@@ -149,8 +154,8 @@
             condition: emptyIfUndefined(data.condition),
             chanceOfRain: emptyIfUndefined(data.propPrecip, "%"),
             humidity: emptyIfUndefined(data.humidity, "%"),
-            sunrise: data.sunrise || SunCalc.SunCalc.getTimes(getDate(data.date), data.location.coord.lat, data.location.coord.lon).sunrise.toLocaleTimeString(),
-            sunset: data.sunset || SunCalc.SunCalc.getTimes(getDate(data.date), data.location.coord.lat, data.location.coord.lon).sunset.toLocaleTimeString(),
+            sunrise: data.sunrise || sunrise.toLocaleTimeString(Qt.locale().name, options),
+            sunset: data.sunset || sunset.toLocaleTimeString(Qt.locale().name, options),
             uvIndex: emptyIfUndefined(data.uv),
             wind: data[tempUnits].windSpeed === undefined || data.windDir === undefined
                         ? "" : Math.round(data[tempUnits].windSpeed) + settings.windUnits + " " + data.windDir
@@ -201,10 +206,11 @@
                     hourlyForecasts = hourlyForecasts.concat(forecasts[x].hourly)
                 }
 
-                // Copy the coords of the location
+                // Copy the coords and timezone of the location
                 // so that sun{rise,set} work with OWM
                 forecasts[x].location = {
                     coord: data.location.coord,
+                    timezone: data.location.timezone
                 };
 
                 if (x === 0) {
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-10-18 15:51:11 +0000
+++ debian/changelog	2015-10-20 01:39:21 +0000
@@ -30,6 +30,7 @@
     languages.
   * Show the bottom loading animation (LoadingIndicator) on the LocationsPage. (LP: #1490040)
   * Add FakeHeader component to ease the bottom edge transition.
+  * Use the timezone of the Location to display sunrise/sunset times.
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data