From fd534ede699984bd02e90ec7f04b46484d652b8f Mon Sep 17 00:00:00 2001 From: ztimson Date: Wed, 24 Jun 2026 16:08:44 -0400 Subject: [PATCH] Added daytime property --- server/src/openweather.mjs | 6 ------ server/src/server.mjs | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/src/openweather.mjs b/server/src/openweather.mjs index 68a5f17..c8148d5 100644 --- a/server/src/openweather.mjs +++ b/server/src/openweather.mjs @@ -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}`}; diff --git a/server/src/server.mjs b/server/src/server.mjs index 5894eaf..ea3c755 100644 --- a/server/src/server.mjs +++ b/server/src/server.mjs @@ -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