5.9.3

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "ws4kp",
-	"version": "5.9.2",
+	"version": "5.9.3",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ws4kp",
-			"version": "5.9.2",
+			"version": "5.9.3",
 			"license": "MIT",
 			"devDependencies": {
 				"del": "^6.0.0",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ws4kp",
-	"version": "5.9.2",
+	"version": "5.9.3",
 	"description": "Welcome to the WeatherStar 4000+ project page!",
 	"main": "index.js",
 	"scripts": {

server/scripts/modules/hazards.mjs

@@ -85,15 +85,15 @@ class Hazards extends WeatherDisplay {
 		// set up the timing
 		this.timing.baseDelay = 20;
 		// 24 hours = 6 pages
-		const pages = Math.ceil(list.scrollHeight / 390); // first page is already displayed, last page doesn't happen
-		const timingStep = 75 * 4;
+		const pages = Math.max(Math.ceil(list.scrollHeight / 400) - 3, 1);
+		const timingStep = 400;
 		this.timing.delay = [150 + timingStep];
 		// add additional pages
 		for (let i = 0; i < pages; i += 1) this.timing.delay.push(timingStep);
 		// add the final 3 second delay
-		this.timing.delay.push(150);
-		this.setStatus(STATUS.loaded);
+		this.timing.delay.push(250);
 		this.calcNavTiming();
+		this.setStatus(STATUS.loaded);
 	}
 
 	drawCanvas() {

server/scripts/modules/navigation.mjs

@@ -109,6 +109,13 @@ const updateStatus = (value) => {
 	// calculate first enabled display
 	const firstDisplayIndex = displays.findIndex((display) => display.enabled && display.timing.totalScreens > 0);
 
+	// value.id = 0 is hazards, if they fail to load hot-wire a new value.id to the current display to see if it needs to be loaded
+	// typically this plays out as current conditions loads, then hazards fails.
+	if (value.id === 0 && (value.status === STATUS.failed || value.status === STATUS.retrying)) {
+		value.id = firstDisplayIndex;
+		value.status = displays[firstDisplayIndex].status;
+	}
+
 	// if this is the first display and we're playing, load it up so it starts playing
 	if (isPlaying() && value.id === firstDisplayIndex && value.status === STATUS.loaded) {
 		navTo(msg.command.firstFrame);