Merge branch 'master' into improve-weather-provider-handling

This commit is contained in:
Matthew Oslan
2019-05-27 01:47:59 -04:00
committed by GitHub
2 changed files with 2 additions and 1 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "os-weather-service",
"description": "OpenSprinkler Weather Service",
"version": "1.0.2",
"version": "1.0.3",
"repository": "https://github.com/OpenSprinkler/Weather-Weather",
"scripts": {
"test": "mocha --exit --require ts-node/register **/*.spec.ts",

View File

@@ -214,6 +214,7 @@ export const getWateringData = async function( req: express.Request, res: expres
// parsed. This allows the adjustment method and the restriction type to both
// be saved in the same byte.
let adjustmentMethod: number = req.params[ 0 ] & ~( 1 << 7 ),
checkRestrictions: boolean = ( ( req.params[ 0 ] >> 7 ) & 1 ) > 0,
adjustmentOptionsString: string = getParameter(req.query.wto),
location: string | GeoCoordinates = getParameter(req.query.loc),
outputFormat: string = getParameter(req.query.format),