From aaa5fd362f7c3370cd0c35491db3d782a8e199b9 Mon Sep 17 00:00:00 2001 From: Matt Walsh Date: Thu, 4 Aug 2022 22:26:09 -0500 Subject: [PATCH] regional forecast cleanup --- server/scripts/modules/regionalforecast.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/server/scripts/modules/regionalforecast.js b/server/scripts/modules/regionalforecast.js index c4ccf9e..c4e3763 100644 --- a/server/scripts/modules/regionalforecast.js +++ b/server/scripts/modules/regionalforecast.js @@ -8,9 +8,6 @@ class RegionalForecast extends WeatherDisplay { constructor(navId, elemId) { super(navId, elemId, 'Regional Forecast', true, true); - // pre-load background image (returns promise) - this.backgroundImage = utils.image.load('images/BackGround5_1.png'); - // timings this.timing.totalScreens = 3; } @@ -20,13 +17,13 @@ class RegionalForecast extends WeatherDisplay { const weatherParameters = _weatherParameters ?? this.weatherParameters; // pre-load the base map - this.baseMap = 'images/Basemap2.png'; + let baseMap = 'images/Basemap2.png'; if (weatherParameters.state === 'HI') { - this.baseMap = 'images/HawaiiRadarMap4.png'; + baseMap = 'images/HawaiiRadarMap4.png'; } else if (weatherParameters.state === 'AK') { - this.baseMap = 'images/AlaskaRadarMap6.png'; + baseMap = 'images/AlaskaRadarMap6.png'; } - this.elem.querySelector('.map img').src = this.baseMap; + this.elem.querySelector('.map img').src = baseMap; // map offset const offsetXY = { @@ -66,7 +63,7 @@ class RegionalForecast extends WeatherDisplay { }); // get regional forecasts and observations (the two are intertwined due to the design of api.weather.gov) - const regionalForecastPromises = regionalCities.map(async (city) => { + const regionalDataAll = await Promise.all(regionalCities.map(async (city) => { try { // get the point first, then break down into forecast and observations const point = await utils.weather.getPoint(city.lat, city.lon); @@ -109,10 +106,8 @@ class RegionalForecast extends WeatherDisplay { console.log(e); return false; } - }); + })); - // wait for the forecasts - const regionalDataAll = await Promise.all(regionalForecastPromises); // filter out any false (unavailable data) const regionalData = regionalDataAll.filter((data) => data); @@ -328,7 +323,7 @@ class RegionalForecast extends WeatherDisplay { return city.match(/[^-;/\\,]*/)[0].substr(0, 12); } - async drawCanvas() { + drawCanvas() { super.drawCanvas(); // break up data into useful values const { regionalData: data, sourceXY, offsetXY } = this.data;