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

Ignore forecast data when calculating Dark Sky watering scale

Browse Source
This commit is contained in:
Matthew Oslan
2019-05-22 15:10:26 -04:00
parent 56bf8a5962
commit c181d12992
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
routes/weatherProviders/DarkSky.ts
View File

@@ -31,8 +31,11 @@ async function getDarkSkyWateringData( coordinates: GeoCoordinates ): Promise< W
} }
const totals = { temp: 0, humidity: 0, precip: 0 }; const totals = { temp: 0, humidity: 0, precip: 0 };
// The number of hourly forecasts from today's data that use historic data (not forecast data).
// Find the first element that contains forecast data.
const todayHistoricElements = todayData.hourly.data.findIndex( ( data ) => data.time > todayTimestamp - 60 * 60 );
// Sum data from the current calendar day. // Sum data from the current calendar day.
const todayPeriods = Math.min( 24, todayData.hourly.data.length ); const todayPeriods = Math.min( 24, todayHistoricElements );
for ( let index = todayPeriods - 1; index >= 0; index-- ) { for ( let index = todayPeriods - 1; index >= 0; index-- ) {
totals.temp += todayData.hourly.data[ index ].temperature; totals.temp += todayData.hourly.data[ index ].temperature;
totals.humidity += todayData.hourly.data[ index ].humidity; totals.humidity += todayData.hourly.data[ index ].humidity;
@@ -50,7 +53,7 @@ async function getDarkSkyWateringData( coordinates: GeoCoordinates ): Promise< W
temp : totals.temp / 24, temp : totals.temp / 24,
humidity: totals.humidity / 24 * 100, humidity: totals.humidity / 24 * 100,
precip: totals.precip, precip: totals.precip,
raining: todayData.hourly.data[ todayData.hourly.data.length - 1 ].precipIntensity > 0 raining: todayData.hourly.data[ todayHistoricElements - 1 ].precipIntensity > 0
}; };
} }