6.1.1

README.md

@@ -335,6 +335,10 @@ Before reporting an issue or requesting a feature please consider that this is n
 
 Note: not all units are converted to metric, if selected. Some text-based products such as warnings are simple text strings provided from the national weather service and thus have baked-in units such as "gusts up to 60 mph." These values will not be converted.
 
+## The full moon icon is broken
+
+This is a known problem with the Ws4kp as it ages. It was a problem with the [actual Weatherstar hardware](https://youtu.be/rcUwlZ4pqh0?feature=shared&t=116) as well. 
+
 ## Related Projects
 
 Not retro enough? Try the [Weatherstar 3000+](https://github.com/netbymatt/ws3kp)

datagenerators/output/regionalcities.json

@@ -84,8 +84,8 @@
 		"lat": 29.7633,
 		"lon": -95.3633,
 		"point": {
-			"x": 65,
-			"y": 97,
+			"x": 63,
+			"y": 95,
 			"wfo": "HGX"
 		}
 	},
@@ -230,7 +230,7 @@
 		}
 	},
 	{
-		"city": "Washington DC",
+		"city": "Washington",
 		"lat": 38.8951,
 		"lon": -77.0364,
 		"point": {
@@ -274,7 +274,7 @@
 		"lat": 61.2181,
 		"lon": -149.9003,
 		"point": {
-			"x": 125,
+			"x": 143,
 			"y": 236,
 			"wfo": "AER"
 		}
@@ -734,8 +734,8 @@
 		"lat": 42.9956,
 		"lon": -71.4548,
 		"point": {
-			"x": 42,
-			"y": 21,
+			"x": 38,
+			"y": 20,
 			"wfo": "GYX"
 		}
 	},
@@ -884,8 +884,8 @@
 		"lat": 43.6615,
 		"lon": -70.2553,
 		"point": {
-			"x": 76,
-			"y": 59,
+			"x": 72,
+			"y": 58,
 			"wfo": "GYX"
 		}
 	},

datagenerators/regionalcities-raw.json

@@ -115,7 +115,7 @@
 		"lon": -82.5329
 	},
 	{
-		"city": "Washington DC",
+		"city": "Washington",
 		"lat": 38.8951,
 		"lon": -77.0364
 	},

gulp/publish-frontend.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
 import 'dotenv/config';
 import {
 	src, dest, series, parallel,
@@ -58,15 +57,6 @@ const jsVendorSources = [
 	'server/scripts/vendor/auto/suncalc.js',
 ];
 
-// Copy metar-taf-parser separately since it's an ES module with locale dependencies
-const metarVendorSources = [
-	'server/scripts/vendor/auto/metar-taf-parser.mjs',
-	'server/scripts/vendor/auto/locale/en.js',
-];
-
-const copyMetarVendor = () => src(metarVendorSources, { base: 'server/scripts/vendor/auto' })
-	.pipe(dest(`${RESOURCES_PATH}/vendor/auto`));
-
 const compressJsVendor = () => src(jsVendorSources)
 	.pipe(concat('vendor.min.js'))
 	.pipe(terser())
@@ -210,7 +200,7 @@ const buildPlaylist = async () => {
 	return file('playlist.json', JSON.stringify(playlist)).pipe(dest('./dist'));
 };
 
-const buildDist = series(clean, parallel(buildJs, compressJsVendor, copyMetarVendor, copyCss, compressHtml, copyOtherFiles, copyDataFiles, copyImageSources, buildPlaylist));
+const buildDist = series(clean, parallel(buildJs, compressJsVendor, copyCss, compressHtml, copyOtherFiles, copyDataFiles, copyImageSources, buildPlaylist));
 
 // upload_images could be in parallel with upload, but _images logs a lot and has little changes
 // by running upload last the majority of the changes will be at the bottom of the log for easy viewing

gulp/update-vendor.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
 import { src, series, dest } from 'gulp';
 import { deleteAsync } from 'del';
 import rename from 'gulp-rename';

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "ws4kp",
-	"version": "6.0.0",
+	"version": "6.1.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ws4kp",
-			"version": "6.0.0",
+			"version": "6.1.1",
 			"license": "MIT",
 			"dependencies": {
 				"dotenv": "^17.0.1",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ws4kp",
-	"version": "6.0.0",
+	"version": "6.1.1",
 	"description": "Welcome to the WeatherStar 4000+ project page!",
 	"main": "index.mjs",
 	"type": "module",

server/scripts/modules/almanac.mjs

@@ -9,11 +9,19 @@ class Almanac extends WeatherDisplay {
 	constructor(navId, elemId) {
 		super(navId, elemId, 'Almanac', true);
 
+		// occasional degraded moon icon
+		this.iconPaths = {
+			Full: imageName(Math.random() > 0.995 ? 'Degraded' : 'Full'),
+			Last: imageName('Last'),
+			New: imageName('New'),
+			First: imageName('First'),
+		};
+
 		// preload the moon images
-		preloadImg(imageName('Full'));
-		preloadImg(imageName('Last'));
-		preloadImg(imageName('New'));
-		preloadImg(imageName('First'));
+		preloadImg(this.iconPaths.Full);
+		preloadImg(this.iconPaths.Last);
+		preloadImg(this.iconPaths.New);
+		preloadImg(this.iconPaths.First);
 
 		this.timing.totalScreens = 1;
 	}
@@ -142,7 +150,7 @@ class Almanac extends WeatherDisplay {
 
 			fill.date = date;
 			fill.type = MoonPhase.phase;
-			fill.icon = { type: 'img', src: imageName(MoonPhase.phase) };
+			fill.icon = { type: 'img', src: this.iconPaths[MoonPhase.phase] };
 
 			return this.fillTemplate('day', fill);
 		});
@@ -169,6 +177,8 @@ const imageName = (type) => {
 	switch (type) {
 		case 'Full':
 			return 'images/icons/moon-phases/Full-Moon.gif';
+		case 'Degraded':
+			return 'images/icons/moon-phases/Full-Moon-Degraded.gif';
 		case 'Last':
 			return 'images/icons/moon-phases/Last-Quarter.gif';
 		case 'New':

server/scripts/modules/currentweather.mjs

@@ -85,7 +85,6 @@ class CurrentWeather extends WeatherDisplay {
 				const requiredFields = [
 					{ name: 'temperature', check: (props) => props.temperature?.value === null, required: true },
 					{ name: 'textDescription', check: (props) => props.textDescription === null || props.textDescription === '', required: true },
-					{ name: 'icon', check: (props) => props.icon === null, required: true },
 					{ name: 'windSpeed', check: (props) => props.windSpeed?.value === null, required: false },
 					{ name: 'dewpoint', check: (props) => props.dewpoint?.value === null, required: false },
 					{ name: 'barometricPressure', check: (props) => props.barometricPressure?.value === null, required: false },

server/scripts/modules/icons/icons-large.mjs

@@ -13,7 +13,7 @@ const largeIcon = (link, _isNightTime) => {
 	} catch (error) {
 		console.warn(`largeIcon: ${error.message}`);
 		// Return a fallback icon to prevent downstream errors
-		return addPath(_isNightTime ? 'Clear.gif' : 'Sunny.gif');
+		return addPath(`No-Data.gif?${conditionIcon}${isNightTime ? '-n' : ''}`);
 	}
 
 	// find the icon
@@ -169,7 +169,7 @@ const largeIcon = (link, _isNightTime) => {
 		default: {
 			console.warn(`Unknown weather condition '${conditionIcon}' from ${link}; using fallback icon`);
 			// Return a reasonable fallback instead of false to prevent downstream errors
-			return addPath(isNightTime ? 'Clear.gif' : 'Sunny.gif');
+			return addPath(`No-Data.gif?${conditionIcon}${isNightTime ? '-n' : ''}`);
 		}
 	}
 };

server/scripts/modules/utils/metar.mjs

@@ -1,5 +1,7 @@
 // METAR parsing utilities using metar-taf-parser library
 import { parseMetar } from '../../vendor/auto/metar-taf-parser.mjs';
+// eslint-disable-next-line import/extensions
+import en from '../../vendor/auto/locale/en.js';
 
 /**
  * Augment observation data by parsing METAR when API fields are missing
@@ -14,7 +16,7 @@ const augmentObservationWithMetar = (observation) => {
 	const metar = { ...observation };
 
 	try {
-		const metarData = parseMetar(observation.rawMessage);
+		const metarData = parseMetar(observation.rawMessage, { locale: en });
 
 		if (observation.windSpeed?.value === null && metarData.wind?.speed !== undefined) {
 			metar.windSpeed = {

ws4kp.code-workspace

@@ -44,7 +44,8 @@
 			"mwood",
 			"unmuted",
 			"dumpio",
-			"mesonet"
+			"mesonet",
+			"metar"
 		],
 		"cSpell.ignorePaths": [
 			"**/package-lock.json",
@@ -82,4 +83,4 @@
 			"j69.ejs-beautify",
 		]
 	}
-}
+}