lifning/ws4kp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

correct heading in regional forecast

Browse source
This commit is contained in:
Matt Walsh 2020-09-16 20:55:34 -05:00
parent 5729579305
commit 0781927882
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/scripts/modules/regionalforecast.js
View file

@ -139,6 +139,7 @@ class RegionalForecast extends WeatherDisplay {
icon: forecast.icon, icon: forecast.icon,
x: cityXY.x, x: cityXY.x,
y: cityXY.y, y: cityXY.y,
time: forecast.startTime,
}; };
} }
@ -341,13 +342,7 @@ class RegionalForecast extends WeatherDisplay {
if (this.screenIndex === 0) { if (this.screenIndex === 0) {
draw.titleText(this.context, 'Regional', 'Observations'); draw.titleText(this.context, 'Regional', 'Observations');
} else { } else {
let forecastDate = DateTime.local(); let forecastDate = DateTime.fromISO(data[0][this.screenIndex].time);
// four conditions to evaluate based on whether the first forecast is for daytime and the requested period
const firstIsDay = data[0][1].daytime;
if (firstIsDay && this.screenIndex === 1) forecastDate = forecastDate.plus({days: 1});
if (firstIsDay && this.screenIndex === 2); // no change, shown for consistency
if (!firstIsDay && this.screenIndex === 1); // no change, shown for consistency
if (!firstIsDay && this.screenIndex === 2) forecastDate = forecastDate.plus({days: 1});
// get the name of the day // get the name of the day
const dayName = forecastDate.toLocaleString({weekday: 'long'}); const dayName = forecastDate.toLocaleString({weekday: 'long'});