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

Merge pull request #5 from PeteBa/zimm2

Browse Source 
Added ability to set reference weather conditions (Temp, Rain, Humidity) to the Zimmerman adjustment method
This commit is contained in:
Samer Albahra
2016-03-12 15:34:05 -08:00
parent 02e5e233c7 9b12b2b29e
commit 9c827ded59
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
routes/weather.js Normal file → Executable file
View File

@@ -305,16 +305,24 @@ function calculateWeatherScale( adjustmentMethod, adjustmentOptions, weather ) {
// Zimmerman method // Zimmerman method
if ( adjustmentMethod === 1 ) { if ( adjustmentMethod === 1 ) {
var humidityBase = 30, tempBase = 70, precipBase = 0;
// Check to make sure valid data exists for all factors // Check to make sure valid data exists for all factors
if ( !validateValues( [ "temp", "humidity", "precip" ], weather ) ) { if ( !validateValues( [ "temp", "humidity", "precip" ], weather ) ) {
return 100; return 100;
} }
// Get baseline conditions for 100% water level, if provided
if ( adjustmentOptions ) {
humidityBase = adjustmentOptions.hasOwnProperty( "bh" ) ? adjustmentOptions.bh : humidityBase;
tempBase = adjustmentOptions.hasOwnProperty( "bt" ) ? adjustmentOptions.bt : tempBase;
precipBase = adjustmentOptions.hasOwnProperty( "br" ) ? adjustmentOptions.br : precipBase;
}
var temp = ( ( weather.maxTemp + weather.minTemp ) / 2 ) || weather.temp, var temp = ( ( weather.maxTemp + weather.minTemp ) / 2 ) || weather.temp,
humidityFactor = ( 30 - weather.humidity ), humidityFactor = ( humidityBase - weather.humidity ),
tempFactor = ( ( temp - 70 ) * 4 ), tempFactor = ( ( temp - tempBase ) * 4 ),
precipFactor = ( weather.precip * -200 ); precipFactor = ( (precipBase - weather.precip ) * 200 );
// Apply adjustment options, if provided, by multiplying the percentage against the factor // Apply adjustment options, if provided, by multiplying the percentage against the factor
if ( adjustmentOptions ) { if ( adjustmentOptions ) {