diff --git a/LICENSE b/LICENSE index 0160467..0aedfb5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2025 Matt Walsh +Copyright (c) 2020-2026 Matt Walsh Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/package-lock.json b/package-lock.json index bad640f..8b5a074 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ws4kp", - "version": "6.5.7", + "version": "6.5.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ws4kp", - "version": "6.5.7", + "version": "6.5.9", "license": "MIT", "dependencies": { "dotenv": "^17.0.1", diff --git a/package.json b/package.json index 750f7d2..3a1be3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ws4kp", - "version": "6.5.7", + "version": "6.5.9", "description": "Welcome to the WeatherStar 4000+ project page!", "main": "index.mjs", "type": "module", diff --git a/server/scripts/index.mjs b/server/scripts/index.mjs index 641bf27..cffb0e1 100644 --- a/server/scripts/index.mjs +++ b/server/scripts/index.mjs @@ -72,7 +72,7 @@ const init = async () => { if (!navigator.geolocation) btnGetGps.style.display = 'none'; document.querySelector('#divTwc').addEventListener('mousemove', () => { - if (document.fullscreenElement) updateFullScreenNavigate(); + if (document.fullscreenElement || settings.kiosk?.value) updateFullScreenNavigate(); }); document.querySelector('#btnGetLatLng').addEventListener('click', () => autoComplete.directFormSubmit()); @@ -384,7 +384,7 @@ const updateFullScreenNavigate = () => { } navigateFadeIntervalId = setTimeout(() => { - if (document.fullscreenElement) { + if (document.fullscreenElement || settings.kiosk?.value) { divTwcBottom.classList.remove('visible'); divTwcBottom.classList.add('hidden'); document.querySelector('#divTwc').classList.add('no-cursor'); diff --git a/server/scripts/modules/currentweather.mjs b/server/scripts/modules/currentweather.mjs index 8473328..e77162c 100644 --- a/server/scripts/modules/currentweather.mjs +++ b/server/scripts/modules/currentweather.mjs @@ -103,9 +103,8 @@ class CurrentWeather extends WeatherDisplay { }); // copy enhanced data and restore the timestamp if it was overwritten by older data from mapclick - const { timestamp } = candidateObservation.features[0].properties; + candidateObservation.features[0].properties = enhancedResult.data; - candidateObservation.features[0].properties.timestamp = timestamp; const { missingFields } = enhancedResult; const missingRequired = missingFields.filter((fieldName) => { diff --git a/server/scripts/modules/custom-scroll-text.mjs b/server/scripts/modules/custom-scroll-text.mjs index 76995df..444619c 100644 --- a/server/scripts/modules/custom-scroll-text.mjs +++ b/server/scripts/modules/custom-scroll-text.mjs @@ -17,7 +17,7 @@ const changeEnable = (newValue) => { // hide the string entry newDisplay = 'none'; } - const stringEntry = document.getElementById('settings-customText-label'); + const stringEntry = document.getElementById('settings-customText-string'); if (stringEntry) { stringEntry.style.display = newDisplay; } diff --git a/server/scripts/modules/settings.mjs b/server/scripts/modules/settings.mjs index aafc559..85443d7 100644 --- a/server/scripts/modules/settings.mjs +++ b/server/scripts/modules/settings.mjs @@ -112,9 +112,11 @@ const kioskChange = (value) => { if (value) { body.classList.add('kiosk'); + document.querySelector('#divTwc')?.classList.add('no-cursor'); window.dispatchEvent(new Event('resize')); } else { body.classList.remove('kiosk'); + document.querySelector('#divTwc')?.classList.remove('no-cursor'); window.dispatchEvent(new Event('resize')); } diff --git a/server/scripts/modules/utils/mapclick.mjs b/server/scripts/modules/utils/mapclick.mjs index 532f386..143542f 100644 --- a/server/scripts/modules/utils/mapclick.mjs +++ b/server/scripts/modules/utils/mapclick.mjs @@ -650,7 +650,7 @@ export const enhanceObservationWithMapClick = async (observationData, options = } return { - data: mapClickProps, + data: { ...mapClickProps, timestamp: observationData.timestamp }, wasImproved: true, improvements, missingFields: [...mapClickMissingRequired, ...mapClickMissingOptional],