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

Change the way restrictions are applied

Browse Source
This commit is contained in:
Samer Albahra
2015-07-19 23:01:35 -05:00
parent b11f952502
commit eeae47ef5d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
routes/weather.js
View File

@@ -283,9 +283,14 @@ exports.getWeather = function( req, res ) {
return;
}
var scale = calculateWeatherScale( adjustmentMethod, adjustmentOptions, weather );
if ( checkWeatherRestriction( req.params[0], weather ) ) {
scale = 0;
}
var data = {
scale: calculateWeatherScale( adjustmentMethod, adjustmentOptions, weather ),
restrict: checkWeatherRestriction( req.params[0], weather ) ? 1 : 0,
scale: scale,
tz: getTimezone( weather.timezone ),
sunrise: weather.sunrise,
sunset: weather.sunset,
@@ -297,7 +302,6 @@ exports.getWeather = function( req, res ) {
res.json( data );
} else {
res.send( "&scale=" + data.scale +
"&restrict=" + data.restrict +
"&tz=" + data.tz +
"&sunrise=" + data.sunrise +
"&sunset=" + data.sunset +