5.20.4

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.20.1",
+	"version": "5.20.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ws4kp",
-			"version": "5.20.1",
+			"version": "5.20.4",
 			"license": "MIT",
 			"dependencies": {
 				"dotenv": "^16.5.0",

package.json

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

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();
@@ -371,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)}`;
 
@@ -380,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}`;
 	});
 };
@@ -411,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/hazards.mjs

@@ -39,9 +39,9 @@ class Hazards extends WeatherDisplay {
 			// get the forecast
 			const url = new URL('https://api.weather.gov/alerts/active');
 			url.searchParams.append('point', `${this.weatherParameters.latitude},${this.weatherParameters.longitude}`);
-			url.searchParams.append('limit', 5);
 			const alerts = await json(url, { retryCount: 3, stillWaiting: () => this.stillWaiting() });
-			const unsortedAlerts = alerts.features ?? [];
+			const allUnsortedAlerts = alerts.features ?? [];
+			const unsortedAlerts = allUnsortedAlerts.slice(0, 5);
 			const hasImmediate = unsortedAlerts.reduce((acc, hazard) => acc || hazard.properties.urgency === 'Immediate', false);
 			const sortedAlerts = unsortedAlerts.sort((a, b) => (calcSeverity(b.properties.severity, b.properties.event)) - (calcSeverity(a.properties.severity, a.properties.event)));
 			const filteredAlerts = sortedAlerts.filter((hazard) => hazard.properties.severity !== 'Unknown' && (!hasImmediate || (hazard.properties.urgency === 'Immediate')));

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,12 +252,6 @@ body {
 	width: 475px;
 }
 
-@font-face {
-	font-family: "Star4000";
-	src: url('../fonts/Star4000.woff') format('woff');
-	font-display: swap;
-}
-
 @font-face {
 	font-family: 'Star4000 Extended';
 	src: url('../fonts/Star4000 Extended.woff') format('woff');
@@ -271,8 +266,8 @@ body {
 
 @font-face {
 	font-family: 'Star4000 Small';
-	font-display: swap;
 	src: url('../fonts/Star4000 Small.woff') format('woff');
+	font-display: swap;
 }
 
 #display {

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">