5.20.2

README.md

@@ -141,6 +141,10 @@ Please do not report issues with api.weather.gov being down. It's a new service
 
 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.
 
+## Related Projects
+
+Not retro enough? Try the [Weatherstar 3000+](https://github.com/netbymatt/ws3kp)
+
 ## Disclaimer
 
 This web site should NOT be used in life threatening weather situations, or be relied on to inform the public of such situations. The Internet is an unreliable network subject to server and network outages and by nature is not suitable for such mission critical use. If you require such access to NWS data, please consider one of their subscription services. The authors of this web site shall not be held liable in the event of injury, death or property damage that occur as a result of disregarding this warning.

gulp/publish-frontend.mjs

@@ -159,6 +159,9 @@ const uploadImages = () => src(imageSources, { base: './server', encoding: false
 		s3({
 			Bucket: process.env.BUCKET,
 			StorageClass: 'STANDARD',
+			maps: {
+				CacheControl: () => 'max-age=31536000',
+			},
 		}),
 	);
 
@@ -189,4 +192,5 @@ export default publishFrontend;
 
 export {
 	buildDist,
+	invalidate,
 };

gulpfile.mjs

@@ -1,8 +1,9 @@
 import updateVendor from './gulp/update-vendor.mjs';
-import publishFrontend, { buildDist } from './gulp/publish-frontend.mjs'
+import publishFrontend, { buildDist, invalidate } from './gulp/publish-frontend.mjs';
 
 export {
 	updateVendor,
 	publishFrontend,
 	buildDist,
+	invalidate,
 };

index.mjs

@@ -60,16 +60,34 @@ const index = (req, res) => {
 	});
 };
 
+const geoip = (req, res) => {
+	res.set({
+		'x-geoip-city': 'Orlando',
+		'x-geoip-country': 'US',
+		'x-geoip-country-name': 'United States',
+		'x-geoip-country-region': 'FL',
+		'x-geoip-country-region-name': 'Florida',
+		'x-geoip-latitude': '28.52135',
+		'x-geoip-longitude': '-81.41079',
+		'x-geoip-postal-code': '32789',
+		'x-geoip-time-zone': 'America/New_York',
+		'content-type': 'application/json',
+	});
+	res.json({});
+};
+
 // debugging
 if (process.env?.DIST === '1') {
 	// distribution
 	app.use('/images', express.static('./server/images'));
 	app.use('/fonts', express.static('./server/fonts'));
 	app.use('/scripts', express.static('./server/scripts'));
+	app.use('/geoip', geoip);
 	app.use('/', express.static('./dist'));
 } else {
 	// debugging
 	app.get('/index.html', index);
+	app.use('/geoip', geoip);
 	app.get('/', index);
 	app.get('*name', express.static('./server'));
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "ws4kp",
-	"version": "5.19.2",
+	"version": "5.20.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ws4kp",
-			"version": "5.19.2",
+			"version": "5.20.2",
 			"license": "MIT",
 			"dependencies": {
 				"dotenv": "^16.5.0",

package.json

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

server/fonts/ReadMe.txt

@@ -1,30 +0,0 @@
---Star 3000--
-
-Star3000.ttf - Standard text style for most screens (and Travel Cities title header)
-Star3000 Small.ttf - Time/Date and some page headers
-Star3000 Large.ttf - Travel Cities Forecast (Forecast portion only)
-Star3000 Extra Large.ttf - Only used on some advertiser text
-Star3000 Extended.ttf - Only used on some advertiser text
-"Heavy" style is an emboldened version of the standard font (used on some STARs)
-
-Star3000 Outline.ttf - A contrast border (stroke) that surrounds the Star3000.ttf base font. When used, must be as a text layer undeneath the base font (and is usually black in color).
-Star3000 Small Outline.ttf - A contrast border (stroke) that surrounds the Star3000 Small.ttf base font. When used, must be as a text layer undeneath the base font (and is usually black in color).
-Star3000 Large Outline.ttf - A contrast border (stroke) that surrounds the Star3000 Large.ttf base font. When used, must be as a text layer undeneath the base font (and is usually black in color).
-
-***Outlines for other font styles are not currently available.
-
---Star 4000--
-
-Star4000.ttf - Standard text style for zone forecast, observation tables, regional map cities, almanac, extended forecast day/weather/temperature headers, Current Conditions right half data and most page header titles (also Travel Cities title header before Nov. 1992)
-Star4000 Small.ttf - Time/Date, NWS Local Update page header, temperature header for Travel Cities Forecast (after Nov. 1992)
-Star4000 Large.ttf - City names and temperature data on Travel Cities Forecast (after Nov. 1992), Extended forecast temperature values (after Feb. 1991), Current Conditions temperature value (after Mar. 1991)
-Star4000 Large Compressed - Travel Cities Forecast (before Nov. 1992), regional map temperatures
-Star4000 Large Compressed Numbers - Temperature values on regional forecast/observation maps
-Star4000 Extended - A proportional width font used for the Current Conditions present weather description and wind data
-Star 4 Radar.ttf - Radar airport I.D.
-
---Star Jr.--
-
-StarJr.ttf - Standard text style for most screens (and Travel Cities title header)
-StarJr Small.ttf - Time/Date and some page headers
-StarJr Compressed.ttf - Travel Cities Forecast

server/scripts/index.mjs

@@ -78,6 +78,7 @@ const init = () => {
 		onSelect(suggestion) { autocompleteOnSelect(suggestion); },
 		width: 490,
 	});
+	window.autoComplete = autoComplete;
 
 	// attempt to parse the url parameters
 	const parsedParameters = parseQueryString();
@@ -109,9 +110,6 @@ const init = () => {
 		document.querySelector('#spanRadarId').innerHTML = '';
 		document.querySelector('#spanZoneId').innerHTML = '';
 
-		document.querySelector('#chkAutoRefresh').checked = true;
-		localStorage.removeItem('autoRefresh');
-
 		localStorage.removeItem('play');
 		postMessage('navButton', 'play');
 
@@ -374,6 +372,10 @@ const btnGetGpsClick = async () => {
 	const position = await getPosition();
 	const { latitude, longitude } = position.coords;
 
+	getForecastFromLatLon(latitude, longitude, true);
+};
+
+const getForecastFromLatLon = (latitude, longitude, fromGps = false) => {
 	const txtAddress = document.querySelector(TXT_ADDRESS_SELECTOR);
 	txtAddress.value = `${round2(latitude, 4)}, ${round2(longitude, 4)}`;
 
@@ -383,7 +385,7 @@ const btnGetGpsClick = async () => {
 		const query = `${location.city}, ${location.state}`;
 		localStorage.setItem('latLon', JSON.stringify({ lat: latitude, lon: longitude }));
 		localStorage.setItem('latLonQuery', query);
-		localStorage.setItem('latLonFromGPS', true);
+		localStorage.setItem('latLonFromGPS', fromGps);
 		txtAddress.value = `${location.city}, ${location.state}`;
 	});
 };
@@ -414,3 +416,6 @@ const getCustomCode = async () => {
 		document.body.append(customElem);
 	}
 };
+
+// expose functions for external use
+window.getForecastFromLatLon = getForecastFromLatLon;

server/scripts/modules/autocomplete.mjs

@@ -172,6 +172,11 @@ class AutoComplete {
 		}
 	}
 
+	setValue(newValue) {
+		this.currentValue = newValue;
+		this.elem.value = newValue;
+	}
+
 	onValueChange() {
 		clearTimeout(this.onValueChange);
 

server/scripts/modules/currentweatherscroll.mjs

@@ -5,10 +5,14 @@ import { currentDisplay } from './navigation.mjs';
 
 // constants
 const degree = String.fromCharCode(176);
+const SCROLL_SPEED = 75; // pixels/second
+const DEFAULT_UPDATE = 8; // 0.5s ticks
 
 // local variables
 let interval;
 let screenIndex = 0;
+let sinceLastUpdate = 0;
+let nextUpdate = DEFAULT_UPDATE;
 
 // start drawing conditions
 // reset starts from the first item in the text scroll list
@@ -17,7 +21,7 @@ const start = () => {
 
 	// set up the interval if needed
 	if (!interval) {
-		interval = setInterval(incrementInterval, 4000);
+		interval = setInterval(incrementInterval, 500);
 	}
 
 	// draw the data
@@ -29,14 +33,24 @@ const stop = (reset) => {
 };
 
 // increment interval, roll over
-const incrementInterval = () => {
+// forcing is used when drawScreen receives an invalid screen and needs to request the next one in line
+const incrementInterval = (force) => {
+	if (!force) {
+		// test for elapsed time (0.5s ticks);
+		sinceLastUpdate += 1;
+		if (sinceLastUpdate < nextUpdate) return;
+	}
+	// reset flags
+	sinceLastUpdate = 0;
+	nextUpdate = DEFAULT_UPDATE;
+
 	// test current screen
 	const display = currentDisplay();
 	if (!display?.okToDrawCurrentConditions) {
 		stop(display?.elemId === 'progress');
 		return;
 	}
-	screenIndex = (screenIndex + 1) % (screens.length);
+	screenIndex = (screenIndex + 1) % (lastScreen);
 	// draw new text
 	drawScreen();
 };
@@ -48,7 +62,22 @@ const drawScreen = async () => {
 	// nothing to do if there's no data yet
 	if (!data) return;
 
-	drawCondition(screens[screenIndex](data));
+	const thisScreen = screens[screenIndex](data);
+	if (typeof thisScreen === 'string') {
+		// only a string
+		drawCondition(thisScreen);
+	} else if (typeof thisScreen === 'object') {
+		// an object was provided with additional parameters
+		switch (thisScreen.type) {
+			case 'scroll':
+				drawScrollCondition(thisScreen);
+				break;
+			default: drawCondition(thisScreen);
+		}
+	} else {
+		// can't identify screen, get another one
+		incrementInterval(true);
+	}
 };
 
 // the "screens" are stored in an array for easy addition and removal
@@ -71,7 +100,7 @@ const screens = [
 	(data) => `Humidity: ${data.Humidity}%   Dewpoint: ${data.DewPoint}${degree}${data.TemperatureUnit}`,
 
 	// barometric pressure
-	(data) => `Barometric Pressure: ${data.Pressure} ${data.PressureUnit} ${data.PressureDirection}`,
+	(data) => `Barometric Pressure: ${data.Pressure} ${data.PressureDirection}`,
 
 	// wind
 	(data) => {
@@ -102,3 +131,56 @@ const drawCondition = (text) => {
 document.addEventListener('DOMContentLoaded', () => {
 	start();
 });
+
+// store the original number of screens
+const originalScreens = screens.length;
+let lastScreen = originalScreens;
+
+// reset the number of screens
+const reset = () => {
+	lastScreen = originalScreens;
+};
+
+// add screen
+const addScreen = (screen) => {
+	screens.push(screen);
+	lastScreen += 1;
+};
+
+const drawScrollCondition = (screen) => {
+	// create the scroll element
+	const scrollElement = document.createElement('div');
+	scrollElement.classList.add('scroll-area');
+	scrollElement.innerHTML = screen.text;
+	// add it to the page to get the width
+	document.querySelector('.weather-display .scroll .fixed').innerHTML = scrollElement.outerHTML;
+	// grab the width
+	const { scrollWidth, clientWidth } = document.querySelector('.weather-display .scroll .fixed .scroll-area');
+
+	// calculate the scroll distance and set a minimum scroll
+	const scrollDistance = Math.max(scrollWidth - clientWidth, 0);
+	// calculate the scroll time
+	const scrollTime = scrollDistance / SCROLL_SPEED;
+	// calculate a new minimum on-screen time +1.0s at start and end
+	nextUpdate = Math.round(Math.ceil(scrollTime / 0.5) + 4);
+
+	// update the element transition and set initial left position
+	scrollElement.style.left = '0px';
+	scrollElement.style.transition = `left linear ${scrollTime.toFixed(1)}s`;
+	elemForEach('.weather-display .scroll .fixed', (elem) => {
+		elem.innerHTML = '';
+		elem.append(scrollElement.cloneNode(true));
+	});
+	// start the scroll after a short delay
+	setTimeout(() => {
+		// change the left position to trigger the scroll
+		elemForEach('.weather-display .scroll .fixed .scroll-area', (elem) => {
+			elem.style.left = `-${scrollDistance.toFixed(0)}px`;
+		});
+	}, 1000);
+};
+
+window.CurrentWeatherScroll = {
+	addScreen,
+	reset,
+};

server/scripts/modules/localforecast.mjs

@@ -47,7 +47,7 @@ class LocalForecast extends WeatherDisplay {
 		forecastsElem.append(...templates);
 
 		// increase each forecast height to a multiple of container height
-		this.pageHeight = forecastsElem.parentNode.scrollHeight;
+		this.pageHeight = forecastsElem.parentNode.offsetHeight;
 		templates.forEach((forecast) => {
 			const newHeight = Math.ceil(forecast.scrollHeight / this.pageHeight) * this.pageHeight;
 			forecast.style.height = `${newHeight}px`;

server/scripts/modules/radar.mjs

@@ -52,7 +52,7 @@ class Radar extends WeatherDisplay {
 		}
 
 		// get the base map
-		const src = 'images/maps/radar.jpg';
+		const src = 'images/maps/radar.webp';
 		this.baseMap = await loadImg(src);
 
 		const baseUrl = 'https://mesonet.agron.iastate.edu/archive/data/';

server/scripts/modules/regionalforecast.mjs

@@ -28,7 +28,7 @@ class RegionalForecast extends WeatherDisplay {
 		// there are enough other cities available to populate the map sufficiently even if some do not load
 
 		// pre-load the base map
-		let baseMap = 'images/maps/basemap.png';
+		let baseMap = 'images/maps/basemap.webp';
 		if (weatherParameters.state === 'HI') {
 			baseMap = 'images/maps/radar-hawaii.png';
 		} else if (weatherParameters.state === 'AK') {

server/styles/scss/_current-weather.scss

@@ -90,7 +90,9 @@
 
 		.location {
 			color: c.$title-color;
+			max-height: 32px;
 			margin-bottom: 10px;
+			overflow: hidden;
 		}
 	}
 }

server/styles/scss/_page.scss

@@ -4,6 +4,7 @@
 @font-face {
 	font-family: "Star4000";
 	src: url('../fonts/Star4000.woff') format('woff');
+	font-display: swap;
 }
 
 body {
@@ -251,39 +252,22 @@ body {
 	width: 475px;
 }
 
-@font-face {
-	font-family: "Star4000";
-	src: url('../fonts/Star4000.woff') format('woff');
-}
-
-@font-face {
-	font-family: "Star 4 Radar";
-	src: url('../fonts/Star 4 Radar.woff') format('woff');
-}
-
 @font-face {
 	font-family: 'Star4000 Extended';
 	src: url('../fonts/Star4000 Extended.woff') format('woff');
-}
-
-@font-face {
-	font-family: 'Star4000LCN';
-	src: url('../fonts/Star4000LCN.woff') format('woff');
-}
-
-@font-face {
-	font-family: 'Star4000 Large Compressed';
-	src: url('../fonts/Star4000 Large Compressed.woff') format('woff');
+	font-display: swap;
 }
 
 @font-face {
 	font-family: 'Star4000 Large';
-	src: url('../fonts/Star4000 Large.ttf') format('truetype');
+	src: url('../fonts/Star4000 Large.woff') format('woff');
+	font-display: swap;
 }
 
 @font-face {
 	font-family: 'Star4000 Small';
 	src: url('../fonts/Star4000 Small.woff') format('woff');
+	font-display: swap;
 }
 
 #display {

server/styles/scss/_weather-display.scss

@@ -113,7 +113,7 @@
 
 	.scroll {
 		@include u.text-shadow(3px, 1.5px);
-		width: 640px;
+		width: calc(640px - 2 * 30px);
 		height: 70px;
 		overflow: hidden;
 		margin-top: 10px;
@@ -122,6 +122,15 @@
 			font-family: 'Star4000';
 			font-size: 24pt;
 			margin-left: 55px;
+			overflow: hidden;
+
+			.scroll-area {
+				text-wrap: nowrap;
+				position: relative;
+				// the following added by js code as it is dependent on the content of the element
+				// transition: left (x)s;
+				// left: calc((elem width) - 640px);
+			}
 		}
 	}
 }

views/index.ejs

@@ -18,6 +18,10 @@
 	<meta property="og:image" content="https://weatherstar.netbymatt.com/images/social/1200x600.png">
 	<meta property="og:image:width" content="1200">
 	<meta property="og:image:height" content="627">
+	<link rel="preload" href="fonts/Star4000.woff" as="font" type="font/woff" crossorigin>
+	<link rel="preload" href="fonts/Star4000 Extended.woff" as="font" type="font/woff" crossorigin>
+	<link rel="preload" href="fonts/Star4000 Large.woff" as="font" type="font/woff" crossorigin>
+	<link rel="preload" href="fonts/Star4000 Small.woff" as="font" type="font/woff" crossorigin>
 
   <% if (production) { %>
   <link rel="stylesheet" type="text/css" href="resources/ws.min.css?_=<%=production%>" />

views/partials/radar.ejs

@@ -35,7 +35,7 @@
 		<div class="scroll-area">
 			<div class="frame template">
 				<div class="map">
-					<img src="images/maps/radar.jpg" />
+					<img src="images/maps/radar.webp" />
 				</div>
 			</div>
 		</div>

views/partials/regional-forecast.ejs

@@ -1,6 +1,6 @@
 <%- include('header.ejs', {titleDual:{ top: 'Regional' , bottom: 'Observations' }, hasTime: true }) %>
 	<div class="main has-scroll regional-forecast">
-		<div class="map"><img src="images/maps/basemap.png" /></div>
+		<div class="map"><img src="images/maps/basemap.webp" /></div>
 		<div class="location-container">
 			<div class="location template">
 				<div class="icon">

views/partials/spc-outlook.ejs

@@ -1,4 +1,4 @@
-<%- include('header.ejs', {title: 'SPC Outlook', hasTime: true, noaaLogo: true}) %>
+<%- include('header.ejs', {titleDual:{ top: 'Storm Prediction' , bottom: 'Center Outlook' }, hasTime: true}) %>
 	<div class="main has-scroll spc-outlook">
 		<div class="container">
 			<div class="risk-levels">