Added daytime property
This commit is contained in:
@@ -61,13 +61,7 @@ export function getWeatherCondition(data) {
|
||||
return {label: 'Mist', code: 701, icon: '50d'};
|
||||
}
|
||||
|
||||
console.log('daytime:',data.daytime);
|
||||
// Cloud-based conditions
|
||||
if(data.daytime == null)
|
||||
data.daytime = data.time.getTime() >= new Date(data.sunrise).getTime() && data.time.getTime() <= new Date(data.sunset).getTime();
|
||||
console.log(data.time, data.sunrise, data.sunset, data.daytime);
|
||||
const dayNight = data.daytime ? 'd' : 'n';
|
||||
|
||||
if(data.clouds > 85) return {label: 'Overcast Clouds', code: 804, icon: `04${dayNight}`};
|
||||
if(data.clouds > 50) return {label: 'Broken Clouds', code: 803, icon: `04${dayNight}`};
|
||||
if(data.clouds > 25) return {label: 'Scattered Clouds', code: 802, icon: `03${dayNight}`};
|
||||
|
||||
@@ -41,8 +41,10 @@ function filterArr(arr, fields) {
|
||||
app.get('/api/current', async (req, res) => {
|
||||
const { fields } = req.query
|
||||
const [sensors, coords] = await Promise.all([queryCurrent(), getCoords()])
|
||||
console.log(sensors);
|
||||
const space = getCelestialCurrent(coords.latitude, coords.longitude)
|
||||
const condition = getWeatherCondition(Object.assign(sensors, space))
|
||||
console.log(sensors);
|
||||
const { summary } = await ensureForecast()
|
||||
|
||||
// Merge forecast summary fields — sensor readings take priority
|
||||
|
||||
Reference in New Issue
Block a user