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

Fix issue retrieving timezone data for OpenWeather Map

Browse Source
This commit is contained in:
Samer Albahra
2018-05-20 16:27:08 -05:00
parent d19f121559
commit e938f57c3c
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
routes/weather.js
View File

@@ -229,14 +229,15 @@ function getOWMWeatherData( location, callback ) {
httpRequest( url, function( data ) {
try {
data = JSON.parse( data );
var weather = {
timezone: timezone,
sunrise: ( sunData.sunrise.getUTCHours() * 60 + sunData.sunrise.getUTCMinutes() ),
sunset: ( sunData.sunset.getUTCHours() * 60 + sunData.sunset.getUTCMinutes() ),
temp: parseInt( data.main.temp ),
humidity: parseInt( data.main.humidity ),
wind: parseInt( data.wind.speed )
};
} catch ( err ) {
// Otherwise indicate the request failed
callback( false );
}
getTimeData( location, function( weather ) {
weather.temp = parseInt( data.main.temp );
weather.humidity = parseInt( data.main.humidity );
weather.wind = parseInt( data.wind.speed );
location = location.join( "," );
@@ -248,11 +249,7 @@ function getOWMWeatherData( location, callback ) {
} );
updateCache( location, weather );
} catch ( err ) {
// Otherwise indicate the request failed
callback( false );
}
} );
} );
}