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

Merge pull request #49 from PeteBa/restrictions-check

Browse Source 
Revert California Restrictions check
This commit is contained in:
Samer Albahra
2019-05-26 23:12:34 -05:00
committed by GitHub
parent fa5e684975 7edae63027
commit acb4ca316a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
routes/weather.ts
View File

@@ -221,6 +221,7 @@ export const getWateringData = async function( req: express.Request, res: expres
// parsed. This allows the adjustment method and the restriction type to both // parsed. This allows the adjustment method and the restriction type to both
// be saved in the same byte. // be saved in the same byte.
let adjustmentMethod: number = req.params[ 0 ] & ~( 1 << 7 ), let adjustmentMethod: number = req.params[ 0 ] & ~( 1 << 7 ),
checkRestrictions: boolean = ( ( req.params[ 0 ] >> 7 ) & 1 ) > 0,
adjustmentOptionsString: string = getParameter(req.query.wto), adjustmentOptionsString: string = getParameter(req.query.wto),
location: string | GeoCoordinates = getParameter(req.query.loc), location: string | GeoCoordinates = getParameter(req.query.loc),
outputFormat: string = getParameter(req.query.format), outputFormat: string = getParameter(req.query.format),
@@ -262,7 +263,7 @@ export const getWateringData = async function( req: express.Request, res: expres
let wateringData: WateringData; let wateringData: WateringData;
if ( local.useLocalWeather() ) { if ( local.useLocalWeather() ) {
wateringData = await getLocalWateringData( coordinates ); wateringData = await getLocalWateringData( coordinates );
} else if ( adjustmentMethod !== 0 ) { } else if ( adjustmentMethod !== 0 || checkRestrictions ) {
wateringData = await weatherProvider.getWateringData(coordinates); wateringData = await weatherProvider.getWateringData(coordinates);
} }