better filtering of null station data for current weather

netbymatt · Oct 19, 2024 · 1d44b9e · 1d44b9e
1 parent 0199086
commit 1d44b9e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/server/scripts/modules/almanac.mjs b/server/scripts/modules/almanac.mjs
@@ -94,7 +94,7 @@ class Almanac extends WeatherDisplay {
 		if (iteration % 2 === 0) test = (lastPhase, testPhase) => lastPhase > threshold && testPhase <= threshold;
 
 		do {
-		// store last phase
+			// store last phase
 			const lastPhase = phase;
 			// calculate new phase after step
 			moonDate = moonDate.plus(step);
@@ -103,7 +103,7 @@ class Almanac extends WeatherDisplay {
 			if (phase > 0.9) phase -= 1.0;
 			// compare
 			if (test(lastPhase, phase)) {
-			// last iteration is three, return value
+				// last iteration is three, return value
 				if (iteration >= 3) break;
 				// iterate recursively
 				return this.getMoonTransition(threshold, phaseName, moonDate, iteration + 1);
@@ -160,15 +160,15 @@ class Almanac extends WeatherDisplay {
 
 const imageName = (type) => {
 	switch (type) {
-	case 'Full':
-		return 'images/2/Full-Moon.gif';
-	case 'Last':
-		return 'images/2/Last-Quarter.gif';
-	case 'New':
-		return 'images/2/New-Moon.gif';
-	case 'First':
-	default:
-		return 'images/2/First-Quarter.gif';
+		case 'Full':
+			return 'images/2/Full-Moon.gif';
+		case 'Last':
+			return 'images/2/Last-Quarter.gif';
+		case 'New':
+			return 'images/2/New-Moon.gif';
+		case 'First':
+		default:
+			return 'images/2/First-Quarter.gif';
 	}
 };
 

diff --git a/server/scripts/modules/currentweather.mjs b/server/scripts/modules/currentweather.mjs
@@ -56,7 +56,9 @@ class CurrentWeather extends WeatherDisplay {
 					|| observations.features[0].properties.windSpeed.value === null
 					|| observations.features[0].properties.textDescription === null
 					|| observations.features[0].properties.textDescription === ''
-					|| observations.features[0].properties.icon === null) {
+					|| observations.features[0].properties.icon === null
+					|| observations.features[0].properties.dewpoint.value === null
+					|| observations.features[0].properties.barometricPressure.value === null) {
 					observations = undefined;
 					throw new Error(`Unable to get observations: ${station.properties.stationIdentifier}, trying next station`);
 				}