From 61c10a7d7ce3dafc673aac001568539238a2ad99 Mon Sep 17 00:00:00 2001 From: Matt Walsh Date: Wed, 7 Dec 2022 11:02:51 -0600 Subject: [PATCH] fix enabled/disabled checkboxes --- server/scripts/modules/almanac.mjs | 2 +- server/scripts/modules/currentweather.mjs | 2 +- server/scripts/modules/extendedforecast.mjs | 2 +- server/scripts/modules/latestobservations.mjs | 2 +- server/scripts/modules/localforecast.mjs | 2 +- server/scripts/modules/radar.mjs | 2 +- server/scripts/modules/regionalforecast.mjs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/scripts/modules/almanac.mjs b/server/scripts/modules/almanac.mjs index 8a6c76c..ba0dcfb 100644 --- a/server/scripts/modules/almanac.mjs +++ b/server/scripts/modules/almanac.mjs @@ -22,7 +22,7 @@ class Almanac extends WeatherDisplay { } async getData(_weatherParameters) { - super.getData(_weatherParameters); + if (!super.getData(_weatherParameters)) return; const weatherParameters = _weatherParameters ?? this.weatherParameters; // get sun/moon data diff --git a/server/scripts/modules/currentweather.mjs b/server/scripts/modules/currentweather.mjs index e9ebf4f..14b9d09 100644 --- a/server/scripts/modules/currentweather.mjs +++ b/server/scripts/modules/currentweather.mjs @@ -19,7 +19,7 @@ class CurrentWeather extends WeatherDisplay { } async getData(_weatherParameters) { - super.getData(_weatherParameters); + if (!super.getData(_weatherParameters)) return; const weatherParameters = _weatherParameters ?? this.weatherParameters; // Load the observations diff --git a/server/scripts/modules/extendedforecast.mjs b/server/scripts/modules/extendedforecast.mjs index a0e29f8..9ca86c4 100644 --- a/server/scripts/modules/extendedforecast.mjs +++ b/server/scripts/modules/extendedforecast.mjs @@ -18,7 +18,7 @@ class ExtendedForecast extends WeatherDisplay { } async getData(_weatherParameters) { - super.getData(_weatherParameters); + if (!super.getData(_weatherParameters)) return; const weatherParameters = _weatherParameters ?? this.weatherParameters; // request us or si units diff --git a/server/scripts/modules/latestobservations.mjs b/server/scripts/modules/latestobservations.mjs index faa072d..4ae9967 100644 --- a/server/scripts/modules/latestobservations.mjs +++ b/server/scripts/modules/latestobservations.mjs @@ -16,7 +16,7 @@ class LatestObservations extends WeatherDisplay { } async getData(_weatherParameters) { - super.getData(_weatherParameters); + if (!super.getData(_weatherParameters)) return; const weatherParameters = _weatherParameters ?? this.weatherParameters; // calculate distance to each station diff --git a/server/scripts/modules/localforecast.mjs b/server/scripts/modules/localforecast.mjs index ec92e46..b3d905c 100644 --- a/server/scripts/modules/localforecast.mjs +++ b/server/scripts/modules/localforecast.mjs @@ -14,7 +14,7 @@ class LocalForecast extends WeatherDisplay { } async getData(_weatherParameters) { - super.getData(_weatherParameters); + if (!super.getData(_weatherParameters)) return; const weatherParameters = _weatherParameters ?? this.weatherParameters; // get raw data diff --git a/server/scripts/modules/radar.mjs b/server/scripts/modules/radar.mjs index 0f2e956..5a19a2b 100644 --- a/server/scripts/modules/radar.mjs +++ b/server/scripts/modules/radar.mjs @@ -42,7 +42,7 @@ class Radar extends WeatherDisplay { } async getData(_weatherParameters) { - super.getData(_weatherParameters); + if (!super.getData(_weatherParameters)) return; const weatherParameters = _weatherParameters ?? this.weatherParameters; // ALASKA AND HAWAII AREN'T SUPPORTED! diff --git a/server/scripts/modules/regionalforecast.mjs b/server/scripts/modules/regionalforecast.mjs index 02b3b6a..620d5bd 100644 --- a/server/scripts/modules/regionalforecast.mjs +++ b/server/scripts/modules/regionalforecast.mjs @@ -20,7 +20,7 @@ class RegionalForecast extends WeatherDisplay { } async getData(_weatherParameters) { - super.getData(_weatherParameters); + if (!super.getData(_weatherParameters)) return; const weatherParameters = _weatherParameters ?? this.weatherParameters; // pre-load the base map