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

Remove Open Weather Map dependency

Browse Source
This commit is contained in:
Samer Albahra
2015-11-02 17:14:58 -06:00
parent 175e0d6c10
commit cc549afb69
1 changed files with 23 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
routes/weather.js
View File

@@ -217,63 +217,34 @@ function getYesterdayWeatherData( location, callback ) {
} ); } );
} }
// Retrieve weather data from Open Weather Map // Calculate timezone and sun rise/set information
function getOWMWeatherData( location, callback ) { function getTimeData( location, callback ) {
timezoner.getTimeZone(
location[ 0 ],
location[ 1 ],
function( err, timezone ) {
if ( err ) {
callback( false );
} else {
timezone = ( timezone.rawOffset + timezone.dstOffset ) / 60;
var tzOffset = getTimezone( timezone, "minutes" ),
// Generate URL using The Weather Company API v1 in Imperial units // Calculate sunrise and sunset since Weather Underground does not provide it
var OWM_API_KEY = process.env.OWM_API_KEY, sunData = SunCalc.getTimes( new Date(), location[ 0 ], location[ 1 ] );
url = "http://api.openweathermap.org/data/2.5/weather?appid=" + OWM_API_KEY + "&units=imperial&lat=" + location[ 0 ] + "&lon=" + location[ 1 ];
// Perform the HTTP request to retrieve the weather data sunData.sunrise.setUTCMinutes( sunData.sunrise.getUTCMinutes() + tzOffset );
httpRequest( url, function( data ) { sunData.sunset.setUTCMinutes( sunData.sunset.getUTCMinutes() + tzOffset );
try { var weather = {
timezone: timezone,
sunrise: ( sunData.sunrise.getUTCHours() * 60 + sunData.sunrise.getUTCMinutes() ),
sunset: ( sunData.sunset.getUTCHours() * 60 + sunData.sunset.getUTCMinutes() )
};
data = JSON.parse( data ); callback( weather );
}
timezoner.getTimeZone(
location[ 0 ],
location[ 1 ],
function( err, timezone ) {
if ( err ) {
callback( false );
} else {
timezone = ( timezone.rawOffset + timezone.dstOffset ) / 60;
var tzOffset = getTimezone( timezone, "minutes" ),
// Calculate sunrise and sunset since Weather Underground does not provide it
sunData = SunCalc.getTimes( new Date(), location[ 0 ], location[ 1 ] );
sunData.sunrise.setUTCMinutes( sunData.sunrise.getUTCMinutes() + tzOffset );
sunData.sunset.setUTCMinutes( sunData.sunset.getUTCMinutes() + tzOffset );
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 )
};
getCache( {
key: "yesterdayHumidity",
location: location,
weather: weather,
callback: callback
} );
updateCache( location, weather );
}
}
);
} catch ( err ) {
// Otherwise indicate the request failed
callback( false );
} }
} ); );
} }
// Retrieve cached record for a given location // Retrieve cached record for a given location