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

Hide raw data when not used

Browse Source
This commit is contained in:
Samer Albahra
2019-05-23 11:08:27 -05:00
parent 4ff52cca09
commit 10c3a67387
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
routes/weather.ts
View File

@@ -312,14 +312,17 @@ export const getWateringData = async function( req: express.Request, res: expres
sunrise: timeData.sunrise, sunrise: timeData.sunrise,
sunset: timeData.sunset, sunset: timeData.sunset,
eip: ipToInt( remoteAddress ), eip: ipToInt( remoteAddress ),
// TODO this may need to be changed (https://github.com/OpenSprinkler/OpenSprinkler-Weather/pull/11#issuecomment-491037948) rawData: undefined
rawData: { };
if ( adjustmentMethod > 0 ) {
data.rawData = {
h: wateringData ? Math.round( wateringData.humidity * 100) / 100 : null, h: wateringData ? Math.round( wateringData.humidity * 100) / 100 : null,
p: wateringData ? Math.round( wateringData.precip * 100 ) / 100 : null, p: wateringData ? Math.round( wateringData.precip * 100 ) / 100 : null,
t: wateringData ? Math.round( wateringData.temp * 10 ) / 10 : null, t: wateringData ? Math.round( wateringData.temp * 10 ) / 10 : null,
raining: wateringData ? ( wateringData.raining ? 1 : 0 ) : null raining: wateringData ? ( wateringData.raining ? 1 : 0 ) : null
} }
}; }
if ( local.useLocalWeather() ) { if ( local.useLocalWeather() ) {
console.log( "OpenSprinkler Weather Response: %s", JSON.stringify( data ) ); console.log( "OpenSprinkler Weather Response: %s", JSON.stringify( data ) );
@@ -335,7 +338,7 @@ export const getWateringData = async function( req: express.Request, res: expres
"&sunrise=" + data.sunrise + "&sunrise=" + data.sunrise +
"&sunset=" + data.sunset + "&sunset=" + data.sunset +
"&eip=" + data.eip + "&eip=" + data.eip +
"&rawData=" + JSON.stringify( data.rawData ) ( adjustmentMethod > 0 ? "&rawData=" + JSON.stringify( data.rawData ) : "" )
); );
} }