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

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

Browse Source
This commit is contained in:
Matthew Oslan
2019-05-27 01:47:59 -04:00
committed by GitHub
parent 3df8e8b972 5ead4ebcd7
commit 8c94af1fdb
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

1
routes/weather.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 // 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),