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

Actually use most recent data

Browse Source
This commit is contained in:
Matthew Oslan
2019-05-26 12:42:37 -04:00
parent 31e443620c
commit e115343cb9
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
routes/weatherProviders/DarkSky.ts
View File

@@ -25,16 +25,16 @@ async function getDarkSkyWateringData( coordinates: GeoCoordinates ): Promise< W
return undefined; return undefined;
} }
// The number of hourly forecasts to use from today's data. This will only include elements that contain historic /* The number of hourly forecasts to use from today's data. This will only include elements that contain historic
// data (not forecast data). data (not forecast data). */
// Find the first element that contains forecast data. // Find the first element that contains forecast data.
const todayElements = Math.min( 24, todayData.hourly.data.findIndex( ( data ) => data.time > todayTimestamp - 60 * 60 ) ); const todayElements = Math.min( 24, todayData.hourly.data.findIndex( ( data ) => data.time > todayTimestamp - 60 * 60 ) );
/* Take as much data as possible from the first elements of today's data and take the remaining required data from
the remaining data from the last elements of yesterday's data. */
const samples = [ const samples = [
// Take as much data as possible from the first elements of today's data.
...todayData.hourly.data.slice( 0, todayElements ),
// Take the remaining data from the last elements of yesterday's data.
...yesterdayData.hourly.data.slice( todayElements - 24 ), ...yesterdayData.hourly.data.slice( todayElements - 24 ),
...todayData.hourly.data.slice( 0, todayElements )
]; ];
// Fail if not enough data is available. // Fail if not enough data is available.
@@ -43,19 +43,17 @@ async function getDarkSkyWateringData( coordinates: GeoCoordinates ): Promise< W
} }
const totals = { temp: 0, humidity: 0, precip: 0 }; const totals = { temp: 0, humidity: 0, precip: 0 };
for ( let index = 0; index < samples.length; index++ ) { for ( const sample of samples ) {
totals.temp += todayData.hourly.data[ index ].temperature; totals.temp += sample.temperature;
totals.humidity += todayData.hourly.data[ index ].humidity; totals.humidity += sample.humidity;
totals.precip += todayData.hourly.data[ index ].precipIntensity totals.precip += sample.precipIntensity
} }
const mostRecentSample = todayElements > 0 ?
todayData.hourly.data[ todayElements - 1 ] : yesterdayData.hourly.data[ yesterdayData.hourly.data.length - 1 ];
return { return {
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: mostRecentSample.precipIntensity > 0 raining: samples[ samples.length - 1 ].precipIntensity > 0
}; };
} }