6.2.5

nginx.conf

@@ -10,8 +10,10 @@ server {
 
     add_header X-Weatherstar true always;
 
+    include /etc/nginx/includes/wsqs_redirect.conf;
+
     location / {
-        index  redirect.html index.html index.htm;
+        index index.html index.htm;
         try_files $uri $uri/ =404;
     }
 

package-lock.json

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

package.json

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

server/scripts/index.mjs

@@ -106,17 +106,34 @@ const init = async () => {
 
 	// attempt to parse the url parameters
 	const parsedParameters = parseQueryString();
-	const loadFromParsed = parsedParameters.latLonQuery && parsedParameters.latLon;
+	const loadFromParsed = !!parsedParameters.latLon;
 
 	// Auto load the parsed parameters and fall back to the previous query
 	const query = parsedParameters.latLonQuery ?? localStorage.getItem('latLonQuery');
 	const latLon = parsedParameters.latLon ?? localStorage.getItem('latLon');
 	const fromGPS = localStorage.getItem('latLonFromGPS') && !loadFromParsed;
 
-	if (query && latLon && !fromGPS) {
+	if (parsedParameters.latLonQuery && !parsedParameters.latLon) {
 		const txtAddress = document.querySelector(TXT_ADDRESS_SELECTOR);
-		txtAddress.value = query;
+		txtAddress.value = parsedParameters.latLonQuery;
-		loadData(JSON.parse(latLon));
+		const geometry = await geocodeLatLonQuery(parsedParameters.latLonQuery);
+		if (geometry) {
+			doRedirectToGeometry(geometry);
+		}
+	} else if (latLon && !fromGPS) {
+		// update in-page search box if using cached data, or parsed parameter
+		if ((query && !loadFromParsed) || (parsedParameters.latLonQuery && loadFromParsed)) {
+			const txtAddress = document.querySelector(TXT_ADDRESS_SELECTOR);
+			txtAddress.value = query;
+		}
+		// use lat-long lookup if that's all that was provided in the query string
+		if (loadFromParsed && parsedParameters.latLon && !parsedParameters.latLonQuery) {
+			const { lat, lon } = JSON.parse(latLon);
+			getForecastFromLatLon(lat, lon, true);
+		} else {
+			// otherwise use pre-stored data	
+			loadData(JSON.parse(latLon));
+		}
 	}
 	if (fromGPS) {
 		btnGetGpsClick();
@@ -162,6 +179,26 @@ const init = async () => {
 	document.querySelector('#container').addEventListener('swiped-right', () => swipeCallBack('right'));
 };
 
+const geocodeLatLonQuery = async (query) => {
+	try {
+		const data = await json('https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/find', {
+			data: {
+				text: query,
+				f: 'json',
+			},
+		});
+
+		const loc = data.locations?.[0];
+		if (loc) {
+			return loc.feature.geometry;
+		}
+		return null;
+	} catch (error) {
+		console.error('Geocoding failed:', error);
+		return null;
+	}
+};
+
 const autocompleteOnSelect = async (suggestion) => {
 	// Note: it's fine that this uses json instead of safeJson since it's infrequent and user-initiated
 	const data = await json('https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/find', {

static-env-handler.sh

@@ -12,6 +12,9 @@ url_encode() {
 
 # build query string from WSQS_ env vars
 while IFS='=' read -r key val; do
+    # Skip empty lines
+    [ -z "$key" ] && continue
+
     # Remove WSQS_ prefix and convert underscores to hyphens
     key="${key#WSQS_}"
     key="${key//_/-}"
@@ -23,11 +26,16 @@ while IFS='=' read -r key val; do
         QS="${key}=${encoded_val}"
     fi
 done << EOF
-$(env | grep '^WSQS_')
+$(env | grep '^WSQS_' || true)
 EOF
 
+mkdir -p /etc/nginx/includes
 
 if [ -n "$QS" ]; then
+    # Escape the query string for use in JavaScript (escape backslashes and single quotes)
+    QS_ESCAPED=$(printf '%s' "$QS" | sed "s/\\\\/\\\\\\\\/g; s/'/\\\'/g")
+
+    # Generate redirect.html with JavaScript logic
     cat > "$ROOT/redirect.html" <<EOF
 <!DOCTYPE html>
 <html>
@@ -35,10 +43,36 @@ if [ -n "$QS" ]; then
   <meta charset="utf-8" />
   <title>Redirecting</title>
   <meta http-equiv="refresh" content="0;url=/index.html?$QS" />
+  <script>
+    (function() {
+      var wsqsParams = '$QS_ESCAPED';
+      var currentParams = window.location.search.substring(1);
+      var targetParams = currentParams || wsqsParams;
+      window.location.replace('/index.html?' + targetParams);
+    })();
+  </script>
 </head>
 <body></body>
 </html>
 EOF
+
+    # Generate nginx config for conditional redirects
+    cat > /etc/nginx/includes/wsqs_redirect.conf <<'EOF'
+location = / {
+    if ($args = '') {
+        rewrite ^ /redirect.html last;
+    }
+    rewrite ^/$ /index.html?$args? redirect;
+}
+
+location = /index.html {
+    if ($args = '') {
+        rewrite ^ /redirect.html last;
+    }
+}
+EOF
+else
+    touch /etc/nginx/includes/wsqs_redirect.conf
 fi
 
 exec nginx -g 'daemon off;'