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

Merge branch 'master' into reduce-response-size

Browse Source 
# Conflicts:
#	routes/weatherProviders/DarkSky.ts
This commit is contained in:
Matthew Oslan
2020-03-21 16:40:35 -04:00
parent a563cbd21c fb52d18b8b
commit b743fc2cb5
3 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
routes/weather.ts
View File

@@ -210,7 +210,7 @@ export const getWateringData = async function( req: express.Request, res: expres
adjustmentOptions = JSON.parse( "{" + adjustmentOptionsString + "}" );
} catch ( err ) {
// If the JSON is not valid then abort the calculation
sendWateringError( res, new CodedError( ErrorCode.MalformedAdjustmentOptions ) );
sendWateringError( res, new CodedError( ErrorCode.MalformedAdjustmentOptions ), adjustmentMethod != ManualAdjustmentMethod );
return;
}
@@ -219,7 +219,7 @@ export const getWateringData = async function( req: express.Request, res: expres
try {
coordinates = await resolveCoordinates( location );
} catch ( err ) {
sendWateringError( res, makeCodedError( err ) );
sendWateringError( res, makeCodedError( err ), adjustmentMethod != ManualAdjustmentMethod );
return;
}
@@ -236,11 +236,11 @@ export const getWateringData = async function( req: express.Request, res: expres
// Make sure that the PWS ID and API key look valid.
if ( !pwsId ) {
sendWateringError( res, new CodedError( ErrorCode.InvalidPwsId ) );
sendWateringError( res, new CodedError( ErrorCode.InvalidPwsId ), adjustmentMethod != ManualAdjustmentMethod );
return;
}
if ( !apiKey ) {
sendWateringError( res, new CodedError( ErrorCode.InvalidPwsApiKey ) );
sendWateringError( res, new CodedError( ErrorCode.InvalidPwsApiKey ), adjustmentMethod != ManualAdjustmentMethod );
return;
}
@@ -278,7 +278,7 @@ export const getWateringData = async function( req: express.Request, res: expres
adjustmentOptions, coordinates, weatherProvider, pws
);
} catch ( err ) {
sendWateringError( res, makeCodedError( err ) );
sendWateringError( res, makeCodedError( err ), adjustmentMethod != ManualAdjustmentMethod );
return;
}
@@ -293,7 +293,7 @@ export const getWateringData = async function( req: express.Request, res: expres
try {
wateringData = await weatherProvider.getWateringData( coordinates );
} catch ( err ) {
sendWateringError( res, makeCodedError( err ) );
sendWateringError( res, makeCodedError( err ), adjustmentMethod != ManualAdjustmentMethod );
return;
}
}
@@ -318,17 +318,20 @@ export const getWateringData = async function( req: express.Request, res: expres
};
/**
* Sends a response to a watering scale request with an error code and a default watering scale of 100%.
* Sends a response to a watering scale request with an error code.
* @param res The Express Response object to send the response through.
* @param error The error code to send in the response body.
* @param resetScale Indicates if the `scale` field in the response should be set to 100. If this parameter is set to false,
* the field will be omitted. Newer firmware versions may ignore the value of this field since they will detect an error
* occurred, but older firmware versions will still update the watering scale accordingly.
* @param useJson Indicates if the response body should use a JSON format instead of a format similar to URL query strings.
*/
function sendWateringError( res: express.Response, error: CodedError, useJson: boolean = false ) {
function sendWateringError( res: express.Response, error: CodedError, resetScale: boolean = true, useJson: boolean = false ) {
if ( error.errCode === ErrorCode.UnexpectedError ) {
console.error( `An unexpected error occurred:`, error );
}
sendWateringData( res, { errCode: error.errCode, scale: 100 } );
sendWateringData( res, { errCode: error.errCode, scale: resetScale ? 100 : undefined } );
}
/**

7
routes/weatherProviders/DarkSky.ts
View File

@@ -41,7 +41,8 @@ export default class DarkSkyWeatherProvider extends WeatherProvider {
];
// Fail if not enough data is available.
if ( samples.length !== 24 ) {
// There will only be 23 samples on the day that daylight saving time begins.
if ( samples.length !== 24 && samples.length !== 23 ) {
throw new CodedError( ErrorCode.InsufficientWeatherData );
}
@@ -61,8 +62,8 @@ export default class DarkSkyWeatherProvider extends WeatherProvider {
return {
weatherProvider: "DS",
temp: totals.temp / 24,
humidity: totals.humidity / 24 * 100,
temp: totals.temp / samples.length,
humidity: totals.humidity / samples.length * 100,
precip: totals.precip,
raining: samples[ samples.length - 1 ].precipIntensity > 0
};