ppetru/opensprinkler-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add timezone offset to Date object so overflow is handled

Browse Source
This commit is contained in:
Samer Albahra
2015-07-03 13:22:45 -05:00
parent 6ad0f0ff33
commit 1a1a744dd7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
routes/weather.js
View File

@@ -72,12 +72,16 @@ function getWeatherUndergroundData( location, weatherUndergroundKey, callback )
// Calculate sunrise and sunset since Weather Underground does not provide it // Calculate sunrise and sunset since Weather Underground does not provide it
sunData = SunCalc.getTimes( data.current_observation.local_epoch * 1000, sunData = SunCalc.getTimes( data.current_observation.local_epoch * 1000,
data.current_observation.observation_location.latitude, data.current_observation.observation_location.latitude,
data.current_observation.observation_location.longitude ), data.current_observation.observation_location.longitude );
weather = {
sunData.sunrise.setUTCMinutes( sunData.sunrise.getUTCMinutes() + tzOffset );
sunData.sunset.setUTCMinutes( sunData.sunset.getUTCMinutes() + tzOffset );
var weather = {
icon: data.current_observation.icon, icon: data.current_observation.icon,
timezone: data.current_observation.local_tz_offset, timezone: data.current_observation.local_tz_offset,
sunrise: ( sunData.sunrise.getUTCHours() * 60 + sunData.sunrise.getUTCMinutes() ) + tzOffset, sunrise: ( sunData.sunrise.getUTCHours() * 60 + sunData.sunrise.getUTCMinutes() ),
sunset: ( sunData.sunset.getUTCHours() * 60 + sunData.sunset.getUTCMinutes() ) + tzOffset, sunset: ( sunData.sunset.getUTCHours() * 60 + sunData.sunset.getUTCMinutes() ),
maxTemp: parseInt( data.history.dailysummary[0].maxtempi ), maxTemp: parseInt( data.history.dailysummary[0].maxtempi ),
minTemp: parseInt( data.history.dailysummary[0].mintempi ), minTemp: parseInt( data.history.dailysummary[0].mintempi ),
temp: parseInt( data.current_observation.temp_f ), temp: parseInt( data.current_observation.temp_f ),
@@ -88,10 +92,6 @@ function getWeatherUndergroundData( location, weatherUndergroundKey, callback )
elevation: parseInt( data.current_observation.observation_location.elevation ) elevation: parseInt( data.current_observation.observation_location.elevation )
}; };
if ( weather.sunrise > weather.sunset ) {
weather.sunset += 1440;
}
callback( weather ); callback( weather );
} catch ( err ) { } catch ( err ) {