From 998b394d2cf6472c839077623cf58b60f5239328 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Fri, 26 Jun 2026 09:09:15 +0100
Subject: [PATCH 01/29] Update map and bands pages to use SSE endpoint after
 initial load. Closes #43.

---
 .idea/spothole.iml        |   1 +
 README.md                 |   6 +-
 templates/add_spot.html   |   2 +-
 templates/alerts.html     |   2 +-
 templates/bands.html      |   8 +--
 templates/base.html       |  10 +--
 templates/conditions.html |   2 +-
 templates/map.html        |   4 +-
 templates/spots.html      |   4 +-
 templates/status.html     |   2 +-
 webassets/js/alerts.js    |  23 ++++++
 webassets/js/bands.js     |  84 +++++++++++++++++-----
 webassets/js/common.js    |  23 ------
 webassets/js/map.js       | 148 +++++++++++++++++++++++++++++++-------
 14 files changed, 234 insertions(+), 85 deletions(-)

diff --git a/.idea/spothole.iml b/.idea/spothole.iml
index 803561c..347b546 100644
--- a/.idea/spothole.iml
+++ b/.idea/spothole.iml
@@ -2,6 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
       <excludeFolder url="file://$MODULE_DIR$/webassets/vendor" />
     </content>
diff --git a/README.md b/README.md
index a49b3b6..40da6e2 100644
--- a/README.md
+++ b/README.md
@@ -95,9 +95,9 @@ Various approaches exist to writing your own client, but in general:
   `https://spothole.app/api/v1/spots` once every few minutes. Apply filters if necessary.
 * Call the "options" API to get an idea of which bands, modes etc. the server knows about. You might want to do that
   first before calling the spots/alerts APIs, to allow you to populate your filters correctly.
-* Refer to the provided HTML/JS interface for a reference on different approaches. For example, the "map" and "bands"
-  pages simply query the main spot API on a timer, whereas the main/spots page combines this approach with using the
-  Server-Sent Events (SSE) endpoint to update live.
+* Refer to the provided HTML/JS interface for a reference on different approaches. For example, the "alerts"/"upcoming"
+  page simply query the main spot API on a timer, whereas the spots, map and bands pages combine this approach with
+  using the Server-Sent Events (SSE) endpoint to update live.
 * Let me know if you get stuck, I'm happy to help.
 
 Please don't hammer the API with an unnecessarily high request rate. For example, Spothole only queries the POTA API
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 0b6bfe9..d8d0ba5 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1782411905"></script>
+<script src="/js/add-spot.js?v=1782461355"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index f3720ca..e4847ed 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1782411905"></script>
+<script src="/js/alerts.js?v=1782461355"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 758c822..04ea125 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -3,9 +3,7 @@
 
 <div class="mt-3">
     <div id="settingsButtonRow" class="row mb-3">
-        <div class="col-auto me-auto pt-3">
-            {% module Template("widgets/refresh-timer.html", web_ui_options=web_ui_options) %}
-        </div>
+        <div class="col-auto me-auto pt-3"></div>
         <div class="col-auto">
             <div class="d-inline-flex gap-1">
                 {% module Template("widgets/filters-display-data-buttons.html", web_ui_options=web_ui_options) %}
@@ -77,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782411905"></script>
-<script src="/js/bands.js?v=1782411905"></script>
+<script src="/js/spotsbandsandmap.js?v=1782461355"></script>
+<script src="/js/bands.js?v=1782461355"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 375148b..e4145a8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1782411905" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1782461355" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1782411905"></script>
-<script src="/js/ui-ham.js?v=1782411905"></script>
-<script src="/js/geo.js?v=1782411905"></script>
-<script src="/js/common.js?v=1782411905"></script>
+<script src="/js/utils.js?v=1782461355"></script>
+<script src="/js/ui-ham.js?v=1782461355"></script>
+<script src="/js/geo.js?v=1782461355"></script>
+<script src="/js/common.js?v=1782461355"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 3aea838..163ec3f 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1782411905"></script>
+<script src="/js/conditions.js?v=1782461355"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index a21d7bf..410aab1 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782411905"></script>
-<script src="/js/map.js?v=1782411905"></script>
+<script src="/js/spotsbandsandmap.js?v=1782461355"></script>
+<script src="/js/map.js?v=1782461355"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 4b26010..10426e6 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782411905"></script>
-<script src="/js/spots.js?v=1782411905"></script>
+<script src="/js/spotsbandsandmap.js?v=1782461355"></script>
+<script src="/js/spots.js?v=1782461355"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 3e8cfd9..101151c 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1782411905"></script>
+<script src="/js/status.js?v=1782461355"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");
diff --git a/webassets/js/alerts.js b/webassets/js/alerts.js
index 35c127c..c731d72 100644
--- a/webassets/js/alerts.js
+++ b/webassets/js/alerts.js
@@ -1,5 +1,7 @@
 // How often to query the server?
 const REFRESH_INTERVAL_SEC = 60 * 10;
+// Last time the alerts list was updated on display.
+let lastUpdateTime;
 
 // Storage for the alert data that the server gives us.
 let alerts = [];
@@ -309,6 +311,27 @@ function filtersUpdated() {
     saveSettings();
 }
 
+// Update the refresh timing display
+function updateRefreshDisplay() {
+    if (lastUpdateTime != null) {
+        let secSinceUpdate = moment.duration(moment().diff(lastUpdateTime)).asSeconds();
+        let count = REFRESH_INTERVAL_SEC;
+        let updatingString = "Updating..."
+        if (secSinceUpdate < REFRESH_INTERVAL_SEC) {
+            count = REFRESH_INTERVAL_SEC - secSinceUpdate;
+            let number;
+            if (count <= 60) {
+                number = count.toFixed(0);
+                updatingString = "<span class='nowrap'>Updating in " + number + " second" + (number !== "1" ? "s" : "") + ".</span>";
+            } else {
+                number = Math.round(count / 60.0).toFixed(0);
+                updatingString = "<span class='nowrap'>Updating in " + number + " minute" + (number !== "1" ? "s" : "") + ".</span>";
+            }
+        }
+        $("#timing-container").html("Last updated at " + lastUpdateTime.format('HH:mm') + " UTC. " + updatingString);
+    }
+}
+
 // Startup
 $(document).ready(function () {
     // Call loadOptions(), this will then trigger loading alerts and setting up timers.
diff --git a/webassets/js/bands.js b/webassets/js/bands.js
index dd42157..f8cfba7 100644
--- a/webassets/js/bands.js
+++ b/webassets/js/bands.js
@@ -1,5 +1,9 @@
-// How often to query the server?
-const REFRESH_INTERVAL_SEC = 60;
+// SSE connection for live spot updates
+let evtSource;
+let restartSSEOnErrorTimeoutId;
+// Debounce timer so rapid SSE bursts only trigger one updateBands() call, as these could trigger a flash of the user
+// visible content
+let updateBandsDebounceId;
 
 // A couple of constants that must match what's in CSS. We need to know them before the content actually renders, so we
 // can't just ask the elements themselves for their dimensions.
@@ -12,19 +16,62 @@ BAND_COLUMN_SPOT_DIV_HEIGHT_PX = BAND_COLUMN_FONT_SIZE * 1.6;
 
 // Load spots and populate the bands display.
 function loadSpots() {
-    $.getJSON('/api/v1/spots' + buildQueryString(false), function (jsonData) {
-        // Store last updated time
-        lastUpdateTime = moment.utc();
-        updateRefreshDisplay();
+    // Close any existing SSE connection before fetching fresh data
+    if (evtSource != null) {
+        evtSource.close();
+    }
+    $.getJSON('/api/v1/spots' + buildQueryString(), function (jsonData) {
         // Store data
         spots = jsonData;
         // Update bands display
         updateBands();
+        // Start the ongoing SSE connection
+        startSSEConnection();
     });
 }
 
-// Build a query string for the API, based on the filters that the user has selected.
-function buildQueryString(includeCredentials) {
+// Start an SSE connection to receive new spots as they arrive.
+function startSSEConnection() {
+    if (evtSource != null) {
+        evtSource.close();
+    }
+    evtSource = new EventSource('/api/v1/spots/stream' + buildQueryString());
+
+    evtSource.onmessage = function (event) {
+        const newSpot = JSON.parse(event.data);
+
+        // Replace any existing spot for this callsign
+        spots = spots.filter(s => newSpot["dx_call"] !== s["dx_call"]);
+        spots.unshift(newSpot);
+
+        // Debounce. Wait 500ms after the last message before re-rendering to avoid too many ugly flashes
+        clearTimeout(updateBandsDebounceId);
+        updateBandsDebounceId = setTimeout(updateBands, 500);
+    };
+
+    evtSource.onerror = function () {
+        if (evtSource != null) {
+            evtSource.close();
+        }
+        clearTimeout(restartSSEOnErrorTimeoutId);
+        restartSSEOnErrorTimeoutId = setTimeout(startSSEConnection, 1000);
+    };
+}
+
+// Remove spots from the display that are older than the selected max age.
+function expireOldSpots() {
+    const maxAgeSeconds = parseInt($("#max-spot-age option:selected").val());
+    const cutoff = (Date.now() / 1000) - maxAgeSeconds;
+    const before = spots.length;
+    spots = spots.filter(s => s["time"] && s["time"] >= cutoff);
+    if (spots.length !== before) {
+        updateBands();
+    }
+}
+
+// Build a query string for the API, based on the filters that the user has selected. There's no need for credentials
+// in the bands page's version of this, because nothing QRZ.com/HamQTH can provide will affect the display.
+function buildQueryString() {
     let str = "?";
     ["dx_continent", "de_continent", "mode", "source", "band", "sig"].forEach(fn => {
         if (!allFilterOptionsSelected(fn)) {
@@ -34,9 +81,6 @@ function buildQueryString(includeCredentials) {
     str = str + "max_age=" + $("#max-spot-age option:selected").val();
     // Additional filters for the bands view: No dupes, no QRT
     str = str + "&dedupe=true&allow_qrt=false";
-    if (includeCredentials) {
-        str = str + getCredentialQueryString();
-    }
     return str;
 }
 
@@ -257,22 +301,28 @@ function loadOptions() {
         // Load settings from settings storage now all the controls are available
         loadSettings();
 
-        // Load spots and set up the timer
+        // Load spots and start SSE for live updates
         loadSpots();
-        setInterval(loadSpots, REFRESH_INTERVAL_SEC * 1000);
+        // Set up spot expiry checker
+        setInterval(expireOldSpots, 60 * 1000);
     });
 }
 
-// Method called when any display property is changed to reload the map and persist the display settings.
+// Method called when any display property is changed to reload the bands display and persist settings.
 function displayUpdated() {
-    updateMap();
+    updateBands();
     saveSettings();
 }
 
 // Startup
 $(document).ready(function () {
+    // Close SSE connection cleanly when navigating away
+    window.addEventListener('beforeunload', function () {
+        if (evtSource != null) {
+            evtSource.close();
+        }
+    });
+
     // Call loadOptions(), this will then trigger loading spots and setting up timers.
     loadOptions();
-    // Update the refresh timing display every second
-    setInterval(updateRefreshDisplay, 1000);
 });
\ No newline at end of file
diff --git a/webassets/js/common.js b/webassets/js/common.js
index 3580075..fe6964f 100644
--- a/webassets/js/common.js
+++ b/webassets/js/common.js
@@ -1,7 +1,5 @@
 // Storage for the options that the server gives us. This will define our filters.
 let options = {};
-// Last time we updated the spots/alerts list on display.
-let lastUpdateTime;
 // Normally load user settings from local storage, unless embedded mode is in use
 let useLocalStorage = true;
 
@@ -145,27 +143,6 @@ function toggleFilterButtons(filterQuery, state) {
     filtersUpdated();
 }
 
-// Update the refresh timing display
-function updateRefreshDisplay() {
-    if (lastUpdateTime != null) {
-        let secSinceUpdate = moment.duration(moment().diff(lastUpdateTime)).asSeconds();
-        let count = REFRESH_INTERVAL_SEC;
-        let updatingString = "Updating..."
-        if (secSinceUpdate < REFRESH_INTERVAL_SEC) {
-            count = REFRESH_INTERVAL_SEC - secSinceUpdate;
-            let number;
-            if (count <= 60) {
-                number = count.toFixed(0);
-                updatingString = "<span class='nowrap'>Updating in " + number + " second" + (number !== "1" ? "s" : "") + ".</span>";
-            } else {
-                number = Math.round(count / 60.0).toFixed(0);
-                updatingString = "<span class='nowrap'>Updating in " + number + " minute" + (number !== "1" ? "s" : "") + ".</span>";
-            }
-        }
-        $("#timing-container").html("Last updated at " + lastUpdateTime.format('HH:mm') + " UTC. " + updatingString);
-    }
-}
-
 // When the "use local time" field is changed, reload the table and save settings
 function timeZoneUpdated() {
     updateTable();
diff --git a/webassets/js/map.js b/webassets/js/map.js
index da35d78..5eba7fa 100644
--- a/webassets/js/map.js
+++ b/webassets/js/map.js
@@ -1,6 +1,3 @@
-// How often to query the server?
-const REFRESH_INTERVAL_SEC = 60;
-
 // Colours
 const MAIDENHEAD_GRID_COLOR_LIGHT = 'rgba(200, 140, 140, 1.0)';
 const CQ_ZONES_COLOR_LIGHT = 'rgba(140, 200, 140, 1.0)';
@@ -11,6 +8,15 @@ const CQ_ZONES_COLOR_DARK = 'rgba(60, 120, 60, 1.0)';
 const ITU_ZONES_COLOR_DARK = 'rgba(120, 120, 60, 1.0)';
 const WAB_WAI_GRID_COLOR_DARK = 'rgba(60, 60, 120, 1.0)';
 
+// SSE connection for live spot updates
+let evtSource;
+let restartSSEOnErrorTimeoutId;
+// Map dx_call to a pair of marker & geodesic line, so we can de-duplicate spots as they arrive and only show
+// one marker per dx_call. The key here is actually dx_call + SSID if the spot gives us an SSID; this is mostly for
+// if APRS spots are enabled so we can ID a home and mobile station separately rather than our marker oscillating
+// between the two as updates come in.
+let spotMarkers = new Map();
+
 // Map layers
 let backgroundTileLayer;
 let markersLayer;
@@ -28,7 +34,13 @@ let firstLoad = true;
 
 // Load spots and populate the map.
 function loadSpots() {
-    $.getJSON('/api/v1/spots' + buildQueryString(true), function (jsonData) {
+    // Close any existing SSE connection before fetching fresh data
+    if (evtSource != null) {
+        evtSource.close();
+    }
+    // On first fetch, don't include QRZ/HamQTH credentials. This will cause some inaccurate
+    // marker positions but avoids having to wait a minute or more for all the lookups to fire.
+    $.getJSON('/api/v1/spots' + buildQueryString(false), function (jsonData) {
         // Store data
         spots = jsonData;
         // Update map
@@ -36,9 +48,102 @@ function loadSpots() {
         if ($("#showTerminator")[0].checked) {
             terminator.setTime();
         }
+        // Start the ongoing SSE connection
+        startSSEConnection();
     });
 }
 
+// Start the SSE connection to receive new spots as they arrive
+function startSSEConnection() {
+    if (evtSource != null) {
+        evtSource.close();
+    }
+    // SSE is going to fetch only a few spots at a time, so now we include QRZ/HamQTH credentials because the delay won't be significant.
+    evtSource = new EventSource('/api/v1/spots/stream' + buildQueryString(true));
+
+    evtSource.onmessage = function (event) {
+        const newSpot = JSON.parse(event.data);
+        const key = spotKey(newSpot);
+
+        // Remove existing marker/geodesic for this callsign if present
+        removeSpotFromMap(key);
+        spots = spots.filter(s => spotKey(s) !== key);
+
+        // Skip spots with no map coordinates
+        if (newSpot["dx_latitude"] == null || newSpot["dx_longitude"] == null) {
+            return;
+        }
+
+        // Add to data store and map
+        spots.unshift(newSpot);
+        addSpotToMap(newSpot);
+    };
+
+    evtSource.onerror = function () {
+        if (evtSource != null) {
+            evtSource.close();
+        }
+        clearTimeout(restartSSEOnErrorTimeoutId);
+        restartSSEOnErrorTimeoutId = setTimeout(startSSEConnection, 1000);
+    };
+}
+
+// Remove spots from the map that are older than the selected max age.
+function expireOldSpots() {
+    const maxAgeSeconds = parseInt($("#max-spot-age option:selected").val());
+    const cutoff = (Date.now() / 1000) - maxAgeSeconds;
+    spots = spots.filter(function (s) {
+        if (s["time"] && s["time"] < cutoff) {
+            removeSpotFromMap(spotKey(s));
+            return false;
+        }
+        return true;
+    });
+}
+
+// Returns a unique key for a spot based on its callsign and SSID. This is in case the APRS spot source is enabled and
+// we want to display all SSIDs for a given callsign, not just the latest one.
+function spotKey(s) {
+    return s["dx_call"] + (s["dx_ssid"] ? "-" + s["dx_ssid"] : "");
+}
+
+// Add a single spot's marker and geodesic to the map and to spotMarkers
+function addSpotToMap(s) {
+    const m = L.marker([s["dx_latitude"], s["dx_longitude"]], {icon: getIcon(s)});
+    m.bindPopup(getTooltipText(s));
+    markersLayer.addLayer(m);
+    oms.addMarker(m);
+
+    let geodesic = null;
+    if ($("#mapShowGeodesics")[0].checked && s["de_latitude"] != null && s["de_longitude"] != null) {
+        try {
+            geodesic = L.geodesic([[s["de_latitude"], s["de_longitude"]], m.getLatLng()], {
+                color: bandToColor(s['band']),
+                wrap: false,
+                steps: 5
+            });
+            geodesicsLayer.addLayer(geodesic);
+        } catch (e) {
+            // Not sure what causes these but better to continue than to crash out
+        }
+    }
+
+    spotMarkers.set(spotKey(s), {marker: m, geodesic: geodesic});
+}
+
+// Remove a spot's marker and geodesic from the map and from spotMarkers.
+function removeSpotFromMap(key) {
+    const entry = spotMarkers.get(key);
+    if (entry) {
+        markersLayer.removeLayer(entry.marker);
+        oms.removeMarker(entry.marker);
+        if (entry.geodesic) {
+            geodesicsLayer.removeLayer(entry.geodesic);
+        }
+        spotMarkers.delete(key);
+    }
+}
+
 // Build a query string for the API, based on the filters that the user has selected.
 function buildQueryString(includeCredentials) {
     let str = "?";
@@ -62,27 +167,14 @@ function updateMap() {
     markersLayer.clearLayers();
     geodesicsLayer.clearLayers();
     oms.clearMarkers();
+    spotMarkers.clear();
 
-    // Make new markers for all spots that match the filter
+    // Make new markers for all spots
     spots.forEach(function (s) {
-        const m = L.marker([s["dx_latitude"], s["dx_longitude"]], {icon: getIcon(s)});
-        m.bindPopup(getTooltipText(s));
-        markersLayer.addLayer(m);
-        oms.addMarker(m);
-
-        // Create geodesics if required
-        if ($("#mapShowGeodesics")[0].checked && s["de_latitude"] != null && s["de_longitude"] != null) {
-            try {
-                const geodesic = L.geodesic([[s["de_latitude"], s["de_longitude"]], m.getLatLng()], {
-                    color: bandToColor(s['band']),
-                    wrap: false,
-                    steps: 5
-                });
-                geodesicsLayer.addLayer(geodesic);
-            } catch (e) {
-                // Not sure what causes these but better to continue than to crash out
-            }
+        if (s["dx_latitude"] == null || s["dx_longitude"] == null) {
+            return;
         }
+        addSpotToMap(s);
     });
 
     // On first load, zoom to the extent of the markers
@@ -239,9 +331,10 @@ function loadOptions() {
         enableITUZones($("#showITUZones")[0].checked);
         enableWABWAIGrid($("#showWABWAIGrid")[0].checked);
 
-        // Load spots and set up the timer
+        // Load spots and start SSE for live updates
         loadSpots();
-        setInterval(loadSpots, REFRESH_INTERVAL_SEC * 1000);
+        // Set up spot expiry checker
+        setInterval(expireOldSpots, 60 * 1000);
     });
 }
 
@@ -483,6 +576,13 @@ function setUpMap() {
 
 // Startup
 $(document).ready(function () {
+    // Close SSE connection cleanly when navigating away
+    window.addEventListener('beforeunload', function () {
+        if (evtSource != null) {
+            evtSource.close();
+        }
+    });
+
     // Hide the extra things that need to be hidden on this page
     $(".hideonmap").hide();
     // Set up map

From 72f367f607102c249e635af12cdff59748378fbe Mon Sep 17 00:00:00 2001
From: ian <ian@ianrenton.com>
Date: Fri, 26 Jun 2026 13:23:46 +0000
Subject: [PATCH 02/29] Honestly 5 seconds delay for the denounce is fine,
 500ms was unnecessarily quick

---
 webassets/js/bands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webassets/js/bands.js b/webassets/js/bands.js
index f8cfba7..9166ce5 100644
--- a/webassets/js/bands.js
+++ b/webassets/js/bands.js
@@ -46,7 +46,7 @@ function startSSEConnection() {
 
         // Debounce. Wait 500ms after the last message before re-rendering to avoid too many ugly flashes
         clearTimeout(updateBandsDebounceId);
-        updateBandsDebounceId = setTimeout(updateBands, 500);
+        updateBandsDebounceId = setTimeout(updateBands, 5000);
     };
 
     evtSource.onerror = function () {

From b09108b41bdbdd711e3880b0cb2503f412644b8f Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sun, 28 Jun 2026 18:09:44 +0100
Subject: [PATCH 03/29] Fix a bug where some NaN values could leak into the
 JSON output, causing it to be invalid. Created a new safe_json_dumps method
 since we would otherwise now be providing multiple parameters all over the
 code

---
 core/utils.py                  | 13 ++++++++-----
 requirements.txt               |  3 ++-
 server/handlers/api/addspot.py | 34 +++++++++++++---------------------
 server/handlers/api/alerts.py  | 11 +++++------
 server/handlers/api/lookups.py | 32 ++++++++++++++------------------
 server/handlers/api/options.py |  5 ++---
 server/handlers/api/spots.py   | 11 +++++------
 server/handlers/api/status.py  |  5 ++---
 templates/add_spot.html        |  2 +-
 templates/alerts.html          |  2 +-
 templates/bands.html           |  4 ++--
 templates/base.html            | 10 +++++-----
 templates/conditions.html      |  2 +-
 templates/map.html             |  4 ++--
 templates/spots.html           |  4 ++--
 templates/status.html          |  2 +-
 16 files changed, 66 insertions(+), 78 deletions(-)

diff --git a/core/utils.py b/core/utils.py
index d8c6c6d..9c99210 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -1,8 +1,11 @@
-def serialize_everything(obj):
-    """Convert objects to serialisable things. Used by JSON serialiser as a default when it encounters unserializable things.
-    Just converts objects to dict. Try to avoid doing anything clever here when serialising spots, because we also need
-    to receive spots without complex handling."""
-    return obj.__dict__
+import simplejson
+
+
+def safe_json_dumps(obj):
+    """Safe version of json.dumps that also converts objects to dicts so they can be output, and ignores NaN floats
+    which are invalid in JSON."""
+
+    return simplejson.dumps(obj, ensure_ascii=False, ignore_nan=True, default=lambda o: o.__dict__)
 
 
 def empty_queue(q):
diff --git a/requirements.txt b/requirements.txt
index 293f6ec..163a941 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,4 +16,5 @@ beautifulsoup4~=4.14.2
 websocket-client~=1.8.0
 tornado~=6.4.2
 tornado_eventsource~=3.0.0
-geopandas~=0.13.2
\ No newline at end of file
+geopandas~=0.13.2
+simplejson~=4.1.1
\ No newline at end of file
diff --git a/server/handlers/api/addspot.py b/server/handlers/api/addspot.py
index 7ef5da3..f9eccd1 100644
--- a/server/handlers/api/addspot.py
+++ b/server/handlers/api/addspot.py
@@ -14,7 +14,7 @@ from core.constants import UNKNOWN_BAND
 from core.lookup_helper import infer_band_from_freq
 from core.prometheus_metrics_handler import api_requests_counter
 from core.sig_utils import get_ref_regex_for_sig
-from core.utils import serialize_everything
+from core.utils import safe_json_dumps
 from data.sig_ref import SIGRef
 from data.spot import Spot
 
@@ -42,8 +42,7 @@ class APISpotHandler(tornado.web.RequestHandler):
             # Reject if not allowed
             if not ALLOW_SPOTTING:
                 self.set_status(401)
-                self.write(json.dumps("Error - this server does not allow new spots to be added via the API.",
-                                      default=serialize_everything))
+                self.write(safe_json_dumps("Error - this server does not allow new spots to be added via the API."))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
@@ -51,8 +50,7 @@ class APISpotHandler(tornado.web.RequestHandler):
             # Reject if format not json
             if not self.request.headers.get('Content-Type', '').startswith("application/json"):
                 self.set_status(415)
-                self.write(
-                    json.dumps("Error - request Content-Type must be application/json", default=serialize_everything))
+                self.write(safe_json_dumps("Error - request Content-Type must be application/json"))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
@@ -61,7 +59,7 @@ class APISpotHandler(tornado.web.RequestHandler):
             post_data = self.request.body
             if not post_data:
                 self.set_status(422)
-                self.write(json.dumps("Error - request body is empty", default=serialize_everything))
+                self.write(safe_json_dumps("Error - request body is empty"))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
@@ -81,8 +79,7 @@ class APISpotHandler(tornado.web.RequestHandler):
             # Reject if no timestamp, frequency, dx_call or de_call
             if not spot.time or not spot.dx_call or not spot.freq or not spot.de_call:
                 self.set_status(422)
-                self.write(json.dumps("Error - 'time', 'dx_call', 'freq' and 'de_call' must be provided as a minimum.",
-                                      default=serialize_everything))
+                self.write(safe_json_dumps("Error - 'time', 'dx_call', 'freq' and 'de_call' must be provided as a minimum."))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
@@ -90,15 +87,13 @@ class APISpotHandler(tornado.web.RequestHandler):
             # Reject invalid-looking callsigns
             if not re.match(r"^[A-Za-z0-9/\-]*$", spot.dx_call):
                 self.set_status(422)
-                self.write(json.dumps("Error - '" + spot.dx_call + "' does not look like a valid callsign.",
-                                      default=serialize_everything))
+                self.write(safe_json_dumps("Error - '" + spot.dx_call + "' does not look like a valid callsign."))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
             if not re.match(r"^[A-Za-z0-9/\-]*$", spot.de_call):
                 self.set_status(422)
-                self.write(json.dumps("Error - '" + spot.de_call + "' does not look like a valid callsign.",
-                                      default=serialize_everything))
+                self.write(safe_json_dumps("Error - '" + spot.de_call + "' does not look like a valid callsign."))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
@@ -106,8 +101,7 @@ class APISpotHandler(tornado.web.RequestHandler):
             # Reject if frequency not in a known band
             if infer_band_from_freq(spot.freq) == UNKNOWN_BAND:
                 self.set_status(422)
-                self.write(json.dumps("Error - Frequency of " + str(spot.freq / 1000.0) + "kHz is not in a known band.",
-                                      default=serialize_everything))
+                self.write(safe_json_dumps("Error - Frequency of " + str(spot.freq / 1000.0) + "kHz is not in a known band."))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
@@ -117,8 +111,7 @@ class APISpotHandler(tornado.web.RequestHandler):
                     r"^([A-R]{2}[0-9]{2}[A-X]{2}[0-9]{2}[A-X]{2}|[A-R]{2}[0-9]{2}[A-X]{2}[0-9]{2}|[A-R]{2}[0-9]{2}[A-X]{2}|[A-R]{2}[0-9]{2})$",
                     spot.dx_grid.upper()):
                 self.set_status(422)
-                self.write(json.dumps("Error - '" + spot.dx_grid + "' does not look like a valid Maidenhead grid.",
-                                      default=serialize_everything))
+                self.write(safe_json_dumps("Error - '" + spot.dx_grid + "' does not look like a valid Maidenhead grid."))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
@@ -127,9 +120,8 @@ class APISpotHandler(tornado.web.RequestHandler):
             if spot.sig and spot.sig_refs and len(spot.sig_refs) > 0 and spot.sig_refs[0].id and get_ref_regex_for_sig(
                     spot.sig) and not re.match(get_ref_regex_for_sig(spot.sig), spot.sig_refs[0].id):
                 self.set_status(422)
-                self.write(json.dumps(
-                    "Error - '" + spot.sig_refs[0].id + "' does not look like a valid reference for " + spot.sig + ".",
-                    default=serialize_everything))
+                self.write(safe_json_dumps(
+                    "Error - '" + spot.sig_refs[0].id + "' does not look like a valid reference for " + spot.sig + "."))
                 self.set_header("Cache-Control", "no-store")
                 self.set_header("Content-Type", "application/json")
                 return
@@ -139,14 +131,14 @@ class APISpotHandler(tornado.web.RequestHandler):
             spot.infer_missing()
             self._spots.add(spot.id, spot, expire=MAX_SPOT_AGE)
 
-            self.write(json.dumps("OK", default=serialize_everything))
+            self.write(safe_json_dumps("OK"))
             self.set_status(201)
             self.set_header("Cache-Control", "no-store")
             self.set_header("Content-Type", "application/json")
 
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
             self.set_header("Cache-Control", "no-store")
             self.set_header("Content-Type", "application/json")
diff --git a/server/handlers/api/alerts.py b/server/handlers/api/alerts.py
index f91d6f1..d2f140a 100644
--- a/server/handlers/api/alerts.py
+++ b/server/handlers/api/alerts.py
@@ -1,5 +1,4 @@
 import copy
-import json
 import logging
 from datetime import datetime
 from queue import Queue
@@ -12,7 +11,7 @@ from tornado import httputil
 from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
-from core.utils import serialize_everything, empty_queue
+from core.utils import safe_json_dumps, empty_queue
 from data.lookup_credentials import extract_credentials
 
 SSE_HANDLER_MAX_QUEUE_SIZE = 100
@@ -57,15 +56,15 @@ class APIAlertsHandler(tornado.web.RequestHandler):
             data = get_alert_list_with_filters(self._alerts, query_params)
             if credentials:
                 data = self._enrich(data, credentials)
-            self.write(json.dumps(data, default=serialize_everything))
+            self.write(safe_json_dumps(data))
             self.set_status(200)
         except ValueError as e:
             logging.error(e)
-            self.write(json.dumps("Bad request - " + str(e), default=serialize_everything))
+            self.write(safe_json_dumps("Bad request - " + str(e)))
             self.set_status(400)
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
         self.set_header("Cache-Control", "no-store")
         self.set_header("Content-Type", "application/json")
@@ -150,7 +149,7 @@ class APIAlertsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
                             if self._credentials:
                                 alert = copy.deepcopy(alert)
                                 alert.infer_missing(self._credentials)
-                            self.write_message(msg=json.dumps(alert, default=serialize_everything))
+                            self.write_message(msg=safe_json_dumps(alert))
 
                 else:
                     # Send a keepalive comment if the queue was empty
diff --git a/server/handlers/api/lookups.py b/server/handlers/api/lookups.py
index 0fb7e21..4ab34cd 100644
--- a/server/handlers/api/lookups.py
+++ b/server/handlers/api/lookups.py
@@ -1,4 +1,3 @@
-import json
 import logging
 import re
 from datetime import datetime
@@ -13,7 +12,7 @@ from core.constants import SIGS
 from core.geo_utils import lat_lon_for_grid_sw_corner_plus_size, lat_lon_to_cq_zone, lat_lon_to_itu_zone
 from core.prometheus_metrics_handler import api_requests_counter
 from core.sig_utils import get_ref_regex_for_sig, populate_sig_ref_info
-from core.utils import serialize_everything
+from core.utils import safe_json_dumps
 from data.lookup_credentials import extract_credentials
 from data.sig_ref import SIGRef
 from data.spot import Spot
@@ -65,19 +64,18 @@ class APILookupCallHandler(tornado.web.RequestHandler):
                         "longitude": fake_spot.dx_longitude,
                         "location_source": fake_spot.dx_location_source
                     }
-                    self.write(json.dumps(data, default=serialize_everything))
+                    self.write(safe_json_dumps(data))
 
                 else:
-                    self.write(json.dumps("Error - '" + call + "' does not look like a valid callsign.",
-                                          default=serialize_everything))
+                    self.write(safe_json_dumps("Error - '" + call + "' does not look like a valid callsign."))
                     self.set_status(422)
             else:
-                self.write(json.dumps("Error - call must be provided", default=serialize_everything))
+                self.write(safe_json_dumps("Error - call must be provided"))
                 self.set_status(422)
 
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
 
         self.set_header("Cache-Control", "no-store")
@@ -114,24 +112,22 @@ class APILookupSIGRefHandler(tornado.web.RequestHandler):
                 if sig in list(map(lambda p: p.name.upper(), SIGS)):
                     if not get_ref_regex_for_sig(sig) or re.match(get_ref_regex_for_sig(sig), ref_id):
                         data = populate_sig_ref_info(SIGRef(id=ref_id, sig=sig))
-                        self.write(json.dumps(data, default=serialize_everything))
+                        self.write(safe_json_dumps(data))
 
                     else:
-                        self.write(
-                            json.dumps(
-                                "Error - '" + ref_id + "' does not look like a valid reference ID for " + sig + ".",
-                                default=serialize_everything))
+                        self.write(safe_json_dumps(
+                                "Error - '" + ref_id + "' does not look like a valid reference ID for " + sig + "."))
                         self.set_status(422)
                 else:
-                    self.write(json.dumps("Error - sig '" + sig + "' is not known.", default=serialize_everything))
+                    self.write(safe_json_dumps("Error - sig '" + sig + "' is not known."))
                     self.set_status(422)
             else:
-                self.write(json.dumps("Error - sig and id must be provided", default=serialize_everything))
+                self.write(safe_json_dumps("Error - sig and id must be provided"))
                 self.set_status(422)
 
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
 
         self.set_header("Cache-Control", "no-store")
@@ -185,15 +181,15 @@ class APILookupGridHandler(tornado.web.RequestHandler):
                             "latitude": lat + lat_cell_size,
                             "longitude": lon + lon_cell_size,
                         }}
-                    self.write(json.dumps(response, default=serialize_everything))
+                    self.write(safe_json_dumps(response))
 
             else:
-                self.write(json.dumps("Error - grid must be provided", default=serialize_everything))
+                self.write(safe_json_dumps("Error - grid must be provided"))
                 self.set_status(422)
 
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
 
         self.set_header("Cache-Control", "no-store")
diff --git a/server/handlers/api/options.py b/server/handlers/api/options.py
index 9e581dd..cc545f2 100644
--- a/server/handlers/api/options.py
+++ b/server/handlers/api/options.py
@@ -1,4 +1,3 @@
-import json
 from datetime import datetime
 from typing import Any
 
@@ -10,7 +9,7 @@ from tornado.web import Application
 from core.config import MAX_SPOT_AGE, ALLOW_SPOTTING
 from core.constants import BANDS, ALL_MODES, MODE_TYPES, SIGS, CONTINENTS, PROPAGATION_MODES
 from core.prometheus_metrics_handler import api_requests_counter
-from core.utils import serialize_everything
+from core.utils import safe_json_dumps
 
 
 class APIOptionsHandler(tornado.web.RequestHandler):
@@ -50,7 +49,7 @@ class APIOptionsHandler(tornado.web.RequestHandler):
         if ALLOW_SPOTTING:
             options["spot_sources"].append("API")
 
-        self.write(json.dumps(options, default=serialize_everything))
+        self.write(safe_json_dumps(options))
         self.set_status(200)
         self.set_header("Cache-Control", "no-store")
         self.set_header("Content-Type", "application/json")
diff --git a/server/handlers/api/spots.py b/server/handlers/api/spots.py
index ab6d3e2..0eba452 100644
--- a/server/handlers/api/spots.py
+++ b/server/handlers/api/spots.py
@@ -1,5 +1,4 @@
 import copy
-import json
 import logging
 from datetime import datetime, timedelta
 from queue import Queue
@@ -12,7 +11,7 @@ from tornado import httputil
 from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
-from core.utils import serialize_everything, empty_queue
+from core.utils import safe_json_dumps, empty_queue
 from data.lookup_credentials import extract_credentials
 
 SSE_HANDLER_MAX_QUEUE_SIZE = 1000
@@ -57,15 +56,15 @@ class APISpotsHandler(tornado.web.RequestHandler):
             data = get_spot_list_with_filters(self._spots, query_params)
             if credentials:
                 data = self._enrich(data, credentials)
-            self.write(json.dumps(data, default=serialize_everything))
+            self.write(safe_json_dumps(data))
             self.set_status(200)
         except ValueError as e:
             logging.error(e)
-            self.write(json.dumps("Bad request - " + str(e), default=serialize_everything))
+            self.write(safe_json_dumps("Bad request - " + str(e)))
             self.set_status(400)
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
         self.set_header("Cache-Control", "no-store")
         self.set_header("Content-Type", "application/json")
@@ -152,7 +151,7 @@ class APISpotsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
                             if self._credentials:
                                 spot = copy.deepcopy(spot)
                                 spot.infer_missing(self._credentials)
-                            self.write_message(msg=json.dumps(spot, default=serialize_everything))
+                            self.write_message(msg=safe_json_dumps(spot))
 
                 else:
                     # Send a keepalive comment if the queue was empty
diff --git a/server/handlers/api/status.py b/server/handlers/api/status.py
index eb3efb9..1a125cd 100644
--- a/server/handlers/api/status.py
+++ b/server/handlers/api/status.py
@@ -1,4 +1,3 @@
-import json
 from datetime import datetime
 from typing import Any
 
@@ -8,7 +7,7 @@ from tornado import httputil
 from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
-from core.utils import serialize_everything
+from core.utils import safe_json_dumps
 
 
 class APIStatusHandler(tornado.web.RequestHandler):
@@ -30,7 +29,7 @@ class APIStatusHandler(tornado.web.RequestHandler):
         self._web_server_metrics["status"] = "OK"
         api_requests_counter.inc()
 
-        self.write(json.dumps(self._status_data, default=serialize_everything))
+        self.write(safe_json_dumps(self._status_data))
         self.set_status(200)
         self.set_header("Cache-Control", "no-store")
         self.set_header("Content-Type", "application/json")
diff --git a/templates/add_spot.html b/templates/add_spot.html
index d8d0ba5..d9b48b5 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1782461355"></script>
+<script src="/js/add-spot.js?v=1782666584"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index e4847ed..a999cc7 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1782461355"></script>
+<script src="/js/alerts.js?v=1782666584"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 04ea125..36671b6 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782461355"></script>
-<script src="/js/bands.js?v=1782461355"></script>
+<script src="/js/spotsbandsandmap.js?v=1782666584"></script>
+<script src="/js/bands.js?v=1782666584"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index e4145a8..840889d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1782461355" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1782666584" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1782461355"></script>
-<script src="/js/ui-ham.js?v=1782461355"></script>
-<script src="/js/geo.js?v=1782461355"></script>
-<script src="/js/common.js?v=1782461355"></script>
+<script src="/js/utils.js?v=1782666584"></script>
+<script src="/js/ui-ham.js?v=1782666584"></script>
+<script src="/js/geo.js?v=1782666584"></script>
+<script src="/js/common.js?v=1782666584"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 163ec3f..d367b82 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1782461355"></script>
+<script src="/js/conditions.js?v=1782666584"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 410aab1..a0a99fb 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782461355"></script>
-<script src="/js/map.js?v=1782461355"></script>
+<script src="/js/spotsbandsandmap.js?v=1782666584"></script>
+<script src="/js/map.js?v=1782666584"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 10426e6..613cb46 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782461355"></script>
-<script src="/js/spots.js?v=1782461355"></script>
+<script src="/js/spotsbandsandmap.js?v=1782666584"></script>
+<script src="/js/spots.js?v=1782666584"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 101151c..75ae823 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1782461355"></script>
+<script src="/js/status.js?v=1782666584"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 565a3f75648e62314ef0bbe04de6b25f5312bea3 Mon Sep 17 00:00:00 2001
From: ian <ian@ianrenton.com>
Date: Tue, 30 Jun 2026 18:13:25 +0000
Subject: [PATCH 04/29] LLOTA References are now prefixed with LL

---
 core/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/constants.py b/core/constants.py
index b2d844a..3acbe9a 100644
--- a/core/constants.py
+++ b/core/constants.py
@@ -27,7 +27,7 @@ SIGS = [
     SIG(name="WOTA", comment_names=["WOTA"], description="Wainwrights on the Air", ref_regex=r"[A-Z]{3}-[0-9]{2}"),
     SIG(name="BOTA", comment_names=[], description="Beaches on the Air"),
     SIG(name="KRMNPA", comment_names=["KRMNPA"], description="Keith Roget Memorial National Parks Award"),
-    SIG(name="LLOTA", comment_names=["LLOTA"], description="Lagos y Lagunas on the Air", ref_regex=r"[A-Z]{2}\-\d{4}"),
+    SIG(name="LLOTA", comment_names=["LLOTA"], description="Lagos y Lagunas on the Air", ref_regex=r"LL[A-Z]{2}\-\d{4}"),
     SIG(name="Towers", comment_names=["TOTA"], description="Towers on the Air", ref_regex=r"[A-Z]{2}R\-\d{4}"),
     SIG(name="Tiles", comment_names=[], description="Tiles on the Air", ref_regex=r"[A-Za-z]{2}[0-9]{2}[A-Za-z]{2}"),
     SIG(name="WAB", comment_names=["WAB"], description="Worked All Britain", ref_regex=r"[A-Z]{1,2}[0-9]{2}"),

From 88923bc96efe1251394fafce1099b3e777d69fdf Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Tue, 30 Jun 2026 21:15:16 +0100
Subject: [PATCH 05/29] Fix a logging call

---
 data/spot.py              |  2 +-
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/data/spot.py b/data/spot.py
index 92c3cf0..8af0d15 100644
--- a/data/spot.py
+++ b/data/spot.py
@@ -312,7 +312,7 @@ class Spot:
                         self.propagation_mode = PROPAGATION_MODES[mode_tag]
                     else:
                         self.propagation_mode = mode_tag
-                        logging.info("Seen a new propagation mode tag not yet in the system: {}", mode_tag)
+                        logging.info("Seen a new propagation mode tag not yet in the system: %s", mode_tag)
 
         # DX Grid to lat/lon and vice versa in case one is missing
         if self.dx_grid and not self.dx_latitude:
diff --git a/templates/add_spot.html b/templates/add_spot.html
index d9b48b5..37f9abc 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1782666584"></script>
+<script src="/js/add-spot.js?v=1782850516"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index a999cc7..81edeca 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1782666584"></script>
+<script src="/js/alerts.js?v=1782850516"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 36671b6..413c88a 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782666584"></script>
-<script src="/js/bands.js?v=1782666584"></script>
+<script src="/js/spotsbandsandmap.js?v=1782850516"></script>
+<script src="/js/bands.js?v=1782850516"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 840889d..4f35bc9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1782666584" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1782850516" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1782666584"></script>
-<script src="/js/ui-ham.js?v=1782666584"></script>
-<script src="/js/geo.js?v=1782666584"></script>
-<script src="/js/common.js?v=1782666584"></script>
+<script src="/js/utils.js?v=1782850516"></script>
+<script src="/js/ui-ham.js?v=1782850516"></script>
+<script src="/js/geo.js?v=1782850516"></script>
+<script src="/js/common.js?v=1782850516"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index d367b82..2aa95e5 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1782666584"></script>
+<script src="/js/conditions.js?v=1782850516"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index a0a99fb..47ff105 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782666584"></script>
-<script src="/js/map.js?v=1782666584"></script>
+<script src="/js/spotsbandsandmap.js?v=1782850516"></script>
+<script src="/js/map.js?v=1782850516"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 613cb46..fca68cc 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782666584"></script>
-<script src="/js/spots.js?v=1782666584"></script>
+<script src="/js/spotsbandsandmap.js?v=1782850516"></script>
+<script src="/js/spots.js?v=1782850516"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 75ae823..ccb3443 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1782666584"></script>
+<script src="/js/status.js?v=1782850516"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From c51648738fd58455f5e2cd58c0eaa107489e2807 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Mon, 6 Jul 2026 17:56:40 +0100
Subject: [PATCH 06/29] Update GMA API endpoints

---
 spotproviders/gma.py      |  4 ++--
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/spotproviders/gma.py b/spotproviders/gma.py
index 9803459..3362ff4 100644
--- a/spotproviders/gma.py
+++ b/spotproviders/gma.py
@@ -14,9 +14,9 @@ class GMA(HTTPSpotProvider):
     """Spot provider for General Mountain Activity"""
 
     POLL_INTERVAL_SEC = 120
-    SPOTS_URL = "https://www.cqgma.org/api/spots/25/"
+    SPOTS_URL = "https://www.gma.rocks/api/spots/25/"
     # GMA spots don't contain the details of the programme they are for, we need a separate lookup for that
-    REF_INFO_URL_ROOT = "https://www.cqgma.org/api/ref/?"
+    REF_INFO_URL_ROOT = "https://www.gma.rocks/api/ref/?"
 
     def __init__(self, provider_config):
         # Ensure there is an API key in our config, and set up the query URL using it. If no key is provided,
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 37f9abc..6c39319 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1782850516"></script>
+<script src="/js/add-spot.js?v=1783357000"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 81edeca..edc0f76 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1782850516"></script>
+<script src="/js/alerts.js?v=1783357000"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 413c88a..afa7b3f 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782850516"></script>
-<script src="/js/bands.js?v=1782850516"></script>
+<script src="/js/spotsbandsandmap.js?v=1783357000"></script>
+<script src="/js/bands.js?v=1783357000"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 4f35bc9..9cc6090 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1782850516" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1783357000" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1782850516"></script>
-<script src="/js/ui-ham.js?v=1782850516"></script>
-<script src="/js/geo.js?v=1782850516"></script>
-<script src="/js/common.js?v=1782850516"></script>
+<script src="/js/utils.js?v=1783357000"></script>
+<script src="/js/ui-ham.js?v=1783357000"></script>
+<script src="/js/geo.js?v=1783357000"></script>
+<script src="/js/common.js?v=1783357000"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 2aa95e5..9ca3167 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1782850516"></script>
+<script src="/js/conditions.js?v=1783357000"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 47ff105..13db931 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782850516"></script>
-<script src="/js/map.js?v=1782850516"></script>
+<script src="/js/spotsbandsandmap.js?v=1783357000"></script>
+<script src="/js/map.js?v=1783357000"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index fca68cc..1e41720 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782850516"></script>
-<script src="/js/spots.js?v=1782850516"></script>
+<script src="/js/spotsbandsandmap.js?v=1783357000"></script>
+<script src="/js/spots.js?v=1783357000"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index ccb3443..4bcffb6 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1782850516"></script>
+<script src="/js/status.js?v=1783357000"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From c7b61634404db5ace2e77f642200706f5fc1ecf1 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Mon, 6 Jul 2026 17:58:45 +0100
Subject: [PATCH 07/29] Extra search and replaces in PNP spot frequencies to
 cope with a weird one encountered

---
 spotproviders/parksnpeaks.py |  4 ++--
 templates/add_spot.html      |  2 +-
 templates/alerts.html        |  2 +-
 templates/bands.html         |  4 ++--
 templates/base.html          | 10 +++++-----
 templates/conditions.html    |  2 +-
 templates/map.html           |  4 ++--
 templates/spots.html         |  4 ++--
 templates/status.html        |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/spotproviders/parksnpeaks.py b/spotproviders/parksnpeaks.py
index 6b5b573..0a7ea7a 100644
--- a/spotproviders/parksnpeaks.py
+++ b/spotproviders/parksnpeaks.py
@@ -30,8 +30,8 @@ class ParksNPeaks(HTTPSpotProvider):
                             dx_call=source_spot["actCallsign"].upper(),
                             de_call=source_spot["actSpoter"].upper() if source_spot["actSpoter"] != "" else None,
                             # typo exists in API
-                            freq=float(source_spot["actFreq"].replace(",", "")) * 1000000 if (
-                                    source_spot["actFreq"] != "") else None,
+                            freq=float(source_spot["actFreq"].replace(",", "").replace("+-", "")
+                                       .replace("+/-", "").strip()) * 1000000 if (source_spot["actFreq"] != "") else None,
                             # Seen PNP spots with empty frequency, and with comma-separated thousands digits
                             mode=source_spot["actMode"].upper(),
                             comment=source_spot["actComments"],
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 6c39319..69ce837 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1783357000"></script>
+<script src="/js/add-spot.js?v=1783357126"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index edc0f76..74ce1fb 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1783357000"></script>
+<script src="/js/alerts.js?v=1783357126"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index afa7b3f..f0e7c39 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783357000"></script>
-<script src="/js/bands.js?v=1783357000"></script>
+<script src="/js/spotsbandsandmap.js?v=1783357126"></script>
+<script src="/js/bands.js?v=1783357126"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 9cc6090..0874163 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1783357000" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1783357126" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1783357000"></script>
-<script src="/js/ui-ham.js?v=1783357000"></script>
-<script src="/js/geo.js?v=1783357000"></script>
-<script src="/js/common.js?v=1783357000"></script>
+<script src="/js/utils.js?v=1783357126"></script>
+<script src="/js/ui-ham.js?v=1783357126"></script>
+<script src="/js/geo.js?v=1783357126"></script>
+<script src="/js/common.js?v=1783357126"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 9ca3167..3b81962 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1783357000"></script>
+<script src="/js/conditions.js?v=1783357126"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 13db931..fede4f6 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783357000"></script>
-<script src="/js/map.js?v=1783357000"></script>
+<script src="/js/spotsbandsandmap.js?v=1783357125"></script>
+<script src="/js/map.js?v=1783357125"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 1e41720..d4073d5 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783357000"></script>
-<script src="/js/spots.js?v=1783357000"></script>
+<script src="/js/spotsbandsandmap.js?v=1783357125"></script>
+<script src="/js/spots.js?v=1783357125"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 4bcffb6..7a3c2be 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1783357000"></script>
+<script src="/js/status.js?v=1783357126"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 4d29e0026f4776145caf047b205e65155a652633 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Fri, 10 Jul 2026 12:17:09 +0100
Subject: [PATCH 08/29] Config option to disable logging web requests, to spare
 the log file.

---
 config-example.yml        |  4 ++++
 core/config.py            |  1 +
 server/webserver.py       | 32 +++++++++++++++++---------------
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 11 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/config-example.yml b/config-example.yml
index 3cb1822..2c48dc7 100644
--- a/config-example.yml
+++ b/config-example.yml
@@ -211,6 +211,10 @@ clublog-api-key: ""
 # Allow submitting spots to the Spothole API?
 allow-spotting: true
 
+# Log web requests? Useful to see what your users are requesting in terms of pages and API endpoints, but will fill up
+# your log quickly on a popular server.
+log-web-requests: false
+
 # Options for the web UI.
 web-ui-options:
   spot-count: [ 10, 25, 50, 100 ]
diff --git a/core/config.py b/core/config.py
index 70adc18..ff0f235 100644
--- a/core/config.py
+++ b/core/config.py
@@ -22,6 +22,7 @@ WEB_SERVER_PORT = config["web-server-port"]
 ALLOW_SPOTTING = config["allow-spotting"]
 WEB_UI_OPTIONS = config["web-ui-options"]
 API_ONLY_MODE = config.get("api-only-mode", False)
+LOG_WEB_REQUESTS = config.get("log-web-requests", False)
 
 # For ease of config, each spot provider owns its own config about whether it should be enabled by default in the web UI
 # but for consistency we provide this to the front-end in web-ui-options because it has no impact outside of the web UI.
diff --git a/server/webserver.py b/server/webserver.py
index bf846ec..a99030c 100644
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -5,7 +5,7 @@ import os
 import tornado
 from tornado.web import StaticFileHandler
 
-from core.config import ALLOW_SPOTTING, WEB_SERVER_PORT, API_ONLY_MODE
+from core.config import ALLOW_SPOTTING, WEB_SERVER_PORT, API_ONLY_MODE, LOG_WEB_REQUESTS
 from core.utils import empty_queue
 from server.handlers.api.addspot import APISpotHandler
 from server.handlers.api.alerts import APIAlertsHandler, APIAlertsStreamHandler
@@ -165,20 +165,22 @@ class WebServer:
         pass
 
 def request_log(handler):
-    """Custom log function to provide more data about requests."""
+    """Custom log function to provide more data about requests when enabled, and to provide the ability to turn off
+    web request logging altogetether."""
 
-    if handler.get_status() < 500:
-        log_method = logging.info
-    else:
-        log_method = logging.warning
+    if LOG_WEB_REQUESTS:
+        if handler.get_status() < 500:
+            log_method = logging.info
+        else:
+            log_method = logging.warning
 
-    request = handler.request
-    client_ip = request.remote_ip
-    referrer = request.headers.get("Referer", "-")
-    user_agent = request.headers.get("User-Agent", "-")
+        request = handler.request
+        client_ip = request.remote_ip
+        referrer = request.headers.get("Referer", "-")
+        user_agent = request.headers.get("User-Agent", "-")
 
-    log_method(
-        f'{client_ip} - "{request.method} {request.uri}" '
-        f'{handler.get_status()} {request.request_time():.2f}ms | '
-        f'Ref: {referrer} | UA: {user_agent}'
-    )
+        log_method(
+            f'{client_ip} - "{request.method} {request.uri}" '
+            f'{handler.get_status()} {request.request_time():.2f}ms | '
+            f'Ref: {referrer} | UA: {user_agent}'
+        )
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 69ce837..9a4de26 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1783357126"></script>
+<script src="/js/add-spot.js?v=1783682229"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 74ce1fb..1064f3e 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1783357126"></script>
+<script src="/js/alerts.js?v=1783682229"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index f0e7c39..235e97f 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783357126"></script>
-<script src="/js/bands.js?v=1783357126"></script>
+<script src="/js/spotsbandsandmap.js?v=1783682229"></script>
+<script src="/js/bands.js?v=1783682229"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 0874163..455d4d4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1783357126" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1783682229" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1783357126"></script>
-<script src="/js/ui-ham.js?v=1783357126"></script>
-<script src="/js/geo.js?v=1783357126"></script>
-<script src="/js/common.js?v=1783357126"></script>
+<script src="/js/utils.js?v=1783682229"></script>
+<script src="/js/ui-ham.js?v=1783682229"></script>
+<script src="/js/geo.js?v=1783682229"></script>
+<script src="/js/common.js?v=1783682229"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 3b81962..c4cd2b3 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1783357126"></script>
+<script src="/js/conditions.js?v=1783682229"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index fede4f6..a684034 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783357125"></script>
-<script src="/js/map.js?v=1783357125"></script>
+<script src="/js/spotsbandsandmap.js?v=1783682229"></script>
+<script src="/js/map.js?v=1783682229"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index d4073d5..4ba5ca6 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783357125"></script>
-<script src="/js/spots.js?v=1783357125"></script>
+<script src="/js/spotsbandsandmap.js?v=1783682229"></script>
+<script src="/js/spots.js?v=1783682229"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 7a3c2be..4490070 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1783357126"></script>
+<script src="/js/status.js?v=1783682229"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From f2a6bfa51539a14c13fc231bab8a79ad3925577b Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Fri, 10 Jul 2026 17:25:38 +0100
Subject: [PATCH 09/29] Support "SAT" propagation mode

---
 core/constants.py         |  3 ++-
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 9 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/core/constants.py b/core/constants.py
index 3acbe9a..88da781 100644
--- a/core/constants.py
+++ b/core/constants.py
@@ -102,5 +102,6 @@ PROPAGATION_MODES = {
     "AU": "Aurora",
     "MS": "Meteor scatter",
     "RS": "Rain scatter",
-    "AS": "Aircraft scatter"
+    "AS": "Aircraft scatter",
+    "SAT": "Satellite"
 }
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 9a4de26..e5b659b 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1783682229"></script>
+<script src="/js/add-spot.js?v=1783700739"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 1064f3e..046fb14 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1783682229"></script>
+<script src="/js/alerts.js?v=1783700739"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 235e97f..3a4b26c 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783682229"></script>
-<script src="/js/bands.js?v=1783682229"></script>
+<script src="/js/spotsbandsandmap.js?v=1783700739"></script>
+<script src="/js/bands.js?v=1783700739"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 455d4d4..d30a2ca 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1783682229" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1783700739" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1783682229"></script>
-<script src="/js/ui-ham.js?v=1783682229"></script>
-<script src="/js/geo.js?v=1783682229"></script>
-<script src="/js/common.js?v=1783682229"></script>
+<script src="/js/utils.js?v=1783700739"></script>
+<script src="/js/ui-ham.js?v=1783700739"></script>
+<script src="/js/geo.js?v=1783700739"></script>
+<script src="/js/common.js?v=1783700739"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index c4cd2b3..2c79327 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1783682229"></script>
+<script src="/js/conditions.js?v=1783700739"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index a684034..96eb28b 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783682229"></script>
-<script src="/js/map.js?v=1783682229"></script>
+<script src="/js/spotsbandsandmap.js?v=1783700738"></script>
+<script src="/js/map.js?v=1783700738"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 4ba5ca6..d0e5cc6 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783682229"></script>
-<script src="/js/spots.js?v=1783682229"></script>
+<script src="/js/spotsbandsandmap.js?v=1783700739"></script>
+<script src="/js/spots.js?v=1783700739"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 4490070..f4f8942 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1783682229"></script>
+<script src="/js/status.js?v=1783700739"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 600a330e63817f67fb6bdf22429eb83f03458c62 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Fri, 10 Jul 2026 17:38:33 +0100
Subject: [PATCH 10/29] Fix a bug where SIGs weren't being handled properly in
 the add spot JS

---
 server/webserver.py       |  3 ++-
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 webassets/js/add-spot.js  |  2 +-
 10 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/server/webserver.py b/server/webserver.py
index a99030c..4ae9ea3 100644
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -5,7 +5,7 @@ import os
 import tornado
 from tornado.web import StaticFileHandler
 
-from core.config import ALLOW_SPOTTING, WEB_SERVER_PORT, API_ONLY_MODE, LOG_WEB_REQUESTS
+from core.config import ALLOW_SPOTTING, WEB_SERVER_PORT, API_ONLY_MODE, LOG_WEB_REQUESTS, BASE_URL
 from core.utils import empty_queue
 from server.handlers.api.addspot import APISpotHandler
 from server.handlers.api.alerts import APIAlertsHandler, APIAlertsStreamHandler
@@ -112,6 +112,7 @@ class WebServer:
                                       debug=False)
         app.listen(self._port, xheaders=True)
         logging.info("Web server running on port " + str(WEB_SERVER_PORT))
+        logging.info("You can access your copy of Spothole at " + BASE_URL)
         await self._shutdown_event.wait()
 
     def notify_new_spot(self, spot):
diff --git a/templates/add_spot.html b/templates/add_spot.html
index e5b659b..f44407c 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1783700739"></script>
+<script src="/js/add-spot.js?v=1783701514"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 046fb14..cde601a 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1783700739"></script>
+<script src="/js/alerts.js?v=1783701513"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 3a4b26c..c3a1419 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783700739"></script>
-<script src="/js/bands.js?v=1783700739"></script>
+<script src="/js/spotsbandsandmap.js?v=1783701514"></script>
+<script src="/js/bands.js?v=1783701514"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index d30a2ca..6c94a47 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1783700739" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1783701513" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1783700739"></script>
-<script src="/js/ui-ham.js?v=1783700739"></script>
-<script src="/js/geo.js?v=1783700739"></script>
-<script src="/js/common.js?v=1783700739"></script>
+<script src="/js/utils.js?v=1783701513"></script>
+<script src="/js/ui-ham.js?v=1783701513"></script>
+<script src="/js/geo.js?v=1783701513"></script>
+<script src="/js/common.js?v=1783701513"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 2c79327..1811421 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1783700739"></script>
+<script src="/js/conditions.js?v=1783701513"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 96eb28b..d4a9efe 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783700738"></script>
-<script src="/js/map.js?v=1783700738"></script>
+<script src="/js/spotsbandsandmap.js?v=1783701513"></script>
+<script src="/js/map.js?v=1783701513"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index d0e5cc6..efd41b4 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783700739"></script>
-<script src="/js/spots.js?v=1783700739"></script>
+<script src="/js/spotsbandsandmap.js?v=1783701513"></script>
+<script src="/js/spots.js?v=1783701513"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index f4f8942..193dc93 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1783700739"></script>
+<script src="/js/status.js?v=1783701514"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");
diff --git a/webassets/js/add-spot.js b/webassets/js/add-spot.js
index e0e1f3e..ef912ad 100644
--- a/webassets/js/add-spot.js
+++ b/webassets/js/add-spot.js
@@ -62,7 +62,7 @@ function addSpot() {
             spot["sig"] = sig;
         }
         if (sigRef !== "") {
-            spot["sig_refs"] = [{id: sigRef}];
+            spot["sig_refs"] = [{sig: sig, id: sigRef}];
         }
         if (dxGrid !== "") {
             spot["dx_grid"] = dxGrid;

From eee0d701408b0ce112636e486b3904347369e02d Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Fri, 10 Jul 2026 17:45:43 +0100
Subject: [PATCH 11/29] Create SIGRef objects when converting dict to Spot
 object in the spot object's own __post_init__ method rather than in
 add_spot.py

---
 data/spot.py                   | 11 +++++++++++
 server/handlers/api/addspot.py | 10 ----------
 templates/add_spot.html        |  2 +-
 templates/alerts.html          |  2 +-
 templates/bands.html           |  4 ++--
 templates/base.html            | 10 +++++-----
 templates/conditions.html      |  2 +-
 templates/map.html             |  4 ++--
 templates/spots.html           |  4 ++--
 templates/status.html          |  2 +-
 10 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/data/spot.py b/data/spot.py
index 8af0d15..56f2e78 100644
--- a/data/spot.py
+++ b/data/spot.py
@@ -133,6 +133,17 @@ class Spot:
     # The ID the source gave it, if any.
     source_id: str | None = None
 
+    def __post_init__(self):
+        """Normalise fields that don't survive a plain dict to Spot conversion. This is used in the "add spot" API
+        endpoint where the client is submitting JSON, and we want to recreate a full Spot object, including nested
+        objects such as the sig_refs list.."""
+
+        if self.sig_refs:
+            self.sig_refs = [
+                sig_ref if isinstance(sig_ref, SIGRef) else SIGRef(**sig_ref)
+                for sig_ref in self.sig_refs
+            ]
+
     def infer_missing(self, credentials=None):
         """Infer missing parameters where possible"""
 
diff --git a/server/handlers/api/addspot.py b/server/handlers/api/addspot.py
index f9eccd1..60c8762 100644
--- a/server/handlers/api/addspot.py
+++ b/server/handlers/api/addspot.py
@@ -1,4 +1,3 @@
-import json
 import logging
 import re
 from datetime import datetime
@@ -15,7 +14,6 @@ from core.lookup_helper import infer_band_from_freq
 from core.prometheus_metrics_handler import api_requests_counter
 from core.sig_utils import get_ref_regex_for_sig
 from core.utils import safe_json_dumps
-from data.sig_ref import SIGRef
 from data.spot import Spot
 
 
@@ -68,14 +66,6 @@ class APISpotHandler(tornado.web.RequestHandler):
             json_spot = tornado.escape.json_decode(post_data)
             spot = Spot(**json_spot)
 
-            # Converting to a spot object this way won't have coped with sig_ref objects, so fix that. (Would be nice to
-            # redo this in a functional style)
-            if spot.sig_refs:
-                real_sig_refs = []
-                for dict_obj in spot.sig_refs:
-                    real_sig_refs.append(json.loads(json.dumps(dict_obj), object_hook=lambda d: SIGRef(**d)))
-                spot.sig_refs = real_sig_refs
-
             # Reject if no timestamp, frequency, dx_call or de_call
             if not spot.time or not spot.dx_call or not spot.freq or not spot.de_call:
                 self.set_status(422)
diff --git a/templates/add_spot.html b/templates/add_spot.html
index f44407c..48eddee 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1783701514"></script>
+<script src="/js/add-spot.js?v=1783701943"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index cde601a..b38c198 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1783701513"></script>
+<script src="/js/alerts.js?v=1783701943"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index c3a1419..59614a9 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783701514"></script>
-<script src="/js/bands.js?v=1783701514"></script>
+<script src="/js/spotsbandsandmap.js?v=1783701943"></script>
+<script src="/js/bands.js?v=1783701943"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 6c94a47..ee72525 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1783701513" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1783701943" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1783701513"></script>
-<script src="/js/ui-ham.js?v=1783701513"></script>
-<script src="/js/geo.js?v=1783701513"></script>
-<script src="/js/common.js?v=1783701513"></script>
+<script src="/js/utils.js?v=1783701943"></script>
+<script src="/js/ui-ham.js?v=1783701943"></script>
+<script src="/js/geo.js?v=1783701943"></script>
+<script src="/js/common.js?v=1783701943"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 1811421..aa7e3b5 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1783701513"></script>
+<script src="/js/conditions.js?v=1783701943"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index d4a9efe..47eb5a2 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783701513"></script>
-<script src="/js/map.js?v=1783701513"></script>
+<script src="/js/spotsbandsandmap.js?v=1783701943"></script>
+<script src="/js/map.js?v=1783701943"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index efd41b4..3e34b08 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783701513"></script>
-<script src="/js/spots.js?v=1783701513"></script>
+<script src="/js/spotsbandsandmap.js?v=1783701943"></script>
+<script src="/js/spots.js?v=1783701943"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 193dc93..e40d244 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1783701514"></script>
+<script src="/js/status.js?v=1783701943"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 34e3933d5d0cfd30626591dc8307101ee4d49bf6 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Fri, 10 Jul 2026 17:50:55 +0100
Subject: [PATCH 12/29] Towers refs can have three letters

---
 core/constants.py         |  2 +-
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/constants.py b/core/constants.py
index 88da781..f412f6b 100644
--- a/core/constants.py
+++ b/core/constants.py
@@ -28,7 +28,7 @@ SIGS = [
     SIG(name="BOTA", comment_names=[], description="Beaches on the Air"),
     SIG(name="KRMNPA", comment_names=["KRMNPA"], description="Keith Roget Memorial National Parks Award"),
     SIG(name="LLOTA", comment_names=["LLOTA"], description="Lagos y Lagunas on the Air", ref_regex=r"LL[A-Z]{2}\-\d{4}"),
-    SIG(name="Towers", comment_names=["TOTA"], description="Towers on the Air", ref_regex=r"[A-Z]{2}R\-\d{4}"),
+    SIG(name="Towers", comment_names=["TOTA"], description="Towers on the Air", ref_regex=r"[A-Z]{2,3}R\-\d{4}"),
     SIG(name="Tiles", comment_names=[], description="Tiles on the Air", ref_regex=r"[A-Za-z]{2}[0-9]{2}[A-Za-z]{2}"),
     SIG(name="WAB", comment_names=["WAB"], description="Worked All Britain", ref_regex=r"[A-Z]{1,2}[0-9]{2}"),
     SIG(name="WAI", comment_names=["WAI"], description="Worked All Ireland", ref_regex=r"[A-Z][0-9]{2}"),
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 48eddee..660b17b 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1783701943"></script>
+<script src="/js/add-spot.js?v=1783702256"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index b38c198..0e90d50 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1783701943"></script>
+<script src="/js/alerts.js?v=1783702256"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 59614a9..8467f6a 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783701943"></script>
-<script src="/js/bands.js?v=1783701943"></script>
+<script src="/js/spotsbandsandmap.js?v=1783702256"></script>
+<script src="/js/bands.js?v=1783702256"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index ee72525..8639554 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1783701943" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1783702256" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1783701943"></script>
-<script src="/js/ui-ham.js?v=1783701943"></script>
-<script src="/js/geo.js?v=1783701943"></script>
-<script src="/js/common.js?v=1783701943"></script>
+<script src="/js/utils.js?v=1783702256"></script>
+<script src="/js/ui-ham.js?v=1783702256"></script>
+<script src="/js/geo.js?v=1783702256"></script>
+<script src="/js/common.js?v=1783702256"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index aa7e3b5..d71800c 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1783701943"></script>
+<script src="/js/conditions.js?v=1783702256"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 47eb5a2..296628d 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783701943"></script>
-<script src="/js/map.js?v=1783701943"></script>
+<script src="/js/spotsbandsandmap.js?v=1783702255"></script>
+<script src="/js/map.js?v=1783702255"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 3e34b08..41462e3 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783701943"></script>
-<script src="/js/spots.js?v=1783701943"></script>
+<script src="/js/spotsbandsandmap.js?v=1783702255"></script>
+<script src="/js/spots.js?v=1783702255"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index e40d244..c4cb91b 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1783701943"></script>
+<script src="/js/status.js?v=1783702256"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 2fc9658571ee7279149b0a334102a050d8578459 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 08:17:17 +0100
Subject: [PATCH 13/29] Improve error handling to spare the server log from
 user's malformed requests and stop trying to parse data from providers if the
 HTTP status was not 200

---
 alertproviders/http_alert_provider.py         | 21 ++++---
 config-example.yml                            |  4 ++
 core/config.py                                |  1 +
 server/handlers/api/addspot.py                |  2 +-
 server/handlers/api/alerts.py                 |  3 +-
 server/handlers/api/dxstats.py                | 52 +++++++++-------
 server/handlers/api/lookups.py                |  6 +-
 server/handlers/api/options.py                | 59 +++++++++++--------
 server/handlers/api/solar_conditions.py       | 26 +++++---
 server/handlers/api/spots.py                  |  3 +-
 server/handlers/api/status.py                 | 25 +++++---
 solarconditionsproviders/giroionosonde.py     |  7 ++-
 solarconditionsproviders/hamqsl.py            |  4 --
 .../http_solar_conditions_provider.py         | 15 +++--
 solarconditionsproviders/kc2gprop.py          |  8 +--
 solarconditionsproviders/noaa3dayforecast.py  |  4 --
 spothole.py                                   |  6 +-
 spotproviders/http_spot_provider.py           | 21 ++++---
 templates/add_spot.html                       |  2 +-
 templates/alerts.html                         |  2 +-
 templates/bands.html                          |  4 +-
 templates/base.html                           | 10 ++--
 templates/conditions.html                     |  2 +-
 templates/map.html                            |  4 +-
 templates/spots.html                          |  4 +-
 templates/status.html                         |  2 +-
 26 files changed, 169 insertions(+), 128 deletions(-)

diff --git a/alertproviders/http_alert_provider.py b/alertproviders/http_alert_provider.py
index a4dd99a..a59a003 100644
--- a/alertproviders/http_alert_provider.py
+++ b/alertproviders/http_alert_provider.py
@@ -41,15 +41,20 @@ class HTTPAlertProvider(AlertProvider):
             # Request data from API
             logging.debug("Polling " + self.name + " alert API...")
             http_response = requests.get(self._url, headers=HTTP_HEADERS, timeout=(5, 30))
-            # Pass off to the subclass for processing
-            new_alerts = self._http_response_to_alerts(http_response)
-            # Submit the new alerts for processing. There might not be any alerts for the less popular programs.
-            if new_alerts:
-                self._submit_batch(new_alerts)
+            # Check response code was good
+            if http_response.status_code == 200:
+                # Pass off to the subclass for processing
+                new_alerts = self._http_response_to_alerts(http_response)
+                # Submit the new alerts for processing. There might not be any alerts for the less popular programs.
+                if new_alerts:
+                    self._submit_batch(new_alerts)
 
-            self.status = "OK"
-            self.last_update_time = datetime.now(pytz.UTC)
-            logging.debug("Received data from " + self.name + " alert API.")
+                self.status = "OK"
+                self.last_update_time = datetime.now(pytz.UTC)
+                logging.debug("Received data from " + self.name + " alert API.")
+            else:
+                self.status = "Error"
+                logging.warning(f"{self.name} alert API returned HTTP {http_response.status_code}.")
 
         except Exception:
             self.status = "Error"
diff --git a/config-example.yml b/config-example.yml
index 2c48dc7..2b545dc 100644
--- a/config-example.yml
+++ b/config-example.yml
@@ -215,6 +215,10 @@ allow-spotting: true
 # your log quickly on a popular server.
 log-web-requests: false
 
+# Minimum severity of log statements to print to the system log. Defaults to INFO, change to DEBUG if you need more
+# information.
+log-level: INFO
+
 # Options for the web UI.
 web-ui-options:
   spot-count: [ 10, 25, 50, 100 ]
diff --git a/core/config.py b/core/config.py
index ff0f235..4cb43c8 100644
--- a/core/config.py
+++ b/core/config.py
@@ -22,6 +22,7 @@ WEB_SERVER_PORT = config["web-server-port"]
 ALLOW_SPOTTING = config["allow-spotting"]
 WEB_UI_OPTIONS = config["web-ui-options"]
 API_ONLY_MODE = config.get("api-only-mode", False)
+LOG_LEVEL = config.get("log-level", "INFO")
 LOG_WEB_REQUESTS = config.get("log-web-requests", False)
 
 # For ease of config, each spot provider owns its own config about whether it should be enabled by default in the web UI
diff --git a/server/handlers/api/addspot.py b/server/handlers/api/addspot.py
index 60c8762..20c64c1 100644
--- a/server/handlers/api/addspot.py
+++ b/server/handlers/api/addspot.py
@@ -127,7 +127,7 @@ class APISpotHandler(tornado.web.RequestHandler):
             self.set_header("Content-Type", "application/json")
 
         except Exception as e:
-            logging.error(e)
+            logging.error("Exception when handling client request to add spot API: %s", e, exc_info=True)
             self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
             self.set_header("Cache-Control", "no-store")
diff --git a/server/handlers/api/alerts.py b/server/handlers/api/alerts.py
index d2f140a..b556fbc 100644
--- a/server/handlers/api/alerts.py
+++ b/server/handlers/api/alerts.py
@@ -59,11 +59,10 @@ class APIAlertsHandler(tornado.web.RequestHandler):
             self.write(safe_json_dumps(data))
             self.set_status(200)
         except ValueError as e:
-            logging.error(e)
             self.write(safe_json_dumps("Bad request - " + str(e)))
             self.set_status(400)
         except Exception as e:
-            logging.error(e)
+            logging.error("Exception when handling client request to alerts API: %s", e, exc_info=True)
             self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
         self.set_header("Cache-Control", "no-store")
diff --git a/server/handlers/api/dxstats.py b/server/handlers/api/dxstats.py
index e6f3b03..7a683a5 100644
--- a/server/handlers/api/dxstats.py
+++ b/server/handlers/api/dxstats.py
@@ -1,4 +1,5 @@
 import json
+import logging
 from collections import Counter
 from datetime import datetime, timedelta
 from typing import Any
@@ -9,6 +10,7 @@ from tornado import httputil
 from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
+from core.utils import safe_json_dumps
 
 CONTINENTS = ["EU", "NA", "SA", "AS", "AF", "OC", "AN"]
 BANDS = ["160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "10m", "6m"]
@@ -29,29 +31,35 @@ class APIDxStatsHandler(tornado.web.RequestHandler):
         self._web_server_metrics = web_server_metrics
 
     def get(self):
-        self._web_server_metrics["last_api_access_time"] = datetime.now(pytz.UTC)
-        self._web_server_metrics["api_access_counter"] += 1
-        self._web_server_metrics["status"] = "OK"
-        api_requests_counter.inc()
+        try:
+            self._web_server_metrics["last_api_access_time"] = datetime.now(pytz.UTC)
+            self._web_server_metrics["api_access_counter"] += 1
+            self._web_server_metrics["status"] = "OK"
+            api_requests_counter.inc()
 
-        one_hour_ago = (datetime.now(pytz.UTC) - timedelta(hours=1)).timestamp()
-        counts = Counter()
+            one_hour_ago = (datetime.now(pytz.UTC) - timedelta(hours=1)).timestamp()
+            counts = Counter()
 
-        for key in self._spots.iterkeys():
-            spot = self._spots.get(key)
-            if spot is None:
-                continue
-            if not spot.time or spot.time < one_hour_ago:
-                continue
-            if spot.de_continent in CONTINENTS_SET and spot.dx_continent in CONTINENTS_SET and spot.band in BANDS_SET:
-                counts[spot.de_continent, spot.dx_continent, spot.band] += 1
+            for key in self._spots.iterkeys():
+                spot = self._spots.get(key)
+                if spot is None:
+                    continue
+                if not spot.time or spot.time < one_hour_ago:
+                    continue
+                if spot.de_continent in CONTINENTS_SET and spot.dx_continent in CONTINENTS_SET and spot.band in BANDS_SET:
+                    counts[spot.de_continent, spot.dx_continent, spot.band] += 1
 
-        result = {
-            de: {dx: {band: counts[de, dx, band] for band in BANDS} for dx in CONTINENTS}
-            for de in CONTINENTS
-        }
+            result = {
+                de: {dx: {band: counts[de, dx, band] for band in BANDS} for dx in CONTINENTS}
+                for de in CONTINENTS
+            }
 
-        self.write(json.dumps(result))
-        self.set_status(200)
-        self.set_header("Cache-Control", "no-store")
-        self.set_header("Content-Type", "application/json")
+            self.write(json.dumps(result))
+            self.set_status(200)
+            self.set_header("Cache-Control", "no-store")
+            self.set_header("Content-Type", "application/json")
+
+        except Exception as e:
+            logging.error("Exception when handling client request to dx stats API: %s", e, exc_info=True)
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
+            self.set_status(500)
diff --git a/server/handlers/api/lookups.py b/server/handlers/api/lookups.py
index 4ab34cd..4475bdc 100644
--- a/server/handlers/api/lookups.py
+++ b/server/handlers/api/lookups.py
@@ -74,7 +74,7 @@ class APILookupCallHandler(tornado.web.RequestHandler):
                 self.set_status(422)
 
         except Exception as e:
-            logging.error(e)
+            logging.error("Exception when handling client request to call lookup API: %s", e, exc_info=True)
             self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
 
@@ -126,7 +126,7 @@ class APILookupSIGRefHandler(tornado.web.RequestHandler):
                 self.set_status(422)
 
         except Exception as e:
-            logging.error(e)
+            logging.error("Exception when handling client request to sig ref lookup API: %s", e, exc_info=True)
             self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
 
@@ -188,7 +188,7 @@ class APILookupGridHandler(tornado.web.RequestHandler):
                 self.set_status(422)
 
         except Exception as e:
-            logging.error(e)
+            logging.error("Exception when handling client request to grid ref lookup API: %s", e, exc_info=True)
             self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
 
diff --git a/server/handlers/api/options.py b/server/handlers/api/options.py
index cc545f2..1ec6c00 100644
--- a/server/handlers/api/options.py
+++ b/server/handlers/api/options.py
@@ -1,3 +1,4 @@
+import logging
 from datetime import datetime
 from typing import Any
 
@@ -25,31 +26,37 @@ class APIOptionsHandler(tornado.web.RequestHandler):
         self._web_server_metrics = web_server_metrics
 
     def get(self):
-        # Metrics
-        self._web_server_metrics["last_api_access_time"] = datetime.now(pytz.UTC)
-        self._web_server_metrics["api_access_counter"] += 1
-        self._web_server_metrics["status"] = "OK"
-        api_requests_counter.inc()
+        try:
+            # Metrics
+            self._web_server_metrics["last_api_access_time"] = datetime.now(pytz.UTC)
+            self._web_server_metrics["api_access_counter"] += 1
+            self._web_server_metrics["status"] = "OK"
+            api_requests_counter.inc()
 
-        options = {"bands": BANDS,
-                   "modes": ALL_MODES,
-                   "mode_types": MODE_TYPES,
-                   "sigs": SIGS,
-                   # Spot/alert sources are filtered for only ones that are enabled in config, no point letting the user toggle things that aren't even available.
-                   "spot_sources": list(
-                       map(lambda p: p["name"], filter(lambda p: p["enabled"], self._status_data["spot_providers"]))),
-                   "alert_sources": list(
-                       map(lambda p: p["name"], filter(lambda p: p["enabled"], self._status_data["alert_providers"]))),
-                   "continents": CONTINENTS,
-                   "propagation_modes": list(PROPAGATION_MODES.values()),
-                   "max_spot_age": MAX_SPOT_AGE,
-                   "spot_allowed": ALLOW_SPOTTING}
-        # If spotting to this server is enabled, "API" is another valid spot source even though it does not come from
-        # one of our proviers.
-        if ALLOW_SPOTTING:
-            options["spot_sources"].append("API")
+            options = {"bands": BANDS,
+                       "modes": ALL_MODES,
+                       "mode_types": MODE_TYPES,
+                       "sigs": SIGS,
+                       # Spot/alert sources are filtered for only ones that are enabled in config, no point letting the user toggle things that aren't even available.
+                       "spot_sources": list(
+                           map(lambda p: p["name"], filter(lambda p: p["enabled"], self._status_data["spot_providers"]))),
+                       "alert_sources": list(
+                           map(lambda p: p["name"], filter(lambda p: p["enabled"], self._status_data["alert_providers"]))),
+                       "continents": CONTINENTS,
+                       "propagation_modes": list(PROPAGATION_MODES.values()),
+                       "max_spot_age": MAX_SPOT_AGE,
+                       "spot_allowed": ALLOW_SPOTTING}
+            # If spotting to this server is enabled, "API" is another valid spot source even though it does not come from
+            # one of our proviers.
+            if ALLOW_SPOTTING:
+                options["spot_sources"].append("API")
 
-        self.write(safe_json_dumps(options))
-        self.set_status(200)
-        self.set_header("Cache-Control", "no-store")
-        self.set_header("Content-Type", "application/json")
+            self.write(safe_json_dumps(options))
+            self.set_status(200)
+            self.set_header("Cache-Control", "no-store")
+            self.set_header("Content-Type", "application/json")
+
+        except Exception as e:
+            logging.error("Exception when handling client request to options API: %s", e, exc_info=True)
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
+            self.set_status(500)
diff --git a/server/handlers/api/solar_conditions.py b/server/handlers/api/solar_conditions.py
index 5fdcc46..7193b30 100644
--- a/server/handlers/api/solar_conditions.py
+++ b/server/handlers/api/solar_conditions.py
@@ -1,3 +1,4 @@
+import logging
 from datetime import datetime
 from typing import Any
 
@@ -7,6 +8,7 @@ from tornado import httputil
 from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
+from core.utils import safe_json_dumps
 
 
 class APISolarConditionsHandler(tornado.web.RequestHandler):
@@ -22,13 +24,19 @@ class APISolarConditionsHandler(tornado.web.RequestHandler):
         self._web_server_metrics = web_server_metrics
 
     def get(self):
-        # Metrics
-        self._web_server_metrics["last_api_access_time"] = datetime.now(pytz.UTC)
-        self._web_server_metrics["api_access_counter"] += 1
-        self._web_server_metrics["status"] = "OK"
-        api_requests_counter.inc()
+        try:
+            # Metrics
+            self._web_server_metrics["last_api_access_time"] = datetime.now(pytz.UTC)
+            self._web_server_metrics["api_access_counter"] += 1
+            self._web_server_metrics["status"] = "OK"
+            api_requests_counter.inc()
 
-        self.write(self._solar_conditions.to_json())
-        self.set_status(200)
-        self.set_header("Cache-Control", "no-store")
-        self.set_header("Content-Type", "application/json")
+            self.write(self._solar_conditions.to_json())
+            self.set_status(200)
+            self.set_header("Cache-Control", "no-store")
+            self.set_header("Content-Type", "application/json")
+
+        except Exception as e:
+            logging.error("Exception when handling client request to solar conditions API: %s", e, exc_info=True)
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
+            self.set_status(500)
diff --git a/server/handlers/api/spots.py b/server/handlers/api/spots.py
index 0eba452..675076f 100644
--- a/server/handlers/api/spots.py
+++ b/server/handlers/api/spots.py
@@ -59,11 +59,10 @@ class APISpotsHandler(tornado.web.RequestHandler):
             self.write(safe_json_dumps(data))
             self.set_status(200)
         except ValueError as e:
-            logging.error(e)
             self.write(safe_json_dumps("Bad request - " + str(e)))
             self.set_status(400)
         except Exception as e:
-            logging.error(e)
+            logging.error("Excedption when handling client request to spots API: %s", e, exc_info=True)
             self.write(safe_json_dumps("Error - an internal server error occurred."))
             self.set_status(500)
         self.set_header("Cache-Control", "no-store")
diff --git a/server/handlers/api/status.py b/server/handlers/api/status.py
index 1a125cd..589831c 100644
--- a/server/handlers/api/status.py
+++ b/server/handlers/api/status.py
@@ -1,3 +1,4 @@
+import logging
 from datetime import datetime
 from typing import Any
 
@@ -23,13 +24,19 @@ class APIStatusHandler(tornado.web.RequestHandler):
         self._web_server_metrics = web_server_metrics
 
     def get(self):
-        # Metrics
-        self._web_server_metrics["last_api_access_time"] = datetime.now(pytz.UTC)
-        self._web_server_metrics["api_access_counter"] += 1
-        self._web_server_metrics["status"] = "OK"
-        api_requests_counter.inc()
+        try:
+            # Metrics
+            self._web_server_metrics["last_api_access_time"] = datetime.now(pytz.UTC)
+            self._web_server_metrics["api_access_counter"] += 1
+            self._web_server_metrics["status"] = "OK"
+            api_requests_counter.inc()
 
-        self.write(safe_json_dumps(self._status_data))
-        self.set_status(200)
-        self.set_header("Cache-Control", "no-store")
-        self.set_header("Content-Type", "application/json")
+            self.write(safe_json_dumps(self._status_data))
+            self.set_status(200)
+            self.set_header("Cache-Control", "no-store")
+            self.set_header("Content-Type", "application/json")
+
+        except Exception as e:
+            logging.error("Exception when handling client request to status API: %s", e, exc_info=True)
+            self.write(safe_json_dumps("Error - an internal server error occurred."))
+            self.set_status(500)
diff --git a/solarconditionsproviders/giroionosonde.py b/solarconditionsproviders/giroionosonde.py
index 8a9e398..86d2042 100644
--- a/solarconditionsproviders/giroionosonde.py
+++ b/solarconditionsproviders/giroionosonde.py
@@ -127,10 +127,11 @@ class GIROIonosonde(SolarConditionsProvider):
         from_str = from_time.strftime("%Y.%m.%d+%H:%M:%S")
         to_str = to_time.strftime("%Y.%m.%d+%H:%M:%S")
         url = f"{LGDC_URL}?ursiCode={ursi}&charName=foF2,MUFD,fmin&DMUF=3000&fromDate={from_str}&toDate={to_str}"
-        response = requests.get(url, headers=HTTP_HEADERS, timeout=(5, 15))
-        if response.status_code != 200:
+        http_response = requests.get(url, headers=HTTP_HEADERS, timeout=(5, 15))
+        if http_response.status_code != 200:
+            logging.warning(f"Giro ionosonde API returned HTTP {http_response.status_code}.")
             return None, None, None
-        return self._parse_all(response.text)
+        return self._parse_all(http_response.text)
 
     @staticmethod
     def _parse_all(text):
diff --git a/solarconditionsproviders/hamqsl.py b/solarconditionsproviders/hamqsl.py
index 62cfd70..92c5306 100644
--- a/solarconditionsproviders/hamqsl.py
+++ b/solarconditionsproviders/hamqsl.py
@@ -18,10 +18,6 @@ class HamQSL(HTTPSolarConditionsProvider):
         super().__init__(provider_config, URL, POLL_INTERVAL)
 
     def _http_response_to_solar_conditions(self, http_response):
-        if http_response.status_code != 200:
-            logging.warning("HamQSL solar conditions API returned HTTP " + str(http_response.status_code))
-            return None
-
         root = ElementTree.fromstring(http_response.text)
         sd = root.find("solardata")
         if sd is None:
diff --git a/solarconditionsproviders/http_solar_conditions_provider.py b/solarconditionsproviders/http_solar_conditions_provider.py
index 0a8dfcd..4a639fd 100644
--- a/solarconditionsproviders/http_solar_conditions_provider.py
+++ b/solarconditionsproviders/http_solar_conditions_provider.py
@@ -39,12 +39,17 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
         try:
             logging.debug("Polling " + self.name + " solar conditions API...")
             http_response = requests.get(self._url, headers=HTTP_HEADERS, timeout=(5, 30))
-            new_data = self._http_response_to_solar_conditions(http_response)
-            self.update_data(new_data)
+            # Check response code was good
+            if http_response.status_code == 200:
+                new_data = self._http_response_to_solar_conditions(http_response)
+                self.update_data(new_data)
 
-            self.status = "OK"
-            self.last_update_time = datetime.now(pytz.UTC)
-            logging.debug("Received data from " + self.name + " solar conditions API.")
+                self.status = "OK"
+                self.last_update_time = datetime.now(pytz.UTC)
+                logging.debug("Received data from " + self.name + " solar conditions API.")
+            else:
+                self.status = "Error"
+                logging.warning(f"{self.name} solar conditions API returned HTTP {http_response.status_code}.")
 
         except Exception:
             self.status = "Error"
diff --git a/solarconditionsproviders/kc2gprop.py b/solarconditionsproviders/kc2gprop.py
index 41342b1..99660ad 100644
--- a/solarconditionsproviders/kc2gprop.py
+++ b/solarconditionsproviders/kc2gprop.py
@@ -44,9 +44,9 @@ class KC2GProp(SolarConditionsProvider):
     def _poll(self):
         try:
             logging.debug("Polling KC2G ionosonde data...")
-            response = requests.get(KC2G_URL, headers=HTTP_HEADERS, timeout=(5, 30))
-            if response.status_code != 200:
-                logging.warning(f"KC2G ionosonde API returned HTTP {response.status_code}")
+            http_response = requests.get(KC2G_URL, headers=HTTP_HEADERS, timeout=(5, 30))
+            if http_response.status_code != 200:
+                logging.warning(f"KC2G ionosonde API returned HTTP {http_response.status_code}")
                 return
 
             now = datetime.now(timezone.utc)
@@ -57,7 +57,7 @@ class KC2GProp(SolarConditionsProvider):
             ionosonde_data = dict(self._solar_conditions.ionosonde_data or {})
             updated_count = 0
 
-            for reading in response.json():
+            for reading in http_response.json():
                 station = reading.get("station", {})
                 ursi = station.get("code")
                 name = station.get("name")
diff --git a/solarconditionsproviders/noaa3dayforecast.py b/solarconditionsproviders/noaa3dayforecast.py
index d677e66..de5bf1a 100644
--- a/solarconditionsproviders/noaa3dayforecast.py
+++ b/solarconditionsproviders/noaa3dayforecast.py
@@ -80,10 +80,6 @@ class NOAA3dayForecast(HTTPSolarConditionsProvider):
         return result if result else None
 
     def _http_response_to_solar_conditions(self, http_response):
-        if http_response.status_code != 200:
-            logging.warning("NOAA K-index forecast API returned HTTP " + str(http_response.status_code))
-            return None
-
         lines = http_response.text.splitlines()
 
         # Find the "NOAA Kp index breakdown" section header
diff --git a/spothole.py b/spothole.py
index 3657487..d2ed8be 100644
--- a/spothole.py
+++ b/spothole.py
@@ -8,7 +8,7 @@ import sys
 from diskcache import Cache
 
 from core.cleanup import CleanupTimer
-from core.config import config, SERVER_OWNER_CALLSIGN
+from core.config import config, SERVER_OWNER_CALLSIGN, LOG_LEVEL
 from core.constants import SOFTWARE_VERSION
 from core.lookup_helper import lookup_helper
 from core.status_reporter import StatusReporter
@@ -84,9 +84,9 @@ def get_solar_conditions_provider_from_config(config_providers_entry):
 if __name__ == '__main__':
     # Set up logging
     root = logging.getLogger()
-    root.setLevel(logging.INFO)
+    root.setLevel(LOG_LEVEL)
     handler = logging.StreamHandler(sys.stdout)
-    handler.setLevel(logging.INFO)
+    handler.setLevel(LOG_LEVEL)
     formatter = logging.Formatter("%(levelname)s : %(message)s")
     handler.setFormatter(formatter)
     root.handlers.clear()
diff --git a/spotproviders/http_spot_provider.py b/spotproviders/http_spot_provider.py
index 39b052d..57bd046 100644
--- a/spotproviders/http_spot_provider.py
+++ b/spotproviders/http_spot_provider.py
@@ -41,15 +41,20 @@ class HTTPSpotProvider(SpotProvider):
             # Request data from API
             logging.debug("Polling " + self.name + " spot API...")
             http_response = requests.get(self._url, headers=HTTP_HEADERS, timeout=(5, 30))
-            # Pass off to the subclass for processing
-            new_spots = self._http_response_to_spots(http_response)
-            # Submit the new spots for processing. There might not be any spots for the less popular programs.
-            if new_spots:
-                self._submit_batch(new_spots)
+            # Check response code was good
+            if http_response.status_code == 200:
+                # Pass off to the subclass for processing
+                new_spots = self._http_response_to_spots(http_response)
+                # Submit the new spots for processing. There might not be any spots for the less popular programs.
+                if new_spots:
+                    self._submit_batch(new_spots)
 
-            self.status = "OK"
-            self.last_update_time = datetime.now(pytz.UTC)
-            logging.debug("Received data from " + self.name + " spot API.")
+                self.status = "OK"
+                self.last_update_time = datetime.now(pytz.UTC)
+                logging.debug("Received data from " + self.name + " spot API.")
+            else:
+                self.status = "Error"
+                logging.warning(f"{self.name} spot API returned HTTP {http_response.status_code}.")
 
         except Exception:
             self.status = "Error"
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 660b17b..587c910 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1783702256"></script>
+<script src="/js/add-spot.js?v=1784963837"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 0e90d50..26dff8c 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1783702256"></script>
+<script src="/js/alerts.js?v=1784963837"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 8467f6a..5c0203a 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783702256"></script>
-<script src="/js/bands.js?v=1783702256"></script>
+<script src="/js/spotsbandsandmap.js?v=1784963837"></script>
+<script src="/js/bands.js?v=1784963837"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 8639554..a801bba 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1783702256" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784963837" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1783702256"></script>
-<script src="/js/ui-ham.js?v=1783702256"></script>
-<script src="/js/geo.js?v=1783702256"></script>
-<script src="/js/common.js?v=1783702256"></script>
+<script src="/js/utils.js?v=1784963837"></script>
+<script src="/js/ui-ham.js?v=1784963837"></script>
+<script src="/js/geo.js?v=1784963837"></script>
+<script src="/js/common.js?v=1784963837"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index d71800c..8124c77 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1783702256"></script>
+<script src="/js/conditions.js?v=1784963837"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 296628d..ec5c18d 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783702255"></script>
-<script src="/js/map.js?v=1783702255"></script>
+<script src="/js/spotsbandsandmap.js?v=1784963837"></script>
+<script src="/js/map.js?v=1784963837"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 41462e3..701fce4 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1783702255"></script>
-<script src="/js/spots.js?v=1783702255"></script>
+<script src="/js/spotsbandsandmap.js?v=1784963837"></script>
+<script src="/js/spots.js?v=1784963837"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index c4cb91b..0454209 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1783702256"></script>
+<script src="/js/status.js?v=1784963837"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 66010dc682b331e1f69c84d119e8986aa1d014cf Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 08:29:22 +0100
Subject: [PATCH 14/29] Improve error reporting consistency and ensure
 SEMI_STATIC_URL_DATA_CACHE caches 400-series responses from the server so we
 don't keep requesting summit/park/bunker data for a reference that the user
 typod and doesn't actually exist.

---
 alertproviders/http_alert_provider.py                  |  2 +-
 core/cache_utils.py                                    |  7 +++++--
 solarconditionsproviders/giroionosonde.py              |  2 +-
 .../http_solar_conditions_provider.py                  |  2 +-
 solarconditionsproviders/kc2gprop.py                   |  2 +-
 spotproviders/http_spot_provider.py                    |  2 +-
 templates/add_spot.html                                |  2 +-
 templates/alerts.html                                  |  2 +-
 templates/bands.html                                   |  4 ++--
 templates/base.html                                    | 10 +++++-----
 templates/conditions.html                              |  2 +-
 templates/map.html                                     |  4 ++--
 templates/spots.html                                   |  4 ++--
 templates/status.html                                  |  2 +-
 14 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/alertproviders/http_alert_provider.py b/alertproviders/http_alert_provider.py
index a59a003..1abb4ee 100644
--- a/alertproviders/http_alert_provider.py
+++ b/alertproviders/http_alert_provider.py
@@ -54,7 +54,7 @@ class HTTPAlertProvider(AlertProvider):
                 logging.debug("Received data from " + self.name + " alert API.")
             else:
                 self.status = "Error"
-                logging.warning(f"{self.name} alert API returned HTTP {http_response.status_code}.")
+                logging.warning(f"HTTP {http_response.status_code} when calling {self.name} alerts API.")
 
         except Exception:
             self.status = "Error"
diff --git a/core/cache_utils.py b/core/cache_utils.py
index 2ec492c..68e521f 100644
--- a/core/cache_utils.py
+++ b/core/cache_utils.py
@@ -8,8 +8,11 @@ from requests_cache import CachedSession
 # of time has passed. This is used throughout Spothole to cache data that does not change
 # rapidly. The ThreadSafeSession construct here protects it against some multithreading
 # contention weirdness we sometimes used to see on startup where the cache was hammered
-# pretty hard.
-_session = CachedSession("cache/semi_static_url_data_cache", expire_after=timedelta(days=30))
+# pretty hard. The expanded list of allowable_codes ensures we also cache and return 400-type
+# responses, e.g "this SOTA summit ref doesn't actually exist", to avoid hammering remote
+# servers for data they've told us they can't provide.
+_session = CachedSession("cache/semi_static_url_data_cache", expire_after=timedelta(days=30),
+                         allowable_codes=(200, 400, 401, 403, 404))
 _lock = threading.Lock()
 
 
diff --git a/solarconditionsproviders/giroionosonde.py b/solarconditionsproviders/giroionosonde.py
index 86d2042..c85960d 100644
--- a/solarconditionsproviders/giroionosonde.py
+++ b/solarconditionsproviders/giroionosonde.py
@@ -129,7 +129,7 @@ class GIROIonosonde(SolarConditionsProvider):
         url = f"{LGDC_URL}?ursiCode={ursi}&charName=foF2,MUFD,fmin&DMUF=3000&fromDate={from_str}&toDate={to_str}"
         http_response = requests.get(url, headers=HTTP_HEADERS, timeout=(5, 15))
         if http_response.status_code != 200:
-            logging.warning(f"Giro ionosonde API returned HTTP {http_response.status_code}.")
+            logging.warning(f"HTTP {http_response.status_code} when calling Giro ionosonde API.")
             return None, None, None
         return self._parse_all(http_response.text)
 
diff --git a/solarconditionsproviders/http_solar_conditions_provider.py b/solarconditionsproviders/http_solar_conditions_provider.py
index 4a639fd..b3a0064 100644
--- a/solarconditionsproviders/http_solar_conditions_provider.py
+++ b/solarconditionsproviders/http_solar_conditions_provider.py
@@ -49,7 +49,7 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
                 logging.debug("Received data from " + self.name + " solar conditions API.")
             else:
                 self.status = "Error"
-                logging.warning(f"{self.name} solar conditions API returned HTTP {http_response.status_code}.")
+                logging.warning(f"HTTP {http_response.status_code} when calling {self.name} solar conditions API.")
 
         except Exception:
             self.status = "Error"
diff --git a/solarconditionsproviders/kc2gprop.py b/solarconditionsproviders/kc2gprop.py
index 99660ad..d1aa1b0 100644
--- a/solarconditionsproviders/kc2gprop.py
+++ b/solarconditionsproviders/kc2gprop.py
@@ -46,7 +46,7 @@ class KC2GProp(SolarConditionsProvider):
             logging.debug("Polling KC2G ionosonde data...")
             http_response = requests.get(KC2G_URL, headers=HTTP_HEADERS, timeout=(5, 30))
             if http_response.status_code != 200:
-                logging.warning(f"KC2G ionosonde API returned HTTP {http_response.status_code}")
+                logging.warning(f"HTTP {http_response.status_code} when calling KG2G ionosonde API.")
                 return
 
             now = datetime.now(timezone.utc)
diff --git a/spotproviders/http_spot_provider.py b/spotproviders/http_spot_provider.py
index 57bd046..37038c7 100644
--- a/spotproviders/http_spot_provider.py
+++ b/spotproviders/http_spot_provider.py
@@ -54,7 +54,7 @@ class HTTPSpotProvider(SpotProvider):
                 logging.debug("Received data from " + self.name + " spot API.")
             else:
                 self.status = "Error"
-                logging.warning(f"{self.name} spot API returned HTTP {http_response.status_code}.")
+                logging.warning(f"HTTP {http_response.status_code} when calling {self.name} spot API.")
 
         except Exception:
             self.status = "Error"
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 587c910..56b2739 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784963837"></script>
+<script src="/js/add-spot.js?v=1784964562"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 26dff8c..73f0081 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784963837"></script>
+<script src="/js/alerts.js?v=1784964563"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 5c0203a..a4d206f 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784963837"></script>
-<script src="/js/bands.js?v=1784963837"></script>
+<script src="/js/spotsbandsandmap.js?v=1784964562"></script>
+<script src="/js/bands.js?v=1784964562"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index a801bba..45842c0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784963837" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784964562" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784963837"></script>
-<script src="/js/ui-ham.js?v=1784963837"></script>
-<script src="/js/geo.js?v=1784963837"></script>
-<script src="/js/common.js?v=1784963837"></script>
+<script src="/js/utils.js?v=1784964562"></script>
+<script src="/js/ui-ham.js?v=1784964562"></script>
+<script src="/js/geo.js?v=1784964562"></script>
+<script src="/js/common.js?v=1784964562"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 8124c77..15273a7 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784963837"></script>
+<script src="/js/conditions.js?v=1784964562"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index ec5c18d..2e64fba 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784963837"></script>
-<script src="/js/map.js?v=1784963837"></script>
+<script src="/js/spotsbandsandmap.js?v=1784964563"></script>
+<script src="/js/map.js?v=1784964563"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 701fce4..22fc625 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784963837"></script>
-<script src="/js/spots.js?v=1784963837"></script>
+<script src="/js/spotsbandsandmap.js?v=1784964562"></script>
+<script src="/js/spots.js?v=1784964562"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 0454209..3da2d06 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784963837"></script>
+<script src="/js/status.js?v=1784964562"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From c397009ada7a98e13e200a4f9b15e725cd83cb56 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 08:53:55 +0100
Subject: [PATCH 15/29] Improve error reporting

---
 alertproviders/http_alert_provider.py         |   2 +-
 core/lookup_helper.py                         |  64 +++--
 core/sig_utils.py                             | 262 ++++++++++--------
 solarconditionsproviders/giroionosonde.py     |   2 +-
 .../http_solar_conditions_provider.py         |   2 +-
 solarconditionsproviders/kc2gprop.py          |   2 +-
 spotproviders/gma.py                          |  18 +-
 spotproviders/http_spot_provider.py           |   2 +-
 templates/add_spot.html                       |   2 +-
 templates/alerts.html                         |   2 +-
 templates/bands.html                          |   4 +-
 templates/base.html                           |  10 +-
 templates/conditions.html                     |   2 +-
 templates/map.html                            |   4 +-
 templates/spots.html                          |   4 +-
 templates/status.html                         |   2 +-
 16 files changed, 227 insertions(+), 157 deletions(-)

diff --git a/alertproviders/http_alert_provider.py b/alertproviders/http_alert_provider.py
index 1abb4ee..debf791 100644
--- a/alertproviders/http_alert_provider.py
+++ b/alertproviders/http_alert_provider.py
@@ -42,7 +42,7 @@ class HTTPAlertProvider(AlertProvider):
             logging.debug("Polling " + self.name + " alert API...")
             http_response = requests.get(self._url, headers=HTTP_HEADERS, timeout=(5, 30))
             # Check response code was good
-            if http_response.status_code == 200:
+            if http_response.ok:
                 # Pass off to the subclass for processing
                 new_alerts = self._http_response_to_alerts(http_response)
                 # Submit the new alerts for processing. There might not be any alerts for the less popular programs.
diff --git a/core/lookup_helper.py b/core/lookup_helper.py
index 7fe2594..97b6060 100644
--- a/core/lookup_helper.py
+++ b/core/lookup_helper.py
@@ -5,7 +5,6 @@ import re
 import urllib.parse
 from datetime import timedelta
 
-import requests
 import xmltodict
 from diskcache import Cache
 from pyhamtools import LookupLib, Callinfo, callinfo
@@ -143,12 +142,16 @@ class LookupHelper:
         try:
             logging.info("Downloading Country-files.com cty.plist...")
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://www.country-files.com/cty/cty.plist",
-                                                      headers=HTTP_HEADERS).text
+                                                      headers=HTTP_HEADERS)
 
-            with open(self._country_files_cty_plist_download_location, "w") as f:
-                f.write(response)
-                f.flush()
-                return True
+            if response.ok:
+                with open(self._country_files_cty_plist_download_location, "w") as f:
+                    f.write(response.text)
+                    f.flush()
+                    return True
+            else:
+                logging.warning(f"HTTP {response.status_code} when downloading Country-files.com cty.plist.")
+                return False
 
         except Exception as e:
             logging.error("Exception when downloading Clublog cty.xml", e)
@@ -161,12 +164,16 @@ class LookupHelper:
             logging.info("Downloading dxcc.json...")
             response = SEMI_STATIC_URL_DATA_CACHE.get(
                 "https://raw.githubusercontent.com/k0swe/dxcc-json/refs/heads/main/dxcc.json",
-                headers=HTTP_HEADERS).text
+                headers=HTTP_HEADERS)
 
-            with open(self._dxcc_json_download_location, "w") as f:
-                f.write(response)
-                f.flush()
-                return True
+            if response.ok:
+                with open(self._dxcc_json_download_location, "w") as f:
+                    f.write(response.text)
+                    f.flush()
+                    return True
+            else:
+                logging.warning(f"HTTP {response.status_code} when downloading dxcc.json.")
+                return False
 
         except Exception as e:
             logging.error("Exception when downloading dxcc.json", e)
@@ -496,14 +503,20 @@ class LookupHelper:
 
         for lookup_call in calls_to_try:
             try:
-                lookup_response = requests.get(
+                response = SEMI_STATIC_URL_DATA_CACHE.get(
                     self._qrz_base_url + "?s=" + session_key + "&callsign=" + urllib.parse.quote_plus(lookup_call),
-                    headers=HTTP_HEADERS, timeout=10).content
-                raw = xmltodict.parse(lookup_response).get("QRZDatabase", {}).get("Callsign")
-                if raw:
-                    data = _normalize_qrz_data(raw)
-                    self._qrz_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
-                    return data
+                    headers=HTTP_HEADERS, timeout=10)
+                if response.ok:
+                    raw = xmltodict.parse(response.content).get("QRZDatabase", {}).get("Callsign")
+                    if raw:
+                        data = _normalize_qrz_data(raw)
+                        self._qrz_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
+                        return data
+                    elif not response.from_cache:
+                        logging.warning("Malformed response looking up callsign %s using QRZ", lookup_call)
+                elif not response.from_cache:
+                    logging.warning("HTTP %d looking up callsign %s using QRZ", lookup_call)
+
             except (KeyError, ValueError):
                 continue
             except Exception:
@@ -552,12 +565,17 @@ class LookupHelper:
 
         for lookup_call in calls_to_try:
             try:
-                lookup_data = SEMI_STATIC_URL_DATA_CACHE.get(
+                response = SEMI_STATIC_URL_DATA_CACHE.get(
                     self._hamqth_base_url + "?id=" + session_id + "&callsign=" + urllib.parse.quote_plus(
-                        lookup_call) + "&prg=" + HAMQTH_PRG, headers=HTTP_HEADERS).content
-                data = xmltodict.parse(lookup_data)["HamQTH"]["search"]
-                self._hamqth_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
-                return data
+                        lookup_call) + "&prg=" + HAMQTH_PRG, headers=HTTP_HEADERS)
+                if response.ok:
+                    data = xmltodict.parse(response.content)["HamQTH"]["search"]
+                    self._hamqth_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
+                    return data
+                elif not response.from_cache:
+                    logging.warning("HTTP %d looking up callsign %s using HamQTH", response.status_code, lookup_call)
+                    return None
+
             except (KeyError, ValueError):
                 continue
             except Exception:
diff --git a/core/sig_utils.py b/core/sig_utils.py
index db180dc..339bd4a 100644
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -45,144 +45,181 @@ def populate_sig_ref_info(sig_ref):
     try:
         if sig.upper() == "POTA":
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://api.pota.app/park/" + ref_id, headers=HTTP_HEADERS)
-            if not response.ok:
+            if response.ok:
+                data = response.json()
+                if data:
+                    fullname = str(data["name"]) if "name" in data else None
+                    if fullname and "parktypeDesc" in data and data["parktypeDesc"] != "":
+                        fullname = fullname + " " + data["parktypeDesc"]
+                    sig_ref.name = fullname
+                    sig_ref.url = "https://pota.app/#/park/" + ref_id
+                    sig_ref.grid = data["grid6"] if "grid6" in data else None
+                    sig_ref.latitude = data["latitude"] if "latitude" in data else None
+                    sig_ref.longitude = data["longitude"] if "longitude" in data else None
+                elif not response.from_cache:
+                    logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
+            elif not response.from_cache:
                 logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
-            data = response.json() if response.ok else None
-            if data:
-                fullname = str(data["name"]) if "name" in data else None
-                if fullname and "parktypeDesc" in data and data["parktypeDesc"] != "":
-                    fullname = fullname + " " + data["parktypeDesc"]
-                sig_ref.name = fullname
-                sig_ref.url = "https://pota.app/#/park/" + ref_id
-                sig_ref.grid = data["grid6"] if "grid6" in data else None
-                sig_ref.latitude = data["latitude"] if "latitude" in data else None
-                sig_ref.longitude = data["longitude"] if "longitude" in data else None
+
         elif sig.upper() == "SOTA":
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://api-db2.sota.org.uk/api/summits/" + ref_id,
                                                       headers=HTTP_HEADERS)
-            if not response.ok:
+            if response.ok:
+                data = response.json()
+                if data:
+                    sig_ref.name = data["name"] if "name" in data else None
+                    sig_ref.url = "https://www.sotadata.org.uk/en/summit/" + ref_id
+                    sig_ref.grid = data["locator"] if "locator" in data else None
+                    sig_ref.latitude = data["latitude"] if "latitude" in data else None
+                    sig_ref.longitude = data["longitude"] if "longitude" in data else None
+                    sig_ref.activation_score = data["points"] if "points" in data else None
+                elif not response.from_cache:
+                    logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
+            elif not response.from_cache:
                 logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
-            data = response.json() if response.ok else None
-            if data:
-                sig_ref.name = data["name"] if "name" in data else None
-                sig_ref.url = "https://www.sotadata.org.uk/en/summit/" + ref_id
-                sig_ref.grid = data["locator"] if "locator" in data else None
-                sig_ref.latitude = data["latitude"] if "latitude" in data else None
-                sig_ref.longitude = data["longitude"] if "longitude" in data else None
-                sig_ref.activation_score = data["points"] if "points" in data else None
+
         elif sig.upper() == "WWBOTA":
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://api.wwbota.org/bunkers/" + ref_id,
                                                       headers=HTTP_HEADERS)
-            if not response.ok:
+            if response.ok:
+                data = response.json()
+                if data:
+                    sig_ref.name = data["name"] if "name" in data else None
+                    sig_ref.url = "https://bunkerwiki.org/?s=" + ref_id if ref_id.startswith("B/G") else None
+                    sig_ref.grid = data["locator"] if "locator" in data else None
+                    sig_ref.latitude = data["lat"] if "lat" in data else None
+                    sig_ref.longitude = data["long"] if "long" in data else None
+                elif not response.from_cache:
+                    logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
+            elif not response.from_cache:
                 logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
-            data = response.json() if response.ok else None
-            if data:
-                sig_ref.name = data["name"] if "name" in data else None
-                sig_ref.url = "https://bunkerwiki.org/?s=" + ref_id if ref_id.startswith("B/G") else None
-                sig_ref.grid = data["locator"] if "locator" in data else None
-                sig_ref.latitude = data["lat"] if "lat" in data else None
-                sig_ref.longitude = data["long"] if "long" in data else None
+
         elif sig.upper() == "GMA" or sig.upper() == "ARLHS" or sig.upper() == "ILLW" or sig.upper() == "WCA" or sig.upper() == "MOTA" or sig.upper() == "IOTA":
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://www.cqgma.org/api/ref/?" + ref_id,
                                                       headers=HTTP_HEADERS)
-            if not response.ok:
+            if response.ok:
+                data = response.json()
+                if data:
+                    sig_ref.name = data["name"] if "name" in data else None
+                    sig_ref.url = "https://www.cqgma.org/zinfo.php?ref=" + ref_id
+                    sig_ref.grid = data["locator"] if "locator" in data else None
+                    sig_ref.latitude = data["latitude"] if "latitude" in data else None
+                    sig_ref.longitude = data["longitude"] if "longitude" in data else None
+                elif not response.from_cache:
+                    logging.warning("Malformed response looking up %s ref %s via GMA", sig, ref_id)
+            elif not response.from_cache:
                 logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
-            data = response.json() if response.ok else None
-            if data:
-                sig_ref.name = data["name"] if "name" in data else None
-                sig_ref.url = "https://www.cqgma.org/zinfo.php?ref=" + ref_id
-                sig_ref.grid = data["locator"] if "locator" in data else None
-                sig_ref.latitude = data["latitude"] if "latitude" in data else None
-                sig_ref.longitude = data["longitude"] if "longitude" in data else None
+
         elif sig.upper() == "WWFF":
-            wwff_response = SEMI_STATIC_URL_DATA_CACHE.get("https://wwff.co/wwff-data/wwff_directory.csv",
-                                                           headers=HTTP_HEADERS)
-            if not wwff_response.ok:
-                logging.warning("HTTP %d looking up %s ref %s", wwff_response.status_code, sig, ref_id)
-                return sig_ref
-            wwff_index = {row["reference"]: row for row in csv.DictReader(wwff_response.content.decode().splitlines())}
-            row = wwff_index.get(ref_id)
-            if row:
-                sig_ref.name = row["name"] if "name" in row else None
-                sig_ref.url = "https://wwff.co/directory/?showRef=" + ref_id
-                sig_ref.grid = row["iaruLocator"] if "iaruLocator" in row and row["iaruLocator"] != "-" else None
-                sig_ref.latitude = float(row["latitude"]) if "latitude" in row and row["latitude"] != "-" else None
-                sig_ref.longitude = float(row["longitude"]) if "longitude" in row and row["longitude"] != "-" else None
+            response = SEMI_STATIC_URL_DATA_CACHE.get("https://wwff.co/wwff-data/wwff_directory.csv",
+                                                      headers=HTTP_HEADERS)
+            if response.ok:
+                wwff_index = {row["reference"]: row for row in csv.DictReader(response.content.decode().splitlines())}
+                row = wwff_index.get(ref_id)
+                if row:
+                    sig_ref.name = row["name"] if "name" in row else None
+                    sig_ref.url = "https://wwff.co/directory/?showRef=" + ref_id
+                    sig_ref.grid = row["iaruLocator"] if "iaruLocator" in row and row["iaruLocator"] != "-" else None
+                    sig_ref.latitude = float(row["latitude"]) if "latitude" in row and row["latitude"] != "-" else None
+                    sig_ref.longitude = float(row["longitude"]) if "longitude" in row and row[
+                        "longitude"] != "-" else None
+                elif not response.from_cache:
+                    logging.warning("WWFF database did not contain data for ref %s", ref_id)
+            elif not response.from_cache:
+                logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
+
         elif sig.upper() == "SIOTA":
-            siota_response = SEMI_STATIC_URL_DATA_CACHE.get("https://www.silosontheair.com/data/silos.csv",
-                                                            headers=HTTP_HEADERS)
-            if not siota_response.ok:
-                logging.warning("HTTP %d looking up %s ref %s", siota_response.status_code, sig, ref_id)
-                return sig_ref
-            siota_index = {row["SILO_CODE"]: row for row in
-                           csv.DictReader(siota_response.content.decode().splitlines())}
-            row = siota_index.get(ref_id)
-            if row:
-                sig_ref.name = row["NAME"] if "NAME" in row else None
-                sig_ref.grid = row["LOCATOR"] if "LOCATOR" in row else None
-                sig_ref.latitude = float(row["LAT"]) if "LAT" in row else None
-                sig_ref.longitude = float(row["LNG"]) if "LNG" in row else None
+            response = SEMI_STATIC_URL_DATA_CACHE.get("https://www.silosontheair.com/data/silos.csv",
+                                                      headers=HTTP_HEADERS)
+            if response.ok:
+                siota_index = {row["SILO_CODE"]: row for row in
+                               csv.DictReader(response.content.decode().splitlines())}
+                row = siota_index.get(ref_id)
+                if row:
+                    sig_ref.name = row["NAME"] if "NAME" in row else None
+                    sig_ref.grid = row["LOCATOR"] if "LOCATOR" in row else None
+                    sig_ref.latitude = float(row["LAT"]) if "LAT" in row else None
+                    sig_ref.longitude = float(row["LNG"]) if "LNG" in row else None
+                elif not response.from_cache:
+                    logging.warning("SIOTA database did not contain data for ref %s", ref_id)
+            elif not response.from_cache:
+                logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
+
         elif sig.upper() == "WOTA":
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://www.wota.org.uk/mapping/data/summits.json",
                                                       headers=HTTP_HEADERS)
-            if not response.ok:
+            if response.ok:
+                data = response.json()
+                if data:
+                    for feature in data.get("features", []):
+                        if feature["properties"]["wotaId"] == ref_id:
+                            sig_ref.name = feature["properties"]["title"]
+                            # Fudge WOTA URLs. Outlying fell (LDO) URLs don't match their ID numbers but require 214 to be
+                            # added to them
+                            sig_ref.url = "https://www.wota.org.uk/MM_" + ref_id
+                            if ref_id.upper().startswith("LDO-"):
+                                number = int(ref_id.upper().replace("LDO-", ""))
+                                sig_ref.url = "https://www.wota.org.uk/MM_LDO-" + str(number + 214)
+                            sig_ref.grid = feature["properties"]["qthLocator"]
+                            sig_ref.latitude = feature["geometry"]["coordinates"][1]
+                            sig_ref.longitude = feature["geometry"]["coordinates"][0]
+                            break
+                elif not response.from_cache:
+                    logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
+            elif not response.from_cache:
                 logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
-            data = response.json() if response.ok else None
-            if data:
-                for feature in data.get("features", []):
-                    if feature["properties"]["wotaId"] == ref_id:
-                        sig_ref.name = feature["properties"]["title"]
-                        # Fudge WOTA URLs. Outlying fell (LDO) URLs don't match their ID numbers but require 214 to be
-                        # added to them
-                        sig_ref.url = "https://www.wota.org.uk/MM_" + ref_id
-                        if ref_id.upper().startswith("LDO-"):
-                            number = int(ref_id.upper().replace("LDO-", ""))
-                            sig_ref.url = "https://www.wota.org.uk/MM_LDO-" + str(number + 214)
-                        sig_ref.grid = feature["properties"]["qthLocator"]
-                        sig_ref.latitude = feature["geometry"]["coordinates"][1]
-                        sig_ref.longitude = feature["geometry"]["coordinates"][0]
-                        break
+
         elif sig.upper() == "ZLOTA":
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://ontheair.nz/assets/assets.json", headers=HTTP_HEADERS)
-            if not response.ok:
+            if response.ok:
+                data = response.json()
+                if isinstance(data, list):
+                    for asset in data:
+                        if asset["code"] == ref_id:
+                            sig_ref.name = asset["name"]
+                            sig_ref.url = "https://ontheair.nz/assets/" + ref_id.replace("/", "_")
+                            try:
+                                sig_ref.grid = latlong_to_locator(asset["y"], asset["x"], 6)
+                            except:
+                                logging.debug("Invalid lat/lon received for reference")
+                                sig_ref.latitude = asset["y"]
+                                sig_ref.longitude = asset["x"]
+                            break
+                elif not response.from_cache:
+                    logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
+            elif not response.from_cache:
                 logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
-            data = response.json() if response.ok else None
-            if isinstance(data, list):
-                for asset in data:
-                    if asset["code"] == ref_id:
-                        sig_ref.name = asset["name"]
-                        sig_ref.url = "https://ontheair.nz/assets/ZLI_OT-030" + ref_id.replace("/", "_")
-                        try:
-                            sig_ref.grid = latlong_to_locator(asset["y"], asset["x"], 6)
-                        except:
-                            logging.debug("Invalid lat/lon received for reference")
-                            sig_ref.latitude = asset["y"]
-                            sig_ref.longitude = asset["x"]
-                        break
+
         elif sig.upper() == "BOTA":
             if not sig_ref.name:
                 sig_ref.name = sig_ref.id
             sig_ref.url = "https://www.beachesontheair.com/beaches/" + sig_ref.name.lower().replace(" ", "-")
+
         elif sig.upper() == "LLOTA":
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://llota.app/api/public/references",
                                                       headers=HTTP_HEADERS)
-            if not response.ok:
+            if response.ok:
+                data = response.json()
+                if isinstance(data, list):
+                    for ref in data:
+                        if ref["reference_code"] == ref_id:
+                            sig_ref.name = str(ref["name"])
+                            sig_ref.url = "https://llota.app/list/ref/" + ref_id
+                            sig_ref.grid = str(ref["grid_locator"])
+                            ll = locator_to_latlong(sig_ref.grid)
+                            sig_ref.latitude = ll[0]
+                            sig_ref.longitude = ll[1]
+                            break
+                elif not response.from_cache:
+                    logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
+            elif not response.from_cache:
                 logging.warning("HTTP %d looking up %s ref %s", response.status_code, sig, ref_id)
-            data = response.json() if response.ok else None
-            if isinstance(data, list):
-                for ref in data:
-                    if ref["reference_code"] == ref_id:
-                        sig_ref.name = str(ref["name"])
-                        sig_ref.url = "https://llota.app/list/ref/" + ref_id
-                        sig_ref.grid = str(ref["grid_locator"])
-                        ll = locator_to_latlong(sig_ref.grid)
-                        sig_ref.latitude = ll[0]
-                        sig_ref.longitude = ll[1]
-                        break
+
         elif sig.upper() == "WWTOTA":
             if not sig_ref.name:
                 sig_ref.name = sig_ref.id
             sig_ref.url = "https://wwtota.com/seznam/karta_rozhledny.php?ref=" + str(sig_ref.name)
+
         elif sig.upper() == "TILES":
             # Tiles on the Air just uses Maidenhead 6-digit squares, so ID, Name and Grid are all the same
             if not sig_ref.name:
@@ -193,6 +230,7 @@ def populate_sig_ref_info(sig_ref):
                 ll = locator_to_latlong(str(sig_ref.grid))
                 sig_ref.latitude = ll[0]
                 sig_ref.longitude = ll[1]
+
         elif sig.upper() == "WAB" or sig.upper() == "WAI":
             ll = wab_wai_square_to_lat_lon(ref_id)
             if ll:
@@ -202,21 +240,27 @@ def populate_sig_ref_info(sig_ref):
                     sig_ref.latitude = ll[0]
                     sig_ref.longitude = ll[1]
                 except:
-                    logging.debug("Invalid lat/lon received for reference")
+                    logging.warning("Invalid lat/lon received for WAB/WAI reference")
+
         elif sig.upper() == "DME":
             # Zero-pad to 5 digits to match our source data
             row = _DME_INDEX.get(ref_id.zfill(5))
             if row:
                 sig_ref.name = row["NOMBRE_ACTUAL"] + ", " + row["PROVINCIA"]
-                sig_ref.latitude = float(row["LATITUD_ETRS89_REGCAN95"].replace(",", ".")) if row.get("LATITUD_ETRS89_REGCAN95") else None
-                sig_ref.longitude = float(row["LONGITUD_ETRS89_REGCAN95"].replace(",", ".")) if row.get("LONGITUD_ETRS89_REGCAN95") else None
+                sig_ref.latitude = float(row["LATITUD_ETRS89_REGCAN95"].replace(",", ".")) if row.get(
+                    "LATITUD_ETRS89_REGCAN95") else None
+                sig_ref.longitude = float(row["LONGITUD_ETRS89_REGCAN95"].replace(",", ".")) if row.get(
+                    "LONGITUD_ETRS89_REGCAN95") else None
                 if sig_ref.latitude and sig_ref.longitude:
                     try:
                         sig_ref.grid = latlong_to_locator(sig_ref.latitude, sig_ref.longitude, 6)
                     except Exception:
-                        logging.debug("Invalid lat/lon received for reference")
+                        logging.warning("Invalid lat/lon received for DME reference")
+            else:
+                logging.warning("DME database did not contain data for ref %s", ref_id)
+
     except Exception:
-        logging.warning("Failed to look up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)
+        logging.warning("Exception when looking up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)
     return sig_ref
 
 
diff --git a/solarconditionsproviders/giroionosonde.py b/solarconditionsproviders/giroionosonde.py
index c85960d..b97b1e3 100644
--- a/solarconditionsproviders/giroionosonde.py
+++ b/solarconditionsproviders/giroionosonde.py
@@ -128,7 +128,7 @@ class GIROIonosonde(SolarConditionsProvider):
         to_str = to_time.strftime("%Y.%m.%d+%H:%M:%S")
         url = f"{LGDC_URL}?ursiCode={ursi}&charName=foF2,MUFD,fmin&DMUF=3000&fromDate={from_str}&toDate={to_str}"
         http_response = requests.get(url, headers=HTTP_HEADERS, timeout=(5, 15))
-        if http_response.status_code != 200:
+        if not http_response.ok:
             logging.warning(f"HTTP {http_response.status_code} when calling Giro ionosonde API.")
             return None, None, None
         return self._parse_all(http_response.text)
diff --git a/solarconditionsproviders/http_solar_conditions_provider.py b/solarconditionsproviders/http_solar_conditions_provider.py
index b3a0064..0662b07 100644
--- a/solarconditionsproviders/http_solar_conditions_provider.py
+++ b/solarconditionsproviders/http_solar_conditions_provider.py
@@ -40,7 +40,7 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
             logging.debug("Polling " + self.name + " solar conditions API...")
             http_response = requests.get(self._url, headers=HTTP_HEADERS, timeout=(5, 30))
             # Check response code was good
-            if http_response.status_code == 200:
+            if http_response.ok:
                 new_data = self._http_response_to_solar_conditions(http_response)
                 self.update_data(new_data)
 
diff --git a/solarconditionsproviders/kc2gprop.py b/solarconditionsproviders/kc2gprop.py
index d1aa1b0..47c6500 100644
--- a/solarconditionsproviders/kc2gprop.py
+++ b/solarconditionsproviders/kc2gprop.py
@@ -45,7 +45,7 @@ class KC2GProp(SolarConditionsProvider):
         try:
             logging.debug("Polling KC2G ionosonde data...")
             http_response = requests.get(KC2G_URL, headers=HTTP_HEADERS, timeout=(5, 30))
-            if http_response.status_code != 200:
+            if not http_response.ok:
                 logging.warning(f"HTTP {http_response.status_code} when calling KG2G ionosonde API.")
                 return
 
diff --git a/spotproviders/gma.py b/spotproviders/gma.py
index 3362ff4..9bb53ee 100644
--- a/spotproviders/gma.py
+++ b/spotproviders/gma.py
@@ -39,7 +39,7 @@ class GMA(HTTPSpotProvider):
                             de_call=source_spot["SPOTTER"].upper(),
                             # Seen GMA spots with no frequency or with "QRT" in this field
                             freq=float(source_spot["QRG"]) * 1000 if (
-                                        source_spot["QRG"] != "" and source_spot["QRG"] != "QRT") else None,
+                                    source_spot["QRG"] != "" and source_spot["QRG"] != "QRT") else None,
                             # Filter out some weird mode strings
                             mode=source_spot["MODE"].upper() if "<>" not in source_spot["MODE"] else None,
                             comment=source_spot["TEXT"],
@@ -58,8 +58,8 @@ class GMA(HTTPSpotProvider):
                     try:
                         ref_response = SEMI_STATIC_URL_DATA_CACHE.get(self.REF_INFO_URL_ROOT + source_spot["REF"],
                                                                       headers=HTTP_HEADERS)
-                        # Sometimes this is blank, so handle that
-                        if ref_response.text is not None and ref_response.text != "":
+                        # Sometimes this is blank even if it's a 200 response, so handle that
+                        if ref_response.ok and ref_response.text is not None and ref_response.text != "":
                             ref_info = ref_response.json()
                             # If this is POTA, SOTA or WWFF data we already have it through other means, so ignore. POTA and WWFF
                             # spots come through with reftype=POTA or reftype=WWFF. SOTA is harder to figure out because both SOTA
@@ -94,9 +94,17 @@ class GMA(HTTPSpotProvider):
                                         spot.sig_refs[0].sig = ref_info["reftype"]
                                         spot.sig = ref_info["reftype"]
 
-                                # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
-                                # that for us.
+                                # Add to our list. Don't worry about de-duping, removing old spots etc. at this point;
+                                # other code will do that for us.
                                 new_spots.append(spot)
+
+                            elif not ref_response.from_cache:
+                                if not ref_response.ok:
+                                    logging.warning(
+                                        f"HTTP {ref_response.status_code} when looking up GMA ref {source_spot["REF"]}")
+                                else:
+                                    logging.warning(
+                                        f"GMA API returned a malformed response when looking up ref {source_spot["REF"]}")
                     except:
                         logging.warning("Exception when looking up " + self.REF_INFO_URL_ROOT + source_spot[
                             "REF"] + ", ignoring this spot for now")
diff --git a/spotproviders/http_spot_provider.py b/spotproviders/http_spot_provider.py
index 37038c7..f918a77 100644
--- a/spotproviders/http_spot_provider.py
+++ b/spotproviders/http_spot_provider.py
@@ -42,7 +42,7 @@ class HTTPSpotProvider(SpotProvider):
             logging.debug("Polling " + self.name + " spot API...")
             http_response = requests.get(self._url, headers=HTTP_HEADERS, timeout=(5, 30))
             # Check response code was good
-            if http_response.status_code == 200:
+            if http_response.ok:
                 # Pass off to the subclass for processing
                 new_spots = self._http_response_to_spots(http_response)
                 # Submit the new spots for processing. There might not be any spots for the less popular programs.
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 56b2739..5eb90aa 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784964562"></script>
+<script src="/js/add-spot.js?v=1784966035"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 73f0081..9d79c2d 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784964563"></script>
+<script src="/js/alerts.js?v=1784966035"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index a4d206f..8ad31ad 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784964562"></script>
-<script src="/js/bands.js?v=1784964562"></script>
+<script src="/js/spotsbandsandmap.js?v=1784966035"></script>
+<script src="/js/bands.js?v=1784966035"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 45842c0..3ffcb45 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784964562" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784966035" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784964562"></script>
-<script src="/js/ui-ham.js?v=1784964562"></script>
-<script src="/js/geo.js?v=1784964562"></script>
-<script src="/js/common.js?v=1784964562"></script>
+<script src="/js/utils.js?v=1784966035"></script>
+<script src="/js/ui-ham.js?v=1784966035"></script>
+<script src="/js/geo.js?v=1784966035"></script>
+<script src="/js/common.js?v=1784966035"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 15273a7..2959b1c 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784964562"></script>
+<script src="/js/conditions.js?v=1784966035"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 2e64fba..0af2128 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784964563"></script>
-<script src="/js/map.js?v=1784964563"></script>
+<script src="/js/spotsbandsandmap.js?v=1784966035"></script>
+<script src="/js/map.js?v=1784966035"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 22fc625..e7f3a1d 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784964562"></script>
-<script src="/js/spots.js?v=1784964562"></script>
+<script src="/js/spotsbandsandmap.js?v=1784966035"></script>
+<script src="/js/spots.js?v=1784966035"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 3da2d06..25ccc0a 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784964562"></script>
+<script src="/js/status.js?v=1784966035"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 374a3268744c56e87d41316f8cfb4b3a2e31de9a Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 09:02:57 +0100
Subject: [PATCH 16/29] Improve error reporting

---
 alertproviders/http_alert_provider.py         |  2 +
 core/lookup_helper.py                         | 12 +++-
 core/sig_utils.py                             |  4 +-
 solarconditionsproviders/giroionosonde.py     | 12 ++--
 .../http_solar_conditions_provider.py         |  2 +
 solarconditionsproviders/kc2gprop.py          |  2 +
 spotproviders/hema.py                         | 60 ++++++++++---------
 spotproviders/http_spot_provider.py           |  2 +
 spotproviders/sota.py                         | 46 +++++++-------
 templates/add_spot.html                       |  2 +-
 templates/alerts.html                         |  2 +-
 templates/bands.html                          |  4 +-
 templates/base.html                           | 10 ++--
 templates/conditions.html                     |  2 +-
 templates/map.html                            |  4 +-
 templates/spots.html                          |  4 +-
 templates/status.html                         |  2 +-
 17 files changed, 101 insertions(+), 71 deletions(-)

diff --git a/alertproviders/http_alert_provider.py b/alertproviders/http_alert_provider.py
index debf791..b7c83de 100644
--- a/alertproviders/http_alert_provider.py
+++ b/alertproviders/http_alert_provider.py
@@ -56,6 +56,8 @@ class HTTPAlertProvider(AlertProvider):
                 self.status = "Error"
                 logging.warning(f"HTTP {http_response.status_code} when calling {self.name} alerts API.")
 
+        except ConnectionError:
+            logging.warning(f"Connection error when accessing {self.name} alerts API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP JSON Alert Provider (" + self.name + ")")
diff --git a/core/lookup_helper.py b/core/lookup_helper.py
index 97b6060..f4f7363 100644
--- a/core/lookup_helper.py
+++ b/core/lookup_helper.py
@@ -153,6 +153,8 @@ class LookupHelper:
                 logging.warning(f"HTTP {response.status_code} when downloading Country-files.com cty.plist.")
                 return False
 
+        except ConnectionError:
+            logging.warning(f"Connection error when downloading Clublog cty.xml.")
         except Exception as e:
             logging.error("Exception when downloading Clublog cty.xml", e)
             return False
@@ -175,6 +177,8 @@ class LookupHelper:
                 logging.warning(f"HTTP {response.status_code} when downloading dxcc.json.")
                 return False
 
+        except ConnectionError:
+            logging.warning(f"Connection error when downloading dxcc.json.")
         except Exception as e:
             logging.error("Exception when downloading dxcc.json", e)
             return False
@@ -519,8 +523,10 @@ class LookupHelper:
 
             except (KeyError, ValueError):
                 continue
+            except ConnectionError:
+                logging.warning(f"Connection error when looking up callsign %s using QRZ", lookup_call)
             except Exception:
-                logging.error("Exception when looking up QRZ data")
+                logging.error("Exception when looking up callsign %s using QRZ", lookup_call)
                 return None
 
         # Not found in QRZ; cache None so we don't keep retrying
@@ -578,8 +584,10 @@ class LookupHelper:
 
             except (KeyError, ValueError):
                 continue
+            except ConnectionError:
+                logging.warning(f"Connection error when looking up callsign %s using HamQTH", lookup_call)
             except Exception:
-                logging.error("Exception when looking up HamQTH data")
+                logging.error("Exception when looking up callsign %s using HamQTH", lookup_call)
                 return None
 
         # Not found in HamQTH; cache None so we don't keep retrying
diff --git a/core/sig_utils.py b/core/sig_utils.py
index 339bd4a..60f5f96 100644
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -259,8 +259,10 @@ def populate_sig_ref_info(sig_ref):
             else:
                 logging.warning("DME database did not contain data for ref %s", ref_id)
 
+    except ConnectionError:
+        logging.warning("Connection error when looking up sig_ref info for " + sig + " ref " + ref_id)
     except Exception:
-        logging.warning("Exception when looking up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)
+        logging.error("Exception when looking up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)
     return sig_ref
 
 
diff --git a/solarconditionsproviders/giroionosonde.py b/solarconditionsproviders/giroionosonde.py
index b97b1e3..380bd7e 100644
--- a/solarconditionsproviders/giroionosonde.py
+++ b/solarconditionsproviders/giroionosonde.py
@@ -127,11 +127,15 @@ class GIROIonosonde(SolarConditionsProvider):
         from_str = from_time.strftime("%Y.%m.%d+%H:%M:%S")
         to_str = to_time.strftime("%Y.%m.%d+%H:%M:%S")
         url = f"{LGDC_URL}?ursiCode={ursi}&charName=foF2,MUFD,fmin&DMUF=3000&fromDate={from_str}&toDate={to_str}"
-        http_response = requests.get(url, headers=HTTP_HEADERS, timeout=(5, 15))
-        if not http_response.ok:
-            logging.warning(f"HTTP {http_response.status_code} when calling Giro ionosonde API.")
+        try:
+            http_response = requests.get(url, headers=HTTP_HEADERS, timeout=(5, 15))
+            if not http_response.ok:
+                logging.warning(f"HTTP {http_response.status_code} when calling Giro ionosonde API.")
+                return None, None, None
+            return self._parse_all(http_response.text)
+        except ConnectionError:
+            logging.warning("Connection error when accessing Giro ionosonde API.")
             return None, None, None
-        return self._parse_all(http_response.text)
 
     @staticmethod
     def _parse_all(text):
diff --git a/solarconditionsproviders/http_solar_conditions_provider.py b/solarconditionsproviders/http_solar_conditions_provider.py
index 0662b07..fbf87fd 100644
--- a/solarconditionsproviders/http_solar_conditions_provider.py
+++ b/solarconditionsproviders/http_solar_conditions_provider.py
@@ -51,6 +51,8 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
                 self.status = "Error"
                 logging.warning(f"HTTP {http_response.status_code} when calling {self.name} solar conditions API.")
 
+        except ConnectionError:
+            logging.warning(f"Connection error when accessing {self.name} solar conditions API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP Solar Conditions Provider (" + self.name + ")")
diff --git a/solarconditionsproviders/kc2gprop.py b/solarconditionsproviders/kc2gprop.py
index 47c6500..a33a0f9 100644
--- a/solarconditionsproviders/kc2gprop.py
+++ b/solarconditionsproviders/kc2gprop.py
@@ -115,6 +115,8 @@ class KC2GProp(SolarConditionsProvider):
             self.last_update_time = datetime.now(pytz.UTC)
             logging.debug(f"Updated KC2G ionosonde data for {updated_count} stations.")
 
+        except ConnectionError:
+            logging.warning("Connection error when accessing KC2G ionosonde API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in KC2G ionosonde data provider")
diff --git a/spotproviders/hema.py b/spotproviders/hema.py
index b2517e7..e796f4f 100644
--- a/spotproviders/hema.py
+++ b/spotproviders/hema.py
@@ -1,3 +1,4 @@
+import logging
 import re
 from datetime import datetime
 
@@ -35,34 +36,37 @@ class HEMA(HTTPSpotProvider):
         new_spots = []
         # OK, if the spot seed actually changed, now we make the real request for data.
         if spot_seed_changed:
-            source_data = requests.get(self.SPOTS_URL, headers=HTTP_HEADERS, timeout=(5, 30))
-            source_data_items = source_data.text.split("=")
-            # Iterate through source data items.
-            for source_spot in source_data_items:
-                spot_items = source_spot.split(";")
-                # Any line with less than 9 items is not a proper spot line
-                if len(spot_items) >= 9:
-                    # Fiddle with some data to extract bits we need. Freq/mode and spotter/comment come in combined fields.
-                    freq_mode_match = re.search(self.FREQ_MODE_PATTERN, spot_items[5])
-                    spotter_comment_match = re.search(self.SPOTTER_COMMENT_PATTERN, spot_items[6])
-                    if not freq_mode_match or not spotter_comment_match:
-                        continue
+            try:
+                source_data = requests.get(self.SPOTS_URL, headers=HTTP_HEADERS, timeout=(5, 30))
+                source_data_items = source_data.text.split("=")
+                # Iterate through source data items.
+                for source_spot in source_data_items:
+                    spot_items = source_spot.split(";")
+                    # Any line with less than 9 items is not a proper spot line
+                    if len(spot_items) >= 9:
+                        # Fiddle with some data to extract bits we need. Freq/mode and spotter/comment come in combined fields.
+                        freq_mode_match = re.search(self.FREQ_MODE_PATTERN, spot_items[5])
+                        spotter_comment_match = re.search(self.SPOTTER_COMMENT_PATTERN, spot_items[6])
+                        if not freq_mode_match or not spotter_comment_match:
+                            continue
 
-                    # Convert to our spot format
-                    spot = Spot(source=self.name,
-                                dx_call=spot_items[2].upper(),
-                                de_call=spotter_comment_match.group(1).upper(),
-                                freq=float(freq_mode_match.group(1)) * 1000000,
-                                mode=freq_mode_match.group(2).upper(),
-                                comment=spotter_comment_match.group(2),
-                                sig="HEMA",
-                                sig_refs=[SIGRef(id=spot_items[3].upper(), sig="HEMA", name=spot_items[4])],
-                                time=datetime.strptime(spot_items[0], "%d/%m/%Y %H:%M").replace(
-                                    tzinfo=pytz.UTC).timestamp(),
-                                dx_latitude=float(spot_items[7]),
-                                dx_longitude=float(spot_items[8]))
+                        # Convert to our spot format
+                        spot = Spot(source=self.name,
+                                    dx_call=spot_items[2].upper(),
+                                    de_call=spotter_comment_match.group(1).upper(),
+                                    freq=float(freq_mode_match.group(1)) * 1000000,
+                                    mode=freq_mode_match.group(2).upper(),
+                                    comment=spotter_comment_match.group(2),
+                                    sig="HEMA",
+                                    sig_refs=[SIGRef(id=spot_items[3].upper(), sig="HEMA", name=spot_items[4])],
+                                    time=datetime.strptime(spot_items[0], "%d/%m/%Y %H:%M").replace(
+                                        tzinfo=pytz.UTC).timestamp(),
+                                    dx_latitude=float(spot_items[7]),
+                                    dx_longitude=float(spot_items[8]))
 
-                    # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
-                    # that for us.
-                    new_spots.append(spot)
+                        # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other
+                        # code will do that for us.
+                        new_spots.append(spot)
+            except ConnectionError:
+                logging.warning("Connection error when accessing HEMA spots API.")
         return new_spots
diff --git a/spotproviders/http_spot_provider.py b/spotproviders/http_spot_provider.py
index f918a77..9885940 100644
--- a/spotproviders/http_spot_provider.py
+++ b/spotproviders/http_spot_provider.py
@@ -56,6 +56,8 @@ class HTTPSpotProvider(SpotProvider):
                 self.status = "Error"
                 logging.warning(f"HTTP {http_response.status_code} when calling {self.name} spot API.")
 
+        except ConnectionError:
+            logging.warning(f"Connection error when accessing {self.name} spots API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP JSON Spot Provider (" + self.name + ")")
diff --git a/spotproviders/sota.py b/spotproviders/sota.py
index 4aff055..fee0ef2 100644
--- a/spotproviders/sota.py
+++ b/spotproviders/sota.py
@@ -1,3 +1,4 @@
+import logging
 from datetime import datetime
 
 import requests
@@ -33,26 +34,29 @@ class SOTA(HTTPSpotProvider):
         new_spots = []
         # OK, if the epoch actually changed, now we make the real request for data.
         if epoch_changed:
-            source_data = requests.get(self.SPOTS_URL, headers=HTTP_HEADERS, timeout=(5, 30)).json()
-            # Iterate through source data
-            for source_spot in source_data:
-                # Convert to our spot format
-                spot = Spot(source=self.name,
-                            source_id=source_spot["id"],
-                            dx_call=source_spot["activatorCallsign"].upper(),
-                            dx_name=source_spot["activatorName"],
-                            de_call=source_spot["callsign"].upper(),
-                            freq=(float(source_spot["frequency"]) * 1000000) if (
-                                    source_spot["frequency"] is not None) else None,
-                            # Seen SOTA spots with no frequency!
-                            mode=source_spot["mode"].upper(),
-                            comment=source_spot["comments"],
-                            sig="SOTA",
-                            sig_refs=[SIGRef(id=source_spot["summitCode"], sig="SOTA", name=source_spot["summitName"],
-                                             activation_score=source_spot["points"])],
-                            time=datetime.fromisoformat(source_spot["timeStamp"].replace("Z", "+00:00")).timestamp())
+            try:
+                source_data = requests.get(self.SPOTS_URL, headers=HTTP_HEADERS, timeout=(5, 30)).json()
+                # Iterate through source data
+                for source_spot in source_data:
+                    # Convert to our spot format
+                    spot = Spot(source=self.name,
+                                source_id=source_spot["id"],
+                                dx_call=source_spot["activatorCallsign"].upper(),
+                                dx_name=source_spot["activatorName"],
+                                de_call=source_spot["callsign"].upper(),
+                                freq=(float(source_spot["frequency"]) * 1000000) if (
+                                        source_spot["frequency"] is not None) else None,
+                                # Seen SOTA spots with no frequency!
+                                mode=source_spot["mode"].upper(),
+                                comment=source_spot["comments"],
+                                sig="SOTA",
+                                sig_refs=[SIGRef(id=source_spot["summitCode"], sig="SOTA", name=source_spot["summitName"],
+                                                 activation_score=source_spot["points"])],
+                                time=datetime.fromisoformat(source_spot["timeStamp"].replace("Z", "+00:00")).timestamp())
 
-                # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
-                # that for us.
-                new_spots.append(spot)
+                    # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
+                    # that for us.
+                    new_spots.append(spot)
+            except ConnectionError:
+                logging.warning("Connection error when accessing SOTA spots API")
         return new_spots
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 5eb90aa..75c4ec4 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784966035"></script>
+<script src="/js/add-spot.js?v=1784966577"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 9d79c2d..6b03924 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784966035"></script>
+<script src="/js/alerts.js?v=1784966578"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 8ad31ad..af63fe2 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784966035"></script>
-<script src="/js/bands.js?v=1784966035"></script>
+<script src="/js/spotsbandsandmap.js?v=1784966577"></script>
+<script src="/js/bands.js?v=1784966577"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 3ffcb45..682fc6e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784966035" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784966577" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784966035"></script>
-<script src="/js/ui-ham.js?v=1784966035"></script>
-<script src="/js/geo.js?v=1784966035"></script>
-<script src="/js/common.js?v=1784966035"></script>
+<script src="/js/utils.js?v=1784966577"></script>
+<script src="/js/ui-ham.js?v=1784966577"></script>
+<script src="/js/geo.js?v=1784966577"></script>
+<script src="/js/common.js?v=1784966577"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 2959b1c..1cdc718 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784966035"></script>
+<script src="/js/conditions.js?v=1784966577"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 0af2128..b2b8889 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784966035"></script>
-<script src="/js/map.js?v=1784966035"></script>
+<script src="/js/spotsbandsandmap.js?v=1784966578"></script>
+<script src="/js/map.js?v=1784966578"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index e7f3a1d..b5c8d37 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784966035"></script>
-<script src="/js/spots.js?v=1784966035"></script>
+<script src="/js/spotsbandsandmap.js?v=1784966577"></script>
+<script src="/js/spots.js?v=1784966577"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 25ccc0a..ef05c15 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784966035"></script>
+<script src="/js/status.js?v=1784966577"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From ba08555a30b983222a2b09f4c4db5bb6c3f9f636 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 09:33:18 +0100
Subject: [PATCH 17/29] Improve error reporting

---
 core/lookup_helper.py     | 30 +++++++++++++++++++-----------
 spotproviders/gma.py      | 14 +++++++-------
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 10 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/core/lookup_helper.py b/core/lookup_helper.py
index f4f7363..ed9aa22 100644
--- a/core/lookup_helper.py
+++ b/core/lookup_helper.py
@@ -511,13 +511,20 @@ class LookupHelper:
                     self._qrz_base_url + "?s=" + session_key + "&callsign=" + urllib.parse.quote_plus(lookup_call),
                     headers=HTTP_HEADERS, timeout=10)
                 if response.ok:
-                    raw = xmltodict.parse(response.content).get("QRZDatabase", {}).get("Callsign")
-                    if raw:
-                        data = _normalize_qrz_data(raw)
-                        self._qrz_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
-                        return data
+                    qrz_response = xmltodict.parse(response.content).get("QRZDatabase", {})
+                    if qrz_response:
+                        if "Callsign" in qrz_response:
+                            data = _normalize_qrz_data(qrz_response.get("Callsign"))
+                            self._qrz_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
+                            return data
+                        elif "Session" in qrz_response and "Error" in qrz_response.get("Session"):
+                            # Errors here are normally just "callsign not in database", no need to log that ourselves
+                            # above debug level.
+                            logging.debug("QRZ returned an error looking up callsign %s: %s", lookup_call,
+                                          qrz_response.get("Session").get("Error"))
+
                     elif not response.from_cache:
-                        logging.warning("Malformed response looking up callsign %s using QRZ", lookup_call)
+                        logging.warning("QRZ returned a malformed response looking up callsign %s", lookup_call)
                 elif not response.from_cache:
                     logging.warning("HTTP %d looking up callsign %s using QRZ", lookup_call)
 
@@ -525,9 +532,10 @@ class LookupHelper:
                 continue
             except ConnectionError:
                 logging.warning(f"Connection error when looking up callsign %s using QRZ", lookup_call)
+                continue
             except Exception:
-                logging.error("Exception when looking up callsign %s using QRZ", lookup_call)
-                return None
+                logging.error("Exception when looking up callsign %s using QRZ", lookup_call, exc_info=True)
+                continue
 
         # Not found in QRZ; cache None so we don't keep retrying
         self._qrz_callsign_data_cache.add(call, None, expire=604800)  # 1 week in seconds
@@ -580,15 +588,15 @@ class LookupHelper:
                     return data
                 elif not response.from_cache:
                     logging.warning("HTTP %d looking up callsign %s using HamQTH", response.status_code, lookup_call)
-                    return None
 
             except (KeyError, ValueError):
                 continue
             except ConnectionError:
                 logging.warning(f"Connection error when looking up callsign %s using HamQTH", lookup_call)
+                continue
             except Exception:
-                logging.error("Exception when looking up callsign %s using HamQTH", lookup_call)
-                return None
+                logging.error("Exception when looking up callsign %s using HamQTH", lookup_call, exc_info=True)
+                continue
 
         # Not found in HamQTH; cache None so we don't keep retrying
         self._hamqth_callsign_data_cache.add(call, None, expire=604800)  # 1 week in seconds
diff --git a/spotproviders/gma.py b/spotproviders/gma.py
index 9bb53ee..3942238 100644
--- a/spotproviders/gma.py
+++ b/spotproviders/gma.py
@@ -98,13 +98,13 @@ class GMA(HTTPSpotProvider):
                                 # other code will do that for us.
                                 new_spots.append(spot)
 
-                            elif not ref_response.from_cache:
-                                if not ref_response.ok:
-                                    logging.warning(
-                                        f"HTTP {ref_response.status_code} when looking up GMA ref {source_spot["REF"]}")
-                                else:
-                                    logging.warning(
-                                        f"GMA API returned a malformed response when looking up ref {source_spot["REF"]}")
+                        elif not ref_response.from_cache:
+                            if not ref_response.ok:
+                                logging.warning(
+                                    f"HTTP {ref_response.status_code} when looking up GMA ref {source_spot["REF"]}")
+                            else:
+                                logging.warning(
+                                    f"GMA API returned a malformed response when looking up ref {source_spot["REF"]}")
                     except:
                         logging.warning("Exception when looking up " + self.REF_INFO_URL_ROOT + source_spot[
                             "REF"] + ", ignoring this spot for now")
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 75c4ec4..2abe093 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784966577"></script>
+<script src="/js/add-spot.js?v=1784968398"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 6b03924..249dc23 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784966578"></script>
+<script src="/js/alerts.js?v=1784968398"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index af63fe2..544782a 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784966577"></script>
-<script src="/js/bands.js?v=1784966577"></script>
+<script src="/js/spotsbandsandmap.js?v=1784968398"></script>
+<script src="/js/bands.js?v=1784968398"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 682fc6e..d1e8097 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784966577" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784968398" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784966577"></script>
-<script src="/js/ui-ham.js?v=1784966577"></script>
-<script src="/js/geo.js?v=1784966577"></script>
-<script src="/js/common.js?v=1784966577"></script>
+<script src="/js/utils.js?v=1784968398"></script>
+<script src="/js/ui-ham.js?v=1784968398"></script>
+<script src="/js/geo.js?v=1784968398"></script>
+<script src="/js/common.js?v=1784968398"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 1cdc718..dd07614 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784966577"></script>
+<script src="/js/conditions.js?v=1784968398"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index b2b8889..d9b9dc0 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784966578"></script>
-<script src="/js/map.js?v=1784966578"></script>
+<script src="/js/spotsbandsandmap.js?v=1784968398"></script>
+<script src="/js/map.js?v=1784968398"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index b5c8d37..96501e3 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784966577"></script>
-<script src="/js/spots.js?v=1784966577"></script>
+<script src="/js/spotsbandsandmap.js?v=1784968398"></script>
+<script src="/js/spots.js?v=1784968398"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index ef05c15..2d14a8b 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784966577"></script>
+<script src="/js/status.js?v=1784968398"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From e7253c091696e43304f554410f5396d44992b1e3 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 13:42:21 +0100
Subject: [PATCH 18/29] Improve error reporting

---
 alertproviders/http_alert_provider.py            |  1 +
 core/lookup_helper.py                            |  1 +
 core/sig_utils.py                                |  1 +
 server/handlers/quietstaticfilehandler.py        | 16 ++++++++++++++++
 server/webserver.py                              |  2 +-
 solarconditionsproviders/giroionosonde.py        |  1 +
 .../http_solar_conditions_provider.py            |  1 +
 solarconditionsproviders/kc2gprop.py             |  1 +
 spotproviders/hema.py                            |  1 +
 spotproviders/http_spot_provider.py              |  1 +
 spotproviders/sota.py                            |  1 +
 templates/add_spot.html                          |  2 +-
 templates/alerts.html                            |  2 +-
 templates/bands.html                             |  4 ++--
 templates/base.html                              | 10 +++++-----
 templates/conditions.html                        |  2 +-
 templates/map.html                               |  4 ++--
 templates/spots.html                             |  4 ++--
 templates/status.html                            |  2 +-
 19 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 server/handlers/quietstaticfilehandler.py

diff --git a/alertproviders/http_alert_provider.py b/alertproviders/http_alert_provider.py
index b7c83de..3e8dcf6 100644
--- a/alertproviders/http_alert_provider.py
+++ b/alertproviders/http_alert_provider.py
@@ -4,6 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
+from requests.exceptions import ConnectionError
 
 from alertproviders.alert_provider import AlertProvider
 from core.constants import HTTP_HEADERS
diff --git a/core/lookup_helper.py b/core/lookup_helper.py
index ed9aa22..598972e 100644
--- a/core/lookup_helper.py
+++ b/core/lookup_helper.py
@@ -11,6 +11,7 @@ from pyhamtools import LookupLib, Callinfo, callinfo
 from pyhamtools.exceptions import APIKeyMissingError
 from pyhamtools.frequency import freq_to_band
 from pyhamtools.locator import latlong_to_locator
+from requests.exceptions import ConnectionError
 from requests_cache import CachedSession
 
 from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
diff --git a/core/sig_utils.py b/core/sig_utils.py
index 60f5f96..2dec186 100644
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -2,6 +2,7 @@ import csv
 import logging
 
 from pyhamtools.locator import latlong_to_locator, locator_to_latlong
+from requests.exceptions import ConnectionError
 
 from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.constants import SIGS, HTTP_HEADERS
diff --git a/server/handlers/quietstaticfilehandler.py b/server/handlers/quietstaticfilehandler.py
new file mode 100644
index 0000000..4ba2d4d
--- /dev/null
+++ b/server/handlers/quietstaticfilehandler.py
@@ -0,0 +1,16 @@
+import logging
+
+from tornado.web import StaticFileHandler, HTTPError
+
+
+class QuietStaticFileHandler(StaticFileHandler):
+    """Minor override of logging in StaticFileHandler to log HTTP errors at debug level instead of their usual
+    warning level. Without this, attacks on Spothole which try to do path traversal attacks would log exceptions
+    from inside Tornado, and the server logs would contain a lot of this type of content. This effectively changes
+    the log level of these exceptions to DEBUG so they are only logged if DEBUG level logging is enabled."""
+
+    def log_exception(self, typ, value, tb):
+        if isinstance(value, HTTPError):
+            logging.debug(value)
+            return
+        super().log_exception(typ, value, tb)
\ No newline at end of file
diff --git a/server/webserver.py b/server/webserver.py
index 4ae9ea3..d28139d 100644
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -103,7 +103,7 @@ class WebServer:
         misc_routes = [
             (r"/apidocs", PageTemplateHandler, {"template_name": "apidocs", **handler_opts}),
             (r"/metrics", PrometheusMetricsHandler),
-            (r"/(.*)", StaticFileHandler, {"path": os.path.join(_HERE, "../webassets")})
+            (r"/(.*)", QuietStaticFileHandler, {"path": os.path.join(_HERE, "../webassets")})
         ]
 
         app = tornado.web.Application(api_routes + ui_routes + misc_routes,
diff --git a/solarconditionsproviders/giroionosonde.py b/solarconditionsproviders/giroionosonde.py
index 380bd7e..56a7ebe 100644
--- a/solarconditionsproviders/giroionosonde.py
+++ b/solarconditionsproviders/giroionosonde.py
@@ -5,6 +5,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
+from requests.exceptions import ConnectionError
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.ionosonde_utils import compute_band_states
diff --git a/solarconditionsproviders/http_solar_conditions_provider.py b/solarconditionsproviders/http_solar_conditions_provider.py
index fbf87fd..b08d7b9 100644
--- a/solarconditionsproviders/http_solar_conditions_provider.py
+++ b/solarconditionsproviders/http_solar_conditions_provider.py
@@ -4,6 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
+from requests.exceptions import ConnectionError
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.solar_conditions_provider import SolarConditionsProvider
diff --git a/solarconditionsproviders/kc2gprop.py b/solarconditionsproviders/kc2gprop.py
index a33a0f9..5fa581b 100644
--- a/solarconditionsproviders/kc2gprop.py
+++ b/solarconditionsproviders/kc2gprop.py
@@ -4,6 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
+from requests.exceptions import ConnectionError
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.ionosonde_utils import compute_band_states
diff --git a/spotproviders/hema.py b/spotproviders/hema.py
index e796f4f..07f593e 100644
--- a/spotproviders/hema.py
+++ b/spotproviders/hema.py
@@ -4,6 +4,7 @@ from datetime import datetime
 
 import pytz
 import requests
+from requests.exceptions import ConnectionError
 
 from core.constants import HTTP_HEADERS
 from data.sig_ref import SIGRef
diff --git a/spotproviders/http_spot_provider.py b/spotproviders/http_spot_provider.py
index 9885940..17b748c 100644
--- a/spotproviders/http_spot_provider.py
+++ b/spotproviders/http_spot_provider.py
@@ -4,6 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
+from requests.exceptions import ConnectionError
 
 from core.constants import HTTP_HEADERS
 from spotproviders.spot_provider import SpotProvider
diff --git a/spotproviders/sota.py b/spotproviders/sota.py
index fee0ef2..fa0fc80 100644
--- a/spotproviders/sota.py
+++ b/spotproviders/sota.py
@@ -2,6 +2,7 @@ import logging
 from datetime import datetime
 
 import requests
+from requests.exceptions import ConnectionError
 
 from core.constants import HTTP_HEADERS
 from data.sig_ref import SIGRef
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 2abe093..4c86461 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784968398"></script>
+<script src="/js/add-spot.js?v=1784983342"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 249dc23..740753e 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784968398"></script>
+<script src="/js/alerts.js?v=1784983342"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 544782a..5f5d97e 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784968398"></script>
-<script src="/js/bands.js?v=1784968398"></script>
+<script src="/js/spotsbandsandmap.js?v=1784983342"></script>
+<script src="/js/bands.js?v=1784983342"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index d1e8097..27c27a5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784968398" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784983342" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784968398"></script>
-<script src="/js/ui-ham.js?v=1784968398"></script>
-<script src="/js/geo.js?v=1784968398"></script>
-<script src="/js/common.js?v=1784968398"></script>
+<script src="/js/utils.js?v=1784983342"></script>
+<script src="/js/ui-ham.js?v=1784983342"></script>
+<script src="/js/geo.js?v=1784983342"></script>
+<script src="/js/common.js?v=1784983342"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index dd07614..91e321c 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784968398"></script>
+<script src="/js/conditions.js?v=1784983342"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index d9b9dc0..8197b89 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784968398"></script>
-<script src="/js/map.js?v=1784968398"></script>
+<script src="/js/spotsbandsandmap.js?v=1784983341"></script>
+<script src="/js/map.js?v=1784983341"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 96501e3..88310c9 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784968398"></script>
-<script src="/js/spots.js?v=1784968398"></script>
+<script src="/js/spotsbandsandmap.js?v=1784983341"></script>
+<script src="/js/spots.js?v=1784983341"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 2d14a8b..a7cd84c 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784968398"></script>
+<script src="/js/status.js?v=1784983342"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 4a9ff2c636d5ee50435fded8e634851561cf48dd Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 13:43:13 +0100
Subject: [PATCH 19/29] Improve error reporting

---
 server/webserver.py       |  1 +
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 9 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/server/webserver.py b/server/webserver.py
index d28139d..a23ea73 100644
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -17,6 +17,7 @@ from server.handlers.api.spots import APISpotsHandler, APISpotsStreamHandler
 from server.handlers.api.status import APIStatusHandler
 from server.handlers.metrics import PrometheusMetricsHandler
 from server.handlers.pagetemplate import PageTemplateHandler
+from server.handlers.quietstaticfilehandler import QuietStaticFileHandler
 
 _HERE = os.path.dirname(__file__ or "")
 
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 4c86461..c150255 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784983342"></script>
+<script src="/js/add-spot.js?v=1784983394"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 740753e..1eb66d2 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784983342"></script>
+<script src="/js/alerts.js?v=1784983394"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 5f5d97e..15fa39a 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784983342"></script>
-<script src="/js/bands.js?v=1784983342"></script>
+<script src="/js/spotsbandsandmap.js?v=1784983394"></script>
+<script src="/js/bands.js?v=1784983394"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 27c27a5..eafddda 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784983342" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784983394" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784983342"></script>
-<script src="/js/ui-ham.js?v=1784983342"></script>
-<script src="/js/geo.js?v=1784983342"></script>
-<script src="/js/common.js?v=1784983342"></script>
+<script src="/js/utils.js?v=1784983394"></script>
+<script src="/js/ui-ham.js?v=1784983394"></script>
+<script src="/js/geo.js?v=1784983394"></script>
+<script src="/js/common.js?v=1784983394"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 91e321c..ae6075a 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784983342"></script>
+<script src="/js/conditions.js?v=1784983394"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 8197b89..1fd37f1 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784983341"></script>
-<script src="/js/map.js?v=1784983341"></script>
+<script src="/js/spotsbandsandmap.js?v=1784983393"></script>
+<script src="/js/map.js?v=1784983393"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 88310c9..04ad53b 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784983341"></script>
-<script src="/js/spots.js?v=1784983341"></script>
+<script src="/js/spotsbandsandmap.js?v=1784983393"></script>
+<script src="/js/spots.js?v=1784983393"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index a7cd84c..24c2ad9 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784983342"></script>
+<script src="/js/status.js?v=1784983394"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 4353c9ebf9a4399a9b1034f0595559fc93756f83 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 14:43:16 +0100
Subject: [PATCH 20/29] Intermediate reload of map data if QRZ/HamQTH
 credentials are supplied

---
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 webassets/js/map.js       | 24 ++++++++++++++++++++++--
 9 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/templates/add_spot.html b/templates/add_spot.html
index c150255..863335b 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784983394"></script>
+<script src="/js/add-spot.js?v=1784986996"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 1eb66d2..9d20346 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784983394"></script>
+<script src="/js/alerts.js?v=1784986996"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 15fa39a..f2a2083 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784983394"></script>
-<script src="/js/bands.js?v=1784983394"></script>
+<script src="/js/spotsbandsandmap.js?v=1784986996"></script>
+<script src="/js/bands.js?v=1784986996"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index eafddda..0294bcc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784983394" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784986996" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784983394"></script>
-<script src="/js/ui-ham.js?v=1784983394"></script>
-<script src="/js/geo.js?v=1784983394"></script>
-<script src="/js/common.js?v=1784983394"></script>
+<script src="/js/utils.js?v=1784986996"></script>
+<script src="/js/ui-ham.js?v=1784986996"></script>
+<script src="/js/geo.js?v=1784986996"></script>
+<script src="/js/common.js?v=1784986996"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index ae6075a..a52a48a 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784983394"></script>
+<script src="/js/conditions.js?v=1784986996"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 1fd37f1..0d4e6ee 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784983393"></script>
-<script src="/js/map.js?v=1784983393"></script>
+<script src="/js/spotsbandsandmap.js?v=1784986996"></script>
+<script src="/js/map.js?v=1784986996"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 04ad53b..9ccdf8a 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784983393"></script>
-<script src="/js/spots.js?v=1784983393"></script>
+<script src="/js/spotsbandsandmap.js?v=1784986996"></script>
+<script src="/js/spots.js?v=1784986996"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 24c2ad9..7c1dfe4 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784983394"></script>
+<script src="/js/status.js?v=1784986996"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");
diff --git a/webassets/js/map.js b/webassets/js/map.js
index 5eba7fa..1de1a4e 100644
--- a/webassets/js/map.js
+++ b/webassets/js/map.js
@@ -38,8 +38,13 @@ function loadSpots() {
     if (evtSource != null) {
         evtSource.close();
     }
-    // On first fetch, don't include QRZ/HamQTH credentials. This will cause some inaccurate
-    // marker positions but avoids having to wait a minute or more for all the lookups to fire.
+    // Including QRZ/HamQTH lookups to improve positions causes the load to be really slow, so on first load
+    // the user would be waiting ages without data and will think it's broken. We therefore load in several
+    // stages:
+    // 1) Load without any credentials
+    // 2) (If we have credentials) reload with them, replacing what's already there,
+    // 3) Subscribe to the SSE endpoint (with credentials if we have them) so that updates come with augmented
+    // data if they can.
     $.getJSON('/api/v1/spots' + buildQueryString(false), function (jsonData) {
         // Store data
         spots = jsonData;
@@ -48,6 +53,21 @@ function loadSpots() {
         if ($("#showTerminator")[0].checked) {
             terminator.setTime();
         }
+        // Check if we have any credentials to use
+        if (getCredentialQueryString() !== "") {
+            // OK, we have credentials and have loaded once without them so the user has a basic map. Now reload
+            // with the credentials and replace what's on the map, so we can improve the data.
+            $.getJSON('/api/v1/spots' + buildQueryString(true), function (jsonData2) {
+                spots = jsonData2;
+                updateMap();
+                // Now start the ongoing SSE connection
+                startSSEConnection();
+            });
+        } else {
+            // We had no credentials with which to augment the data anyway, so just start the SSE connection
+            // now
+            startSSEConnection();
+        }
         // Start the ongoing SSE connection
         startSSEConnection();
     });

From 7ee08e2fcdd1afad23f2223ef4f3bf86d49eea15 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 15:06:19 +0100
Subject: [PATCH 21/29] Bug fixes and map page banner

---
 core/lookup_helper.py     | 18 ++++++++++++------
 templates/about.html      | 11 ++++++++++-
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        | 17 +++++++++++++++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 webassets/js/map.js       | 14 ++++++++++++--
 11 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/core/lookup_helper.py b/core/lookup_helper.py
index 598972e..a2a4fd8 100644
--- a/core/lookup_helper.py
+++ b/core/lookup_helper.py
@@ -502,9 +502,12 @@ class LookupHelper:
 
         # Try the call as given, then fall back to the base call (strips /P, /M etc.)
         calls_to_try = [call]
-        home_call = callinfo.Callinfo.get_homecall(call)
-        if home_call != call:
-            calls_to_try.append(home_call)
+        try:
+            home_call = callinfo.Callinfo.get_homecall(call)
+            if home_call != call:
+                calls_to_try.append(home_call)
+        except ValueError:
+            logging.debug("Could not look up home call for callsign %s", call)
 
         for lookup_call in calls_to_try:
             try:
@@ -574,9 +577,12 @@ class LookupHelper:
 
         # Try the call as given, then fall back to the base call (strips /P, /M etc.)
         calls_to_try = [call]
-        home_call = callinfo.Callinfo.get_homecall(call)
-        if home_call != call:
-            calls_to_try.append(home_call)
+        try:
+            home_call = callinfo.Callinfo.get_homecall(call)
+            if home_call != call:
+                calls_to_try.append(home_call)
+        except ValueError:
+            logging.debug("Could not look up home call for callsign %s", call)
 
         for lookup_call in calls_to_try:
             try:
diff --git a/templates/about.html b/templates/about.html
index 5982461..bbeda55 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -159,13 +159,22 @@
         modify it however you like, you can claim you wrote it and charge people £1000 for a copy, I don't really mind.
         (Please don't do the last one. But if you're using my code for something cool, it would be nice to hear from
         you!)</p>
-    <h2 class="mt-4">Data Accuracy</h2>
+    <h2 id="accuracy" class="mt-4">Data Accuracy</h2>
     <p>Please note that the data coming out of Spothole is only as good as the data going in. People mis-hear and make
         typos when spotting callsigns all the time. There are also plenty of cases where Spothole's data, particularly
         location data, may be inaccurate. For example, there are POTA parks that span multiple US states, countries that
         span multiple CQ zones, portable operators with no requirement to sign /P, etc. If you are doing something where
         accuracy is important, such as contesting, you should not rely on Spothole's data to fill in any gaps in your
         log.</p>
+    <p>In the Spothole user interface, under "Your Data", you can enter your credentials for QRZ.com and/or HamQTH if
+        you have them. This allows Spothole to augment its data with lookups from these services. See the following
+        section, Privacy, for details of how these are handled. If you are looking at the map and see lots of spots in
+        the geographic centre of countries, allowing these lookups will help. For QRZ.com a paid account is required to
+        look up operator locations.</p>
+    <p>IOTA in particular causes a mapping problem, firstly that there is no official set of geodata beyond the names of
+        islands. We also have no way of telling whether priority should be given to IOTA reference or e.g. QRZ lookup,
+        for example for a G callsign in EU-005 Great Britain the QRZ home address is probably more accurate, but in
+        EU-002 Aaland islands, it's more likely a DXpedition and the IOTA would be more accurate.</p>
     <h2 id="privacy" class="mt-4">Privacy</h2>
     <p>Spothole collects no data about you on a permanent basis. All spots and alerts are "timed out" and deleted from
         the system after a set interval, which by default is one hour for spots and one week for alerts.</p>
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 863335b..c647075 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784986996"></script>
+<script src="/js/add-spot.js?v=1784988379"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 9d20346..f481f14 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784986996"></script>
+<script src="/js/alerts.js?v=1784988379"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index f2a2083..56e3e49 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784986996"></script>
-<script src="/js/bands.js?v=1784986996"></script>
+<script src="/js/spotsbandsandmap.js?v=1784988379"></script>
+<script src="/js/bands.js?v=1784988379"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 0294bcc..af05a27 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784986996" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784988379" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784986996"></script>
-<script src="/js/ui-ham.js?v=1784986996"></script>
-<script src="/js/geo.js?v=1784986996"></script>
-<script src="/js/common.js?v=1784986996"></script>
+<script src="/js/utils.js?v=1784988379"></script>
+<script src="/js/ui-ham.js?v=1784988379"></script>
+<script src="/js/geo.js?v=1784988379"></script>
+<script src="/js/common.js?v=1784988379"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index a52a48a..92805ca 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784986996"></script>
+<script src="/js/conditions.js?v=1784988379"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 0d4e6ee..d11f6eb 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -1,6 +1,19 @@
 {% extends "base.html" %}
 {% block content %}
 
+<div id="map-intro-box" class="permanently-dismissible-box mt-3">
+    <div class="alert alert-primary alert-dismissible fade show" role="alert">
+        <i class="fa-solid fa-circle-info"></i> <strong>Spothole's map</strong><br/>Spothole pulls in location data from
+        a number of sources to try and provide the best map possible. However, please don't trust them to be anything
+        other than a rough guide. In particular, if you are seeing lots of spots in the centre of a country, please
+        consider opening the "Your Data" menu and providing QRZ.com and/or HamQTH credentials so that Spothole can find
+        more accurate locations for these spots. More information can be found in the
+        <a href="/about#accuracy" class="alert-link">Data Accuracy section of the About page</a>.
+        <button type="button" id="map-intro-box-dismiss" class="btn-close" data-bs-dismiss="alert"
+                aria-label="Close"></button>
+    </div>
+</div>
+
 <div id="map">
     <div id="settingsButtonRowMap" class="mt-3 px-3">
         <div class="row mb-3">
@@ -95,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784986996"></script>
-<script src="/js/map.js?v=1784986996"></script>
+<script src="/js/spotsbandsandmap.js?v=1784988379"></script>
+<script src="/js/map.js?v=1784988379"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 9ccdf8a..a77bf94 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784986996"></script>
-<script src="/js/spots.js?v=1784986996"></script>
+<script src="/js/spotsbandsandmap.js?v=1784988379"></script>
+<script src="/js/spots.js?v=1784988379"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 7c1dfe4..4f55f4d 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784986996"></script>
+<script src="/js/status.js?v=1784988379"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");
diff --git a/webassets/js/map.js b/webassets/js/map.js
index 1de1a4e..c6b0f1e 100644
--- a/webassets/js/map.js
+++ b/webassets/js/map.js
@@ -68,8 +68,6 @@ function loadSpots() {
             // now
             startSSEConnection();
         }
-        // Start the ongoing SSE connection
-        startSSEConnection();
     });
 }
 
@@ -594,6 +592,16 @@ function setUpMap() {
     map.setView([30, 0], 3);
 }
 
+// Display the intro box, unless the user has already dismissed it once.
+function displayIntroBox() {
+    if (localStorage.getItem("map-intro-box-dismissed") == null) {
+        $("#map-intro-box").show();
+    }
+    $("#map-intro-box-dismiss").click(function () {
+        localStorage.setItem("map-intro-box-dismissed", true);
+    });
+}
+
 // Startup
 $(document).ready(function () {
     // Close SSE connection cleanly when navigating away
@@ -609,6 +617,8 @@ $(document).ready(function () {
     setUpMap();
     // Call loadOptions(), this will then trigger loading spots and setting up timers.
     loadOptions();
+    // Display intro box
+    displayIntroBox();
     // Prevent mouse scroll and touch actions in the popup menus being passed through to the map
     L.DomEvent.disableScrollPropagation(document.getElementById('settingsButtonRowMap'));
     L.DomEvent.disableClickPropagation(document.getElementById('settingsButtonRowMap'));

From 555a8418a9d793390e214947f7be32e73b5cae72 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 15:27:13 +0100
Subject: [PATCH 22/29] Fix IOTA location lookup

---
 core/sig_utils.py         | 13 +++++++++++--
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 9 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/core/sig_utils.py b/core/sig_utils.py
index 2dec186..253c841 100644
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -104,8 +104,17 @@ def populate_sig_ref_info(sig_ref):
                     sig_ref.name = data["name"] if "name" in data else None
                     sig_ref.url = "https://www.cqgma.org/zinfo.php?ref=" + ref_id
                     sig_ref.grid = data["locator"] if "locator" in data else None
-                    sig_ref.latitude = data["latitude"] if "latitude" in data else None
-                    sig_ref.longitude = data["longitude"] if "longitude" in data else None
+
+                    # For some things (just IOTA?) the GMA actually returns a box where "latitude" and "longitude" are
+                    # the zeroest corner of the box, then "lat2" and "lng2" provide the other corner. We detect this
+                    # and provide a single lat/lon for the centre. Otherwise if we don't have these extra parameters,
+                    # just use the single point we have.
+                    if "latitude" in data and "longitude" in data and "lat2" in data and "lng2" in data:
+                        sig_ref.latitude = (float(data["latitude"]) + float(data["lat2"])) / 2.0
+                        sig_ref.longitude = (float(data["longitude"]) + float(data["lng2"])) / 2.0
+                    else:
+                        sig_ref.latitude = float(data["latitude"]) if "latitude" in data else None
+                        sig_ref.longitude = float(data["longitude"]) if "longitude" in data else None
                 elif not response.from_cache:
                     logging.warning("Malformed response looking up %s ref %s via GMA", sig, ref_id)
             elif not response.from_cache:
diff --git a/templates/add_spot.html b/templates/add_spot.html
index c647075..71ff126 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784988379"></script>
+<script src="/js/add-spot.js?v=1784989634"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index f481f14..653a089 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784988379"></script>
+<script src="/js/alerts.js?v=1784989634"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 56e3e49..bd304e2 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784988379"></script>
-<script src="/js/bands.js?v=1784988379"></script>
+<script src="/js/spotsbandsandmap.js?v=1784989634"></script>
+<script src="/js/bands.js?v=1784989634"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index af05a27..906aa30 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784988379" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1784989634" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784988379"></script>
-<script src="/js/ui-ham.js?v=1784988379"></script>
-<script src="/js/geo.js?v=1784988379"></script>
-<script src="/js/common.js?v=1784988379"></script>
+<script src="/js/utils.js?v=1784989634"></script>
+<script src="/js/ui-ham.js?v=1784989634"></script>
+<script src="/js/geo.js?v=1784989634"></script>
+<script src="/js/common.js?v=1784989634"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 92805ca..7790e03 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784988379"></script>
+<script src="/js/conditions.js?v=1784989634"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index d11f6eb..3286a46 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -108,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784988379"></script>
-<script src="/js/map.js?v=1784988379"></script>
+<script src="/js/spotsbandsandmap.js?v=1784989633"></script>
+<script src="/js/map.js?v=1784989633"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index a77bf94..5d16f1a 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784988379"></script>
-<script src="/js/spots.js?v=1784988379"></script>
+<script src="/js/spotsbandsandmap.js?v=1784989633"></script>
+<script src="/js/spots.js?v=1784989633"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 4f55f4d..3ca2975 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784988379"></script>
+<script src="/js/status.js?v=1784989634"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 3c4c5952885755207d64f4ddabccbcc4eff3ebcb Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 16:49:49 +0100
Subject: [PATCH 23/29] Put static assets in a separate directory so they can
 be delivered directly by nginx

---
 README.md                                     | 81 ++++++++-----------
 server/handlers/manifesthandler.py            | 11 +++
 server/webserver.py                           |  6 +-
 templates/add_spot.html                       |  2 +-
 templates/alerts.html                         |  2 +-
 templates/api_only_home.html                  |  2 +-
 templates/apidocs.html                        |  2 +-
 templates/bands.html                          |  4 +-
 templates/base.html                           | 26 +++---
 templates/conditions.html                     |  4 +-
 {webassets => templates}/manifest.webmanifest |  8 +-
 templates/map.html                            | 28 +++----
 templates/skeleton.html                       | 18 ++---
 templates/spots.html                          |  4 +-
 templates/status.html                         |  2 +-
 webassets/img/flags/generate.py               |  4 +-
 webassets/js/alerts.js                        |  2 +-
 webassets/js/spots.js                         |  4 +-
 webassets/service-worker.js                   | 75 +++++++++++------
 .../css/leaflet-extra-markers-1.2.2.min.css   |  2 +-
 20 files changed, 157 insertions(+), 130 deletions(-)
 create mode 100644 server/handlers/manifesthandler.py
 rename {webassets => templates}/manifest.webmanifest (81%)

diff --git a/README.md b/README.md
index 40da6e2..15c9c2d 100644
--- a/README.md
+++ b/README.md
@@ -318,93 +318,78 @@ To set up nginx as a reverse proxy that sits in front of Spothole, first ensure
 
 Create a file at `/etc/nginx/sites-available/` called `spothole`. Give it the following contents, replacing
 `spothole.app` with the domain name on which you want to run Spothole. If you changed the port on which Spothole runs,
-update that on the "proxy_pass" line too.
+update that on the "proxy_pass" line, and if you installed Spothole somewhere other than `/home/spothole/spothole`,
+adjust the alias location for serving static files.
+
+(The latter section, configuring the nginx server to serve static files directly, improves efficiency because it saves
+Spothole itself from serving JS, CSS etc. files. If you can't do this for some reason, e.g. your nginx and spothole are
+on different computers, you can omit the `location /static/ {}` block.)
 
 ```nginx
 server {
     server_name spothole.app;
 
+    # Global proxy settings
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+    proxy_connect_timeout 10s;
+    proxy_buffering on;
+    
+    # Pass on IP address and host information to Spothole, in case logging this information is required
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
     # Wellknown area for Lets Encrypt
     location /.well-known/ {
         alias /var/www/html/.well-known/;
     }
+
+    # Load static assets directly from the Spothole webassets directory
+    location /static/ {
+        alias /home/spothole/spothole/webassets/;
+        expires 1h;
+        add_header Cache-Control "public, max-age=3600, must-revalidate";
+    }
     
     # SSE endpoints
-    location ~ ^/api/v1/(spots|alerts)/stream {
+    location ~ ^/api/v1/(spots|alerts)/stream/? {
         proxy_pass http://127.0.0.1:8080;
         
-        # Allow keep-alive
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-        
-        # Set correct content type for SSE API calls
-        add_header Content-Type text/event-stream always;
-        
-        # Set remove buffering, remove caching, add suitable timeouts for SSE API calls
+        # Remove buffering, remove caching, add suitable timeouts for SSE API calls
         proxy_buffering off;
         proxy_cache off;
         proxy_read_timeout 24h;
-        proxy_connect_timeout 10s;
         proxy_send_timeout 24h;
         proxy_set_header X-Accel-Buffering no;
         add_header Cache-Control no-store always;
         
         # Allow cross-origin requests to API
         proxy_hide_header Access-Control-Allow-Origin;
-        add_header Access-Control-Allow-Origin * always;
-        
-        # Pass on IP address and host information to Spothole, in case logging this information is required
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        add_header Access-Control-Allow-Origin * always; 
     }
 
     # Other API endpoints
     location /api/ {
         proxy_pass http://127.0.0.1:8080;
         
-        # Allow keep-alive
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-        
-        # Set up buffering, remove caching, add suitable timeouts for API calls
-        proxy_buffering on;
+        # Remove buffering, remove caching, add suitable timeouts for API calls
+        proxy_buffering off;
         proxy_cache off;
         proxy_read_timeout 30s;
-        proxy_connect_timeout 10s;
         add_header Cache-Control no-store always;
         
         # Allow cross-origin requests to API
         proxy_hide_header Access-Control-Allow-Origin;
         add_header Access-Control-Allow-Origin * always;
-        
-        # Pass on IP address and host information to Spothole, in case logging this information is required
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    # Static assets
+    # Templated pages
     location / {
         proxy_pass http://127.0.0.1:8080;
-        
-        # Allow keep-alive
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-        
-        # Set up buffering and caching, add suitable timeouts for static asset requests
-        proxy_buffering on;
         proxy_read_timeout 30s;
-        proxy_connect_timeout 10s;
-        add_header Cache-Control "public, max-age=3600, must-revalidate" always;
-        
-        # Pass on IP address and host information to Spothole, in case logging this information is required
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        add_header Cache-Control "no-cache, must-revalidate" always;
     }
 }
 ```
@@ -467,7 +452,7 @@ To navigate your way around the source code, this list may help.
 
 *HTML/JS/CSS front-end code*
 
-* `/webassets` - Root for static files served by the web server
+* `/webassets` - Root for static files served by the web server. These are all served from a path starting `/static/`.
 * `/webassets/apidocs` - Contains the OpenAPI spec (`openapi.yml`)
 * `/webassets/css` - CSS files used by the web front-end
 * `/webassets/img` - image files used by the web front-end
diff --git a/server/handlers/manifesthandler.py b/server/handlers/manifesthandler.py
new file mode 100644
index 0000000..978b090
--- /dev/null
+++ b/server/handlers/manifesthandler.py
@@ -0,0 +1,11 @@
+import tornado.web
+
+from core.config import BASE_URL
+
+
+class ManifestHandler(tornado.web.RequestHandler):
+    """Handler for manifest.webmanifest, which needs BASE_URL inserted and a custom content-type"""
+
+    def get(self):
+        self.set_header("Content-Type", "application/manifest+json; charset=UTF-8")
+        self.render("manifest.webmanifest", baseurl=BASE_URL)
diff --git a/server/webserver.py b/server/webserver.py
index a23ea73..21228cd 100644
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -15,6 +15,7 @@ from server.handlers.api.options import APIOptionsHandler
 from server.handlers.api.solar_conditions import APISolarConditionsHandler
 from server.handlers.api.spots import APISpotsHandler, APISpotsStreamHandler
 from server.handlers.api.status import APIStatusHandler
+from server.handlers.manifesthandler import ManifestHandler
 from server.handlers.metrics import PrometheusMetricsHandler
 from server.handlers.pagetemplate import PageTemplateHandler
 from server.handlers.quietstaticfilehandler import QuietStaticFileHandler
@@ -100,11 +101,12 @@ class WebServer:
             if ALLOW_SPOTTING:
                 ui_routes += [(r"/add-spot", PageTemplateHandler, {"template_name": "add_spot", **handler_opts})]
 
-        # API docs, Prometheus metrics, and finally static assets are always available regardless of API-only mode.
+        # API docs, Prometheus metrics, webapp manifest and static assets are always available regardless of API-only mode.
         misc_routes = [
             (r"/apidocs", PageTemplateHandler, {"template_name": "apidocs", **handler_opts}),
             (r"/metrics", PrometheusMetricsHandler),
-            (r"/(.*)", QuietStaticFileHandler, {"path": os.path.join(_HERE, "../webassets")})
+            (r"/manifest.webmanifest", ManifestHandler),
+            (r"/static/(.*)", QuietStaticFileHandler, {"path": os.path.join(_HERE, "../webassets")})
         ]
 
         app = tornado.web.Application(api_routes + ui_routes + misc_routes,
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 71ff126..c164a6b 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1784989634"></script>
+<script src="/static/js/add-spot.js?v=1784994589"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 653a089..832345b 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1784989634"></script>
+<script src="/static/js/alerts.js?v=1784994589"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/api_only_home.html b/templates/api_only_home.html
index 97139c9..11ed393 100644
--- a/templates/api_only_home.html
+++ b/templates/api_only_home.html
@@ -7,7 +7,7 @@
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="text-center mb-4">
-                <img src="/img/logo.png" width="192" height="60" alt="Spothole">
+                <img src="/static/img/logo.png" width="192" height="60" alt="Spothole">
             </div>
             <div class="card">
                 <div class="card-body">
diff --git a/templates/apidocs.html b/templates/apidocs.html
index 3f4325d..9266dcb 100644
--- a/templates/apidocs.html
+++ b/templates/apidocs.html
@@ -1,5 +1,5 @@
 {% extends "skeleton.html" %}
 {% block body %}
-<redoc spec-url="/apidocs/openapi.yml"></redoc>
+<redoc spec-url="/static/apidocs/openapi.yml"></redoc>
 <script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"></script>
 {% end %}
diff --git a/templates/bands.html b/templates/bands.html
index bd304e2..5ee8472 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784989634"></script>
-<script src="/js/bands.js?v=1784989634"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
+<script src="/static/js/bands.js?v=1784994589"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 906aa30..8e27dd3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,26 +1,26 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1784989634" type="text/css">
-<link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
-<link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
-<link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
+<link rel="stylesheet" href="/static/css/style.css?v=1784994589" type="text/css">
+<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
+<link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
+<link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
 
-<script src="/vendor/js/jquery-3.7.1.min.js"></script>
-<script src="/vendor/js/moment-2.29.4.min.js"></script>
-<script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
-<script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
+<script src="/static/vendor/js/jquery-3.7.1.min.js"></script>
+<script src="/static/vendor/js/moment-2.29.4.min.js"></script>
+<script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
+<script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1784989634"></script>
-<script src="/js/ui-ham.js?v=1784989634"></script>
-<script src="/js/geo.js?v=1784989634"></script>
-<script src="/js/common.js?v=1784989634"></script>
+<script src="/static/js/utils.js?v=1784994589"></script>
+<script src="/static/js/ui-ham.js?v=1784994589"></script>
+<script src="/static/js/geo.js?v=1784994589"></script>
+<script src="/static/js/common.js?v=1784994589"></script>
 {% end %}
 {% block body %}
 <div class="container">
     <nav id="header" class="navbar navbar-expand-lg bg-body p-0 border-bottom">
         <div class="container-fluid p-0">
             <a class="navbar-brand" href="/">
-                <img src="/img/logo.png" class="logo" width="192" height="60" alt="Spothole">
+                <img src="/static/img/logo.png" class="logo" width="192" height="60" alt="Spothole">
             </a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                     data-bs-target="#navbar-toggler-content" aria-controls="navbar-toggler-content"
diff --git a/templates/conditions.html b/templates/conditions.html
index 7790e03..f260457 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -283,8 +283,8 @@
     </div>
 </div>
 
-<script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1784989634"></script>
+<script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
+<script src="/static/js/conditions.js?v=1784994589"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/webassets/manifest.webmanifest b/templates/manifest.webmanifest
similarity index 81%
rename from webassets/manifest.webmanifest
rename to templates/manifest.webmanifest
index be33ce4..1d07df2 100644
--- a/webassets/manifest.webmanifest
+++ b/templates/manifest.webmanifest
@@ -5,7 +5,7 @@
     "short_name": "Spothole",
     "scope": "/",
     "display": "standalone",
-    "start_url": "https://spothole.app/",
+    "start_url": "{{ baseurl }}",
     "background_color": "white",
     "theme_color": "white",
     "description": "An Amateur Radio spotting tool bringing together DX clusters and outdoor programmes, providing a universal JSON API and web interface.",
@@ -13,17 +13,17 @@
     "prefer_related_applications": false,
     "icons": [
     {
-      "src": "/img/icon-192-pwa.png",
+      "src": "/static/img/icon-192-pwa.png",
       "type": "image/png",
       "sizes": "192x192",
       "purpose": "maskable"
     },
     {
-      "src": "/img/icon-512-pwa.png",
+      "src": "/static/img/icon-512-pwa.png",
       "type": "image/png",
       "sizes": "512x512",
       "purpose": "maskable"
     }
   ],
-  "url": "https://spothole.app"
+  "url": "{{ baseurl }}"
 }
diff --git a/templates/map.html b/templates/map.html
index 3286a46..f0d6b19 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -92,24 +92,24 @@
 
 <link rel="stylesheet" href="/vendor/css/leaflet-1.9.4.min.css">
 <link rel="stylesheet" href="/vendor/css/leaflet-extra-markers-1.2.2.min.css">
-<script src="/vendor/js/leaflet-1.9.4.min.js"></script>
-<script src="/vendor/js/oms-leaflet-0.2.7.min.js"></script>
-<script src="/vendor/js/leaflet-providers-2.0.0.js"></script>
-<script src="/vendor/js/leaflet-extra-markers-1.2.2.min.js"></script>
-<script src="/vendor/js/leaflet-geodesic-2.7.2.umd.min.js"></script>
-<script src="/vendor/js/leaflet-vectorgrid-1.3.0.js"></script>
-<script src="/vendor/js/text-image-0.7.0.js"></script>
-<script src="/vendor/js/leaflet-terminator-1.1.0.min.js"></script>
-<script src="/vendor/js/leaflet-maidenhead.js"></script>
-<script src="/vendor/js/leaflet-ituzones.js"></script>
-<script src="/vendor/js/leaflet-cqzones.js"></script>
-<script src="/vendor/js/leaflet-workedallbritainireland.js"></script>
+<script src="/static/vendor/js/leaflet-1.9.4.min.js"></script>
+<script src="/static/vendor/js/oms-leaflet-0.2.7.min.js"></script>
+<script src="/static/vendor/js/leaflet-providers-2.0.0.js"></script>
+<script src="/static/vendor/js/leaflet-extra-markers-1.2.2.min.js"></script>
+<script src="/static/vendor/js/leaflet-geodesic-2.7.2.umd.min.js"></script>
+<script src="/static/vendor/js/leaflet-vectorgrid-1.3.0.js"></script>
+<script src="/static/vendor/js/text-image-0.7.0.js"></script>
+<script src="/static/vendor/js/leaflet-terminator-1.1.0.min.js"></script>
+<script src="/static/vendor/js/leaflet-maidenhead.js"></script>
+<script src="/static/vendor/js/leaflet-ituzones.js"></script>
+<script src="/static/vendor/js/leaflet-cqzones.js"></script>
+<script src="/static/vendor/js/leaflet-workedallbritainireland.js"></script>
 
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784989633"></script>
-<script src="/js/map.js?v=1784989633"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
+<script src="/static/js/map.js?v=1784994589"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/skeleton.html b/templates/skeleton.html
index bdbcd36..4efc3a4 100644
--- a/templates/skeleton.html
+++ b/templates/skeleton.html
@@ -15,10 +15,10 @@
           content="An Amateur Radio spotting tool bringing together DX clusters and outdoor programmes, providing a universal JSON API and web interface."/>
     <meta property="og:description"
           content="An Amateur Radio spotting tool bringing together DX clusters and outdoor programmes, providing a universal JSON API and web interface."/>
-    <link rel="canonical" href="https://spothole.app/"/>
-    <meta property="og:url" content="https://spothole.app/"/>
-    <meta property="og:image" content="https://spothole.app/img/banner.png"/>
-    <meta property="twitter:image" content="https://spothole.app/img/banner.png"/>
+    <link rel="canonical" href="{{ baseurl }}"/>
+    <meta property="og:url" content="{{ baseurl }}"/>
+    <meta property="og:image" content="{{ baseurl }}/static/img/banner.png"/>
+    <meta property="twitter:image" content="{{ baseurl }}/static/img/banner.png"/>
     <meta name="twitter:card" content="summary_large_image"/>
     <meta name="author" content="Ian Renton"/>
     <meta property="og:locale" content="en_GB"/>
@@ -26,14 +26,14 @@
 
     <title>Spothole</title>
 
-    <link rel="icon" type="image/png" href="/img/icon-512.png">
+    <link rel="icon" type="image/png" href="/static/img/icon-512.png">
     <link rel="apple-touch-icon" href="img/icon-512-pwa.png">
-    <link rel="alternate icon" type="image/png" href="/img/icon-192.png">
-    <link rel="alternate icon" type="image/png" href="/img/icon-32.png">
-    <link rel="alternate icon" type="image/png" href="/img/icon-16.png">
+    <link rel="alternate icon" type="image/png" href="/static/img/icon-192.png">
+    <link rel="alternate icon" type="image/png" href="/static/img/icon-32.png">
+    <link rel="alternate icon" type="image/png" href="/static/img/icon-16.png">
     <link rel="alternate icon" type="image/x-icon" href="/favicon.ico">
 
-    <link rel="manifest" href="manifest.webmanifest">
+    <link rel="manifest" href="/manifest.webmanifest">
 
     {% block head_extra %}{% end %}
 </head>
diff --git a/templates/spots.html b/templates/spots.html
index 5d16f1a..37cdc48 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1784989633"></script>
-<script src="/js/spots.js?v=1784989633"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
+<script src="/static/js/spots.js?v=1784994589"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 3ca2975..9dfe3c5 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1784989634"></script>
+<script src="/static/js/status.js?v=1784994589"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");
diff --git a/webassets/img/flags/generate.py b/webassets/img/flags/generate.py
index 2d90252..a31fa35 100644
--- a/webassets/img/flags/generate.py
+++ b/webassets/img/flags/generate.py
@@ -4,10 +4,10 @@ from datetime import timedelta
 from PIL import Image, ImageDraw, ImageFont
 from requests_cache import CachedSession
 
-test = os.listdir("./")
+test = os.listdir("/")
 for item in test:
     if item.endswith(".png"):
-        os.remove(os.path.join("./", item))
+        os.remove(os.path.join("/", item))
 
 cache = CachedSession("/tmp/cache", expire_after=timedelta(days=30))
 data = cache.get("https://raw.githubusercontent.com/k0swe/dxcc-json/refs/heads/main/dxcc.json").json()
diff --git a/webassets/js/alerts.js b/webassets/js/alerts.js
index c731d72..463dc56 100644
--- a/webassets/js/alerts.js
+++ b/webassets/js/alerts.js
@@ -184,7 +184,7 @@ function addAlertRowsToTable(tbody, alerts) {
         // Format DX flag
         let dx_flag = "<i class='fa-solid fa-globe-africa'></i>";
         if (a["dx_dxcc_id"] && a["dx_dxcc_id"] != null && a["dx_dxcc_id"] !== 0) {
-            dx_flag = `<img src="img/flags/${a['dx_dxcc_id']}.png" class="flag" width="24" alt="${dx_country}" title="${dx_country}"/>`;
+            dx_flag = `<img src="static/img/flags/${a['dx_dxcc_id']}.png" class="flag" width="24" alt="${dx_country}" title="${dx_country}"/>`;
         }
 
         // Format dx calls
diff --git a/webassets/js/spots.js b/webassets/js/spots.js
index 9b6418e..c0d4375 100644
--- a/webassets/js/spots.js
+++ b/webassets/js/spots.js
@@ -249,7 +249,7 @@ function createNewTableRowsForSpot(s, highlightNew) {
         dx_flag = "";
     }
     if (s["dx_dxcc_id"] && s["dx_dxcc_id"] != null && s["dx_dxcc_id"] !== 0) {
-        dx_flag = `<img src="img/flags/${s['dx_dxcc_id']}.png" class="flag" width="24" alt="${dx_country}" title="${dx_country}"/>`;
+        dx_flag = `<img src="static/img/flags/${s['dx_dxcc_id']}.png" class="flag" width="24" alt="${dx_country}" title="${dx_country}"/>`;
     }
 
     // Format the frequency
@@ -319,7 +319,7 @@ function createNewTableRowsForSpot(s, highlightNew) {
     // Format DE flag
     let de_flag = "<i class='fa-solid fa-circle-question'></i>";
     if (s["de_dxcc_id"] && s["de_dxcc_id"] != null && s["de_dxcc_id"] !== 0) {
-        de_flag = `<img src="img/flags/${s['de_dxcc_id']}.png" class="flag" width="24" alt="${de_country}" title="${de_country}"/>`;
+        de_flag = `<img src="static/img/flags/${s['de_dxcc_id']}.png" class="flag" width="24" alt="${de_country}" title="${de_country}"/>`;
     }
 
     // Format de call
diff --git a/webassets/service-worker.js b/webassets/service-worker.js
index cdfde8a..8340792 100644
--- a/webassets/service-worker.js
+++ b/webassets/service-worker.js
@@ -1,28 +1,57 @@
 const CACHE_NAME = 'Spothole';
 const CACHE_URLS = [
-    'index.html',
-    './',
-    'apidocs',
-    'apidocs/openapi.yml',
-    'about',
-    'css/style.css',
-    'js/add-spot.js',
-    'js/alerts.js',
-    'js/bands.js',
-    'js/common.js',
-    'js/map.js',
-    'js/spots.js',
-    'js/spotsbandsandmap.js',
-    'js/status.js',
-    'img/logo.png',
-    'img/favicon.ico',
-    'img/icon-32.png',
-    'img/icon-192.png',
-    'img/icon-512.png',
-    'fa/css/fontawesome.min.css',
-    'fa/css/solid.min.css',
-    'fa/webfonts/fa-solid-900.ttf',
-    'fa/webfonts/fa-solid-900.woff2'
+    'static/apidocs/openapi.yml',
+    'static/audio/ping.mp3',
+    'static/css/style.css',
+    'static/js/add-spot.js',
+    'static/js/alerts.js',
+    'static/js/bands.js',
+    'static/js/common.js',
+    'static/js/geo.js',
+    'static/js/map.js',
+    'static/js/spots.js',
+    'static/js/spotsbandsandmap.js',
+    'static/js/status.js',
+    'static/js/ui-ham.js',
+    'static/js/utils.js',
+    'static/img/logo.png',
+    'static/img/favicon.ico',
+    'static/img/icon-32.png',
+    'static/img/icon-192.png',
+    'static/img/icon-512.png',
+    'static/vendor/img/markers_default@2x.png',
+    'static/vendor/img/markers_shadow.png',
+    'static/vendor/img/markers_default.png',
+    'static/vendor/img/markers_shadow@2x.png',
+    'static/vendor/css/bootstrap-5.3.8.min.css',
+    'static/vendor/css/images/marker-icon.png',
+    'static/vendor/css/images/layers-2x.png',
+    'static/vendor/css/images/marker-shadow.png',
+    'static/vendor/css/images/layers.png',
+    'static/vendor/css/images/marker-icon-2x.png',
+    'static/vendor/css/leaflet-extra-markers-1.2.2.min.css',
+    'static/vendor/css/leaflet-1.9.4.min.css',
+    'static/vendor/css/fontawesome-6.7.2.min.css',
+    'static/vendor/css/solid-6.7.2.min.css',
+    'static/vendor/js/jquery-3.7.1.min.js',
+    'static/vendor/js/chart-4.4.9.umd.min.js',
+    'static/vendor/js/oms-leaflet-0.2.7.min.js',
+    'static/vendor/js/leaflet-workedallbritainireland.js',
+    'static/vendor/js/leaflet-providers-2.0.0.js',
+    'static/vendor/js/text-image-0.7.0.js',
+    'static/vendor/js/leaflet-vectorgrid-1.3.0.js',
+    'static/vendor/js/leaflet-ituzones.js',
+    'static/vendor/js/tinycolor2-1.6.0.min.js',
+    'static/vendor/js/bootstrap-5.3.8.bundle.min.js',
+    'static/vendor/js/moment-2.29.4.min.js',
+    'static/vendor/js/leaflet-cqzones.js',
+    'static/vendor/js/leaflet-extra-markers-1.2.2.min.js',
+    'static/vendor/js/leaflet-terminator-1.1.0.min.js',
+    'static/vendor/js/leaflet-1.9.4.min.js',
+    'static/vendor/js/leaflet-geodesic-2.7.2.umd.min.js',
+    'static/vendor/js/leaflet-maidenhead.js',
+    'static/vendor/webfonts/fa-solid-900.ttf',
+    'static/vendor/webfonts/fa-solid-900.woff2'
 ];
 
 self.addEventListener('fetch', (event) => {
diff --git a/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css b/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
index d682791..d4fd797 100644
--- a/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
+++ b/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
@@ -5,4 +5,4 @@
  * https://github.com/coryasilva/Leaflet.ExtraMarkers/
  * @author coryasilva <https://github.com/coryasilva>
  * @version 1.2.1
- */.extra-marker{background:url("../img/markers_default.png") no-repeat 0 0;width:35px;height:46px;position:absolute;left:0;top:0;display:block;text-align:center}.extra-marker-shadow{background:url("../img/markers_shadow.png") no-repeat 0 0;width:36px;height:16px}@media (min--moz-device-pixel-ratio:1.5),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){.extra-marker{background-image:url("../img/markers_default@2x.png");background-size:540px 184px}.extra-marker-shadow{background-image:url("../img/markers_shadow@2x.png");background-size:35px 16px}}.extra-marker.extra-marker-svg{background:none}.extra-marker.extra-marker-svg .svg-inline--fa,.extra-marker.extra-marker-svg i{position:absolute;left:0;width:35px}.extra-marker .svg-inline--fa,.extra-marker i{color:#fff;margin-top:7px;display:inline-block;font-size:14px}.extra-marker .svg-inline--fa{margin-top:10px;background:none}.extra-marker .svg-inline--fa,.extra-marker i.fa,.extra-marker i.fab,.extra-marker i.fas,.extra-marker i.far,.extra-marker i.fal{margin-top:10px}.extra-marker .svg-inline--fa.fa-2x,.extra-marker i.fa.fa-2x,.extra-marker i.fab.fa-2x,.extra-marker i.fas.fa-2x,.extra-marker i.far.fa-2x,.extra-marker i.fal.fa-2x{font-size:16px;margin-top:9px}.extra-marker .svg-inline--fa.fa-3x,.extra-marker i.fa.fa-3x,.extra-marker i.fab.fa-3x,.extra-marker i.fas.fa-3x,.extra-marker i.far.fa-3x,.extra-marker i.fal.fa-3x{font-size:18px;margin-top:9px}.extra-marker .svg-inline--fa.fa-4x,.extra-marker i.fa.fa-4x,.extra-marker i.fab.fa-4x,.extra-marker i.fas.fa-4x,.extra-marker i.far.fa-4x,.extra-marker i.fal.fa-4x{font-size:20px;margin-top:8px}.extra-marker .svg-inline--fa.fa-5x,.extra-marker i.fa.fa-5x,.extra-marker i.fab.fa-5x,.extra-marker i.fas.fa-5x,.extra-marker i.far.fa-5x,.extra-marker i.fal.fa-5x{font-size:24px;margin-top:6px}.extra-marker .fa-number:before{content:attr(number)}.extra-marker i.glyphicon{margin-top:10px}.extra-marker i.icon{margin-right:0;opacity:1}.extra-marker-circle-red{background-position:0 0}.extra-marker-circle-orange-dark{background-position:-36px 0}.extra-marker-circle-orange{background-position:-72px 0}.extra-marker-circle-yellow{background-position:-108px 0}.extra-marker-circle-blue-dark{background-position:-144px 0}.extra-marker-circle-blue{background-position:-180px 0}.extra-marker-circle-cyan{background-position:-216px 0}.extra-marker-circle-purple{background-position:-252px 0}.extra-marker-circle-violet{background-position:-288px 0}.extra-marker-circle-pink{background-position:-324px 0}.extra-marker-circle-green-dark{background-position:-360px 0}.extra-marker-circle-green{background-position:-396px 0}.extra-marker-circle-green-light{background-position:-432px 0}.extra-marker-circle-black{background-position:-468px 0}.extra-marker-circle-white{background-position:-504px 0}.extra-marker-square-red{background-position:0 -46px}.extra-marker-square-orange-dark{background-position:-36px -46px}.extra-marker-square-orange{background-position:-72px -46px}.extra-marker-square-yellow{background-position:-108px -46px}.extra-marker-square-blue-dark{background-position:-144px -46px}.extra-marker-square-blue{background-position:-180px -46px}.extra-marker-square-cyan{background-position:-216px -46px}.extra-marker-square-purple{background-position:-252px -46px}.extra-marker-square-violet{background-position:-288px -46px}.extra-marker-square-pink{background-position:-324px -46px}.extra-marker-square-green-dark{background-position:-360px -46px}.extra-marker-square-green{background-position:-396px -46px}.extra-marker-square-green-light{background-position:-432px -46px}.extra-marker-square-black{background-position:-468px -46px}.extra-marker-square-white{background-position:-504px -46px}.extra-marker-star-red{background-position:0 -92px}.extra-marker-star-orange-dark{background-position:-36px -92px}.extra-marker-star-orange{background-position:-72px -92px}.extra-marker-star-yellow{background-position:-108px -92px}.extra-marker-star-blue-dark{background-position:-144px -92px}.extra-marker-star-blue{background-position:-180px -92px}.extra-marker-star-cyan{background-position:-216px -92px}.extra-marker-star-purple{background-position:-252px -92px}.extra-marker-star-violet{background-position:-288px -92px}.extra-marker-star-pink{background-position:-324px -92px}.extra-marker-star-green-dark{background-position:-360px -92px}.extra-marker-star-green{background-position:-396px -92px}.extra-marker-star-green-light{background-position:-432px -92px}.extra-marker-star-black{background-position:-468px -92px}.extra-marker-star-white{background-position:-504px -92px}.extra-marker-penta-red{background-position:0 -138px}.extra-marker-penta-orange-dark{background-position:-36px -138px}.extra-marker-penta-orange{background-position:-72px -138px}.extra-marker-penta-yellow{background-position:-108px -138px}.extra-marker-penta-blue-dark{background-position:-144px -138px}.extra-marker-penta-blue{background-position:-180px -138px}.extra-marker-penta-cyan{background-position:-216px -138px}.extra-marker-penta-purple{background-position:-252px -138px}.extra-marker-penta-violet{background-position:-288px -138px}.extra-marker-penta-pink{background-position:-324px -138px}.extra-marker-penta-green-dark{background-position:-360px -138px}.extra-marker-penta-green{background-position:-396px -138px}.extra-marker-penta-green-light{background-position:-432px -138px}.extra-marker-penta-black{background-position:-468px -138px}.extra-marker-penta-white{background-position:-504px -138px}
\ No newline at end of file
+ */.extra-marker{background:url("../img/markers_default.png") no-repeat 0 0;width:35px;height:46px;position:absolute;left:0;top:0;display:block;text-align:center}  .extra-marker-shadow{background:url("../img/markers_shadow.png") no-repeat 0 0;width:36px;height:16px}@media (min--moz-device-pixel-ratio:1.5),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){.extra-marker{background-image:url("../img/markers_default@2x.png");background-size:540px 184px}  .extra-marker-shadow{background-image:url("../img/markers_shadow@2x.png");background-size:35px 16px}}  .extra-marker.extra-marker-svg{background:none}  .extra-marker.extra-marker-svg .svg-inline--fa,.extra-marker.extra-marker-svg i{position:absolute;left:0;width:35px}  .extra-marker .svg-inline--fa,.extra-marker i{color:#fff;margin-top:7px;display:inline-block;font-size:14px}  .extra-marker .svg-inline--fa{margin-top:10px;background:none}  .extra-marker .svg-inline--fa,.extra-marker i.fa,.extra-marker i.fab,.extra-marker i.fas,.extra-marker i.far,.extra-marker i.fal{margin-top:10px}  .extra-marker .svg-inline--fa.fa-2x,.extra-marker i.fa.fa-2x,.extra-marker i.fab.fa-2x,.extra-marker i.fas.fa-2x,.extra-marker i.far.fa-2x,.extra-marker i.fal.fa-2x{font-size:16px;margin-top:9px}  .extra-marker .svg-inline--fa.fa-3x,.extra-marker i.fa.fa-3x,.extra-marker i.fab.fa-3x,.extra-marker i.fas.fa-3x,.extra-marker i.far.fa-3x,.extra-marker i.fal.fa-3x{font-size:18px;margin-top:9px}  .extra-marker .svg-inline--fa.fa-4x,.extra-marker i.fa.fa-4x,.extra-marker i.fab.fa-4x,.extra-marker i.fas.fa-4x,.extra-marker i.far.fa-4x,.extra-marker i.fal.fa-4x{font-size:20px;margin-top:8px}  .extra-marker .svg-inline--fa.fa-5x,.extra-marker i.fa.fa-5x,.extra-marker i.fab.fa-5x,.extra-marker i.fas.fa-5x,.extra-marker i.far.fa-5x,.extra-marker i.fal.fa-5x{font-size:24px;margin-top:6px}  .extra-marker .fa-number:before{content:attr(number)}  .extra-marker i.glyphicon{margin-top:10px}  .extra-marker i.icon{margin-right:0;opacity:1}  .extra-marker-circle-red{background-position:0 0}  .extra-marker-circle-orange-dark{background-position:-36px 0}  .extra-marker-circle-orange{background-position:-72px 0}  .extra-marker-circle-yellow{background-position:-108px 0}  .extra-marker-circle-blue-dark{background-position:-144px 0}  .extra-marker-circle-blue{background-position:-180px 0}  .extra-marker-circle-cyan{background-position:-216px 0}  .extra-marker-circle-purple{background-position:-252px 0}  .extra-marker-circle-violet{background-position:-288px 0}  .extra-marker-circle-pink{background-position:-324px 0}  .extra-marker-circle-green-dark{background-position:-360px 0}  .extra-marker-circle-green{background-position:-396px 0}  .extra-marker-circle-green-light{background-position:-432px 0}  .extra-marker-circle-black{background-position:-468px 0}  .extra-marker-circle-white{background-position:-504px 0}  .extra-marker-square-red{background-position:0 -46px}  .extra-marker-square-orange-dark{background-position:-36px -46px}  .extra-marker-square-orange{background-position:-72px -46px}  .extra-marker-square-yellow{background-position:-108px -46px}  .extra-marker-square-blue-dark{background-position:-144px -46px}  .extra-marker-square-blue{background-position:-180px -46px}  .extra-marker-square-cyan{background-position:-216px -46px}  .extra-marker-square-purple{background-position:-252px -46px}  .extra-marker-square-violet{background-position:-288px -46px}  .extra-marker-square-pink{background-position:-324px -46px}  .extra-marker-square-green-dark{background-position:-360px -46px}  .extra-marker-square-green{background-position:-396px -46px}  .extra-marker-square-green-light{background-position:-432px -46px}  .extra-marker-square-black{background-position:-468px -46px}  .extra-marker-square-white{background-position:-504px -46px}  .extra-marker-star-red{background-position:0 -92px}  .extra-marker-star-orange-dark{background-position:-36px -92px}  .extra-marker-star-orange{background-position:-72px -92px}  .extra-marker-star-yellow{background-position:-108px -92px}  .extra-marker-star-blue-dark{background-position:-144px -92px}  .extra-marker-star-blue{background-position:-180px -92px}  .extra-marker-star-cyan{background-position:-216px -92px}  .extra-marker-star-purple{background-position:-252px -92px}  .extra-marker-star-violet{background-position:-288px -92px}  .extra-marker-star-pink{background-position:-324px -92px}  .extra-marker-star-green-dark{background-position:-360px -92px}  .extra-marker-star-green{background-position:-396px -92px}  .extra-marker-star-green-light{background-position:-432px -92px}  .extra-marker-star-black{background-position:-468px -92px}  .extra-marker-star-white{background-position:-504px -92px}  .extra-marker-penta-red{background-position:0 -138px}  .extra-marker-penta-orange-dark{background-position:-36px -138px}  .extra-marker-penta-orange{background-position:-72px -138px}  .extra-marker-penta-yellow{background-position:-108px -138px}  .extra-marker-penta-blue-dark{background-position:-144px -138px}  .extra-marker-penta-blue{background-position:-180px -138px}  .extra-marker-penta-cyan{background-position:-216px -138px}  .extra-marker-penta-purple{background-position:-252px -138px}  .extra-marker-penta-violet{background-position:-288px -138px}  .extra-marker-penta-pink{background-position:-324px -138px}  .extra-marker-penta-green-dark{background-position:-360px -138px}  .extra-marker-penta-green{background-position:-396px -138px}  .extra-marker-penta-green-light{background-position:-432px -138px}  .extra-marker-penta-black{background-position:-468px -138px}  .extra-marker-penta-white{background-position:-504px -138px}
\ No newline at end of file

From 0cea777616bea6afc26c69e6f49fe989424630b4 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 16:51:52 +0100
Subject: [PATCH 24/29] Put static assets in a separate directory so they can
 be delivered directly by nginx

---
 templates/add_spot.html                                |  2 +-
 templates/alerts.html                                  |  2 +-
 templates/bands.html                                   |  4 ++--
 templates/base.html                                    | 10 +++++-----
 templates/conditions.html                              |  2 +-
 templates/map.html                                     |  4 ++--
 templates/spots.html                                   |  4 ++--
 templates/status.html                                  |  2 +-
 webassets/img/flags/generate.py                        |  4 ++--
 .../vendor/css/leaflet-extra-markers-1.2.2.min.css     |  2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/templates/add_spot.html b/templates/add_spot.html
index c164a6b..683a68f 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1784994589"></script>
+<script src="/static/js/add-spot.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 832345b..8b93c5a 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1784994589"></script>
+<script src="/static/js/alerts.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 5ee8472..2d18a3a 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
-<script src="/static/js/bands.js?v=1784994589"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
+<script src="/static/js/bands.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 8e27dd3..22e6348 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1784994589" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1784994712" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/static/js/utils.js?v=1784994589"></script>
-<script src="/static/js/ui-ham.js?v=1784994589"></script>
-<script src="/static/js/geo.js?v=1784994589"></script>
-<script src="/static/js/common.js?v=1784994589"></script>
+<script src="/static/js/utils.js?v=1784994712"></script>
+<script src="/static/js/ui-ham.js?v=1784994712"></script>
+<script src="/static/js/geo.js?v=1784994712"></script>
+<script src="/static/js/common.js?v=1784994712"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index f260457..c047940 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1784994589"></script>
+<script src="/static/js/conditions.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index f0d6b19..05546b4 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -108,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
-<script src="/static/js/map.js?v=1784994589"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
+<script src="/static/js/map.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 37cdc48..92a7434 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
-<script src="/static/js/spots.js?v=1784994589"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
+<script src="/static/js/spots.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 9dfe3c5..d7ea03b 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1784994589"></script>
+<script src="/static/js/status.js?v=1784994712"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");
diff --git a/webassets/img/flags/generate.py b/webassets/img/flags/generate.py
index a31fa35..2d90252 100644
--- a/webassets/img/flags/generate.py
+++ b/webassets/img/flags/generate.py
@@ -4,10 +4,10 @@ from datetime import timedelta
 from PIL import Image, ImageDraw, ImageFont
 from requests_cache import CachedSession
 
-test = os.listdir("/")
+test = os.listdir("./")
 for item in test:
     if item.endswith(".png"):
-        os.remove(os.path.join("/", item))
+        os.remove(os.path.join("./", item))
 
 cache = CachedSession("/tmp/cache", expire_after=timedelta(days=30))
 data = cache.get("https://raw.githubusercontent.com/k0swe/dxcc-json/refs/heads/main/dxcc.json").json()
diff --git a/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css b/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
index d4fd797..d682791 100644
--- a/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
+++ b/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
@@ -5,4 +5,4 @@
  * https://github.com/coryasilva/Leaflet.ExtraMarkers/
  * @author coryasilva <https://github.com/coryasilva>
  * @version 1.2.1
- */.extra-marker{background:url("../img/markers_default.png") no-repeat 0 0;width:35px;height:46px;position:absolute;left:0;top:0;display:block;text-align:center}  .extra-marker-shadow{background:url("../img/markers_shadow.png") no-repeat 0 0;width:36px;height:16px}@media (min--moz-device-pixel-ratio:1.5),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){.extra-marker{background-image:url("../img/markers_default@2x.png");background-size:540px 184px}  .extra-marker-shadow{background-image:url("../img/markers_shadow@2x.png");background-size:35px 16px}}  .extra-marker.extra-marker-svg{background:none}  .extra-marker.extra-marker-svg .svg-inline--fa,.extra-marker.extra-marker-svg i{position:absolute;left:0;width:35px}  .extra-marker .svg-inline--fa,.extra-marker i{color:#fff;margin-top:7px;display:inline-block;font-size:14px}  .extra-marker .svg-inline--fa{margin-top:10px;background:none}  .extra-marker .svg-inline--fa,.extra-marker i.fa,.extra-marker i.fab,.extra-marker i.fas,.extra-marker i.far,.extra-marker i.fal{margin-top:10px}  .extra-marker .svg-inline--fa.fa-2x,.extra-marker i.fa.fa-2x,.extra-marker i.fab.fa-2x,.extra-marker i.fas.fa-2x,.extra-marker i.far.fa-2x,.extra-marker i.fal.fa-2x{font-size:16px;margin-top:9px}  .extra-marker .svg-inline--fa.fa-3x,.extra-marker i.fa.fa-3x,.extra-marker i.fab.fa-3x,.extra-marker i.fas.fa-3x,.extra-marker i.far.fa-3x,.extra-marker i.fal.fa-3x{font-size:18px;margin-top:9px}  .extra-marker .svg-inline--fa.fa-4x,.extra-marker i.fa.fa-4x,.extra-marker i.fab.fa-4x,.extra-marker i.fas.fa-4x,.extra-marker i.far.fa-4x,.extra-marker i.fal.fa-4x{font-size:20px;margin-top:8px}  .extra-marker .svg-inline--fa.fa-5x,.extra-marker i.fa.fa-5x,.extra-marker i.fab.fa-5x,.extra-marker i.fas.fa-5x,.extra-marker i.far.fa-5x,.extra-marker i.fal.fa-5x{font-size:24px;margin-top:6px}  .extra-marker .fa-number:before{content:attr(number)}  .extra-marker i.glyphicon{margin-top:10px}  .extra-marker i.icon{margin-right:0;opacity:1}  .extra-marker-circle-red{background-position:0 0}  .extra-marker-circle-orange-dark{background-position:-36px 0}  .extra-marker-circle-orange{background-position:-72px 0}  .extra-marker-circle-yellow{background-position:-108px 0}  .extra-marker-circle-blue-dark{background-position:-144px 0}  .extra-marker-circle-blue{background-position:-180px 0}  .extra-marker-circle-cyan{background-position:-216px 0}  .extra-marker-circle-purple{background-position:-252px 0}  .extra-marker-circle-violet{background-position:-288px 0}  .extra-marker-circle-pink{background-position:-324px 0}  .extra-marker-circle-green-dark{background-position:-360px 0}  .extra-marker-circle-green{background-position:-396px 0}  .extra-marker-circle-green-light{background-position:-432px 0}  .extra-marker-circle-black{background-position:-468px 0}  .extra-marker-circle-white{background-position:-504px 0}  .extra-marker-square-red{background-position:0 -46px}  .extra-marker-square-orange-dark{background-position:-36px -46px}  .extra-marker-square-orange{background-position:-72px -46px}  .extra-marker-square-yellow{background-position:-108px -46px}  .extra-marker-square-blue-dark{background-position:-144px -46px}  .extra-marker-square-blue{background-position:-180px -46px}  .extra-marker-square-cyan{background-position:-216px -46px}  .extra-marker-square-purple{background-position:-252px -46px}  .extra-marker-square-violet{background-position:-288px -46px}  .extra-marker-square-pink{background-position:-324px -46px}  .extra-marker-square-green-dark{background-position:-360px -46px}  .extra-marker-square-green{background-position:-396px -46px}  .extra-marker-square-green-light{background-position:-432px -46px}  .extra-marker-square-black{background-position:-468px -46px}  .extra-marker-square-white{background-position:-504px -46px}  .extra-marker-star-red{background-position:0 -92px}  .extra-marker-star-orange-dark{background-position:-36px -92px}  .extra-marker-star-orange{background-position:-72px -92px}  .extra-marker-star-yellow{background-position:-108px -92px}  .extra-marker-star-blue-dark{background-position:-144px -92px}  .extra-marker-star-blue{background-position:-180px -92px}  .extra-marker-star-cyan{background-position:-216px -92px}  .extra-marker-star-purple{background-position:-252px -92px}  .extra-marker-star-violet{background-position:-288px -92px}  .extra-marker-star-pink{background-position:-324px -92px}  .extra-marker-star-green-dark{background-position:-360px -92px}  .extra-marker-star-green{background-position:-396px -92px}  .extra-marker-star-green-light{background-position:-432px -92px}  .extra-marker-star-black{background-position:-468px -92px}  .extra-marker-star-white{background-position:-504px -92px}  .extra-marker-penta-red{background-position:0 -138px}  .extra-marker-penta-orange-dark{background-position:-36px -138px}  .extra-marker-penta-orange{background-position:-72px -138px}  .extra-marker-penta-yellow{background-position:-108px -138px}  .extra-marker-penta-blue-dark{background-position:-144px -138px}  .extra-marker-penta-blue{background-position:-180px -138px}  .extra-marker-penta-cyan{background-position:-216px -138px}  .extra-marker-penta-purple{background-position:-252px -138px}  .extra-marker-penta-violet{background-position:-288px -138px}  .extra-marker-penta-pink{background-position:-324px -138px}  .extra-marker-penta-green-dark{background-position:-360px -138px}  .extra-marker-penta-green{background-position:-396px -138px}  .extra-marker-penta-green-light{background-position:-432px -138px}  .extra-marker-penta-black{background-position:-468px -138px}  .extra-marker-penta-white{background-position:-504px -138px}
\ No newline at end of file
+ */.extra-marker{background:url("../img/markers_default.png") no-repeat 0 0;width:35px;height:46px;position:absolute;left:0;top:0;display:block;text-align:center}.extra-marker-shadow{background:url("../img/markers_shadow.png") no-repeat 0 0;width:36px;height:16px}@media (min--moz-device-pixel-ratio:1.5),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){.extra-marker{background-image:url("../img/markers_default@2x.png");background-size:540px 184px}.extra-marker-shadow{background-image:url("../img/markers_shadow@2x.png");background-size:35px 16px}}.extra-marker.extra-marker-svg{background:none}.extra-marker.extra-marker-svg .svg-inline--fa,.extra-marker.extra-marker-svg i{position:absolute;left:0;width:35px}.extra-marker .svg-inline--fa,.extra-marker i{color:#fff;margin-top:7px;display:inline-block;font-size:14px}.extra-marker .svg-inline--fa{margin-top:10px;background:none}.extra-marker .svg-inline--fa,.extra-marker i.fa,.extra-marker i.fab,.extra-marker i.fas,.extra-marker i.far,.extra-marker i.fal{margin-top:10px}.extra-marker .svg-inline--fa.fa-2x,.extra-marker i.fa.fa-2x,.extra-marker i.fab.fa-2x,.extra-marker i.fas.fa-2x,.extra-marker i.far.fa-2x,.extra-marker i.fal.fa-2x{font-size:16px;margin-top:9px}.extra-marker .svg-inline--fa.fa-3x,.extra-marker i.fa.fa-3x,.extra-marker i.fab.fa-3x,.extra-marker i.fas.fa-3x,.extra-marker i.far.fa-3x,.extra-marker i.fal.fa-3x{font-size:18px;margin-top:9px}.extra-marker .svg-inline--fa.fa-4x,.extra-marker i.fa.fa-4x,.extra-marker i.fab.fa-4x,.extra-marker i.fas.fa-4x,.extra-marker i.far.fa-4x,.extra-marker i.fal.fa-4x{font-size:20px;margin-top:8px}.extra-marker .svg-inline--fa.fa-5x,.extra-marker i.fa.fa-5x,.extra-marker i.fab.fa-5x,.extra-marker i.fas.fa-5x,.extra-marker i.far.fa-5x,.extra-marker i.fal.fa-5x{font-size:24px;margin-top:6px}.extra-marker .fa-number:before{content:attr(number)}.extra-marker i.glyphicon{margin-top:10px}.extra-marker i.icon{margin-right:0;opacity:1}.extra-marker-circle-red{background-position:0 0}.extra-marker-circle-orange-dark{background-position:-36px 0}.extra-marker-circle-orange{background-position:-72px 0}.extra-marker-circle-yellow{background-position:-108px 0}.extra-marker-circle-blue-dark{background-position:-144px 0}.extra-marker-circle-blue{background-position:-180px 0}.extra-marker-circle-cyan{background-position:-216px 0}.extra-marker-circle-purple{background-position:-252px 0}.extra-marker-circle-violet{background-position:-288px 0}.extra-marker-circle-pink{background-position:-324px 0}.extra-marker-circle-green-dark{background-position:-360px 0}.extra-marker-circle-green{background-position:-396px 0}.extra-marker-circle-green-light{background-position:-432px 0}.extra-marker-circle-black{background-position:-468px 0}.extra-marker-circle-white{background-position:-504px 0}.extra-marker-square-red{background-position:0 -46px}.extra-marker-square-orange-dark{background-position:-36px -46px}.extra-marker-square-orange{background-position:-72px -46px}.extra-marker-square-yellow{background-position:-108px -46px}.extra-marker-square-blue-dark{background-position:-144px -46px}.extra-marker-square-blue{background-position:-180px -46px}.extra-marker-square-cyan{background-position:-216px -46px}.extra-marker-square-purple{background-position:-252px -46px}.extra-marker-square-violet{background-position:-288px -46px}.extra-marker-square-pink{background-position:-324px -46px}.extra-marker-square-green-dark{background-position:-360px -46px}.extra-marker-square-green{background-position:-396px -46px}.extra-marker-square-green-light{background-position:-432px -46px}.extra-marker-square-black{background-position:-468px -46px}.extra-marker-square-white{background-position:-504px -46px}.extra-marker-star-red{background-position:0 -92px}.extra-marker-star-orange-dark{background-position:-36px -92px}.extra-marker-star-orange{background-position:-72px -92px}.extra-marker-star-yellow{background-position:-108px -92px}.extra-marker-star-blue-dark{background-position:-144px -92px}.extra-marker-star-blue{background-position:-180px -92px}.extra-marker-star-cyan{background-position:-216px -92px}.extra-marker-star-purple{background-position:-252px -92px}.extra-marker-star-violet{background-position:-288px -92px}.extra-marker-star-pink{background-position:-324px -92px}.extra-marker-star-green-dark{background-position:-360px -92px}.extra-marker-star-green{background-position:-396px -92px}.extra-marker-star-green-light{background-position:-432px -92px}.extra-marker-star-black{background-position:-468px -92px}.extra-marker-star-white{background-position:-504px -92px}.extra-marker-penta-red{background-position:0 -138px}.extra-marker-penta-orange-dark{background-position:-36px -138px}.extra-marker-penta-orange{background-position:-72px -138px}.extra-marker-penta-yellow{background-position:-108px -138px}.extra-marker-penta-blue-dark{background-position:-144px -138px}.extra-marker-penta-blue{background-position:-180px -138px}.extra-marker-penta-cyan{background-position:-216px -138px}.extra-marker-penta-purple{background-position:-252px -138px}.extra-marker-penta-violet{background-position:-288px -138px}.extra-marker-penta-pink{background-position:-324px -138px}.extra-marker-penta-green-dark{background-position:-360px -138px}.extra-marker-penta-green{background-position:-396px -138px}.extra-marker-penta-green-light{background-position:-432px -138px}.extra-marker-penta-black{background-position:-468px -138px}.extra-marker-penta-white{background-position:-504px -138px}
\ No newline at end of file

From ecab8d6d166e1fc82e176913d905aefe9c100475 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 17:01:21 +0100
Subject: [PATCH 25/29] Put static assets in a separate directory so they can
 be delivered directly by nginx

---
 templates/add_spot.html      |  2 +-
 templates/alerts.html        |  2 +-
 templates/api_only_home.html |  2 +-
 templates/bands.html         |  4 ++--
 templates/base.html          | 13 +++++++------
 templates/conditions.html    |  2 +-
 templates/map.html           |  8 ++++----
 templates/skeleton.html      |  4 ++--
 templates/spots.html         |  4 ++--
 templates/status.html        |  2 +-
 10 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/templates/add_spot.html b/templates/add_spot.html
index 683a68f..1bf5fae 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1784994712"></script>
+<script src="/static/js/add-spot.js?v=1784995281"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 8b93c5a..ddcd199 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1784994712"></script>
+<script src="/static/js/alerts.js?v=1784995281"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/api_only_home.html b/templates/api_only_home.html
index 11ed393..8d8782c 100644
--- a/templates/api_only_home.html
+++ b/templates/api_only_home.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
+<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 {% end %}
 {% block body %}
 <div class="container mt-5">
diff --git a/templates/bands.html b/templates/bands.html
index 2d18a3a..63c97d2 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
-<script src="/static/js/bands.js?v=1784994712"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784995281"></script>
+<script src="/static/js/bands.js?v=1784995281"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 22e6348..5732398 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1784994712" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1784995281" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/static/js/utils.js?v=1784994712"></script>
-<script src="/static/js/ui-ham.js?v=1784994712"></script>
-<script src="/static/js/geo.js?v=1784994712"></script>
-<script src="/static/js/common.js?v=1784994712"></script>
+<script src="/static/js/utils.js?v=1784995281"></script>
+<script src="/static/js/ui-ham.js?v=1784995281"></script>
+<script src="/static/js/geo.js?v=1784995281"></script>
+<script src="/static/js/common.js?v=1784995281"></script>
 {% end %}
 {% block body %}
 <div class="container">
@@ -87,7 +87,8 @@
     </div>
 </div>
 
-<div id="embeddedModeFooter" class="text-body-secondary pt-2 px-3 pb-1">Powered by <img src="/img/logo.png" class="logo"
+<div id="embeddedModeFooter" class="text-body-secondary pt-2 px-3 pb-1">Powered by <img src="/static/img/logo.png"
+                                                                                        class="logo"
                                                                                         width="96" height="30"
                                                                                         alt="Spothole"></div>
 
diff --git a/templates/conditions.html b/templates/conditions.html
index c047940..5c53370 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1784994712"></script>
+<script src="/static/js/conditions.js?v=1784995281"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 05546b4..874f70d 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -90,8 +90,8 @@
     </div>
 </div>
 
-<link rel="stylesheet" href="/vendor/css/leaflet-1.9.4.min.css">
-<link rel="stylesheet" href="/vendor/css/leaflet-extra-markers-1.2.2.min.css">
+<link rel="stylesheet" href="/static/vendor/css/leaflet-1.9.4.min.css">
+<link rel="stylesheet" href="/static/vendor/css/leaflet-extra-markers-1.2.2.min.css">
 <script src="/static/vendor/js/leaflet-1.9.4.min.js"></script>
 <script src="/static/vendor/js/oms-leaflet-0.2.7.min.js"></script>
 <script src="/static/vendor/js/leaflet-providers-2.0.0.js"></script>
@@ -108,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
-<script src="/static/js/map.js?v=1784994712"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784995281"></script>
+<script src="/static/js/map.js?v=1784995281"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/skeleton.html b/templates/skeleton.html
index 4efc3a4..73dc006 100644
--- a/templates/skeleton.html
+++ b/templates/skeleton.html
@@ -27,11 +27,11 @@
     <title>Spothole</title>
 
     <link rel="icon" type="image/png" href="/static/img/icon-512.png">
-    <link rel="apple-touch-icon" href="img/icon-512-pwa.png">
+    <link rel="apple-touch-icon" href="/static/img/icon-512-pwa.png">
     <link rel="alternate icon" type="image/png" href="/static/img/icon-192.png">
     <link rel="alternate icon" type="image/png" href="/static/img/icon-32.png">
     <link rel="alternate icon" type="image/png" href="/static/img/icon-16.png">
-    <link rel="alternate icon" type="image/x-icon" href="/favicon.ico">
+    <link rel="alternate icon" type="image/x-icon" href="/static/favicon.ico">
 
     <link rel="manifest" href="/manifest.webmanifest">
 
diff --git a/templates/spots.html b/templates/spots.html
index 92a7434..4d8ffe8 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
-<script src="/static/js/spots.js?v=1784994712"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784995281"></script>
+<script src="/static/js/spots.js?v=1784995281"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index d7ea03b..30de80a 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1784994712"></script>
+<script src="/static/js/status.js?v=1784995281"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From c3bcc1190d81c47bf8a6d78aaad8a7a8fd7f0137 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sun, 26 Jul 2026 07:47:38 +0100
Subject: [PATCH 26/29] Structure changes to match other projects and minor
 logging improvements

---
 .idea/spothole.iml                            |   2 +-
 README.md                                     |  24 +++++++++---------
 alertproviders/http_alert_provider.py         |   4 ++-
 core/lookup_helper.py                         |  12 ++++++++-
 core/sig_utils.py                             |   4 ++-
 server/handlers/quietstaticfilehandler.py     |  16 ------------
 server/webserver.py                           |   9 ++++---
 solarconditionsproviders/giroionosonde.py     |   5 +++-
 .../http_solar_conditions_provider.py         |   4 ++-
 solarconditionsproviders/kc2gprop.py          |   4 ++-
 spotproviders/hema.py                         |   4 ++-
 spotproviders/http_spot_provider.py           |   3 +++
 spotproviders/sota.py                         |   4 ++-
 {webassets => static}/apidocs/openapi.yml     |   0
 {webassets => static}/audio/ping.mp3          | Bin
 {webassets => static}/css/style.css           |   0
 {webassets => static}/favicon.ico             | Bin
 {webassets => static}/img/banner.png          | Bin
 {webassets => static}/img/flags/1.png         | Bin
 {webassets => static}/img/flags/10.png        | Bin
 {webassets => static}/img/flags/100.png       | Bin
 {webassets => static}/img/flags/101.png       | Bin
 {webassets => static}/img/flags/102.png       | Bin
 {webassets => static}/img/flags/103.png       | Bin
 {webassets => static}/img/flags/104.png       | Bin
 {webassets => static}/img/flags/105.png       | Bin
 {webassets => static}/img/flags/106.png       | Bin
 {webassets => static}/img/flags/107.png       | Bin
 {webassets => static}/img/flags/108.png       | Bin
 {webassets => static}/img/flags/109.png       | Bin
 {webassets => static}/img/flags/11.png        | Bin
 {webassets => static}/img/flags/110.png       | Bin
 {webassets => static}/img/flags/111.png       | Bin
 {webassets => static}/img/flags/112.png       | Bin
 {webassets => static}/img/flags/113.png       | Bin
 {webassets => static}/img/flags/114.png       | Bin
 {webassets => static}/img/flags/115.png       | Bin
 {webassets => static}/img/flags/116.png       | Bin
 {webassets => static}/img/flags/117.png       | Bin
 {webassets => static}/img/flags/118.png       | Bin
 {webassets => static}/img/flags/119.png       | Bin
 {webassets => static}/img/flags/12.png        | Bin
 {webassets => static}/img/flags/120.png       | Bin
 {webassets => static}/img/flags/122.png       | Bin
 {webassets => static}/img/flags/123.png       | Bin
 {webassets => static}/img/flags/124.png       | Bin
 {webassets => static}/img/flags/125.png       | Bin
 {webassets => static}/img/flags/126.png       | Bin
 {webassets => static}/img/flags/127.png       | Bin
 {webassets => static}/img/flags/128.png       | Bin
 {webassets => static}/img/flags/129.png       | Bin
 {webassets => static}/img/flags/13.png        | Bin
 {webassets => static}/img/flags/130.png       | Bin
 {webassets => static}/img/flags/131.png       | Bin
 {webassets => static}/img/flags/132.png       | Bin
 {webassets => static}/img/flags/133.png       | Bin
 {webassets => static}/img/flags/134.png       | Bin
 {webassets => static}/img/flags/135.png       | Bin
 {webassets => static}/img/flags/136.png       | Bin
 {webassets => static}/img/flags/137.png       | Bin
 {webassets => static}/img/flags/138.png       | Bin
 {webassets => static}/img/flags/139.png       | Bin
 {webassets => static}/img/flags/14.png        | Bin
 {webassets => static}/img/flags/140.png       | Bin
 {webassets => static}/img/flags/141.png       | Bin
 {webassets => static}/img/flags/142.png       | Bin
 {webassets => static}/img/flags/143.png       | Bin
 {webassets => static}/img/flags/144.png       | Bin
 {webassets => static}/img/flags/145.png       | Bin
 {webassets => static}/img/flags/146.png       | Bin
 {webassets => static}/img/flags/147.png       | Bin
 {webassets => static}/img/flags/148.png       | Bin
 {webassets => static}/img/flags/149.png       | Bin
 {webassets => static}/img/flags/15.png        | Bin
 {webassets => static}/img/flags/150.png       | Bin
 {webassets => static}/img/flags/151.png       | Bin
 {webassets => static}/img/flags/152.png       | Bin
 {webassets => static}/img/flags/153.png       | Bin
 {webassets => static}/img/flags/154.png       | Bin
 {webassets => static}/img/flags/155.png       | Bin
 {webassets => static}/img/flags/157.png       | Bin
 {webassets => static}/img/flags/158.png       | Bin
 {webassets => static}/img/flags/159.png       | Bin
 {webassets => static}/img/flags/16.png        | Bin
 {webassets => static}/img/flags/160.png       | Bin
 {webassets => static}/img/flags/161.png       | Bin
 {webassets => static}/img/flags/162.png       | Bin
 {webassets => static}/img/flags/163.png       | Bin
 {webassets => static}/img/flags/164.png       | Bin
 {webassets => static}/img/flags/165.png       | Bin
 {webassets => static}/img/flags/166.png       | Bin
 {webassets => static}/img/flags/167.png       | Bin
 {webassets => static}/img/flags/168.png       | Bin
 {webassets => static}/img/flags/169.png       | Bin
 {webassets => static}/img/flags/17.png        | Bin
 {webassets => static}/img/flags/170.png       | Bin
 {webassets => static}/img/flags/171.png       | Bin
 {webassets => static}/img/flags/172.png       | Bin
 {webassets => static}/img/flags/173.png       | Bin
 {webassets => static}/img/flags/174.png       | Bin
 {webassets => static}/img/flags/175.png       | Bin
 {webassets => static}/img/flags/176.png       | Bin
 {webassets => static}/img/flags/177.png       | Bin
 {webassets => static}/img/flags/178.png       | Bin
 {webassets => static}/img/flags/179.png       | Bin
 {webassets => static}/img/flags/18.png        | Bin
 {webassets => static}/img/flags/180.png       | Bin
 {webassets => static}/img/flags/181.png       | Bin
 {webassets => static}/img/flags/182.png       | Bin
 {webassets => static}/img/flags/183.png       | Bin
 {webassets => static}/img/flags/184.png       | Bin
 {webassets => static}/img/flags/185.png       | Bin
 {webassets => static}/img/flags/186.png       | Bin
 {webassets => static}/img/flags/187.png       | Bin
 {webassets => static}/img/flags/188.png       | Bin
 {webassets => static}/img/flags/189.png       | Bin
 {webassets => static}/img/flags/19.png        | Bin
 {webassets => static}/img/flags/190.png       | Bin
 {webassets => static}/img/flags/191.png       | Bin
 {webassets => static}/img/flags/192.png       | Bin
 {webassets => static}/img/flags/193.png       | Bin
 {webassets => static}/img/flags/194.png       | Bin
 {webassets => static}/img/flags/195.png       | Bin
 {webassets => static}/img/flags/196.png       | Bin
 {webassets => static}/img/flags/197.png       | Bin
 {webassets => static}/img/flags/198.png       | Bin
 {webassets => static}/img/flags/199.png       | Bin
 {webassets => static}/img/flags/2.png         | Bin
 {webassets => static}/img/flags/20.png        | Bin
 {webassets => static}/img/flags/200.png       | Bin
 {webassets => static}/img/flags/201.png       | Bin
 {webassets => static}/img/flags/202.png       | Bin
 {webassets => static}/img/flags/203.png       | Bin
 {webassets => static}/img/flags/204.png       | Bin
 {webassets => static}/img/flags/205.png       | Bin
 {webassets => static}/img/flags/206.png       | Bin
 {webassets => static}/img/flags/207.png       | Bin
 {webassets => static}/img/flags/208.png       | Bin
 {webassets => static}/img/flags/209.png       | Bin
 {webassets => static}/img/flags/21.png        | Bin
 {webassets => static}/img/flags/210.png       | Bin
 {webassets => static}/img/flags/211.png       | Bin
 {webassets => static}/img/flags/212.png       | Bin
 {webassets => static}/img/flags/213.png       | Bin
 {webassets => static}/img/flags/214.png       | Bin
 {webassets => static}/img/flags/215.png       | Bin
 {webassets => static}/img/flags/216.png       | Bin
 {webassets => static}/img/flags/217.png       | Bin
 {webassets => static}/img/flags/218.png       | Bin
 {webassets => static}/img/flags/219.png       | Bin
 {webassets => static}/img/flags/22.png        | Bin
 {webassets => static}/img/flags/220.png       | Bin
 {webassets => static}/img/flags/221.png       | Bin
 {webassets => static}/img/flags/222.png       | Bin
 {webassets => static}/img/flags/223.png       | Bin
 {webassets => static}/img/flags/224.png       | Bin
 {webassets => static}/img/flags/225.png       | Bin
 {webassets => static}/img/flags/226.png       | Bin
 {webassets => static}/img/flags/227.png       | Bin
 {webassets => static}/img/flags/228.png       | Bin
 {webassets => static}/img/flags/229.png       | Bin
 {webassets => static}/img/flags/23.png        | Bin
 {webassets => static}/img/flags/230.png       | Bin
 {webassets => static}/img/flags/231.png       | Bin
 {webassets => static}/img/flags/232.png       | Bin
 {webassets => static}/img/flags/233.png       | Bin
 {webassets => static}/img/flags/234.png       | Bin
 {webassets => static}/img/flags/235.png       | Bin
 {webassets => static}/img/flags/236.png       | Bin
 {webassets => static}/img/flags/237.png       | Bin
 {webassets => static}/img/flags/238.png       | Bin
 {webassets => static}/img/flags/239.png       | Bin
 {webassets => static}/img/flags/24.png        | Bin
 {webassets => static}/img/flags/240.png       | Bin
 {webassets => static}/img/flags/241.png       | Bin
 {webassets => static}/img/flags/242.png       | Bin
 {webassets => static}/img/flags/243.png       | Bin
 {webassets => static}/img/flags/244.png       | Bin
 {webassets => static}/img/flags/245.png       | Bin
 {webassets => static}/img/flags/246.png       | Bin
 {webassets => static}/img/flags/247.png       | Bin
 {webassets => static}/img/flags/248.png       | Bin
 {webassets => static}/img/flags/249.png       | Bin
 {webassets => static}/img/flags/25.png        | Bin
 {webassets => static}/img/flags/250.png       | Bin
 {webassets => static}/img/flags/251.png       | Bin
 {webassets => static}/img/flags/252.png       | Bin
 {webassets => static}/img/flags/253.png       | Bin
 {webassets => static}/img/flags/254.png       | Bin
 {webassets => static}/img/flags/255.png       | Bin
 {webassets => static}/img/flags/256.png       | Bin
 {webassets => static}/img/flags/257.png       | Bin
 {webassets => static}/img/flags/258.png       | Bin
 {webassets => static}/img/flags/259.png       | Bin
 {webassets => static}/img/flags/26.png        | Bin
 {webassets => static}/img/flags/260.png       | Bin
 {webassets => static}/img/flags/261.png       | Bin
 {webassets => static}/img/flags/262.png       | Bin
 {webassets => static}/img/flags/263.png       | Bin
 {webassets => static}/img/flags/264.png       | Bin
 {webassets => static}/img/flags/265.png       | Bin
 {webassets => static}/img/flags/266.png       | Bin
 {webassets => static}/img/flags/267.png       | Bin
 {webassets => static}/img/flags/268.png       | Bin
 {webassets => static}/img/flags/269.png       | Bin
 {webassets => static}/img/flags/27.png        | Bin
 {webassets => static}/img/flags/270.png       | Bin
 {webassets => static}/img/flags/271.png       | Bin
 {webassets => static}/img/flags/272.png       | Bin
 {webassets => static}/img/flags/273.png       | Bin
 {webassets => static}/img/flags/274.png       | Bin
 {webassets => static}/img/flags/275.png       | Bin
 {webassets => static}/img/flags/276.png       | Bin
 {webassets => static}/img/flags/277.png       | Bin
 {webassets => static}/img/flags/278.png       | Bin
 {webassets => static}/img/flags/279.png       | Bin
 {webassets => static}/img/flags/28.png        | Bin
 {webassets => static}/img/flags/280.png       | Bin
 {webassets => static}/img/flags/281.png       | Bin
 {webassets => static}/img/flags/282.png       | Bin
 {webassets => static}/img/flags/283.png       | Bin
 {webassets => static}/img/flags/284.png       | Bin
 {webassets => static}/img/flags/285.png       | Bin
 {webassets => static}/img/flags/286.png       | Bin
 {webassets => static}/img/flags/287.png       | Bin
 {webassets => static}/img/flags/288.png       | Bin
 {webassets => static}/img/flags/289.png       | Bin
 {webassets => static}/img/flags/29.png        | Bin
 {webassets => static}/img/flags/291.png       | Bin
 {webassets => static}/img/flags/292.png       | Bin
 {webassets => static}/img/flags/293.png       | Bin
 {webassets => static}/img/flags/294.png       | Bin
 {webassets => static}/img/flags/295.png       | Bin
 {webassets => static}/img/flags/296.png       | Bin
 {webassets => static}/img/flags/297.png       | Bin
 {webassets => static}/img/flags/298.png       | Bin
 {webassets => static}/img/flags/299.png       | Bin
 {webassets => static}/img/flags/3.png         | Bin
 {webassets => static}/img/flags/30.png        | Bin
 {webassets => static}/img/flags/301.png       | Bin
 {webassets => static}/img/flags/302.png       | Bin
 {webassets => static}/img/flags/303.png       | Bin
 {webassets => static}/img/flags/304.png       | Bin
 {webassets => static}/img/flags/305.png       | Bin
 {webassets => static}/img/flags/306.png       | Bin
 {webassets => static}/img/flags/307.png       | Bin
 {webassets => static}/img/flags/308.png       | Bin
 {webassets => static}/img/flags/309.png       | Bin
 {webassets => static}/img/flags/31.png        | Bin
 {webassets => static}/img/flags/312.png       | Bin
 {webassets => static}/img/flags/315.png       | Bin
 {webassets => static}/img/flags/318.png       | Bin
 {webassets => static}/img/flags/32.png        | Bin
 {webassets => static}/img/flags/321.png       | Bin
 {webassets => static}/img/flags/324.png       | Bin
 {webassets => static}/img/flags/327.png       | Bin
 {webassets => static}/img/flags/33.png        | Bin
 {webassets => static}/img/flags/330.png       | Bin
 {webassets => static}/img/flags/333.png       | Bin
 {webassets => static}/img/flags/336.png       | Bin
 {webassets => static}/img/flags/339.png       | Bin
 {webassets => static}/img/flags/34.png        | Bin
 {webassets => static}/img/flags/342.png       | Bin
 {webassets => static}/img/flags/344.png       | Bin
 {webassets => static}/img/flags/345.png       | Bin
 {webassets => static}/img/flags/348.png       | Bin
 {webassets => static}/img/flags/35.png        | Bin
 {webassets => static}/img/flags/354.png       | Bin
 {webassets => static}/img/flags/36.png        | Bin
 {webassets => static}/img/flags/363.png       | Bin
 {webassets => static}/img/flags/369.png       | Bin
 {webassets => static}/img/flags/37.png        | Bin
 {webassets => static}/img/flags/370.png       | Bin
 {webassets => static}/img/flags/372.png       | Bin
 {webassets => static}/img/flags/375.png       | Bin
 {webassets => static}/img/flags/376.png       | Bin
 {webassets => static}/img/flags/378.png       | Bin
 {webassets => static}/img/flags/379.png       | Bin
 {webassets => static}/img/flags/38.png        | Bin
 {webassets => static}/img/flags/381.png       | Bin
 {webassets => static}/img/flags/382.png       | Bin
 {webassets => static}/img/flags/384.png       | Bin
 {webassets => static}/img/flags/386.png       | Bin
 {webassets => static}/img/flags/387.png       | Bin
 {webassets => static}/img/flags/39.png        | Bin
 {webassets => static}/img/flags/390.png       | Bin
 {webassets => static}/img/flags/391.png       | Bin
 {webassets => static}/img/flags/4.png         | Bin
 {webassets => static}/img/flags/40.png        | Bin
 {webassets => static}/img/flags/400.png       | Bin
 {webassets => static}/img/flags/401.png       | Bin
 {webassets => static}/img/flags/402.png       | Bin
 {webassets => static}/img/flags/404.png       | Bin
 {webassets => static}/img/flags/406.png       | Bin
 {webassets => static}/img/flags/408.png       | Bin
 {webassets => static}/img/flags/409.png       | Bin
 {webassets => static}/img/flags/41.png        | Bin
 {webassets => static}/img/flags/410.png       | Bin
 {webassets => static}/img/flags/411.png       | Bin
 {webassets => static}/img/flags/412.png       | Bin
 {webassets => static}/img/flags/414.png       | Bin
 {webassets => static}/img/flags/416.png       | Bin
 {webassets => static}/img/flags/42.png        | Bin
 {webassets => static}/img/flags/420.png       | Bin
 {webassets => static}/img/flags/422.png       | Bin
 {webassets => static}/img/flags/424.png       | Bin
 {webassets => static}/img/flags/428.png       | Bin
 {webassets => static}/img/flags/43.png        | Bin
 {webassets => static}/img/flags/430.png       | Bin
 {webassets => static}/img/flags/432.png       | Bin
 {webassets => static}/img/flags/434.png       | Bin
 {webassets => static}/img/flags/436.png       | Bin
 {webassets => static}/img/flags/438.png       | Bin
 {webassets => static}/img/flags/44.png        | Bin
 {webassets => static}/img/flags/440.png       | Bin
 {webassets => static}/img/flags/442.png       | Bin
 {webassets => static}/img/flags/444.png       | Bin
 {webassets => static}/img/flags/446.png       | Bin
 {webassets => static}/img/flags/45.png        | Bin
 {webassets => static}/img/flags/450.png       | Bin
 {webassets => static}/img/flags/452.png       | Bin
 {webassets => static}/img/flags/453.png       | Bin
 {webassets => static}/img/flags/454.png       | Bin
 {webassets => static}/img/flags/456.png       | Bin
 {webassets => static}/img/flags/458.png       | Bin
 {webassets => static}/img/flags/46.png        | Bin
 {webassets => static}/img/flags/460.png       | Bin
 {webassets => static}/img/flags/462.png       | Bin
 {webassets => static}/img/flags/464.png       | Bin
 {webassets => static}/img/flags/466.png       | Bin
 {webassets => static}/img/flags/468.png       | Bin
 {webassets => static}/img/flags/47.png        | Bin
 {webassets => static}/img/flags/470.png       | Bin
 {webassets => static}/img/flags/474.png       | Bin
 {webassets => static}/img/flags/478.png       | Bin
 {webassets => static}/img/flags/48.png        | Bin
 {webassets => static}/img/flags/480.png       | Bin
 {webassets => static}/img/flags/482.png       | Bin
 {webassets => static}/img/flags/483.png       | Bin
 {webassets => static}/img/flags/488.png       | Bin
 {webassets => static}/img/flags/489.png       | Bin
 {webassets => static}/img/flags/49.png        | Bin
 {webassets => static}/img/flags/490.png       | Bin
 {webassets => static}/img/flags/492.png       | Bin
 {webassets => static}/img/flags/493.png       | Bin
 {webassets => static}/img/flags/497.png       | Bin
 {webassets => static}/img/flags/499.png       | Bin
 {webassets => static}/img/flags/5.png         | Bin
 {webassets => static}/img/flags/50.png        | Bin
 {webassets => static}/img/flags/501.png       | Bin
 {webassets => static}/img/flags/502.png       | Bin
 {webassets => static}/img/flags/503.png       | Bin
 {webassets => static}/img/flags/504.png       | Bin
 {webassets => static}/img/flags/505.png       | Bin
 {webassets => static}/img/flags/506.png       | Bin
 {webassets => static}/img/flags/507.png       | Bin
 {webassets => static}/img/flags/508.png       | Bin
 {webassets => static}/img/flags/509.png       | Bin
 {webassets => static}/img/flags/51.png        | Bin
 {webassets => static}/img/flags/510.png       | Bin
 {webassets => static}/img/flags/511.png       | Bin
 {webassets => static}/img/flags/512.png       | Bin
 {webassets => static}/img/flags/513.png       | Bin
 {webassets => static}/img/flags/514.png       | Bin
 {webassets => static}/img/flags/515.png       | Bin
 {webassets => static}/img/flags/516.png       | Bin
 {webassets => static}/img/flags/517.png       | Bin
 {webassets => static}/img/flags/518.png       | Bin
 {webassets => static}/img/flags/519.png       | Bin
 {webassets => static}/img/flags/52.png        | Bin
 {webassets => static}/img/flags/520.png       | Bin
 {webassets => static}/img/flags/521.png       | Bin
 {webassets => static}/img/flags/522.png       | Bin
 {webassets => static}/img/flags/53.png        | Bin
 {webassets => static}/img/flags/54.png        | Bin
 {webassets => static}/img/flags/55.png        | Bin
 {webassets => static}/img/flags/56.png        | Bin
 {webassets => static}/img/flags/57.png        | Bin
 {webassets => static}/img/flags/58.png        | Bin
 {webassets => static}/img/flags/59.png        | Bin
 {webassets => static}/img/flags/6.png         | Bin
 {webassets => static}/img/flags/60.png        | Bin
 {webassets => static}/img/flags/61.png        | Bin
 {webassets => static}/img/flags/62.png        | Bin
 {webassets => static}/img/flags/63.png        | Bin
 {webassets => static}/img/flags/64.png        | Bin
 {webassets => static}/img/flags/65.png        | Bin
 {webassets => static}/img/flags/66.png        | Bin
 {webassets => static}/img/flags/67.png        | Bin
 {webassets => static}/img/flags/68.png        | Bin
 {webassets => static}/img/flags/69.png        | Bin
 {webassets => static}/img/flags/7.png         | Bin
 {webassets => static}/img/flags/70.png        | Bin
 {webassets => static}/img/flags/71.png        | Bin
 {webassets => static}/img/flags/72.png        | Bin
 {webassets => static}/img/flags/74.png        | Bin
 {webassets => static}/img/flags/75.png        | Bin
 {webassets => static}/img/flags/76.png        | Bin
 {webassets => static}/img/flags/77.png        | Bin
 {webassets => static}/img/flags/78.png        | Bin
 {webassets => static}/img/flags/79.png        | Bin
 {webassets => static}/img/flags/8.png         | Bin
 {webassets => static}/img/flags/80.png        | Bin
 {webassets => static}/img/flags/81.png        | Bin
 {webassets => static}/img/flags/82.png        | Bin
 {webassets => static}/img/flags/84.png        | Bin
 {webassets => static}/img/flags/85.png        | Bin
 {webassets => static}/img/flags/86.png        | Bin
 {webassets => static}/img/flags/88.png        | Bin
 {webassets => static}/img/flags/89.png        | Bin
 {webassets => static}/img/flags/9.png         | Bin
 {webassets => static}/img/flags/90.png        | Bin
 {webassets => static}/img/flags/91.png        | Bin
 {webassets => static}/img/flags/93.png        | Bin
 {webassets => static}/img/flags/94.png        | Bin
 {webassets => static}/img/flags/95.png        | Bin
 {webassets => static}/img/flags/96.png        | Bin
 {webassets => static}/img/flags/97.png        | Bin
 {webassets => static}/img/flags/98.png        | Bin
 {webassets => static}/img/flags/99.png        | Bin
 {webassets => static}/img/flags/999.png       | Bin
 {webassets => static}/img/flags/generate.py   |   0
 {webassets => static}/img/icon-16.png         | Bin
 {webassets => static}/img/icon-192-pwa.png    | Bin
 {webassets => static}/img/icon-192.png        | Bin
 {webassets => static}/img/icon-32.png         | Bin
 {webassets => static}/img/icon-512-pwa.png    | Bin
 {webassets => static}/img/icon-512.png        | Bin
 {webassets => static}/img/logo.png            | Bin
 {webassets => static}/js/add-spot.js          |   0
 {webassets => static}/js/alerts.js            |   0
 {webassets => static}/js/bands.js             |   0
 {webassets => static}/js/common.js            |   0
 {webassets => static}/js/conditions.js        |   0
 {webassets => static}/js/geo.js               |   0
 {webassets => static}/js/map.js               |   0
 {webassets => static}/js/spots.js             |   0
 {webassets => static}/js/spotsbandsandmap.js  |   0
 {webassets => static}/js/status.js            |   0
 {webassets => static}/js/ui-ham.js            |   0
 {webassets => static}/js/utils.js             |   0
 {webassets => static}/service-worker.js       |   0
 .../vendor/css/bootstrap-5.3.8.min.css        |   0
 .../vendor/css/fontawesome-6.7.2.min.css      |   0
 .../vendor/css/images/layers-2x.png           | Bin
 .../vendor/css/images/layers.png              | Bin
 .../vendor/css/images/marker-icon-2x.png      | Bin
 .../vendor/css/images/marker-icon.png         | Bin
 .../vendor/css/images/marker-shadow.png       | Bin
 .../vendor/css/leaflet-1.9.4.min.css          |   0
 .../css/leaflet-extra-markers-1.2.2.min.css   |   0
 .../vendor/css/solid-6.7.2.min.css            |   0
 .../vendor/img/markers_default.png            | Bin
 .../vendor/img/markers_default@2x.png         | Bin
 .../vendor/img/markers_shadow.png             | Bin
 .../vendor/img/markers_shadow@2x.png          | Bin
 .../vendor/js/bootstrap-5.3.8.bundle.min.js   |   0
 .../vendor/js/chart-4.4.9.umd.min.js          |   0
 .../vendor/js/jquery-3.7.1.min.js             |   0
 .../vendor/js/leaflet-1.9.4.min.js            |   0
 .../vendor/js/leaflet-cqzones.js              |   0
 .../js/leaflet-extra-markers-1.2.2.min.js     |   0
 .../js/leaflet-geodesic-2.7.2.umd.min.js      |   0
 .../vendor/js/leaflet-ituzones.js             |   0
 .../vendor/js/leaflet-maidenhead.js           |   0
 .../vendor/js/leaflet-providers-2.0.0.js      |   0
 .../vendor/js/leaflet-terminator-1.1.0.min.js |   0
 .../vendor/js/leaflet-vectorgrid-1.3.0.js     |   0
 .../js/leaflet-workedallbritainireland.js     |   0
 .../vendor/js/moment-2.29.4.min.js            |   0
 .../vendor/js/oms-leaflet-0.2.7.min.js        |   0
 .../vendor/js/text-image-0.7.0.js             |   0
 .../vendor/js/tinycolor2-1.6.0.min.js         |   0
 .../vendor/webfonts/fa-solid-900.ttf          | Bin
 .../vendor/webfonts/fa-solid-900.woff2        | Bin
 templates/add_spot.html                       |   2 +-
 templates/alerts.html                         |   2 +-
 templates/bands.html                          |   4 +--
 templates/base.html                           |  10 ++++----
 templates/conditions.html                     |   2 +-
 templates/map.html                            |   4 +--
 templates/spots.html                          |   4 +--
 templates/status.html                         |   2 +-
 483 files changed, 70 insertions(+), 55 deletions(-)
 delete mode 100644 server/handlers/quietstaticfilehandler.py
 rename {webassets => static}/apidocs/openapi.yml (100%)
 rename {webassets => static}/audio/ping.mp3 (100%)
 rename {webassets => static}/css/style.css (100%)
 rename {webassets => static}/favicon.ico (100%)
 rename {webassets => static}/img/banner.png (100%)
 rename {webassets => static}/img/flags/1.png (100%)
 rename {webassets => static}/img/flags/10.png (100%)
 rename {webassets => static}/img/flags/100.png (100%)
 rename {webassets => static}/img/flags/101.png (100%)
 rename {webassets => static}/img/flags/102.png (100%)
 rename {webassets => static}/img/flags/103.png (100%)
 rename {webassets => static}/img/flags/104.png (100%)
 rename {webassets => static}/img/flags/105.png (100%)
 rename {webassets => static}/img/flags/106.png (100%)
 rename {webassets => static}/img/flags/107.png (100%)
 rename {webassets => static}/img/flags/108.png (100%)
 rename {webassets => static}/img/flags/109.png (100%)
 rename {webassets => static}/img/flags/11.png (100%)
 rename {webassets => static}/img/flags/110.png (100%)
 rename {webassets => static}/img/flags/111.png (100%)
 rename {webassets => static}/img/flags/112.png (100%)
 rename {webassets => static}/img/flags/113.png (100%)
 rename {webassets => static}/img/flags/114.png (100%)
 rename {webassets => static}/img/flags/115.png (100%)
 rename {webassets => static}/img/flags/116.png (100%)
 rename {webassets => static}/img/flags/117.png (100%)
 rename {webassets => static}/img/flags/118.png (100%)
 rename {webassets => static}/img/flags/119.png (100%)
 rename {webassets => static}/img/flags/12.png (100%)
 rename {webassets => static}/img/flags/120.png (100%)
 rename {webassets => static}/img/flags/122.png (100%)
 rename {webassets => static}/img/flags/123.png (100%)
 rename {webassets => static}/img/flags/124.png (100%)
 rename {webassets => static}/img/flags/125.png (100%)
 rename {webassets => static}/img/flags/126.png (100%)
 rename {webassets => static}/img/flags/127.png (100%)
 rename {webassets => static}/img/flags/128.png (100%)
 rename {webassets => static}/img/flags/129.png (100%)
 rename {webassets => static}/img/flags/13.png (100%)
 rename {webassets => static}/img/flags/130.png (100%)
 rename {webassets => static}/img/flags/131.png (100%)
 rename {webassets => static}/img/flags/132.png (100%)
 rename {webassets => static}/img/flags/133.png (100%)
 rename {webassets => static}/img/flags/134.png (100%)
 rename {webassets => static}/img/flags/135.png (100%)
 rename {webassets => static}/img/flags/136.png (100%)
 rename {webassets => static}/img/flags/137.png (100%)
 rename {webassets => static}/img/flags/138.png (100%)
 rename {webassets => static}/img/flags/139.png (100%)
 rename {webassets => static}/img/flags/14.png (100%)
 rename {webassets => static}/img/flags/140.png (100%)
 rename {webassets => static}/img/flags/141.png (100%)
 rename {webassets => static}/img/flags/142.png (100%)
 rename {webassets => static}/img/flags/143.png (100%)
 rename {webassets => static}/img/flags/144.png (100%)
 rename {webassets => static}/img/flags/145.png (100%)
 rename {webassets => static}/img/flags/146.png (100%)
 rename {webassets => static}/img/flags/147.png (100%)
 rename {webassets => static}/img/flags/148.png (100%)
 rename {webassets => static}/img/flags/149.png (100%)
 rename {webassets => static}/img/flags/15.png (100%)
 rename {webassets => static}/img/flags/150.png (100%)
 rename {webassets => static}/img/flags/151.png (100%)
 rename {webassets => static}/img/flags/152.png (100%)
 rename {webassets => static}/img/flags/153.png (100%)
 rename {webassets => static}/img/flags/154.png (100%)
 rename {webassets => static}/img/flags/155.png (100%)
 rename {webassets => static}/img/flags/157.png (100%)
 rename {webassets => static}/img/flags/158.png (100%)
 rename {webassets => static}/img/flags/159.png (100%)
 rename {webassets => static}/img/flags/16.png (100%)
 rename {webassets => static}/img/flags/160.png (100%)
 rename {webassets => static}/img/flags/161.png (100%)
 rename {webassets => static}/img/flags/162.png (100%)
 rename {webassets => static}/img/flags/163.png (100%)
 rename {webassets => static}/img/flags/164.png (100%)
 rename {webassets => static}/img/flags/165.png (100%)
 rename {webassets => static}/img/flags/166.png (100%)
 rename {webassets => static}/img/flags/167.png (100%)
 rename {webassets => static}/img/flags/168.png (100%)
 rename {webassets => static}/img/flags/169.png (100%)
 rename {webassets => static}/img/flags/17.png (100%)
 rename {webassets => static}/img/flags/170.png (100%)
 rename {webassets => static}/img/flags/171.png (100%)
 rename {webassets => static}/img/flags/172.png (100%)
 rename {webassets => static}/img/flags/173.png (100%)
 rename {webassets => static}/img/flags/174.png (100%)
 rename {webassets => static}/img/flags/175.png (100%)
 rename {webassets => static}/img/flags/176.png (100%)
 rename {webassets => static}/img/flags/177.png (100%)
 rename {webassets => static}/img/flags/178.png (100%)
 rename {webassets => static}/img/flags/179.png (100%)
 rename {webassets => static}/img/flags/18.png (100%)
 rename {webassets => static}/img/flags/180.png (100%)
 rename {webassets => static}/img/flags/181.png (100%)
 rename {webassets => static}/img/flags/182.png (100%)
 rename {webassets => static}/img/flags/183.png (100%)
 rename {webassets => static}/img/flags/184.png (100%)
 rename {webassets => static}/img/flags/185.png (100%)
 rename {webassets => static}/img/flags/186.png (100%)
 rename {webassets => static}/img/flags/187.png (100%)
 rename {webassets => static}/img/flags/188.png (100%)
 rename {webassets => static}/img/flags/189.png (100%)
 rename {webassets => static}/img/flags/19.png (100%)
 rename {webassets => static}/img/flags/190.png (100%)
 rename {webassets => static}/img/flags/191.png (100%)
 rename {webassets => static}/img/flags/192.png (100%)
 rename {webassets => static}/img/flags/193.png (100%)
 rename {webassets => static}/img/flags/194.png (100%)
 rename {webassets => static}/img/flags/195.png (100%)
 rename {webassets => static}/img/flags/196.png (100%)
 rename {webassets => static}/img/flags/197.png (100%)
 rename {webassets => static}/img/flags/198.png (100%)
 rename {webassets => static}/img/flags/199.png (100%)
 rename {webassets => static}/img/flags/2.png (100%)
 rename {webassets => static}/img/flags/20.png (100%)
 rename {webassets => static}/img/flags/200.png (100%)
 rename {webassets => static}/img/flags/201.png (100%)
 rename {webassets => static}/img/flags/202.png (100%)
 rename {webassets => static}/img/flags/203.png (100%)
 rename {webassets => static}/img/flags/204.png (100%)
 rename {webassets => static}/img/flags/205.png (100%)
 rename {webassets => static}/img/flags/206.png (100%)
 rename {webassets => static}/img/flags/207.png (100%)
 rename {webassets => static}/img/flags/208.png (100%)
 rename {webassets => static}/img/flags/209.png (100%)
 rename {webassets => static}/img/flags/21.png (100%)
 rename {webassets => static}/img/flags/210.png (100%)
 rename {webassets => static}/img/flags/211.png (100%)
 rename {webassets => static}/img/flags/212.png (100%)
 rename {webassets => static}/img/flags/213.png (100%)
 rename {webassets => static}/img/flags/214.png (100%)
 rename {webassets => static}/img/flags/215.png (100%)
 rename {webassets => static}/img/flags/216.png (100%)
 rename {webassets => static}/img/flags/217.png (100%)
 rename {webassets => static}/img/flags/218.png (100%)
 rename {webassets => static}/img/flags/219.png (100%)
 rename {webassets => static}/img/flags/22.png (100%)
 rename {webassets => static}/img/flags/220.png (100%)
 rename {webassets => static}/img/flags/221.png (100%)
 rename {webassets => static}/img/flags/222.png (100%)
 rename {webassets => static}/img/flags/223.png (100%)
 rename {webassets => static}/img/flags/224.png (100%)
 rename {webassets => static}/img/flags/225.png (100%)
 rename {webassets => static}/img/flags/226.png (100%)
 rename {webassets => static}/img/flags/227.png (100%)
 rename {webassets => static}/img/flags/228.png (100%)
 rename {webassets => static}/img/flags/229.png (100%)
 rename {webassets => static}/img/flags/23.png (100%)
 rename {webassets => static}/img/flags/230.png (100%)
 rename {webassets => static}/img/flags/231.png (100%)
 rename {webassets => static}/img/flags/232.png (100%)
 rename {webassets => static}/img/flags/233.png (100%)
 rename {webassets => static}/img/flags/234.png (100%)
 rename {webassets => static}/img/flags/235.png (100%)
 rename {webassets => static}/img/flags/236.png (100%)
 rename {webassets => static}/img/flags/237.png (100%)
 rename {webassets => static}/img/flags/238.png (100%)
 rename {webassets => static}/img/flags/239.png (100%)
 rename {webassets => static}/img/flags/24.png (100%)
 rename {webassets => static}/img/flags/240.png (100%)
 rename {webassets => static}/img/flags/241.png (100%)
 rename {webassets => static}/img/flags/242.png (100%)
 rename {webassets => static}/img/flags/243.png (100%)
 rename {webassets => static}/img/flags/244.png (100%)
 rename {webassets => static}/img/flags/245.png (100%)
 rename {webassets => static}/img/flags/246.png (100%)
 rename {webassets => static}/img/flags/247.png (100%)
 rename {webassets => static}/img/flags/248.png (100%)
 rename {webassets => static}/img/flags/249.png (100%)
 rename {webassets => static}/img/flags/25.png (100%)
 rename {webassets => static}/img/flags/250.png (100%)
 rename {webassets => static}/img/flags/251.png (100%)
 rename {webassets => static}/img/flags/252.png (100%)
 rename {webassets => static}/img/flags/253.png (100%)
 rename {webassets => static}/img/flags/254.png (100%)
 rename {webassets => static}/img/flags/255.png (100%)
 rename {webassets => static}/img/flags/256.png (100%)
 rename {webassets => static}/img/flags/257.png (100%)
 rename {webassets => static}/img/flags/258.png (100%)
 rename {webassets => static}/img/flags/259.png (100%)
 rename {webassets => static}/img/flags/26.png (100%)
 rename {webassets => static}/img/flags/260.png (100%)
 rename {webassets => static}/img/flags/261.png (100%)
 rename {webassets => static}/img/flags/262.png (100%)
 rename {webassets => static}/img/flags/263.png (100%)
 rename {webassets => static}/img/flags/264.png (100%)
 rename {webassets => static}/img/flags/265.png (100%)
 rename {webassets => static}/img/flags/266.png (100%)
 rename {webassets => static}/img/flags/267.png (100%)
 rename {webassets => static}/img/flags/268.png (100%)
 rename {webassets => static}/img/flags/269.png (100%)
 rename {webassets => static}/img/flags/27.png (100%)
 rename {webassets => static}/img/flags/270.png (100%)
 rename {webassets => static}/img/flags/271.png (100%)
 rename {webassets => static}/img/flags/272.png (100%)
 rename {webassets => static}/img/flags/273.png (100%)
 rename {webassets => static}/img/flags/274.png (100%)
 rename {webassets => static}/img/flags/275.png (100%)
 rename {webassets => static}/img/flags/276.png (100%)
 rename {webassets => static}/img/flags/277.png (100%)
 rename {webassets => static}/img/flags/278.png (100%)
 rename {webassets => static}/img/flags/279.png (100%)
 rename {webassets => static}/img/flags/28.png (100%)
 rename {webassets => static}/img/flags/280.png (100%)
 rename {webassets => static}/img/flags/281.png (100%)
 rename {webassets => static}/img/flags/282.png (100%)
 rename {webassets => static}/img/flags/283.png (100%)
 rename {webassets => static}/img/flags/284.png (100%)
 rename {webassets => static}/img/flags/285.png (100%)
 rename {webassets => static}/img/flags/286.png (100%)
 rename {webassets => static}/img/flags/287.png (100%)
 rename {webassets => static}/img/flags/288.png (100%)
 rename {webassets => static}/img/flags/289.png (100%)
 rename {webassets => static}/img/flags/29.png (100%)
 rename {webassets => static}/img/flags/291.png (100%)
 rename {webassets => static}/img/flags/292.png (100%)
 rename {webassets => static}/img/flags/293.png (100%)
 rename {webassets => static}/img/flags/294.png (100%)
 rename {webassets => static}/img/flags/295.png (100%)
 rename {webassets => static}/img/flags/296.png (100%)
 rename {webassets => static}/img/flags/297.png (100%)
 rename {webassets => static}/img/flags/298.png (100%)
 rename {webassets => static}/img/flags/299.png (100%)
 rename {webassets => static}/img/flags/3.png (100%)
 rename {webassets => static}/img/flags/30.png (100%)
 rename {webassets => static}/img/flags/301.png (100%)
 rename {webassets => static}/img/flags/302.png (100%)
 rename {webassets => static}/img/flags/303.png (100%)
 rename {webassets => static}/img/flags/304.png (100%)
 rename {webassets => static}/img/flags/305.png (100%)
 rename {webassets => static}/img/flags/306.png (100%)
 rename {webassets => static}/img/flags/307.png (100%)
 rename {webassets => static}/img/flags/308.png (100%)
 rename {webassets => static}/img/flags/309.png (100%)
 rename {webassets => static}/img/flags/31.png (100%)
 rename {webassets => static}/img/flags/312.png (100%)
 rename {webassets => static}/img/flags/315.png (100%)
 rename {webassets => static}/img/flags/318.png (100%)
 rename {webassets => static}/img/flags/32.png (100%)
 rename {webassets => static}/img/flags/321.png (100%)
 rename {webassets => static}/img/flags/324.png (100%)
 rename {webassets => static}/img/flags/327.png (100%)
 rename {webassets => static}/img/flags/33.png (100%)
 rename {webassets => static}/img/flags/330.png (100%)
 rename {webassets => static}/img/flags/333.png (100%)
 rename {webassets => static}/img/flags/336.png (100%)
 rename {webassets => static}/img/flags/339.png (100%)
 rename {webassets => static}/img/flags/34.png (100%)
 rename {webassets => static}/img/flags/342.png (100%)
 rename {webassets => static}/img/flags/344.png (100%)
 rename {webassets => static}/img/flags/345.png (100%)
 rename {webassets => static}/img/flags/348.png (100%)
 rename {webassets => static}/img/flags/35.png (100%)
 rename {webassets => static}/img/flags/354.png (100%)
 rename {webassets => static}/img/flags/36.png (100%)
 rename {webassets => static}/img/flags/363.png (100%)
 rename {webassets => static}/img/flags/369.png (100%)
 rename {webassets => static}/img/flags/37.png (100%)
 rename {webassets => static}/img/flags/370.png (100%)
 rename {webassets => static}/img/flags/372.png (100%)
 rename {webassets => static}/img/flags/375.png (100%)
 rename {webassets => static}/img/flags/376.png (100%)
 rename {webassets => static}/img/flags/378.png (100%)
 rename {webassets => static}/img/flags/379.png (100%)
 rename {webassets => static}/img/flags/38.png (100%)
 rename {webassets => static}/img/flags/381.png (100%)
 rename {webassets => static}/img/flags/382.png (100%)
 rename {webassets => static}/img/flags/384.png (100%)
 rename {webassets => static}/img/flags/386.png (100%)
 rename {webassets => static}/img/flags/387.png (100%)
 rename {webassets => static}/img/flags/39.png (100%)
 rename {webassets => static}/img/flags/390.png (100%)
 rename {webassets => static}/img/flags/391.png (100%)
 rename {webassets => static}/img/flags/4.png (100%)
 rename {webassets => static}/img/flags/40.png (100%)
 rename {webassets => static}/img/flags/400.png (100%)
 rename {webassets => static}/img/flags/401.png (100%)
 rename {webassets => static}/img/flags/402.png (100%)
 rename {webassets => static}/img/flags/404.png (100%)
 rename {webassets => static}/img/flags/406.png (100%)
 rename {webassets => static}/img/flags/408.png (100%)
 rename {webassets => static}/img/flags/409.png (100%)
 rename {webassets => static}/img/flags/41.png (100%)
 rename {webassets => static}/img/flags/410.png (100%)
 rename {webassets => static}/img/flags/411.png (100%)
 rename {webassets => static}/img/flags/412.png (100%)
 rename {webassets => static}/img/flags/414.png (100%)
 rename {webassets => static}/img/flags/416.png (100%)
 rename {webassets => static}/img/flags/42.png (100%)
 rename {webassets => static}/img/flags/420.png (100%)
 rename {webassets => static}/img/flags/422.png (100%)
 rename {webassets => static}/img/flags/424.png (100%)
 rename {webassets => static}/img/flags/428.png (100%)
 rename {webassets => static}/img/flags/43.png (100%)
 rename {webassets => static}/img/flags/430.png (100%)
 rename {webassets => static}/img/flags/432.png (100%)
 rename {webassets => static}/img/flags/434.png (100%)
 rename {webassets => static}/img/flags/436.png (100%)
 rename {webassets => static}/img/flags/438.png (100%)
 rename {webassets => static}/img/flags/44.png (100%)
 rename {webassets => static}/img/flags/440.png (100%)
 rename {webassets => static}/img/flags/442.png (100%)
 rename {webassets => static}/img/flags/444.png (100%)
 rename {webassets => static}/img/flags/446.png (100%)
 rename {webassets => static}/img/flags/45.png (100%)
 rename {webassets => static}/img/flags/450.png (100%)
 rename {webassets => static}/img/flags/452.png (100%)
 rename {webassets => static}/img/flags/453.png (100%)
 rename {webassets => static}/img/flags/454.png (100%)
 rename {webassets => static}/img/flags/456.png (100%)
 rename {webassets => static}/img/flags/458.png (100%)
 rename {webassets => static}/img/flags/46.png (100%)
 rename {webassets => static}/img/flags/460.png (100%)
 rename {webassets => static}/img/flags/462.png (100%)
 rename {webassets => static}/img/flags/464.png (100%)
 rename {webassets => static}/img/flags/466.png (100%)
 rename {webassets => static}/img/flags/468.png (100%)
 rename {webassets => static}/img/flags/47.png (100%)
 rename {webassets => static}/img/flags/470.png (100%)
 rename {webassets => static}/img/flags/474.png (100%)
 rename {webassets => static}/img/flags/478.png (100%)
 rename {webassets => static}/img/flags/48.png (100%)
 rename {webassets => static}/img/flags/480.png (100%)
 rename {webassets => static}/img/flags/482.png (100%)
 rename {webassets => static}/img/flags/483.png (100%)
 rename {webassets => static}/img/flags/488.png (100%)
 rename {webassets => static}/img/flags/489.png (100%)
 rename {webassets => static}/img/flags/49.png (100%)
 rename {webassets => static}/img/flags/490.png (100%)
 rename {webassets => static}/img/flags/492.png (100%)
 rename {webassets => static}/img/flags/493.png (100%)
 rename {webassets => static}/img/flags/497.png (100%)
 rename {webassets => static}/img/flags/499.png (100%)
 rename {webassets => static}/img/flags/5.png (100%)
 rename {webassets => static}/img/flags/50.png (100%)
 rename {webassets => static}/img/flags/501.png (100%)
 rename {webassets => static}/img/flags/502.png (100%)
 rename {webassets => static}/img/flags/503.png (100%)
 rename {webassets => static}/img/flags/504.png (100%)
 rename {webassets => static}/img/flags/505.png (100%)
 rename {webassets => static}/img/flags/506.png (100%)
 rename {webassets => static}/img/flags/507.png (100%)
 rename {webassets => static}/img/flags/508.png (100%)
 rename {webassets => static}/img/flags/509.png (100%)
 rename {webassets => static}/img/flags/51.png (100%)
 rename {webassets => static}/img/flags/510.png (100%)
 rename {webassets => static}/img/flags/511.png (100%)
 rename {webassets => static}/img/flags/512.png (100%)
 rename {webassets => static}/img/flags/513.png (100%)
 rename {webassets => static}/img/flags/514.png (100%)
 rename {webassets => static}/img/flags/515.png (100%)
 rename {webassets => static}/img/flags/516.png (100%)
 rename {webassets => static}/img/flags/517.png (100%)
 rename {webassets => static}/img/flags/518.png (100%)
 rename {webassets => static}/img/flags/519.png (100%)
 rename {webassets => static}/img/flags/52.png (100%)
 rename {webassets => static}/img/flags/520.png (100%)
 rename {webassets => static}/img/flags/521.png (100%)
 rename {webassets => static}/img/flags/522.png (100%)
 rename {webassets => static}/img/flags/53.png (100%)
 rename {webassets => static}/img/flags/54.png (100%)
 rename {webassets => static}/img/flags/55.png (100%)
 rename {webassets => static}/img/flags/56.png (100%)
 rename {webassets => static}/img/flags/57.png (100%)
 rename {webassets => static}/img/flags/58.png (100%)
 rename {webassets => static}/img/flags/59.png (100%)
 rename {webassets => static}/img/flags/6.png (100%)
 rename {webassets => static}/img/flags/60.png (100%)
 rename {webassets => static}/img/flags/61.png (100%)
 rename {webassets => static}/img/flags/62.png (100%)
 rename {webassets => static}/img/flags/63.png (100%)
 rename {webassets => static}/img/flags/64.png (100%)
 rename {webassets => static}/img/flags/65.png (100%)
 rename {webassets => static}/img/flags/66.png (100%)
 rename {webassets => static}/img/flags/67.png (100%)
 rename {webassets => static}/img/flags/68.png (100%)
 rename {webassets => static}/img/flags/69.png (100%)
 rename {webassets => static}/img/flags/7.png (100%)
 rename {webassets => static}/img/flags/70.png (100%)
 rename {webassets => static}/img/flags/71.png (100%)
 rename {webassets => static}/img/flags/72.png (100%)
 rename {webassets => static}/img/flags/74.png (100%)
 rename {webassets => static}/img/flags/75.png (100%)
 rename {webassets => static}/img/flags/76.png (100%)
 rename {webassets => static}/img/flags/77.png (100%)
 rename {webassets => static}/img/flags/78.png (100%)
 rename {webassets => static}/img/flags/79.png (100%)
 rename {webassets => static}/img/flags/8.png (100%)
 rename {webassets => static}/img/flags/80.png (100%)
 rename {webassets => static}/img/flags/81.png (100%)
 rename {webassets => static}/img/flags/82.png (100%)
 rename {webassets => static}/img/flags/84.png (100%)
 rename {webassets => static}/img/flags/85.png (100%)
 rename {webassets => static}/img/flags/86.png (100%)
 rename {webassets => static}/img/flags/88.png (100%)
 rename {webassets => static}/img/flags/89.png (100%)
 rename {webassets => static}/img/flags/9.png (100%)
 rename {webassets => static}/img/flags/90.png (100%)
 rename {webassets => static}/img/flags/91.png (100%)
 rename {webassets => static}/img/flags/93.png (100%)
 rename {webassets => static}/img/flags/94.png (100%)
 rename {webassets => static}/img/flags/95.png (100%)
 rename {webassets => static}/img/flags/96.png (100%)
 rename {webassets => static}/img/flags/97.png (100%)
 rename {webassets => static}/img/flags/98.png (100%)
 rename {webassets => static}/img/flags/99.png (100%)
 rename {webassets => static}/img/flags/999.png (100%)
 rename {webassets => static}/img/flags/generate.py (100%)
 rename {webassets => static}/img/icon-16.png (100%)
 rename {webassets => static}/img/icon-192-pwa.png (100%)
 rename {webassets => static}/img/icon-192.png (100%)
 rename {webassets => static}/img/icon-32.png (100%)
 rename {webassets => static}/img/icon-512-pwa.png (100%)
 rename {webassets => static}/img/icon-512.png (100%)
 rename {webassets => static}/img/logo.png (100%)
 rename {webassets => static}/js/add-spot.js (100%)
 rename {webassets => static}/js/alerts.js (100%)
 rename {webassets => static}/js/bands.js (100%)
 rename {webassets => static}/js/common.js (100%)
 rename {webassets => static}/js/conditions.js (100%)
 rename {webassets => static}/js/geo.js (100%)
 rename {webassets => static}/js/map.js (100%)
 rename {webassets => static}/js/spots.js (100%)
 rename {webassets => static}/js/spotsbandsandmap.js (100%)
 rename {webassets => static}/js/status.js (100%)
 rename {webassets => static}/js/ui-ham.js (100%)
 rename {webassets => static}/js/utils.js (100%)
 rename {webassets => static}/service-worker.js (100%)
 rename {webassets => static}/vendor/css/bootstrap-5.3.8.min.css (100%)
 rename {webassets => static}/vendor/css/fontawesome-6.7.2.min.css (100%)
 rename {webassets => static}/vendor/css/images/layers-2x.png (100%)
 rename {webassets => static}/vendor/css/images/layers.png (100%)
 rename {webassets => static}/vendor/css/images/marker-icon-2x.png (100%)
 rename {webassets => static}/vendor/css/images/marker-icon.png (100%)
 rename {webassets => static}/vendor/css/images/marker-shadow.png (100%)
 rename {webassets => static}/vendor/css/leaflet-1.9.4.min.css (100%)
 rename {webassets => static}/vendor/css/leaflet-extra-markers-1.2.2.min.css (100%)
 rename {webassets => static}/vendor/css/solid-6.7.2.min.css (100%)
 rename {webassets => static}/vendor/img/markers_default.png (100%)
 rename {webassets => static}/vendor/img/markers_default@2x.png (100%)
 rename {webassets => static}/vendor/img/markers_shadow.png (100%)
 rename {webassets => static}/vendor/img/markers_shadow@2x.png (100%)
 rename {webassets => static}/vendor/js/bootstrap-5.3.8.bundle.min.js (100%)
 rename {webassets => static}/vendor/js/chart-4.4.9.umd.min.js (100%)
 rename {webassets => static}/vendor/js/jquery-3.7.1.min.js (100%)
 rename {webassets => static}/vendor/js/leaflet-1.9.4.min.js (100%)
 rename {webassets => static}/vendor/js/leaflet-cqzones.js (100%)
 rename {webassets => static}/vendor/js/leaflet-extra-markers-1.2.2.min.js (100%)
 rename {webassets => static}/vendor/js/leaflet-geodesic-2.7.2.umd.min.js (100%)
 rename {webassets => static}/vendor/js/leaflet-ituzones.js (100%)
 rename {webassets => static}/vendor/js/leaflet-maidenhead.js (100%)
 rename {webassets => static}/vendor/js/leaflet-providers-2.0.0.js (100%)
 rename {webassets => static}/vendor/js/leaflet-terminator-1.1.0.min.js (100%)
 rename {webassets => static}/vendor/js/leaflet-vectorgrid-1.3.0.js (100%)
 rename {webassets => static}/vendor/js/leaflet-workedallbritainireland.js (100%)
 rename {webassets => static}/vendor/js/moment-2.29.4.min.js (100%)
 rename {webassets => static}/vendor/js/oms-leaflet-0.2.7.min.js (100%)
 rename {webassets => static}/vendor/js/text-image-0.7.0.js (100%)
 rename {webassets => static}/vendor/js/tinycolor2-1.6.0.min.js (100%)
 rename {webassets => static}/vendor/webfonts/fa-solid-900.ttf (100%)
 rename {webassets => static}/vendor/webfonts/fa-solid-900.woff2 (100%)

diff --git a/.idea/spothole.iml b/.idea/spothole.iml
index 347b546..f16c839 100644
--- a/.idea/spothole.iml
+++ b/.idea/spothole.iml
@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
-      <excludeFolder url="file://$MODULE_DIR$/webassets/vendor" />
+      <excludeFolder url="file://$MODULE_DIR$/static/vendor" />
     </content>
     <orderEntry type="jdk" jdkName="Python 3.13 virtualenv at ~/code/spothole/.venv" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/README.md b/README.md
index 15c9c2d..6945ec6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ![Spothole](/webassets/img/logo.png)
+# ![Spothole](/static/img/logo.png)
 
 Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an open
 JSON API as well as a website to browse the data.
@@ -89,7 +89,7 @@ callsign and park data.
 
 Various approaches exist to writing your own client, but in general:
 
-* Refer to the API docs. These are built on an OpenAPI definition file (`/webassets/apidocs/openapi.yml`), which you can
+* Refer to the API docs. These are built on an OpenAPI definition file (`/static/apidocs/openapi.yml`), which you can
   automatically use to generate a client skeleton using various software.
 * Call the main "spots" or "alerts" API endpoints to get the data you want. For example, your app could call
   `https://spothole.app/api/v1/spots` once every few minutes. Apply filters if necessary.
@@ -346,9 +346,9 @@ server {
         alias /var/www/html/.well-known/;
     }
 
-    # Load static assets directly from the Spothole webassets directory
+    # Load static assets directly from the Spothole static directory
     location /static/ {
-        alias /home/spothole/spothole/webassets/;
+        alias /home/spothole/spothole/static/;
         expires 1h;
         add_header Cache-Control "public, max-age=3600, must-revalidate";
     }
@@ -452,12 +452,12 @@ To navigate your way around the source code, this list may help.
 
 *HTML/JS/CSS front-end code*
 
-* `/webassets` - Root for static files served by the web server. These are all served from a path starting `/static/`.
-* `/webassets/apidocs` - Contains the OpenAPI spec (`openapi.yml`)
-* `/webassets/css` - CSS files used by the web front-end
-* `/webassets/img` - image files used by the web front-end
-* `/webassets/js` - JavaScript used by the web front-end
-* `/webassets/vendor` - Third-party libraries (CSS, JS, fonts and images)
+* `/static` - Root for static files served by the web server. These are all served from a path starting `/static/`.
+* `/static/apidocs` - Contains the OpenAPI spec (`openapi.yml`)
+* `/static/css` - CSS files used by the web front-end
+* `/static/img` - image files used by the web front-end
+* `/static/js` - JavaScript used by the web front-end
+* `/static/vendor` - Third-party libraries (CSS, JS, fonts and images)
 
 *Miscellaneous*
 
@@ -509,14 +509,14 @@ my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet. `/da
 maps of conference centres.
 
 The project contains a set of flag icons generated using the "Noto Color Emoji" font on a Debian system, in the
-`/webassets/img/flags/` directory.
+`/static/img/flags/` directory.
 
 The software uses a number of Python libraries as listed in `requirements.txt`, and a number of JavaScript libraries.
 This project would not have been possible without these libraries, so many thanks to their developers.
 
 ### Third Party Libraries
 
-A number of third-party libraries are self-hosted in the `/webassets/vendor/` directory. These files are subject to
+A number of third-party libraries are self-hosted in the `/static/vendor/` directory. These files are subject to
 their own licences and are not covered by the overall licence declared in the `LICENSE` file.
 
 Particular thanks go to country-files.com for providing country lookup data for amateur radio, to K0SWE
diff --git a/alertproviders/http_alert_provider.py b/alertproviders/http_alert_provider.py
index 3e8dcf6..df79177 100644
--- a/alertproviders/http_alert_provider.py
+++ b/alertproviders/http_alert_provider.py
@@ -4,7 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from alertproviders.alert_provider import AlertProvider
 from core.constants import HTTP_HEADERS
@@ -59,6 +59,8 @@ class HTTPAlertProvider(AlertProvider):
 
         except ConnectionError:
             logging.warning(f"Connection error when accessing {self.name} alerts API.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing {self.name} alerts API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP JSON Alert Provider (" + self.name + ")")
diff --git a/core/lookup_helper.py b/core/lookup_helper.py
index a2a4fd8..e9c9641 100644
--- a/core/lookup_helper.py
+++ b/core/lookup_helper.py
@@ -11,7 +11,7 @@ from pyhamtools import LookupLib, Callinfo, callinfo
 from pyhamtools.exceptions import APIKeyMissingError
 from pyhamtools.frequency import freq_to_band
 from pyhamtools.locator import latlong_to_locator
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 from requests_cache import CachedSession
 
 from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
@@ -156,6 +156,8 @@ class LookupHelper:
 
         except ConnectionError:
             logging.warning(f"Connection error when downloading Clublog cty.xml.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when downloading Clublog cty.xml.")
         except Exception as e:
             logging.error("Exception when downloading Clublog cty.xml", e)
             return False
@@ -180,6 +182,8 @@ class LookupHelper:
 
         except ConnectionError:
             logging.warning(f"Connection error when downloading dxcc.json.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when downloading dxcc.json.")
         except Exception as e:
             logging.error("Exception when downloading dxcc.json", e)
             return False
@@ -537,6 +541,9 @@ class LookupHelper:
             except ConnectionError:
                 logging.warning(f"Connection error when looking up callsign %s using QRZ", lookup_call)
                 continue
+            except ReadTimeout:
+                logging.warning(f"Read timeout when looking up callsign %s using QRZ.", lookup_call)
+                continue
             except Exception:
                 logging.error("Exception when looking up callsign %s using QRZ", lookup_call, exc_info=True)
                 continue
@@ -601,6 +608,9 @@ class LookupHelper:
             except ConnectionError:
                 logging.warning(f"Connection error when looking up callsign %s using HamQTH", lookup_call)
                 continue
+            except ReadTimeout:
+                logging.warning(f"Read timeout when looking up callsign %s using HamQTH", lookup_call)
+                continue
             except Exception:
                 logging.error("Exception when looking up callsign %s using HamQTH", lookup_call, exc_info=True)
                 continue
diff --git a/core/sig_utils.py b/core/sig_utils.py
index 253c841..8f0fa98 100644
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -2,7 +2,7 @@ import csv
 import logging
 
 from pyhamtools.locator import latlong_to_locator, locator_to_latlong
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.constants import SIGS, HTTP_HEADERS
@@ -271,6 +271,8 @@ def populate_sig_ref_info(sig_ref):
 
     except ConnectionError:
         logging.warning("Connection error when looking up sig_ref info for " + sig + " ref " + ref_id)
+    except ReadTimeout:
+        logging.warning(f"Read timeout when looking up sig_ref info for " + sig + " ref " + ref_id)
     except Exception:
         logging.error("Exception when looking up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)
     return sig_ref
diff --git a/server/handlers/quietstaticfilehandler.py b/server/handlers/quietstaticfilehandler.py
deleted file mode 100644
index 4ba2d4d..0000000
--- a/server/handlers/quietstaticfilehandler.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import logging
-
-from tornado.web import StaticFileHandler, HTTPError
-
-
-class QuietStaticFileHandler(StaticFileHandler):
-    """Minor override of logging in StaticFileHandler to log HTTP errors at debug level instead of their usual
-    warning level. Without this, attacks on Spothole which try to do path traversal attacks would log exceptions
-    from inside Tornado, and the server logs would contain a lot of this type of content. This effectively changes
-    the log level of these exceptions to DEBUG so they are only logged if DEBUG level logging is enabled."""
-
-    def log_exception(self, typ, value, tb):
-        if isinstance(value, HTTPError):
-            logging.debug(value)
-            return
-        super().log_exception(typ, value, tb)
\ No newline at end of file
diff --git a/server/webserver.py b/server/webserver.py
index 21228cd..f55bf21 100644
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -18,7 +18,6 @@ from server.handlers.api.status import APIStatusHandler
 from server.handlers.manifesthandler import ManifestHandler
 from server.handlers.metrics import PrometheusMetricsHandler
 from server.handlers.pagetemplate import PageTemplateHandler
-from server.handlers.quietstaticfilehandler import QuietStaticFileHandler
 
 _HERE = os.path.dirname(__file__ or "")
 
@@ -101,12 +100,16 @@ class WebServer:
             if ALLOW_SPOTTING:
                 ui_routes += [(r"/add-spot", PageTemplateHandler, {"template_name": "add_spot", **handler_opts})]
 
-        # API docs, Prometheus metrics, webapp manifest and static assets are always available regardless of API-only mode.
+        # API docs, Prometheus metrics, webapp manifest and static assets are always available regardless of API-only
+        # mode.
         misc_routes = [
             (r"/apidocs", PageTemplateHandler, {"template_name": "apidocs", **handler_opts}),
             (r"/metrics", PrometheusMetricsHandler),
             (r"/manifest.webmanifest", ManifestHandler),
-            (r"/static/(.*)", QuietStaticFileHandler, {"path": os.path.join(_HERE, "../webassets")})
+            # If e.g. nginx is configured as a reverse proxy with a hard-coded path to static files, as per the README,
+            # this will never have to handle anything, but having it here allows Spothole to work without nginx for
+            # testing.
+            (r"/static/(.*)", StaticFileHandler, {"path": os.path.join(_HERE, "../static")})
         ]
 
         app = tornado.web.Application(api_routes + ui_routes + misc_routes,
diff --git a/solarconditionsproviders/giroionosonde.py b/solarconditionsproviders/giroionosonde.py
index 56a7ebe..03d7b02 100644
--- a/solarconditionsproviders/giroionosonde.py
+++ b/solarconditionsproviders/giroionosonde.py
@@ -5,7 +5,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.ionosonde_utils import compute_band_states
@@ -134,6 +134,9 @@ class GIROIonosonde(SolarConditionsProvider):
                 logging.warning(f"HTTP {http_response.status_code} when calling Giro ionosonde API.")
                 return None, None, None
             return self._parse_all(http_response.text)
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing Giro ionosonde API.")
+            return None, None, None
         except ConnectionError:
             logging.warning("Connection error when accessing Giro ionosonde API.")
             return None, None, None
diff --git a/solarconditionsproviders/http_solar_conditions_provider.py b/solarconditionsproviders/http_solar_conditions_provider.py
index b08d7b9..ddd3be9 100644
--- a/solarconditionsproviders/http_solar_conditions_provider.py
+++ b/solarconditionsproviders/http_solar_conditions_provider.py
@@ -4,7 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.solar_conditions_provider import SolarConditionsProvider
@@ -54,6 +54,8 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
 
         except ConnectionError:
             logging.warning(f"Connection error when accessing {self.name} solar conditions API.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing {self.name} solar conditions API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP Solar Conditions Provider (" + self.name + ")")
diff --git a/solarconditionsproviders/kc2gprop.py b/solarconditionsproviders/kc2gprop.py
index 5fa581b..1d879a1 100644
--- a/solarconditionsproviders/kc2gprop.py
+++ b/solarconditionsproviders/kc2gprop.py
@@ -4,7 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.ionosonde_utils import compute_band_states
@@ -118,6 +118,8 @@ class KC2GProp(SolarConditionsProvider):
 
         except ConnectionError:
             logging.warning("Connection error when accessing KC2G ionosonde API.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing KC2G ionosonde API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in KC2G ionosonde data provider")
diff --git a/spotproviders/hema.py b/spotproviders/hema.py
index 07f593e..62d8d61 100644
--- a/spotproviders/hema.py
+++ b/spotproviders/hema.py
@@ -4,7 +4,7 @@ from datetime import datetime
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from data.sig_ref import SIGRef
@@ -68,6 +68,8 @@ class HEMA(HTTPSpotProvider):
                         # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other
                         # code will do that for us.
                         new_spots.append(spot)
+            except ReadTimeout:
+                logging.warning(f"Read timeout when accessing HEMA spots API.")
             except ConnectionError:
                 logging.warning("Connection error when accessing HEMA spots API.")
         return new_spots
diff --git a/spotproviders/http_spot_provider.py b/spotproviders/http_spot_provider.py
index 17b748c..c851bb0 100644
--- a/spotproviders/http_spot_provider.py
+++ b/spotproviders/http_spot_provider.py
@@ -4,6 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
+from requests import ReadTimeout
 from requests.exceptions import ConnectionError
 
 from core.constants import HTTP_HEADERS
@@ -59,6 +60,8 @@ class HTTPSpotProvider(SpotProvider):
 
         except ConnectionError:
             logging.warning(f"Connection error when accessing {self.name} spots API.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing {self.name} spots API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP JSON Spot Provider (" + self.name + ")")
diff --git a/spotproviders/sota.py b/spotproviders/sota.py
index fa0fc80..750753b 100644
--- a/spotproviders/sota.py
+++ b/spotproviders/sota.py
@@ -2,7 +2,7 @@ import logging
 from datetime import datetime
 
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from data.sig_ref import SIGRef
@@ -60,4 +60,6 @@ class SOTA(HTTPSpotProvider):
                     new_spots.append(spot)
             except ConnectionError:
                 logging.warning("Connection error when accessing SOTA spots API")
+            except ReadTimeout:
+                logging.warning(f"Read timeout when accessing SOTA spots API.")
         return new_spots
diff --git a/webassets/apidocs/openapi.yml b/static/apidocs/openapi.yml
similarity index 100%
rename from webassets/apidocs/openapi.yml
rename to static/apidocs/openapi.yml
diff --git a/webassets/audio/ping.mp3 b/static/audio/ping.mp3
similarity index 100%
rename from webassets/audio/ping.mp3
rename to static/audio/ping.mp3
diff --git a/webassets/css/style.css b/static/css/style.css
similarity index 100%
rename from webassets/css/style.css
rename to static/css/style.css
diff --git a/webassets/favicon.ico b/static/favicon.ico
similarity index 100%
rename from webassets/favicon.ico
rename to static/favicon.ico
diff --git a/webassets/img/banner.png b/static/img/banner.png
similarity index 100%
rename from webassets/img/banner.png
rename to static/img/banner.png
diff --git a/webassets/img/flags/1.png b/static/img/flags/1.png
similarity index 100%
rename from webassets/img/flags/1.png
rename to static/img/flags/1.png
diff --git a/webassets/img/flags/10.png b/static/img/flags/10.png
similarity index 100%
rename from webassets/img/flags/10.png
rename to static/img/flags/10.png
diff --git a/webassets/img/flags/100.png b/static/img/flags/100.png
similarity index 100%
rename from webassets/img/flags/100.png
rename to static/img/flags/100.png
diff --git a/webassets/img/flags/101.png b/static/img/flags/101.png
similarity index 100%
rename from webassets/img/flags/101.png
rename to static/img/flags/101.png
diff --git a/webassets/img/flags/102.png b/static/img/flags/102.png
similarity index 100%
rename from webassets/img/flags/102.png
rename to static/img/flags/102.png
diff --git a/webassets/img/flags/103.png b/static/img/flags/103.png
similarity index 100%
rename from webassets/img/flags/103.png
rename to static/img/flags/103.png
diff --git a/webassets/img/flags/104.png b/static/img/flags/104.png
similarity index 100%
rename from webassets/img/flags/104.png
rename to static/img/flags/104.png
diff --git a/webassets/img/flags/105.png b/static/img/flags/105.png
similarity index 100%
rename from webassets/img/flags/105.png
rename to static/img/flags/105.png
diff --git a/webassets/img/flags/106.png b/static/img/flags/106.png
similarity index 100%
rename from webassets/img/flags/106.png
rename to static/img/flags/106.png
diff --git a/webassets/img/flags/107.png b/static/img/flags/107.png
similarity index 100%
rename from webassets/img/flags/107.png
rename to static/img/flags/107.png
diff --git a/webassets/img/flags/108.png b/static/img/flags/108.png
similarity index 100%
rename from webassets/img/flags/108.png
rename to static/img/flags/108.png
diff --git a/webassets/img/flags/109.png b/static/img/flags/109.png
similarity index 100%
rename from webassets/img/flags/109.png
rename to static/img/flags/109.png
diff --git a/webassets/img/flags/11.png b/static/img/flags/11.png
similarity index 100%
rename from webassets/img/flags/11.png
rename to static/img/flags/11.png
diff --git a/webassets/img/flags/110.png b/static/img/flags/110.png
similarity index 100%
rename from webassets/img/flags/110.png
rename to static/img/flags/110.png
diff --git a/webassets/img/flags/111.png b/static/img/flags/111.png
similarity index 100%
rename from webassets/img/flags/111.png
rename to static/img/flags/111.png
diff --git a/webassets/img/flags/112.png b/static/img/flags/112.png
similarity index 100%
rename from webassets/img/flags/112.png
rename to static/img/flags/112.png
diff --git a/webassets/img/flags/113.png b/static/img/flags/113.png
similarity index 100%
rename from webassets/img/flags/113.png
rename to static/img/flags/113.png
diff --git a/webassets/img/flags/114.png b/static/img/flags/114.png
similarity index 100%
rename from webassets/img/flags/114.png
rename to static/img/flags/114.png
diff --git a/webassets/img/flags/115.png b/static/img/flags/115.png
similarity index 100%
rename from webassets/img/flags/115.png
rename to static/img/flags/115.png
diff --git a/webassets/img/flags/116.png b/static/img/flags/116.png
similarity index 100%
rename from webassets/img/flags/116.png
rename to static/img/flags/116.png
diff --git a/webassets/img/flags/117.png b/static/img/flags/117.png
similarity index 100%
rename from webassets/img/flags/117.png
rename to static/img/flags/117.png
diff --git a/webassets/img/flags/118.png b/static/img/flags/118.png
similarity index 100%
rename from webassets/img/flags/118.png
rename to static/img/flags/118.png
diff --git a/webassets/img/flags/119.png b/static/img/flags/119.png
similarity index 100%
rename from webassets/img/flags/119.png
rename to static/img/flags/119.png
diff --git a/webassets/img/flags/12.png b/static/img/flags/12.png
similarity index 100%
rename from webassets/img/flags/12.png
rename to static/img/flags/12.png
diff --git a/webassets/img/flags/120.png b/static/img/flags/120.png
similarity index 100%
rename from webassets/img/flags/120.png
rename to static/img/flags/120.png
diff --git a/webassets/img/flags/122.png b/static/img/flags/122.png
similarity index 100%
rename from webassets/img/flags/122.png
rename to static/img/flags/122.png
diff --git a/webassets/img/flags/123.png b/static/img/flags/123.png
similarity index 100%
rename from webassets/img/flags/123.png
rename to static/img/flags/123.png
diff --git a/webassets/img/flags/124.png b/static/img/flags/124.png
similarity index 100%
rename from webassets/img/flags/124.png
rename to static/img/flags/124.png
diff --git a/webassets/img/flags/125.png b/static/img/flags/125.png
similarity index 100%
rename from webassets/img/flags/125.png
rename to static/img/flags/125.png
diff --git a/webassets/img/flags/126.png b/static/img/flags/126.png
similarity index 100%
rename from webassets/img/flags/126.png
rename to static/img/flags/126.png
diff --git a/webassets/img/flags/127.png b/static/img/flags/127.png
similarity index 100%
rename from webassets/img/flags/127.png
rename to static/img/flags/127.png
diff --git a/webassets/img/flags/128.png b/static/img/flags/128.png
similarity index 100%
rename from webassets/img/flags/128.png
rename to static/img/flags/128.png
diff --git a/webassets/img/flags/129.png b/static/img/flags/129.png
similarity index 100%
rename from webassets/img/flags/129.png
rename to static/img/flags/129.png
diff --git a/webassets/img/flags/13.png b/static/img/flags/13.png
similarity index 100%
rename from webassets/img/flags/13.png
rename to static/img/flags/13.png
diff --git a/webassets/img/flags/130.png b/static/img/flags/130.png
similarity index 100%
rename from webassets/img/flags/130.png
rename to static/img/flags/130.png
diff --git a/webassets/img/flags/131.png b/static/img/flags/131.png
similarity index 100%
rename from webassets/img/flags/131.png
rename to static/img/flags/131.png
diff --git a/webassets/img/flags/132.png b/static/img/flags/132.png
similarity index 100%
rename from webassets/img/flags/132.png
rename to static/img/flags/132.png
diff --git a/webassets/img/flags/133.png b/static/img/flags/133.png
similarity index 100%
rename from webassets/img/flags/133.png
rename to static/img/flags/133.png
diff --git a/webassets/img/flags/134.png b/static/img/flags/134.png
similarity index 100%
rename from webassets/img/flags/134.png
rename to static/img/flags/134.png
diff --git a/webassets/img/flags/135.png b/static/img/flags/135.png
similarity index 100%
rename from webassets/img/flags/135.png
rename to static/img/flags/135.png
diff --git a/webassets/img/flags/136.png b/static/img/flags/136.png
similarity index 100%
rename from webassets/img/flags/136.png
rename to static/img/flags/136.png
diff --git a/webassets/img/flags/137.png b/static/img/flags/137.png
similarity index 100%
rename from webassets/img/flags/137.png
rename to static/img/flags/137.png
diff --git a/webassets/img/flags/138.png b/static/img/flags/138.png
similarity index 100%
rename from webassets/img/flags/138.png
rename to static/img/flags/138.png
diff --git a/webassets/img/flags/139.png b/static/img/flags/139.png
similarity index 100%
rename from webassets/img/flags/139.png
rename to static/img/flags/139.png
diff --git a/webassets/img/flags/14.png b/static/img/flags/14.png
similarity index 100%
rename from webassets/img/flags/14.png
rename to static/img/flags/14.png
diff --git a/webassets/img/flags/140.png b/static/img/flags/140.png
similarity index 100%
rename from webassets/img/flags/140.png
rename to static/img/flags/140.png
diff --git a/webassets/img/flags/141.png b/static/img/flags/141.png
similarity index 100%
rename from webassets/img/flags/141.png
rename to static/img/flags/141.png
diff --git a/webassets/img/flags/142.png b/static/img/flags/142.png
similarity index 100%
rename from webassets/img/flags/142.png
rename to static/img/flags/142.png
diff --git a/webassets/img/flags/143.png b/static/img/flags/143.png
similarity index 100%
rename from webassets/img/flags/143.png
rename to static/img/flags/143.png
diff --git a/webassets/img/flags/144.png b/static/img/flags/144.png
similarity index 100%
rename from webassets/img/flags/144.png
rename to static/img/flags/144.png
diff --git a/webassets/img/flags/145.png b/static/img/flags/145.png
similarity index 100%
rename from webassets/img/flags/145.png
rename to static/img/flags/145.png
diff --git a/webassets/img/flags/146.png b/static/img/flags/146.png
similarity index 100%
rename from webassets/img/flags/146.png
rename to static/img/flags/146.png
diff --git a/webassets/img/flags/147.png b/static/img/flags/147.png
similarity index 100%
rename from webassets/img/flags/147.png
rename to static/img/flags/147.png
diff --git a/webassets/img/flags/148.png b/static/img/flags/148.png
similarity index 100%
rename from webassets/img/flags/148.png
rename to static/img/flags/148.png
diff --git a/webassets/img/flags/149.png b/static/img/flags/149.png
similarity index 100%
rename from webassets/img/flags/149.png
rename to static/img/flags/149.png
diff --git a/webassets/img/flags/15.png b/static/img/flags/15.png
similarity index 100%
rename from webassets/img/flags/15.png
rename to static/img/flags/15.png
diff --git a/webassets/img/flags/150.png b/static/img/flags/150.png
similarity index 100%
rename from webassets/img/flags/150.png
rename to static/img/flags/150.png
diff --git a/webassets/img/flags/151.png b/static/img/flags/151.png
similarity index 100%
rename from webassets/img/flags/151.png
rename to static/img/flags/151.png
diff --git a/webassets/img/flags/152.png b/static/img/flags/152.png
similarity index 100%
rename from webassets/img/flags/152.png
rename to static/img/flags/152.png
diff --git a/webassets/img/flags/153.png b/static/img/flags/153.png
similarity index 100%
rename from webassets/img/flags/153.png
rename to static/img/flags/153.png
diff --git a/webassets/img/flags/154.png b/static/img/flags/154.png
similarity index 100%
rename from webassets/img/flags/154.png
rename to static/img/flags/154.png
diff --git a/webassets/img/flags/155.png b/static/img/flags/155.png
similarity index 100%
rename from webassets/img/flags/155.png
rename to static/img/flags/155.png
diff --git a/webassets/img/flags/157.png b/static/img/flags/157.png
similarity index 100%
rename from webassets/img/flags/157.png
rename to static/img/flags/157.png
diff --git a/webassets/img/flags/158.png b/static/img/flags/158.png
similarity index 100%
rename from webassets/img/flags/158.png
rename to static/img/flags/158.png
diff --git a/webassets/img/flags/159.png b/static/img/flags/159.png
similarity index 100%
rename from webassets/img/flags/159.png
rename to static/img/flags/159.png
diff --git a/webassets/img/flags/16.png b/static/img/flags/16.png
similarity index 100%
rename from webassets/img/flags/16.png
rename to static/img/flags/16.png
diff --git a/webassets/img/flags/160.png b/static/img/flags/160.png
similarity index 100%
rename from webassets/img/flags/160.png
rename to static/img/flags/160.png
diff --git a/webassets/img/flags/161.png b/static/img/flags/161.png
similarity index 100%
rename from webassets/img/flags/161.png
rename to static/img/flags/161.png
diff --git a/webassets/img/flags/162.png b/static/img/flags/162.png
similarity index 100%
rename from webassets/img/flags/162.png
rename to static/img/flags/162.png
diff --git a/webassets/img/flags/163.png b/static/img/flags/163.png
similarity index 100%
rename from webassets/img/flags/163.png
rename to static/img/flags/163.png
diff --git a/webassets/img/flags/164.png b/static/img/flags/164.png
similarity index 100%
rename from webassets/img/flags/164.png
rename to static/img/flags/164.png
diff --git a/webassets/img/flags/165.png b/static/img/flags/165.png
similarity index 100%
rename from webassets/img/flags/165.png
rename to static/img/flags/165.png
diff --git a/webassets/img/flags/166.png b/static/img/flags/166.png
similarity index 100%
rename from webassets/img/flags/166.png
rename to static/img/flags/166.png
diff --git a/webassets/img/flags/167.png b/static/img/flags/167.png
similarity index 100%
rename from webassets/img/flags/167.png
rename to static/img/flags/167.png
diff --git a/webassets/img/flags/168.png b/static/img/flags/168.png
similarity index 100%
rename from webassets/img/flags/168.png
rename to static/img/flags/168.png
diff --git a/webassets/img/flags/169.png b/static/img/flags/169.png
similarity index 100%
rename from webassets/img/flags/169.png
rename to static/img/flags/169.png
diff --git a/webassets/img/flags/17.png b/static/img/flags/17.png
similarity index 100%
rename from webassets/img/flags/17.png
rename to static/img/flags/17.png
diff --git a/webassets/img/flags/170.png b/static/img/flags/170.png
similarity index 100%
rename from webassets/img/flags/170.png
rename to static/img/flags/170.png
diff --git a/webassets/img/flags/171.png b/static/img/flags/171.png
similarity index 100%
rename from webassets/img/flags/171.png
rename to static/img/flags/171.png
diff --git a/webassets/img/flags/172.png b/static/img/flags/172.png
similarity index 100%
rename from webassets/img/flags/172.png
rename to static/img/flags/172.png
diff --git a/webassets/img/flags/173.png b/static/img/flags/173.png
similarity index 100%
rename from webassets/img/flags/173.png
rename to static/img/flags/173.png
diff --git a/webassets/img/flags/174.png b/static/img/flags/174.png
similarity index 100%
rename from webassets/img/flags/174.png
rename to static/img/flags/174.png
diff --git a/webassets/img/flags/175.png b/static/img/flags/175.png
similarity index 100%
rename from webassets/img/flags/175.png
rename to static/img/flags/175.png
diff --git a/webassets/img/flags/176.png b/static/img/flags/176.png
similarity index 100%
rename from webassets/img/flags/176.png
rename to static/img/flags/176.png
diff --git a/webassets/img/flags/177.png b/static/img/flags/177.png
similarity index 100%
rename from webassets/img/flags/177.png
rename to static/img/flags/177.png
diff --git a/webassets/img/flags/178.png b/static/img/flags/178.png
similarity index 100%
rename from webassets/img/flags/178.png
rename to static/img/flags/178.png
diff --git a/webassets/img/flags/179.png b/static/img/flags/179.png
similarity index 100%
rename from webassets/img/flags/179.png
rename to static/img/flags/179.png
diff --git a/webassets/img/flags/18.png b/static/img/flags/18.png
similarity index 100%
rename from webassets/img/flags/18.png
rename to static/img/flags/18.png
diff --git a/webassets/img/flags/180.png b/static/img/flags/180.png
similarity index 100%
rename from webassets/img/flags/180.png
rename to static/img/flags/180.png
diff --git a/webassets/img/flags/181.png b/static/img/flags/181.png
similarity index 100%
rename from webassets/img/flags/181.png
rename to static/img/flags/181.png
diff --git a/webassets/img/flags/182.png b/static/img/flags/182.png
similarity index 100%
rename from webassets/img/flags/182.png
rename to static/img/flags/182.png
diff --git a/webassets/img/flags/183.png b/static/img/flags/183.png
similarity index 100%
rename from webassets/img/flags/183.png
rename to static/img/flags/183.png
diff --git a/webassets/img/flags/184.png b/static/img/flags/184.png
similarity index 100%
rename from webassets/img/flags/184.png
rename to static/img/flags/184.png
diff --git a/webassets/img/flags/185.png b/static/img/flags/185.png
similarity index 100%
rename from webassets/img/flags/185.png
rename to static/img/flags/185.png
diff --git a/webassets/img/flags/186.png b/static/img/flags/186.png
similarity index 100%
rename from webassets/img/flags/186.png
rename to static/img/flags/186.png
diff --git a/webassets/img/flags/187.png b/static/img/flags/187.png
similarity index 100%
rename from webassets/img/flags/187.png
rename to static/img/flags/187.png
diff --git a/webassets/img/flags/188.png b/static/img/flags/188.png
similarity index 100%
rename from webassets/img/flags/188.png
rename to static/img/flags/188.png
diff --git a/webassets/img/flags/189.png b/static/img/flags/189.png
similarity index 100%
rename from webassets/img/flags/189.png
rename to static/img/flags/189.png
diff --git a/webassets/img/flags/19.png b/static/img/flags/19.png
similarity index 100%
rename from webassets/img/flags/19.png
rename to static/img/flags/19.png
diff --git a/webassets/img/flags/190.png b/static/img/flags/190.png
similarity index 100%
rename from webassets/img/flags/190.png
rename to static/img/flags/190.png
diff --git a/webassets/img/flags/191.png b/static/img/flags/191.png
similarity index 100%
rename from webassets/img/flags/191.png
rename to static/img/flags/191.png
diff --git a/webassets/img/flags/192.png b/static/img/flags/192.png
similarity index 100%
rename from webassets/img/flags/192.png
rename to static/img/flags/192.png
diff --git a/webassets/img/flags/193.png b/static/img/flags/193.png
similarity index 100%
rename from webassets/img/flags/193.png
rename to static/img/flags/193.png
diff --git a/webassets/img/flags/194.png b/static/img/flags/194.png
similarity index 100%
rename from webassets/img/flags/194.png
rename to static/img/flags/194.png
diff --git a/webassets/img/flags/195.png b/static/img/flags/195.png
similarity index 100%
rename from webassets/img/flags/195.png
rename to static/img/flags/195.png
diff --git a/webassets/img/flags/196.png b/static/img/flags/196.png
similarity index 100%
rename from webassets/img/flags/196.png
rename to static/img/flags/196.png
diff --git a/webassets/img/flags/197.png b/static/img/flags/197.png
similarity index 100%
rename from webassets/img/flags/197.png
rename to static/img/flags/197.png
diff --git a/webassets/img/flags/198.png b/static/img/flags/198.png
similarity index 100%
rename from webassets/img/flags/198.png
rename to static/img/flags/198.png
diff --git a/webassets/img/flags/199.png b/static/img/flags/199.png
similarity index 100%
rename from webassets/img/flags/199.png
rename to static/img/flags/199.png
diff --git a/webassets/img/flags/2.png b/static/img/flags/2.png
similarity index 100%
rename from webassets/img/flags/2.png
rename to static/img/flags/2.png
diff --git a/webassets/img/flags/20.png b/static/img/flags/20.png
similarity index 100%
rename from webassets/img/flags/20.png
rename to static/img/flags/20.png
diff --git a/webassets/img/flags/200.png b/static/img/flags/200.png
similarity index 100%
rename from webassets/img/flags/200.png
rename to static/img/flags/200.png
diff --git a/webassets/img/flags/201.png b/static/img/flags/201.png
similarity index 100%
rename from webassets/img/flags/201.png
rename to static/img/flags/201.png
diff --git a/webassets/img/flags/202.png b/static/img/flags/202.png
similarity index 100%
rename from webassets/img/flags/202.png
rename to static/img/flags/202.png
diff --git a/webassets/img/flags/203.png b/static/img/flags/203.png
similarity index 100%
rename from webassets/img/flags/203.png
rename to static/img/flags/203.png
diff --git a/webassets/img/flags/204.png b/static/img/flags/204.png
similarity index 100%
rename from webassets/img/flags/204.png
rename to static/img/flags/204.png
diff --git a/webassets/img/flags/205.png b/static/img/flags/205.png
similarity index 100%
rename from webassets/img/flags/205.png
rename to static/img/flags/205.png
diff --git a/webassets/img/flags/206.png b/static/img/flags/206.png
similarity index 100%
rename from webassets/img/flags/206.png
rename to static/img/flags/206.png
diff --git a/webassets/img/flags/207.png b/static/img/flags/207.png
similarity index 100%
rename from webassets/img/flags/207.png
rename to static/img/flags/207.png
diff --git a/webassets/img/flags/208.png b/static/img/flags/208.png
similarity index 100%
rename from webassets/img/flags/208.png
rename to static/img/flags/208.png
diff --git a/webassets/img/flags/209.png b/static/img/flags/209.png
similarity index 100%
rename from webassets/img/flags/209.png
rename to static/img/flags/209.png
diff --git a/webassets/img/flags/21.png b/static/img/flags/21.png
similarity index 100%
rename from webassets/img/flags/21.png
rename to static/img/flags/21.png
diff --git a/webassets/img/flags/210.png b/static/img/flags/210.png
similarity index 100%
rename from webassets/img/flags/210.png
rename to static/img/flags/210.png
diff --git a/webassets/img/flags/211.png b/static/img/flags/211.png
similarity index 100%
rename from webassets/img/flags/211.png
rename to static/img/flags/211.png
diff --git a/webassets/img/flags/212.png b/static/img/flags/212.png
similarity index 100%
rename from webassets/img/flags/212.png
rename to static/img/flags/212.png
diff --git a/webassets/img/flags/213.png b/static/img/flags/213.png
similarity index 100%
rename from webassets/img/flags/213.png
rename to static/img/flags/213.png
diff --git a/webassets/img/flags/214.png b/static/img/flags/214.png
similarity index 100%
rename from webassets/img/flags/214.png
rename to static/img/flags/214.png
diff --git a/webassets/img/flags/215.png b/static/img/flags/215.png
similarity index 100%
rename from webassets/img/flags/215.png
rename to static/img/flags/215.png
diff --git a/webassets/img/flags/216.png b/static/img/flags/216.png
similarity index 100%
rename from webassets/img/flags/216.png
rename to static/img/flags/216.png
diff --git a/webassets/img/flags/217.png b/static/img/flags/217.png
similarity index 100%
rename from webassets/img/flags/217.png
rename to static/img/flags/217.png
diff --git a/webassets/img/flags/218.png b/static/img/flags/218.png
similarity index 100%
rename from webassets/img/flags/218.png
rename to static/img/flags/218.png
diff --git a/webassets/img/flags/219.png b/static/img/flags/219.png
similarity index 100%
rename from webassets/img/flags/219.png
rename to static/img/flags/219.png
diff --git a/webassets/img/flags/22.png b/static/img/flags/22.png
similarity index 100%
rename from webassets/img/flags/22.png
rename to static/img/flags/22.png
diff --git a/webassets/img/flags/220.png b/static/img/flags/220.png
similarity index 100%
rename from webassets/img/flags/220.png
rename to static/img/flags/220.png
diff --git a/webassets/img/flags/221.png b/static/img/flags/221.png
similarity index 100%
rename from webassets/img/flags/221.png
rename to static/img/flags/221.png
diff --git a/webassets/img/flags/222.png b/static/img/flags/222.png
similarity index 100%
rename from webassets/img/flags/222.png
rename to static/img/flags/222.png
diff --git a/webassets/img/flags/223.png b/static/img/flags/223.png
similarity index 100%
rename from webassets/img/flags/223.png
rename to static/img/flags/223.png
diff --git a/webassets/img/flags/224.png b/static/img/flags/224.png
similarity index 100%
rename from webassets/img/flags/224.png
rename to static/img/flags/224.png
diff --git a/webassets/img/flags/225.png b/static/img/flags/225.png
similarity index 100%
rename from webassets/img/flags/225.png
rename to static/img/flags/225.png
diff --git a/webassets/img/flags/226.png b/static/img/flags/226.png
similarity index 100%
rename from webassets/img/flags/226.png
rename to static/img/flags/226.png
diff --git a/webassets/img/flags/227.png b/static/img/flags/227.png
similarity index 100%
rename from webassets/img/flags/227.png
rename to static/img/flags/227.png
diff --git a/webassets/img/flags/228.png b/static/img/flags/228.png
similarity index 100%
rename from webassets/img/flags/228.png
rename to static/img/flags/228.png
diff --git a/webassets/img/flags/229.png b/static/img/flags/229.png
similarity index 100%
rename from webassets/img/flags/229.png
rename to static/img/flags/229.png
diff --git a/webassets/img/flags/23.png b/static/img/flags/23.png
similarity index 100%
rename from webassets/img/flags/23.png
rename to static/img/flags/23.png
diff --git a/webassets/img/flags/230.png b/static/img/flags/230.png
similarity index 100%
rename from webassets/img/flags/230.png
rename to static/img/flags/230.png
diff --git a/webassets/img/flags/231.png b/static/img/flags/231.png
similarity index 100%
rename from webassets/img/flags/231.png
rename to static/img/flags/231.png
diff --git a/webassets/img/flags/232.png b/static/img/flags/232.png
similarity index 100%
rename from webassets/img/flags/232.png
rename to static/img/flags/232.png
diff --git a/webassets/img/flags/233.png b/static/img/flags/233.png
similarity index 100%
rename from webassets/img/flags/233.png
rename to static/img/flags/233.png
diff --git a/webassets/img/flags/234.png b/static/img/flags/234.png
similarity index 100%
rename from webassets/img/flags/234.png
rename to static/img/flags/234.png
diff --git a/webassets/img/flags/235.png b/static/img/flags/235.png
similarity index 100%
rename from webassets/img/flags/235.png
rename to static/img/flags/235.png
diff --git a/webassets/img/flags/236.png b/static/img/flags/236.png
similarity index 100%
rename from webassets/img/flags/236.png
rename to static/img/flags/236.png
diff --git a/webassets/img/flags/237.png b/static/img/flags/237.png
similarity index 100%
rename from webassets/img/flags/237.png
rename to static/img/flags/237.png
diff --git a/webassets/img/flags/238.png b/static/img/flags/238.png
similarity index 100%
rename from webassets/img/flags/238.png
rename to static/img/flags/238.png
diff --git a/webassets/img/flags/239.png b/static/img/flags/239.png
similarity index 100%
rename from webassets/img/flags/239.png
rename to static/img/flags/239.png
diff --git a/webassets/img/flags/24.png b/static/img/flags/24.png
similarity index 100%
rename from webassets/img/flags/24.png
rename to static/img/flags/24.png
diff --git a/webassets/img/flags/240.png b/static/img/flags/240.png
similarity index 100%
rename from webassets/img/flags/240.png
rename to static/img/flags/240.png
diff --git a/webassets/img/flags/241.png b/static/img/flags/241.png
similarity index 100%
rename from webassets/img/flags/241.png
rename to static/img/flags/241.png
diff --git a/webassets/img/flags/242.png b/static/img/flags/242.png
similarity index 100%
rename from webassets/img/flags/242.png
rename to static/img/flags/242.png
diff --git a/webassets/img/flags/243.png b/static/img/flags/243.png
similarity index 100%
rename from webassets/img/flags/243.png
rename to static/img/flags/243.png
diff --git a/webassets/img/flags/244.png b/static/img/flags/244.png
similarity index 100%
rename from webassets/img/flags/244.png
rename to static/img/flags/244.png
diff --git a/webassets/img/flags/245.png b/static/img/flags/245.png
similarity index 100%
rename from webassets/img/flags/245.png
rename to static/img/flags/245.png
diff --git a/webassets/img/flags/246.png b/static/img/flags/246.png
similarity index 100%
rename from webassets/img/flags/246.png
rename to static/img/flags/246.png
diff --git a/webassets/img/flags/247.png b/static/img/flags/247.png
similarity index 100%
rename from webassets/img/flags/247.png
rename to static/img/flags/247.png
diff --git a/webassets/img/flags/248.png b/static/img/flags/248.png
similarity index 100%
rename from webassets/img/flags/248.png
rename to static/img/flags/248.png
diff --git a/webassets/img/flags/249.png b/static/img/flags/249.png
similarity index 100%
rename from webassets/img/flags/249.png
rename to static/img/flags/249.png
diff --git a/webassets/img/flags/25.png b/static/img/flags/25.png
similarity index 100%
rename from webassets/img/flags/25.png
rename to static/img/flags/25.png
diff --git a/webassets/img/flags/250.png b/static/img/flags/250.png
similarity index 100%
rename from webassets/img/flags/250.png
rename to static/img/flags/250.png
diff --git a/webassets/img/flags/251.png b/static/img/flags/251.png
similarity index 100%
rename from webassets/img/flags/251.png
rename to static/img/flags/251.png
diff --git a/webassets/img/flags/252.png b/static/img/flags/252.png
similarity index 100%
rename from webassets/img/flags/252.png
rename to static/img/flags/252.png
diff --git a/webassets/img/flags/253.png b/static/img/flags/253.png
similarity index 100%
rename from webassets/img/flags/253.png
rename to static/img/flags/253.png
diff --git a/webassets/img/flags/254.png b/static/img/flags/254.png
similarity index 100%
rename from webassets/img/flags/254.png
rename to static/img/flags/254.png
diff --git a/webassets/img/flags/255.png b/static/img/flags/255.png
similarity index 100%
rename from webassets/img/flags/255.png
rename to static/img/flags/255.png
diff --git a/webassets/img/flags/256.png b/static/img/flags/256.png
similarity index 100%
rename from webassets/img/flags/256.png
rename to static/img/flags/256.png
diff --git a/webassets/img/flags/257.png b/static/img/flags/257.png
similarity index 100%
rename from webassets/img/flags/257.png
rename to static/img/flags/257.png
diff --git a/webassets/img/flags/258.png b/static/img/flags/258.png
similarity index 100%
rename from webassets/img/flags/258.png
rename to static/img/flags/258.png
diff --git a/webassets/img/flags/259.png b/static/img/flags/259.png
similarity index 100%
rename from webassets/img/flags/259.png
rename to static/img/flags/259.png
diff --git a/webassets/img/flags/26.png b/static/img/flags/26.png
similarity index 100%
rename from webassets/img/flags/26.png
rename to static/img/flags/26.png
diff --git a/webassets/img/flags/260.png b/static/img/flags/260.png
similarity index 100%
rename from webassets/img/flags/260.png
rename to static/img/flags/260.png
diff --git a/webassets/img/flags/261.png b/static/img/flags/261.png
similarity index 100%
rename from webassets/img/flags/261.png
rename to static/img/flags/261.png
diff --git a/webassets/img/flags/262.png b/static/img/flags/262.png
similarity index 100%
rename from webassets/img/flags/262.png
rename to static/img/flags/262.png
diff --git a/webassets/img/flags/263.png b/static/img/flags/263.png
similarity index 100%
rename from webassets/img/flags/263.png
rename to static/img/flags/263.png
diff --git a/webassets/img/flags/264.png b/static/img/flags/264.png
similarity index 100%
rename from webassets/img/flags/264.png
rename to static/img/flags/264.png
diff --git a/webassets/img/flags/265.png b/static/img/flags/265.png
similarity index 100%
rename from webassets/img/flags/265.png
rename to static/img/flags/265.png
diff --git a/webassets/img/flags/266.png b/static/img/flags/266.png
similarity index 100%
rename from webassets/img/flags/266.png
rename to static/img/flags/266.png
diff --git a/webassets/img/flags/267.png b/static/img/flags/267.png
similarity index 100%
rename from webassets/img/flags/267.png
rename to static/img/flags/267.png
diff --git a/webassets/img/flags/268.png b/static/img/flags/268.png
similarity index 100%
rename from webassets/img/flags/268.png
rename to static/img/flags/268.png
diff --git a/webassets/img/flags/269.png b/static/img/flags/269.png
similarity index 100%
rename from webassets/img/flags/269.png
rename to static/img/flags/269.png
diff --git a/webassets/img/flags/27.png b/static/img/flags/27.png
similarity index 100%
rename from webassets/img/flags/27.png
rename to static/img/flags/27.png
diff --git a/webassets/img/flags/270.png b/static/img/flags/270.png
similarity index 100%
rename from webassets/img/flags/270.png
rename to static/img/flags/270.png
diff --git a/webassets/img/flags/271.png b/static/img/flags/271.png
similarity index 100%
rename from webassets/img/flags/271.png
rename to static/img/flags/271.png
diff --git a/webassets/img/flags/272.png b/static/img/flags/272.png
similarity index 100%
rename from webassets/img/flags/272.png
rename to static/img/flags/272.png
diff --git a/webassets/img/flags/273.png b/static/img/flags/273.png
similarity index 100%
rename from webassets/img/flags/273.png
rename to static/img/flags/273.png
diff --git a/webassets/img/flags/274.png b/static/img/flags/274.png
similarity index 100%
rename from webassets/img/flags/274.png
rename to static/img/flags/274.png
diff --git a/webassets/img/flags/275.png b/static/img/flags/275.png
similarity index 100%
rename from webassets/img/flags/275.png
rename to static/img/flags/275.png
diff --git a/webassets/img/flags/276.png b/static/img/flags/276.png
similarity index 100%
rename from webassets/img/flags/276.png
rename to static/img/flags/276.png
diff --git a/webassets/img/flags/277.png b/static/img/flags/277.png
similarity index 100%
rename from webassets/img/flags/277.png
rename to static/img/flags/277.png
diff --git a/webassets/img/flags/278.png b/static/img/flags/278.png
similarity index 100%
rename from webassets/img/flags/278.png
rename to static/img/flags/278.png
diff --git a/webassets/img/flags/279.png b/static/img/flags/279.png
similarity index 100%
rename from webassets/img/flags/279.png
rename to static/img/flags/279.png
diff --git a/webassets/img/flags/28.png b/static/img/flags/28.png
similarity index 100%
rename from webassets/img/flags/28.png
rename to static/img/flags/28.png
diff --git a/webassets/img/flags/280.png b/static/img/flags/280.png
similarity index 100%
rename from webassets/img/flags/280.png
rename to static/img/flags/280.png
diff --git a/webassets/img/flags/281.png b/static/img/flags/281.png
similarity index 100%
rename from webassets/img/flags/281.png
rename to static/img/flags/281.png
diff --git a/webassets/img/flags/282.png b/static/img/flags/282.png
similarity index 100%
rename from webassets/img/flags/282.png
rename to static/img/flags/282.png
diff --git a/webassets/img/flags/283.png b/static/img/flags/283.png
similarity index 100%
rename from webassets/img/flags/283.png
rename to static/img/flags/283.png
diff --git a/webassets/img/flags/284.png b/static/img/flags/284.png
similarity index 100%
rename from webassets/img/flags/284.png
rename to static/img/flags/284.png
diff --git a/webassets/img/flags/285.png b/static/img/flags/285.png
similarity index 100%
rename from webassets/img/flags/285.png
rename to static/img/flags/285.png
diff --git a/webassets/img/flags/286.png b/static/img/flags/286.png
similarity index 100%
rename from webassets/img/flags/286.png
rename to static/img/flags/286.png
diff --git a/webassets/img/flags/287.png b/static/img/flags/287.png
similarity index 100%
rename from webassets/img/flags/287.png
rename to static/img/flags/287.png
diff --git a/webassets/img/flags/288.png b/static/img/flags/288.png
similarity index 100%
rename from webassets/img/flags/288.png
rename to static/img/flags/288.png
diff --git a/webassets/img/flags/289.png b/static/img/flags/289.png
similarity index 100%
rename from webassets/img/flags/289.png
rename to static/img/flags/289.png
diff --git a/webassets/img/flags/29.png b/static/img/flags/29.png
similarity index 100%
rename from webassets/img/flags/29.png
rename to static/img/flags/29.png
diff --git a/webassets/img/flags/291.png b/static/img/flags/291.png
similarity index 100%
rename from webassets/img/flags/291.png
rename to static/img/flags/291.png
diff --git a/webassets/img/flags/292.png b/static/img/flags/292.png
similarity index 100%
rename from webassets/img/flags/292.png
rename to static/img/flags/292.png
diff --git a/webassets/img/flags/293.png b/static/img/flags/293.png
similarity index 100%
rename from webassets/img/flags/293.png
rename to static/img/flags/293.png
diff --git a/webassets/img/flags/294.png b/static/img/flags/294.png
similarity index 100%
rename from webassets/img/flags/294.png
rename to static/img/flags/294.png
diff --git a/webassets/img/flags/295.png b/static/img/flags/295.png
similarity index 100%
rename from webassets/img/flags/295.png
rename to static/img/flags/295.png
diff --git a/webassets/img/flags/296.png b/static/img/flags/296.png
similarity index 100%
rename from webassets/img/flags/296.png
rename to static/img/flags/296.png
diff --git a/webassets/img/flags/297.png b/static/img/flags/297.png
similarity index 100%
rename from webassets/img/flags/297.png
rename to static/img/flags/297.png
diff --git a/webassets/img/flags/298.png b/static/img/flags/298.png
similarity index 100%
rename from webassets/img/flags/298.png
rename to static/img/flags/298.png
diff --git a/webassets/img/flags/299.png b/static/img/flags/299.png
similarity index 100%
rename from webassets/img/flags/299.png
rename to static/img/flags/299.png
diff --git a/webassets/img/flags/3.png b/static/img/flags/3.png
similarity index 100%
rename from webassets/img/flags/3.png
rename to static/img/flags/3.png
diff --git a/webassets/img/flags/30.png b/static/img/flags/30.png
similarity index 100%
rename from webassets/img/flags/30.png
rename to static/img/flags/30.png
diff --git a/webassets/img/flags/301.png b/static/img/flags/301.png
similarity index 100%
rename from webassets/img/flags/301.png
rename to static/img/flags/301.png
diff --git a/webassets/img/flags/302.png b/static/img/flags/302.png
similarity index 100%
rename from webassets/img/flags/302.png
rename to static/img/flags/302.png
diff --git a/webassets/img/flags/303.png b/static/img/flags/303.png
similarity index 100%
rename from webassets/img/flags/303.png
rename to static/img/flags/303.png
diff --git a/webassets/img/flags/304.png b/static/img/flags/304.png
similarity index 100%
rename from webassets/img/flags/304.png
rename to static/img/flags/304.png
diff --git a/webassets/img/flags/305.png b/static/img/flags/305.png
similarity index 100%
rename from webassets/img/flags/305.png
rename to static/img/flags/305.png
diff --git a/webassets/img/flags/306.png b/static/img/flags/306.png
similarity index 100%
rename from webassets/img/flags/306.png
rename to static/img/flags/306.png
diff --git a/webassets/img/flags/307.png b/static/img/flags/307.png
similarity index 100%
rename from webassets/img/flags/307.png
rename to static/img/flags/307.png
diff --git a/webassets/img/flags/308.png b/static/img/flags/308.png
similarity index 100%
rename from webassets/img/flags/308.png
rename to static/img/flags/308.png
diff --git a/webassets/img/flags/309.png b/static/img/flags/309.png
similarity index 100%
rename from webassets/img/flags/309.png
rename to static/img/flags/309.png
diff --git a/webassets/img/flags/31.png b/static/img/flags/31.png
similarity index 100%
rename from webassets/img/flags/31.png
rename to static/img/flags/31.png
diff --git a/webassets/img/flags/312.png b/static/img/flags/312.png
similarity index 100%
rename from webassets/img/flags/312.png
rename to static/img/flags/312.png
diff --git a/webassets/img/flags/315.png b/static/img/flags/315.png
similarity index 100%
rename from webassets/img/flags/315.png
rename to static/img/flags/315.png
diff --git a/webassets/img/flags/318.png b/static/img/flags/318.png
similarity index 100%
rename from webassets/img/flags/318.png
rename to static/img/flags/318.png
diff --git a/webassets/img/flags/32.png b/static/img/flags/32.png
similarity index 100%
rename from webassets/img/flags/32.png
rename to static/img/flags/32.png
diff --git a/webassets/img/flags/321.png b/static/img/flags/321.png
similarity index 100%
rename from webassets/img/flags/321.png
rename to static/img/flags/321.png
diff --git a/webassets/img/flags/324.png b/static/img/flags/324.png
similarity index 100%
rename from webassets/img/flags/324.png
rename to static/img/flags/324.png
diff --git a/webassets/img/flags/327.png b/static/img/flags/327.png
similarity index 100%
rename from webassets/img/flags/327.png
rename to static/img/flags/327.png
diff --git a/webassets/img/flags/33.png b/static/img/flags/33.png
similarity index 100%
rename from webassets/img/flags/33.png
rename to static/img/flags/33.png
diff --git a/webassets/img/flags/330.png b/static/img/flags/330.png
similarity index 100%
rename from webassets/img/flags/330.png
rename to static/img/flags/330.png
diff --git a/webassets/img/flags/333.png b/static/img/flags/333.png
similarity index 100%
rename from webassets/img/flags/333.png
rename to static/img/flags/333.png
diff --git a/webassets/img/flags/336.png b/static/img/flags/336.png
similarity index 100%
rename from webassets/img/flags/336.png
rename to static/img/flags/336.png
diff --git a/webassets/img/flags/339.png b/static/img/flags/339.png
similarity index 100%
rename from webassets/img/flags/339.png
rename to static/img/flags/339.png
diff --git a/webassets/img/flags/34.png b/static/img/flags/34.png
similarity index 100%
rename from webassets/img/flags/34.png
rename to static/img/flags/34.png
diff --git a/webassets/img/flags/342.png b/static/img/flags/342.png
similarity index 100%
rename from webassets/img/flags/342.png
rename to static/img/flags/342.png
diff --git a/webassets/img/flags/344.png b/static/img/flags/344.png
similarity index 100%
rename from webassets/img/flags/344.png
rename to static/img/flags/344.png
diff --git a/webassets/img/flags/345.png b/static/img/flags/345.png
similarity index 100%
rename from webassets/img/flags/345.png
rename to static/img/flags/345.png
diff --git a/webassets/img/flags/348.png b/static/img/flags/348.png
similarity index 100%
rename from webassets/img/flags/348.png
rename to static/img/flags/348.png
diff --git a/webassets/img/flags/35.png b/static/img/flags/35.png
similarity index 100%
rename from webassets/img/flags/35.png
rename to static/img/flags/35.png
diff --git a/webassets/img/flags/354.png b/static/img/flags/354.png
similarity index 100%
rename from webassets/img/flags/354.png
rename to static/img/flags/354.png
diff --git a/webassets/img/flags/36.png b/static/img/flags/36.png
similarity index 100%
rename from webassets/img/flags/36.png
rename to static/img/flags/36.png
diff --git a/webassets/img/flags/363.png b/static/img/flags/363.png
similarity index 100%
rename from webassets/img/flags/363.png
rename to static/img/flags/363.png
diff --git a/webassets/img/flags/369.png b/static/img/flags/369.png
similarity index 100%
rename from webassets/img/flags/369.png
rename to static/img/flags/369.png
diff --git a/webassets/img/flags/37.png b/static/img/flags/37.png
similarity index 100%
rename from webassets/img/flags/37.png
rename to static/img/flags/37.png
diff --git a/webassets/img/flags/370.png b/static/img/flags/370.png
similarity index 100%
rename from webassets/img/flags/370.png
rename to static/img/flags/370.png
diff --git a/webassets/img/flags/372.png b/static/img/flags/372.png
similarity index 100%
rename from webassets/img/flags/372.png
rename to static/img/flags/372.png
diff --git a/webassets/img/flags/375.png b/static/img/flags/375.png
similarity index 100%
rename from webassets/img/flags/375.png
rename to static/img/flags/375.png
diff --git a/webassets/img/flags/376.png b/static/img/flags/376.png
similarity index 100%
rename from webassets/img/flags/376.png
rename to static/img/flags/376.png
diff --git a/webassets/img/flags/378.png b/static/img/flags/378.png
similarity index 100%
rename from webassets/img/flags/378.png
rename to static/img/flags/378.png
diff --git a/webassets/img/flags/379.png b/static/img/flags/379.png
similarity index 100%
rename from webassets/img/flags/379.png
rename to static/img/flags/379.png
diff --git a/webassets/img/flags/38.png b/static/img/flags/38.png
similarity index 100%
rename from webassets/img/flags/38.png
rename to static/img/flags/38.png
diff --git a/webassets/img/flags/381.png b/static/img/flags/381.png
similarity index 100%
rename from webassets/img/flags/381.png
rename to static/img/flags/381.png
diff --git a/webassets/img/flags/382.png b/static/img/flags/382.png
similarity index 100%
rename from webassets/img/flags/382.png
rename to static/img/flags/382.png
diff --git a/webassets/img/flags/384.png b/static/img/flags/384.png
similarity index 100%
rename from webassets/img/flags/384.png
rename to static/img/flags/384.png
diff --git a/webassets/img/flags/386.png b/static/img/flags/386.png
similarity index 100%
rename from webassets/img/flags/386.png
rename to static/img/flags/386.png
diff --git a/webassets/img/flags/387.png b/static/img/flags/387.png
similarity index 100%
rename from webassets/img/flags/387.png
rename to static/img/flags/387.png
diff --git a/webassets/img/flags/39.png b/static/img/flags/39.png
similarity index 100%
rename from webassets/img/flags/39.png
rename to static/img/flags/39.png
diff --git a/webassets/img/flags/390.png b/static/img/flags/390.png
similarity index 100%
rename from webassets/img/flags/390.png
rename to static/img/flags/390.png
diff --git a/webassets/img/flags/391.png b/static/img/flags/391.png
similarity index 100%
rename from webassets/img/flags/391.png
rename to static/img/flags/391.png
diff --git a/webassets/img/flags/4.png b/static/img/flags/4.png
similarity index 100%
rename from webassets/img/flags/4.png
rename to static/img/flags/4.png
diff --git a/webassets/img/flags/40.png b/static/img/flags/40.png
similarity index 100%
rename from webassets/img/flags/40.png
rename to static/img/flags/40.png
diff --git a/webassets/img/flags/400.png b/static/img/flags/400.png
similarity index 100%
rename from webassets/img/flags/400.png
rename to static/img/flags/400.png
diff --git a/webassets/img/flags/401.png b/static/img/flags/401.png
similarity index 100%
rename from webassets/img/flags/401.png
rename to static/img/flags/401.png
diff --git a/webassets/img/flags/402.png b/static/img/flags/402.png
similarity index 100%
rename from webassets/img/flags/402.png
rename to static/img/flags/402.png
diff --git a/webassets/img/flags/404.png b/static/img/flags/404.png
similarity index 100%
rename from webassets/img/flags/404.png
rename to static/img/flags/404.png
diff --git a/webassets/img/flags/406.png b/static/img/flags/406.png
similarity index 100%
rename from webassets/img/flags/406.png
rename to static/img/flags/406.png
diff --git a/webassets/img/flags/408.png b/static/img/flags/408.png
similarity index 100%
rename from webassets/img/flags/408.png
rename to static/img/flags/408.png
diff --git a/webassets/img/flags/409.png b/static/img/flags/409.png
similarity index 100%
rename from webassets/img/flags/409.png
rename to static/img/flags/409.png
diff --git a/webassets/img/flags/41.png b/static/img/flags/41.png
similarity index 100%
rename from webassets/img/flags/41.png
rename to static/img/flags/41.png
diff --git a/webassets/img/flags/410.png b/static/img/flags/410.png
similarity index 100%
rename from webassets/img/flags/410.png
rename to static/img/flags/410.png
diff --git a/webassets/img/flags/411.png b/static/img/flags/411.png
similarity index 100%
rename from webassets/img/flags/411.png
rename to static/img/flags/411.png
diff --git a/webassets/img/flags/412.png b/static/img/flags/412.png
similarity index 100%
rename from webassets/img/flags/412.png
rename to static/img/flags/412.png
diff --git a/webassets/img/flags/414.png b/static/img/flags/414.png
similarity index 100%
rename from webassets/img/flags/414.png
rename to static/img/flags/414.png
diff --git a/webassets/img/flags/416.png b/static/img/flags/416.png
similarity index 100%
rename from webassets/img/flags/416.png
rename to static/img/flags/416.png
diff --git a/webassets/img/flags/42.png b/static/img/flags/42.png
similarity index 100%
rename from webassets/img/flags/42.png
rename to static/img/flags/42.png
diff --git a/webassets/img/flags/420.png b/static/img/flags/420.png
similarity index 100%
rename from webassets/img/flags/420.png
rename to static/img/flags/420.png
diff --git a/webassets/img/flags/422.png b/static/img/flags/422.png
similarity index 100%
rename from webassets/img/flags/422.png
rename to static/img/flags/422.png
diff --git a/webassets/img/flags/424.png b/static/img/flags/424.png
similarity index 100%
rename from webassets/img/flags/424.png
rename to static/img/flags/424.png
diff --git a/webassets/img/flags/428.png b/static/img/flags/428.png
similarity index 100%
rename from webassets/img/flags/428.png
rename to static/img/flags/428.png
diff --git a/webassets/img/flags/43.png b/static/img/flags/43.png
similarity index 100%
rename from webassets/img/flags/43.png
rename to static/img/flags/43.png
diff --git a/webassets/img/flags/430.png b/static/img/flags/430.png
similarity index 100%
rename from webassets/img/flags/430.png
rename to static/img/flags/430.png
diff --git a/webassets/img/flags/432.png b/static/img/flags/432.png
similarity index 100%
rename from webassets/img/flags/432.png
rename to static/img/flags/432.png
diff --git a/webassets/img/flags/434.png b/static/img/flags/434.png
similarity index 100%
rename from webassets/img/flags/434.png
rename to static/img/flags/434.png
diff --git a/webassets/img/flags/436.png b/static/img/flags/436.png
similarity index 100%
rename from webassets/img/flags/436.png
rename to static/img/flags/436.png
diff --git a/webassets/img/flags/438.png b/static/img/flags/438.png
similarity index 100%
rename from webassets/img/flags/438.png
rename to static/img/flags/438.png
diff --git a/webassets/img/flags/44.png b/static/img/flags/44.png
similarity index 100%
rename from webassets/img/flags/44.png
rename to static/img/flags/44.png
diff --git a/webassets/img/flags/440.png b/static/img/flags/440.png
similarity index 100%
rename from webassets/img/flags/440.png
rename to static/img/flags/440.png
diff --git a/webassets/img/flags/442.png b/static/img/flags/442.png
similarity index 100%
rename from webassets/img/flags/442.png
rename to static/img/flags/442.png
diff --git a/webassets/img/flags/444.png b/static/img/flags/444.png
similarity index 100%
rename from webassets/img/flags/444.png
rename to static/img/flags/444.png
diff --git a/webassets/img/flags/446.png b/static/img/flags/446.png
similarity index 100%
rename from webassets/img/flags/446.png
rename to static/img/flags/446.png
diff --git a/webassets/img/flags/45.png b/static/img/flags/45.png
similarity index 100%
rename from webassets/img/flags/45.png
rename to static/img/flags/45.png
diff --git a/webassets/img/flags/450.png b/static/img/flags/450.png
similarity index 100%
rename from webassets/img/flags/450.png
rename to static/img/flags/450.png
diff --git a/webassets/img/flags/452.png b/static/img/flags/452.png
similarity index 100%
rename from webassets/img/flags/452.png
rename to static/img/flags/452.png
diff --git a/webassets/img/flags/453.png b/static/img/flags/453.png
similarity index 100%
rename from webassets/img/flags/453.png
rename to static/img/flags/453.png
diff --git a/webassets/img/flags/454.png b/static/img/flags/454.png
similarity index 100%
rename from webassets/img/flags/454.png
rename to static/img/flags/454.png
diff --git a/webassets/img/flags/456.png b/static/img/flags/456.png
similarity index 100%
rename from webassets/img/flags/456.png
rename to static/img/flags/456.png
diff --git a/webassets/img/flags/458.png b/static/img/flags/458.png
similarity index 100%
rename from webassets/img/flags/458.png
rename to static/img/flags/458.png
diff --git a/webassets/img/flags/46.png b/static/img/flags/46.png
similarity index 100%
rename from webassets/img/flags/46.png
rename to static/img/flags/46.png
diff --git a/webassets/img/flags/460.png b/static/img/flags/460.png
similarity index 100%
rename from webassets/img/flags/460.png
rename to static/img/flags/460.png
diff --git a/webassets/img/flags/462.png b/static/img/flags/462.png
similarity index 100%
rename from webassets/img/flags/462.png
rename to static/img/flags/462.png
diff --git a/webassets/img/flags/464.png b/static/img/flags/464.png
similarity index 100%
rename from webassets/img/flags/464.png
rename to static/img/flags/464.png
diff --git a/webassets/img/flags/466.png b/static/img/flags/466.png
similarity index 100%
rename from webassets/img/flags/466.png
rename to static/img/flags/466.png
diff --git a/webassets/img/flags/468.png b/static/img/flags/468.png
similarity index 100%
rename from webassets/img/flags/468.png
rename to static/img/flags/468.png
diff --git a/webassets/img/flags/47.png b/static/img/flags/47.png
similarity index 100%
rename from webassets/img/flags/47.png
rename to static/img/flags/47.png
diff --git a/webassets/img/flags/470.png b/static/img/flags/470.png
similarity index 100%
rename from webassets/img/flags/470.png
rename to static/img/flags/470.png
diff --git a/webassets/img/flags/474.png b/static/img/flags/474.png
similarity index 100%
rename from webassets/img/flags/474.png
rename to static/img/flags/474.png
diff --git a/webassets/img/flags/478.png b/static/img/flags/478.png
similarity index 100%
rename from webassets/img/flags/478.png
rename to static/img/flags/478.png
diff --git a/webassets/img/flags/48.png b/static/img/flags/48.png
similarity index 100%
rename from webassets/img/flags/48.png
rename to static/img/flags/48.png
diff --git a/webassets/img/flags/480.png b/static/img/flags/480.png
similarity index 100%
rename from webassets/img/flags/480.png
rename to static/img/flags/480.png
diff --git a/webassets/img/flags/482.png b/static/img/flags/482.png
similarity index 100%
rename from webassets/img/flags/482.png
rename to static/img/flags/482.png
diff --git a/webassets/img/flags/483.png b/static/img/flags/483.png
similarity index 100%
rename from webassets/img/flags/483.png
rename to static/img/flags/483.png
diff --git a/webassets/img/flags/488.png b/static/img/flags/488.png
similarity index 100%
rename from webassets/img/flags/488.png
rename to static/img/flags/488.png
diff --git a/webassets/img/flags/489.png b/static/img/flags/489.png
similarity index 100%
rename from webassets/img/flags/489.png
rename to static/img/flags/489.png
diff --git a/webassets/img/flags/49.png b/static/img/flags/49.png
similarity index 100%
rename from webassets/img/flags/49.png
rename to static/img/flags/49.png
diff --git a/webassets/img/flags/490.png b/static/img/flags/490.png
similarity index 100%
rename from webassets/img/flags/490.png
rename to static/img/flags/490.png
diff --git a/webassets/img/flags/492.png b/static/img/flags/492.png
similarity index 100%
rename from webassets/img/flags/492.png
rename to static/img/flags/492.png
diff --git a/webassets/img/flags/493.png b/static/img/flags/493.png
similarity index 100%
rename from webassets/img/flags/493.png
rename to static/img/flags/493.png
diff --git a/webassets/img/flags/497.png b/static/img/flags/497.png
similarity index 100%
rename from webassets/img/flags/497.png
rename to static/img/flags/497.png
diff --git a/webassets/img/flags/499.png b/static/img/flags/499.png
similarity index 100%
rename from webassets/img/flags/499.png
rename to static/img/flags/499.png
diff --git a/webassets/img/flags/5.png b/static/img/flags/5.png
similarity index 100%
rename from webassets/img/flags/5.png
rename to static/img/flags/5.png
diff --git a/webassets/img/flags/50.png b/static/img/flags/50.png
similarity index 100%
rename from webassets/img/flags/50.png
rename to static/img/flags/50.png
diff --git a/webassets/img/flags/501.png b/static/img/flags/501.png
similarity index 100%
rename from webassets/img/flags/501.png
rename to static/img/flags/501.png
diff --git a/webassets/img/flags/502.png b/static/img/flags/502.png
similarity index 100%
rename from webassets/img/flags/502.png
rename to static/img/flags/502.png
diff --git a/webassets/img/flags/503.png b/static/img/flags/503.png
similarity index 100%
rename from webassets/img/flags/503.png
rename to static/img/flags/503.png
diff --git a/webassets/img/flags/504.png b/static/img/flags/504.png
similarity index 100%
rename from webassets/img/flags/504.png
rename to static/img/flags/504.png
diff --git a/webassets/img/flags/505.png b/static/img/flags/505.png
similarity index 100%
rename from webassets/img/flags/505.png
rename to static/img/flags/505.png
diff --git a/webassets/img/flags/506.png b/static/img/flags/506.png
similarity index 100%
rename from webassets/img/flags/506.png
rename to static/img/flags/506.png
diff --git a/webassets/img/flags/507.png b/static/img/flags/507.png
similarity index 100%
rename from webassets/img/flags/507.png
rename to static/img/flags/507.png
diff --git a/webassets/img/flags/508.png b/static/img/flags/508.png
similarity index 100%
rename from webassets/img/flags/508.png
rename to static/img/flags/508.png
diff --git a/webassets/img/flags/509.png b/static/img/flags/509.png
similarity index 100%
rename from webassets/img/flags/509.png
rename to static/img/flags/509.png
diff --git a/webassets/img/flags/51.png b/static/img/flags/51.png
similarity index 100%
rename from webassets/img/flags/51.png
rename to static/img/flags/51.png
diff --git a/webassets/img/flags/510.png b/static/img/flags/510.png
similarity index 100%
rename from webassets/img/flags/510.png
rename to static/img/flags/510.png
diff --git a/webassets/img/flags/511.png b/static/img/flags/511.png
similarity index 100%
rename from webassets/img/flags/511.png
rename to static/img/flags/511.png
diff --git a/webassets/img/flags/512.png b/static/img/flags/512.png
similarity index 100%
rename from webassets/img/flags/512.png
rename to static/img/flags/512.png
diff --git a/webassets/img/flags/513.png b/static/img/flags/513.png
similarity index 100%
rename from webassets/img/flags/513.png
rename to static/img/flags/513.png
diff --git a/webassets/img/flags/514.png b/static/img/flags/514.png
similarity index 100%
rename from webassets/img/flags/514.png
rename to static/img/flags/514.png
diff --git a/webassets/img/flags/515.png b/static/img/flags/515.png
similarity index 100%
rename from webassets/img/flags/515.png
rename to static/img/flags/515.png
diff --git a/webassets/img/flags/516.png b/static/img/flags/516.png
similarity index 100%
rename from webassets/img/flags/516.png
rename to static/img/flags/516.png
diff --git a/webassets/img/flags/517.png b/static/img/flags/517.png
similarity index 100%
rename from webassets/img/flags/517.png
rename to static/img/flags/517.png
diff --git a/webassets/img/flags/518.png b/static/img/flags/518.png
similarity index 100%
rename from webassets/img/flags/518.png
rename to static/img/flags/518.png
diff --git a/webassets/img/flags/519.png b/static/img/flags/519.png
similarity index 100%
rename from webassets/img/flags/519.png
rename to static/img/flags/519.png
diff --git a/webassets/img/flags/52.png b/static/img/flags/52.png
similarity index 100%
rename from webassets/img/flags/52.png
rename to static/img/flags/52.png
diff --git a/webassets/img/flags/520.png b/static/img/flags/520.png
similarity index 100%
rename from webassets/img/flags/520.png
rename to static/img/flags/520.png
diff --git a/webassets/img/flags/521.png b/static/img/flags/521.png
similarity index 100%
rename from webassets/img/flags/521.png
rename to static/img/flags/521.png
diff --git a/webassets/img/flags/522.png b/static/img/flags/522.png
similarity index 100%
rename from webassets/img/flags/522.png
rename to static/img/flags/522.png
diff --git a/webassets/img/flags/53.png b/static/img/flags/53.png
similarity index 100%
rename from webassets/img/flags/53.png
rename to static/img/flags/53.png
diff --git a/webassets/img/flags/54.png b/static/img/flags/54.png
similarity index 100%
rename from webassets/img/flags/54.png
rename to static/img/flags/54.png
diff --git a/webassets/img/flags/55.png b/static/img/flags/55.png
similarity index 100%
rename from webassets/img/flags/55.png
rename to static/img/flags/55.png
diff --git a/webassets/img/flags/56.png b/static/img/flags/56.png
similarity index 100%
rename from webassets/img/flags/56.png
rename to static/img/flags/56.png
diff --git a/webassets/img/flags/57.png b/static/img/flags/57.png
similarity index 100%
rename from webassets/img/flags/57.png
rename to static/img/flags/57.png
diff --git a/webassets/img/flags/58.png b/static/img/flags/58.png
similarity index 100%
rename from webassets/img/flags/58.png
rename to static/img/flags/58.png
diff --git a/webassets/img/flags/59.png b/static/img/flags/59.png
similarity index 100%
rename from webassets/img/flags/59.png
rename to static/img/flags/59.png
diff --git a/webassets/img/flags/6.png b/static/img/flags/6.png
similarity index 100%
rename from webassets/img/flags/6.png
rename to static/img/flags/6.png
diff --git a/webassets/img/flags/60.png b/static/img/flags/60.png
similarity index 100%
rename from webassets/img/flags/60.png
rename to static/img/flags/60.png
diff --git a/webassets/img/flags/61.png b/static/img/flags/61.png
similarity index 100%
rename from webassets/img/flags/61.png
rename to static/img/flags/61.png
diff --git a/webassets/img/flags/62.png b/static/img/flags/62.png
similarity index 100%
rename from webassets/img/flags/62.png
rename to static/img/flags/62.png
diff --git a/webassets/img/flags/63.png b/static/img/flags/63.png
similarity index 100%
rename from webassets/img/flags/63.png
rename to static/img/flags/63.png
diff --git a/webassets/img/flags/64.png b/static/img/flags/64.png
similarity index 100%
rename from webassets/img/flags/64.png
rename to static/img/flags/64.png
diff --git a/webassets/img/flags/65.png b/static/img/flags/65.png
similarity index 100%
rename from webassets/img/flags/65.png
rename to static/img/flags/65.png
diff --git a/webassets/img/flags/66.png b/static/img/flags/66.png
similarity index 100%
rename from webassets/img/flags/66.png
rename to static/img/flags/66.png
diff --git a/webassets/img/flags/67.png b/static/img/flags/67.png
similarity index 100%
rename from webassets/img/flags/67.png
rename to static/img/flags/67.png
diff --git a/webassets/img/flags/68.png b/static/img/flags/68.png
similarity index 100%
rename from webassets/img/flags/68.png
rename to static/img/flags/68.png
diff --git a/webassets/img/flags/69.png b/static/img/flags/69.png
similarity index 100%
rename from webassets/img/flags/69.png
rename to static/img/flags/69.png
diff --git a/webassets/img/flags/7.png b/static/img/flags/7.png
similarity index 100%
rename from webassets/img/flags/7.png
rename to static/img/flags/7.png
diff --git a/webassets/img/flags/70.png b/static/img/flags/70.png
similarity index 100%
rename from webassets/img/flags/70.png
rename to static/img/flags/70.png
diff --git a/webassets/img/flags/71.png b/static/img/flags/71.png
similarity index 100%
rename from webassets/img/flags/71.png
rename to static/img/flags/71.png
diff --git a/webassets/img/flags/72.png b/static/img/flags/72.png
similarity index 100%
rename from webassets/img/flags/72.png
rename to static/img/flags/72.png
diff --git a/webassets/img/flags/74.png b/static/img/flags/74.png
similarity index 100%
rename from webassets/img/flags/74.png
rename to static/img/flags/74.png
diff --git a/webassets/img/flags/75.png b/static/img/flags/75.png
similarity index 100%
rename from webassets/img/flags/75.png
rename to static/img/flags/75.png
diff --git a/webassets/img/flags/76.png b/static/img/flags/76.png
similarity index 100%
rename from webassets/img/flags/76.png
rename to static/img/flags/76.png
diff --git a/webassets/img/flags/77.png b/static/img/flags/77.png
similarity index 100%
rename from webassets/img/flags/77.png
rename to static/img/flags/77.png
diff --git a/webassets/img/flags/78.png b/static/img/flags/78.png
similarity index 100%
rename from webassets/img/flags/78.png
rename to static/img/flags/78.png
diff --git a/webassets/img/flags/79.png b/static/img/flags/79.png
similarity index 100%
rename from webassets/img/flags/79.png
rename to static/img/flags/79.png
diff --git a/webassets/img/flags/8.png b/static/img/flags/8.png
similarity index 100%
rename from webassets/img/flags/8.png
rename to static/img/flags/8.png
diff --git a/webassets/img/flags/80.png b/static/img/flags/80.png
similarity index 100%
rename from webassets/img/flags/80.png
rename to static/img/flags/80.png
diff --git a/webassets/img/flags/81.png b/static/img/flags/81.png
similarity index 100%
rename from webassets/img/flags/81.png
rename to static/img/flags/81.png
diff --git a/webassets/img/flags/82.png b/static/img/flags/82.png
similarity index 100%
rename from webassets/img/flags/82.png
rename to static/img/flags/82.png
diff --git a/webassets/img/flags/84.png b/static/img/flags/84.png
similarity index 100%
rename from webassets/img/flags/84.png
rename to static/img/flags/84.png
diff --git a/webassets/img/flags/85.png b/static/img/flags/85.png
similarity index 100%
rename from webassets/img/flags/85.png
rename to static/img/flags/85.png
diff --git a/webassets/img/flags/86.png b/static/img/flags/86.png
similarity index 100%
rename from webassets/img/flags/86.png
rename to static/img/flags/86.png
diff --git a/webassets/img/flags/88.png b/static/img/flags/88.png
similarity index 100%
rename from webassets/img/flags/88.png
rename to static/img/flags/88.png
diff --git a/webassets/img/flags/89.png b/static/img/flags/89.png
similarity index 100%
rename from webassets/img/flags/89.png
rename to static/img/flags/89.png
diff --git a/webassets/img/flags/9.png b/static/img/flags/9.png
similarity index 100%
rename from webassets/img/flags/9.png
rename to static/img/flags/9.png
diff --git a/webassets/img/flags/90.png b/static/img/flags/90.png
similarity index 100%
rename from webassets/img/flags/90.png
rename to static/img/flags/90.png
diff --git a/webassets/img/flags/91.png b/static/img/flags/91.png
similarity index 100%
rename from webassets/img/flags/91.png
rename to static/img/flags/91.png
diff --git a/webassets/img/flags/93.png b/static/img/flags/93.png
similarity index 100%
rename from webassets/img/flags/93.png
rename to static/img/flags/93.png
diff --git a/webassets/img/flags/94.png b/static/img/flags/94.png
similarity index 100%
rename from webassets/img/flags/94.png
rename to static/img/flags/94.png
diff --git a/webassets/img/flags/95.png b/static/img/flags/95.png
similarity index 100%
rename from webassets/img/flags/95.png
rename to static/img/flags/95.png
diff --git a/webassets/img/flags/96.png b/static/img/flags/96.png
similarity index 100%
rename from webassets/img/flags/96.png
rename to static/img/flags/96.png
diff --git a/webassets/img/flags/97.png b/static/img/flags/97.png
similarity index 100%
rename from webassets/img/flags/97.png
rename to static/img/flags/97.png
diff --git a/webassets/img/flags/98.png b/static/img/flags/98.png
similarity index 100%
rename from webassets/img/flags/98.png
rename to static/img/flags/98.png
diff --git a/webassets/img/flags/99.png b/static/img/flags/99.png
similarity index 100%
rename from webassets/img/flags/99.png
rename to static/img/flags/99.png
diff --git a/webassets/img/flags/999.png b/static/img/flags/999.png
similarity index 100%
rename from webassets/img/flags/999.png
rename to static/img/flags/999.png
diff --git a/webassets/img/flags/generate.py b/static/img/flags/generate.py
similarity index 100%
rename from webassets/img/flags/generate.py
rename to static/img/flags/generate.py
diff --git a/webassets/img/icon-16.png b/static/img/icon-16.png
similarity index 100%
rename from webassets/img/icon-16.png
rename to static/img/icon-16.png
diff --git a/webassets/img/icon-192-pwa.png b/static/img/icon-192-pwa.png
similarity index 100%
rename from webassets/img/icon-192-pwa.png
rename to static/img/icon-192-pwa.png
diff --git a/webassets/img/icon-192.png b/static/img/icon-192.png
similarity index 100%
rename from webassets/img/icon-192.png
rename to static/img/icon-192.png
diff --git a/webassets/img/icon-32.png b/static/img/icon-32.png
similarity index 100%
rename from webassets/img/icon-32.png
rename to static/img/icon-32.png
diff --git a/webassets/img/icon-512-pwa.png b/static/img/icon-512-pwa.png
similarity index 100%
rename from webassets/img/icon-512-pwa.png
rename to static/img/icon-512-pwa.png
diff --git a/webassets/img/icon-512.png b/static/img/icon-512.png
similarity index 100%
rename from webassets/img/icon-512.png
rename to static/img/icon-512.png
diff --git a/webassets/img/logo.png b/static/img/logo.png
similarity index 100%
rename from webassets/img/logo.png
rename to static/img/logo.png
diff --git a/webassets/js/add-spot.js b/static/js/add-spot.js
similarity index 100%
rename from webassets/js/add-spot.js
rename to static/js/add-spot.js
diff --git a/webassets/js/alerts.js b/static/js/alerts.js
similarity index 100%
rename from webassets/js/alerts.js
rename to static/js/alerts.js
diff --git a/webassets/js/bands.js b/static/js/bands.js
similarity index 100%
rename from webassets/js/bands.js
rename to static/js/bands.js
diff --git a/webassets/js/common.js b/static/js/common.js
similarity index 100%
rename from webassets/js/common.js
rename to static/js/common.js
diff --git a/webassets/js/conditions.js b/static/js/conditions.js
similarity index 100%
rename from webassets/js/conditions.js
rename to static/js/conditions.js
diff --git a/webassets/js/geo.js b/static/js/geo.js
similarity index 100%
rename from webassets/js/geo.js
rename to static/js/geo.js
diff --git a/webassets/js/map.js b/static/js/map.js
similarity index 100%
rename from webassets/js/map.js
rename to static/js/map.js
diff --git a/webassets/js/spots.js b/static/js/spots.js
similarity index 100%
rename from webassets/js/spots.js
rename to static/js/spots.js
diff --git a/webassets/js/spotsbandsandmap.js b/static/js/spotsbandsandmap.js
similarity index 100%
rename from webassets/js/spotsbandsandmap.js
rename to static/js/spotsbandsandmap.js
diff --git a/webassets/js/status.js b/static/js/status.js
similarity index 100%
rename from webassets/js/status.js
rename to static/js/status.js
diff --git a/webassets/js/ui-ham.js b/static/js/ui-ham.js
similarity index 100%
rename from webassets/js/ui-ham.js
rename to static/js/ui-ham.js
diff --git a/webassets/js/utils.js b/static/js/utils.js
similarity index 100%
rename from webassets/js/utils.js
rename to static/js/utils.js
diff --git a/webassets/service-worker.js b/static/service-worker.js
similarity index 100%
rename from webassets/service-worker.js
rename to static/service-worker.js
diff --git a/webassets/vendor/css/bootstrap-5.3.8.min.css b/static/vendor/css/bootstrap-5.3.8.min.css
similarity index 100%
rename from webassets/vendor/css/bootstrap-5.3.8.min.css
rename to static/vendor/css/bootstrap-5.3.8.min.css
diff --git a/webassets/vendor/css/fontawesome-6.7.2.min.css b/static/vendor/css/fontawesome-6.7.2.min.css
similarity index 100%
rename from webassets/vendor/css/fontawesome-6.7.2.min.css
rename to static/vendor/css/fontawesome-6.7.2.min.css
diff --git a/webassets/vendor/css/images/layers-2x.png b/static/vendor/css/images/layers-2x.png
similarity index 100%
rename from webassets/vendor/css/images/layers-2x.png
rename to static/vendor/css/images/layers-2x.png
diff --git a/webassets/vendor/css/images/layers.png b/static/vendor/css/images/layers.png
similarity index 100%
rename from webassets/vendor/css/images/layers.png
rename to static/vendor/css/images/layers.png
diff --git a/webassets/vendor/css/images/marker-icon-2x.png b/static/vendor/css/images/marker-icon-2x.png
similarity index 100%
rename from webassets/vendor/css/images/marker-icon-2x.png
rename to static/vendor/css/images/marker-icon-2x.png
diff --git a/webassets/vendor/css/images/marker-icon.png b/static/vendor/css/images/marker-icon.png
similarity index 100%
rename from webassets/vendor/css/images/marker-icon.png
rename to static/vendor/css/images/marker-icon.png
diff --git a/webassets/vendor/css/images/marker-shadow.png b/static/vendor/css/images/marker-shadow.png
similarity index 100%
rename from webassets/vendor/css/images/marker-shadow.png
rename to static/vendor/css/images/marker-shadow.png
diff --git a/webassets/vendor/css/leaflet-1.9.4.min.css b/static/vendor/css/leaflet-1.9.4.min.css
similarity index 100%
rename from webassets/vendor/css/leaflet-1.9.4.min.css
rename to static/vendor/css/leaflet-1.9.4.min.css
diff --git a/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css b/static/vendor/css/leaflet-extra-markers-1.2.2.min.css
similarity index 100%
rename from webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
rename to static/vendor/css/leaflet-extra-markers-1.2.2.min.css
diff --git a/webassets/vendor/css/solid-6.7.2.min.css b/static/vendor/css/solid-6.7.2.min.css
similarity index 100%
rename from webassets/vendor/css/solid-6.7.2.min.css
rename to static/vendor/css/solid-6.7.2.min.css
diff --git a/webassets/vendor/img/markers_default.png b/static/vendor/img/markers_default.png
similarity index 100%
rename from webassets/vendor/img/markers_default.png
rename to static/vendor/img/markers_default.png
diff --git a/webassets/vendor/img/markers_default@2x.png b/static/vendor/img/markers_default@2x.png
similarity index 100%
rename from webassets/vendor/img/markers_default@2x.png
rename to static/vendor/img/markers_default@2x.png
diff --git a/webassets/vendor/img/markers_shadow.png b/static/vendor/img/markers_shadow.png
similarity index 100%
rename from webassets/vendor/img/markers_shadow.png
rename to static/vendor/img/markers_shadow.png
diff --git a/webassets/vendor/img/markers_shadow@2x.png b/static/vendor/img/markers_shadow@2x.png
similarity index 100%
rename from webassets/vendor/img/markers_shadow@2x.png
rename to static/vendor/img/markers_shadow@2x.png
diff --git a/webassets/vendor/js/bootstrap-5.3.8.bundle.min.js b/static/vendor/js/bootstrap-5.3.8.bundle.min.js
similarity index 100%
rename from webassets/vendor/js/bootstrap-5.3.8.bundle.min.js
rename to static/vendor/js/bootstrap-5.3.8.bundle.min.js
diff --git a/webassets/vendor/js/chart-4.4.9.umd.min.js b/static/vendor/js/chart-4.4.9.umd.min.js
similarity index 100%
rename from webassets/vendor/js/chart-4.4.9.umd.min.js
rename to static/vendor/js/chart-4.4.9.umd.min.js
diff --git a/webassets/vendor/js/jquery-3.7.1.min.js b/static/vendor/js/jquery-3.7.1.min.js
similarity index 100%
rename from webassets/vendor/js/jquery-3.7.1.min.js
rename to static/vendor/js/jquery-3.7.1.min.js
diff --git a/webassets/vendor/js/leaflet-1.9.4.min.js b/static/vendor/js/leaflet-1.9.4.min.js
similarity index 100%
rename from webassets/vendor/js/leaflet-1.9.4.min.js
rename to static/vendor/js/leaflet-1.9.4.min.js
diff --git a/webassets/vendor/js/leaflet-cqzones.js b/static/vendor/js/leaflet-cqzones.js
similarity index 100%
rename from webassets/vendor/js/leaflet-cqzones.js
rename to static/vendor/js/leaflet-cqzones.js
diff --git a/webassets/vendor/js/leaflet-extra-markers-1.2.2.min.js b/static/vendor/js/leaflet-extra-markers-1.2.2.min.js
similarity index 100%
rename from webassets/vendor/js/leaflet-extra-markers-1.2.2.min.js
rename to static/vendor/js/leaflet-extra-markers-1.2.2.min.js
diff --git a/webassets/vendor/js/leaflet-geodesic-2.7.2.umd.min.js b/static/vendor/js/leaflet-geodesic-2.7.2.umd.min.js
similarity index 100%
rename from webassets/vendor/js/leaflet-geodesic-2.7.2.umd.min.js
rename to static/vendor/js/leaflet-geodesic-2.7.2.umd.min.js
diff --git a/webassets/vendor/js/leaflet-ituzones.js b/static/vendor/js/leaflet-ituzones.js
similarity index 100%
rename from webassets/vendor/js/leaflet-ituzones.js
rename to static/vendor/js/leaflet-ituzones.js
diff --git a/webassets/vendor/js/leaflet-maidenhead.js b/static/vendor/js/leaflet-maidenhead.js
similarity index 100%
rename from webassets/vendor/js/leaflet-maidenhead.js
rename to static/vendor/js/leaflet-maidenhead.js
diff --git a/webassets/vendor/js/leaflet-providers-2.0.0.js b/static/vendor/js/leaflet-providers-2.0.0.js
similarity index 100%
rename from webassets/vendor/js/leaflet-providers-2.0.0.js
rename to static/vendor/js/leaflet-providers-2.0.0.js
diff --git a/webassets/vendor/js/leaflet-terminator-1.1.0.min.js b/static/vendor/js/leaflet-terminator-1.1.0.min.js
similarity index 100%
rename from webassets/vendor/js/leaflet-terminator-1.1.0.min.js
rename to static/vendor/js/leaflet-terminator-1.1.0.min.js
diff --git a/webassets/vendor/js/leaflet-vectorgrid-1.3.0.js b/static/vendor/js/leaflet-vectorgrid-1.3.0.js
similarity index 100%
rename from webassets/vendor/js/leaflet-vectorgrid-1.3.0.js
rename to static/vendor/js/leaflet-vectorgrid-1.3.0.js
diff --git a/webassets/vendor/js/leaflet-workedallbritainireland.js b/static/vendor/js/leaflet-workedallbritainireland.js
similarity index 100%
rename from webassets/vendor/js/leaflet-workedallbritainireland.js
rename to static/vendor/js/leaflet-workedallbritainireland.js
diff --git a/webassets/vendor/js/moment-2.29.4.min.js b/static/vendor/js/moment-2.29.4.min.js
similarity index 100%
rename from webassets/vendor/js/moment-2.29.4.min.js
rename to static/vendor/js/moment-2.29.4.min.js
diff --git a/webassets/vendor/js/oms-leaflet-0.2.7.min.js b/static/vendor/js/oms-leaflet-0.2.7.min.js
similarity index 100%
rename from webassets/vendor/js/oms-leaflet-0.2.7.min.js
rename to static/vendor/js/oms-leaflet-0.2.7.min.js
diff --git a/webassets/vendor/js/text-image-0.7.0.js b/static/vendor/js/text-image-0.7.0.js
similarity index 100%
rename from webassets/vendor/js/text-image-0.7.0.js
rename to static/vendor/js/text-image-0.7.0.js
diff --git a/webassets/vendor/js/tinycolor2-1.6.0.min.js b/static/vendor/js/tinycolor2-1.6.0.min.js
similarity index 100%
rename from webassets/vendor/js/tinycolor2-1.6.0.min.js
rename to static/vendor/js/tinycolor2-1.6.0.min.js
diff --git a/webassets/vendor/webfonts/fa-solid-900.ttf b/static/vendor/webfonts/fa-solid-900.ttf
similarity index 100%
rename from webassets/vendor/webfonts/fa-solid-900.ttf
rename to static/vendor/webfonts/fa-solid-900.ttf
diff --git a/webassets/vendor/webfonts/fa-solid-900.woff2 b/static/vendor/webfonts/fa-solid-900.woff2
similarity index 100%
rename from webassets/vendor/webfonts/fa-solid-900.woff2
rename to static/vendor/webfonts/fa-solid-900.woff2
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 1bf5fae..afa63e7 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1784995281"></script>
+<script src="/static/js/add-spot.js?v=1785048458"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index ddcd199..cdde5e5 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1784995281"></script>
+<script src="/static/js/alerts.js?v=1785048458"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 63c97d2..d0cf2b0 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784995281"></script>
-<script src="/static/js/bands.js?v=1784995281"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785048458"></script>
+<script src="/static/js/bands.js?v=1785048458"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 5732398..ad0ee39 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1784995281" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1785048458" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/static/js/utils.js?v=1784995281"></script>
-<script src="/static/js/ui-ham.js?v=1784995281"></script>
-<script src="/static/js/geo.js?v=1784995281"></script>
-<script src="/static/js/common.js?v=1784995281"></script>
+<script src="/static/js/utils.js?v=1785048458"></script>
+<script src="/static/js/ui-ham.js?v=1785048458"></script>
+<script src="/static/js/geo.js?v=1785048458"></script>
+<script src="/static/js/common.js?v=1785048458"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 5c53370..373f0df 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1784995281"></script>
+<script src="/static/js/conditions.js?v=1785048458"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 874f70d..8f9b1af 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -108,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784995281"></script>
-<script src="/static/js/map.js?v=1784995281"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785048458"></script>
+<script src="/static/js/map.js?v=1785048458"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 4d8ffe8..a2a975e 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784995281"></script>
-<script src="/static/js/spots.js?v=1784995281"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785048458"></script>
+<script src="/static/js/spots.js?v=1785048458"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 30de80a..a1fbaa2 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1784995281"></script>
+<script src="/static/js/status.js?v=1785048458"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 77d7fd70d95e65813ca2c6def3a9fe6263aa0a81 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sun, 26 Jul 2026 07:51:25 +0100
Subject: [PATCH 27/29] Logging improvements

---
 alertproviders/http_alert_provider.py          |  6 +++---
 core/lookup_helper.py                          | 18 +++++++++---------
 core/sig_utils.py                              |  6 +++---
 solarconditionsproviders/giroionosonde.py      |  6 +++---
 .../http_solar_conditions_provider.py          |  6 +++---
 solarconditionsproviders/kc2gprop.py           |  6 +++---
 spotproviders/hema.py                          |  6 +++---
 spotproviders/http_spot_provider.py            |  6 +++---
 spotproviders/sota.py                          |  6 +++---
 templates/add_spot.html                        |  2 +-
 templates/alerts.html                          |  2 +-
 templates/bands.html                           |  4 ++--
 templates/base.html                            | 10 +++++-----
 templates/conditions.html                      |  2 +-
 templates/map.html                             |  4 ++--
 templates/spots.html                           |  4 ++--
 templates/status.html                          |  2 +-
 17 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/alertproviders/http_alert_provider.py b/alertproviders/http_alert_provider.py
index df79177..9bef504 100644
--- a/alertproviders/http_alert_provider.py
+++ b/alertproviders/http_alert_provider.py
@@ -4,7 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError, ReadTimeout
+from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
 
 from alertproviders.alert_provider import AlertProvider
 from core.constants import HTTP_HEADERS
@@ -59,8 +59,8 @@ class HTTPAlertProvider(AlertProvider):
 
         except ConnectionError:
             logging.warning(f"Connection error when accessing {self.name} alerts API.")
-        except ReadTimeout:
-            logging.warning(f"Read timeout when accessing {self.name} alerts API.")
+        except (ConnectTimeout, ReadTimeout):
+            logging.warning(f"Timeout when accessing {self.name} alerts API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP JSON Alert Provider (" + self.name + ")")
diff --git a/core/lookup_helper.py b/core/lookup_helper.py
index e9c9641..8d8dec4 100644
--- a/core/lookup_helper.py
+++ b/core/lookup_helper.py
@@ -11,7 +11,7 @@ from pyhamtools import LookupLib, Callinfo, callinfo
 from pyhamtools.exceptions import APIKeyMissingError
 from pyhamtools.frequency import freq_to_band
 from pyhamtools.locator import latlong_to_locator
-from requests.exceptions import ConnectionError, ReadTimeout
+from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
 from requests_cache import CachedSession
 
 from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
@@ -156,8 +156,8 @@ class LookupHelper:
 
         except ConnectionError:
             logging.warning(f"Connection error when downloading Clublog cty.xml.")
-        except ReadTimeout:
-            logging.warning(f"Read timeout when downloading Clublog cty.xml.")
+        except (ConnectTimeout, ReadTimeout):
+            logging.warning(f"Timeout when downloading Clublog cty.xml.")
         except Exception as e:
             logging.error("Exception when downloading Clublog cty.xml", e)
             return False
@@ -182,8 +182,8 @@ class LookupHelper:
 
         except ConnectionError:
             logging.warning(f"Connection error when downloading dxcc.json.")
-        except ReadTimeout:
-            logging.warning(f"Read timeout when downloading dxcc.json.")
+        except (ConnectTimeout, ReadTimeout):
+            logging.warning(f"Timeout when downloading dxcc.json.")
         except Exception as e:
             logging.error("Exception when downloading dxcc.json", e)
             return False
@@ -541,8 +541,8 @@ class LookupHelper:
             except ConnectionError:
                 logging.warning(f"Connection error when looking up callsign %s using QRZ", lookup_call)
                 continue
-            except ReadTimeout:
-                logging.warning(f"Read timeout when looking up callsign %s using QRZ.", lookup_call)
+            except (ConnectTimeout, ReadTimeout):
+                logging.warning(f"Timeout when looking up callsign %s using QRZ.", lookup_call)
                 continue
             except Exception:
                 logging.error("Exception when looking up callsign %s using QRZ", lookup_call, exc_info=True)
@@ -608,8 +608,8 @@ class LookupHelper:
             except ConnectionError:
                 logging.warning(f"Connection error when looking up callsign %s using HamQTH", lookup_call)
                 continue
-            except ReadTimeout:
-                logging.warning(f"Read timeout when looking up callsign %s using HamQTH", lookup_call)
+            except (ConnectTimeout, ReadTimeout):
+                logging.warning(f"Timeout when looking up callsign %s using HamQTH", lookup_call)
                 continue
             except Exception:
                 logging.error("Exception when looking up callsign %s using HamQTH", lookup_call, exc_info=True)
diff --git a/core/sig_utils.py b/core/sig_utils.py
index 8f0fa98..2fd96b5 100644
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -2,7 +2,7 @@ import csv
 import logging
 
 from pyhamtools.locator import latlong_to_locator, locator_to_latlong
-from requests.exceptions import ConnectionError, ReadTimeout
+from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
 
 from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.constants import SIGS, HTTP_HEADERS
@@ -271,8 +271,8 @@ def populate_sig_ref_info(sig_ref):
 
     except ConnectionError:
         logging.warning("Connection error when looking up sig_ref info for " + sig + " ref " + ref_id)
-    except ReadTimeout:
-        logging.warning(f"Read timeout when looking up sig_ref info for " + sig + " ref " + ref_id)
+    except (ConnectTimeout, ReadTimeout):
+        logging.warning(f"Timeout when looking up sig_ref info for " + sig + " ref " + ref_id)
     except Exception:
         logging.error("Exception when looking up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)
     return sig_ref
diff --git a/solarconditionsproviders/giroionosonde.py b/solarconditionsproviders/giroionosonde.py
index 03d7b02..1c5795f 100644
--- a/solarconditionsproviders/giroionosonde.py
+++ b/solarconditionsproviders/giroionosonde.py
@@ -5,7 +5,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError, ReadTimeout
+from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.ionosonde_utils import compute_band_states
@@ -134,8 +134,8 @@ class GIROIonosonde(SolarConditionsProvider):
                 logging.warning(f"HTTP {http_response.status_code} when calling Giro ionosonde API.")
                 return None, None, None
             return self._parse_all(http_response.text)
-        except ReadTimeout:
-            logging.warning(f"Read timeout when accessing Giro ionosonde API.")
+        except (ConnectTimeout, ReadTimeout):
+            logging.warning(f"Timeout when accessing Giro ionosonde API.")
             return None, None, None
         except ConnectionError:
             logging.warning("Connection error when accessing Giro ionosonde API.")
diff --git a/solarconditionsproviders/http_solar_conditions_provider.py b/solarconditionsproviders/http_solar_conditions_provider.py
index ddd3be9..0f7903e 100644
--- a/solarconditionsproviders/http_solar_conditions_provider.py
+++ b/solarconditionsproviders/http_solar_conditions_provider.py
@@ -4,7 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError, ReadTimeout
+from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.solar_conditions_provider import SolarConditionsProvider
@@ -54,8 +54,8 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
 
         except ConnectionError:
             logging.warning(f"Connection error when accessing {self.name} solar conditions API.")
-        except ReadTimeout:
-            logging.warning(f"Read timeout when accessing {self.name} solar conditions API.")
+        except (ConnectTimeout, ReadTimeout):
+            logging.warning(f"Timeout when accessing {self.name} solar conditions API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP Solar Conditions Provider (" + self.name + ")")
diff --git a/solarconditionsproviders/kc2gprop.py b/solarconditionsproviders/kc2gprop.py
index 1d879a1..16af204 100644
--- a/solarconditionsproviders/kc2gprop.py
+++ b/solarconditionsproviders/kc2gprop.py
@@ -4,7 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError, ReadTimeout
+from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.ionosonde_utils import compute_band_states
@@ -118,8 +118,8 @@ class KC2GProp(SolarConditionsProvider):
 
         except ConnectionError:
             logging.warning("Connection error when accessing KC2G ionosonde API.")
-        except ReadTimeout:
-            logging.warning(f"Read timeout when accessing KC2G ionosonde API.")
+        except (ConnectTimeout, ReadTimeout):
+            logging.warning(f"Timeout when accessing KC2G ionosonde API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in KC2G ionosonde data provider")
diff --git a/spotproviders/hema.py b/spotproviders/hema.py
index 62d8d61..b5d2d13 100644
--- a/spotproviders/hema.py
+++ b/spotproviders/hema.py
@@ -4,7 +4,7 @@ from datetime import datetime
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError, ReadTimeout
+from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
 
 from core.constants import HTTP_HEADERS
 from data.sig_ref import SIGRef
@@ -68,8 +68,8 @@ class HEMA(HTTPSpotProvider):
                         # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other
                         # code will do that for us.
                         new_spots.append(spot)
-            except ReadTimeout:
-                logging.warning(f"Read timeout when accessing HEMA spots API.")
+            except (ConnectTimeout, ReadTimeout):
+                logging.warning(f"Timeout when accessing HEMA spots API.")
             except ConnectionError:
                 logging.warning("Connection error when accessing HEMA spots API.")
         return new_spots
diff --git a/spotproviders/http_spot_provider.py b/spotproviders/http_spot_provider.py
index c851bb0..bf083a5 100644
--- a/spotproviders/http_spot_provider.py
+++ b/spotproviders/http_spot_provider.py
@@ -5,7 +5,7 @@ from threading import Thread, Event
 import pytz
 import requests
 from requests import ReadTimeout
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ConnectTimeout
 
 from core.constants import HTTP_HEADERS
 from spotproviders.spot_provider import SpotProvider
@@ -60,8 +60,8 @@ class HTTPSpotProvider(SpotProvider):
 
         except ConnectionError:
             logging.warning(f"Connection error when accessing {self.name} spots API.")
-        except ReadTimeout:
-            logging.warning(f"Read timeout when accessing {self.name} spots API.")
+        except (ConnectTimeout, ReadTimeout):
+            logging.warning(f"Timeout when accessing {self.name} spots API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP JSON Spot Provider (" + self.name + ")")
diff --git a/spotproviders/sota.py b/spotproviders/sota.py
index 750753b..eef05b4 100644
--- a/spotproviders/sota.py
+++ b/spotproviders/sota.py
@@ -2,7 +2,7 @@ import logging
 from datetime import datetime
 
 import requests
-from requests.exceptions import ConnectionError, ReadTimeout
+from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
 
 from core.constants import HTTP_HEADERS
 from data.sig_ref import SIGRef
@@ -60,6 +60,6 @@ class SOTA(HTTPSpotProvider):
                     new_spots.append(spot)
             except ConnectionError:
                 logging.warning("Connection error when accessing SOTA spots API")
-            except ReadTimeout:
-                logging.warning(f"Read timeout when accessing SOTA spots API.")
+            except (ConnectTimeout, ReadTimeout):
+                logging.warning(f"Timeout when accessing SOTA spots API.")
         return new_spots
diff --git a/templates/add_spot.html b/templates/add_spot.html
index afa63e7..91cbe33 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1785048458"></script>
+<script src="/static/js/add-spot.js?v=1785048685"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index cdde5e5..61ba018 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1785048458"></script>
+<script src="/static/js/alerts.js?v=1785048685"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index d0cf2b0..4a3e712 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785048458"></script>
-<script src="/static/js/bands.js?v=1785048458"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785048685"></script>
+<script src="/static/js/bands.js?v=1785048685"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index ad0ee39..66bc487 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1785048458" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1785048685" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/static/js/utils.js?v=1785048458"></script>
-<script src="/static/js/ui-ham.js?v=1785048458"></script>
-<script src="/static/js/geo.js?v=1785048458"></script>
-<script src="/static/js/common.js?v=1785048458"></script>
+<script src="/static/js/utils.js?v=1785048685"></script>
+<script src="/static/js/ui-ham.js?v=1785048685"></script>
+<script src="/static/js/geo.js?v=1785048685"></script>
+<script src="/static/js/common.js?v=1785048685"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 373f0df..06b5f45 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1785048458"></script>
+<script src="/static/js/conditions.js?v=1785048685"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 8f9b1af..5eb5524 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -108,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785048458"></script>
-<script src="/static/js/map.js?v=1785048458"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785048685"></script>
+<script src="/static/js/map.js?v=1785048685"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index a2a975e..deeb2ee 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785048458"></script>
-<script src="/static/js/spots.js?v=1785048458"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785048685"></script>
+<script src="/static/js/spots.js?v=1785048685"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index a1fbaa2..a3e4e7f 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1785048458"></script>
+<script src="/static/js/status.js?v=1785048685"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 3c1b1821f53064ba2dafbbac28aa002519390439 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sun, 26 Jul 2026 07:57:48 +0100
Subject: [PATCH 28/29] Defensive coding

---
 core/sig_utils.py         |  7 ++++---
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 9 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/core/sig_utils.py b/core/sig_utils.py
index 2fd96b5..38c3b23 100644
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -109,12 +109,13 @@ def populate_sig_ref_info(sig_ref):
                     # the zeroest corner of the box, then "lat2" and "lng2" provide the other corner. We detect this
                     # and provide a single lat/lon for the centre. Otherwise if we don't have these extra parameters,
                     # just use the single point we have.
-                    if "latitude" in data and "longitude" in data and "lat2" in data and "lng2" in data:
+                    if data.get("latitude") is not None and data.get("longitude") is not None and data.get(
+                            "lat2") is not None and data.get("lng2") is not None:
                         sig_ref.latitude = (float(data["latitude"]) + float(data["lat2"])) / 2.0
                         sig_ref.longitude = (float(data["longitude"]) + float(data["lng2"])) / 2.0
                     else:
-                        sig_ref.latitude = float(data["latitude"]) if "latitude" in data else None
-                        sig_ref.longitude = float(data["longitude"]) if "longitude" in data else None
+                        sig_ref.latitude = float(data["latitude"]) if data.get("latitude") is not None else None
+                        sig_ref.longitude = float(data["longitude"]) if data.get("longitude") is not None else None
                 elif not response.from_cache:
                     logging.warning("Malformed response looking up %s ref %s via GMA", sig, ref_id)
             elif not response.from_cache:
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 91cbe33..11867dc 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1785048685"></script>
+<script src="/static/js/add-spot.js?v=1785049068"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 61ba018..d8db687 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1785048685"></script>
+<script src="/static/js/alerts.js?v=1785049068"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 4a3e712..f5d24b5 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785048685"></script>
-<script src="/static/js/bands.js?v=1785048685"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785049068"></script>
+<script src="/static/js/bands.js?v=1785049068"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 66bc487..c828934 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1785048685" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1785049068" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/static/js/utils.js?v=1785048685"></script>
-<script src="/static/js/ui-ham.js?v=1785048685"></script>
-<script src="/static/js/geo.js?v=1785048685"></script>
-<script src="/static/js/common.js?v=1785048685"></script>
+<script src="/static/js/utils.js?v=1785049068"></script>
+<script src="/static/js/ui-ham.js?v=1785049068"></script>
+<script src="/static/js/geo.js?v=1785049068"></script>
+<script src="/static/js/common.js?v=1785049068"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 06b5f45..4fe2ef7 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1785048685"></script>
+<script src="/static/js/conditions.js?v=1785049068"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 5eb5524..84d0d6f 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -108,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785048685"></script>
-<script src="/static/js/map.js?v=1785048685"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785049068"></script>
+<script src="/static/js/map.js?v=1785049068"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index deeb2ee..3387b41 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785048685"></script>
-<script src="/static/js/spots.js?v=1785048685"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785049068"></script>
+<script src="/static/js/spots.js?v=1785049068"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index a3e4e7f..813e227 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1785048685"></script>
+<script src="/static/js/status.js?v=1785049068"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From fffd230633f4eba21b629caaedf38e34bede50af Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sun, 26 Jul 2026 17:10:21 +0100
Subject: [PATCH 29/29] Cache data for the programmes for which we must fetch
 the whole set of references, and avoid transforming CSV/JSON to dict every
 time.

---
 core/sig_utils.py         | 101 ++++++++++++++++++++++++--------------
 templates/add_spot.html   |   2 +-
 templates/alerts.html     |   2 +-
 templates/bands.html      |   4 +-
 templates/base.html       |  10 ++--
 templates/conditions.html |   2 +-
 templates/map.html        |   4 +-
 templates/spots.html      |   4 +-
 templates/status.html     |   2 +-
 9 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/core/sig_utils.py b/core/sig_utils.py
index 38c3b23..258d5ac 100644
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -12,6 +12,14 @@ from core.geo_utils import wab_wai_square_to_lat_lon
 # file in Spothole and load it on startup.
 with open("datafiles/MUNICIPIOS.csv", encoding="latin-1") as _f:
     _DME_INDEX = {row["COD_INE"][:5]: row for row in csv.DictReader(_f, delimiter=";")}
+# Caches for data for the SIGs where we have to download a whole global reference list, rather than looking up a single
+# reference. These get populated from the SEMI_STATIC_URL_DATA_CACHE only if the data actually came
+# live from the internet, to avoid repopulating them every time we pull the same data from the cache.
+_WWFF_INDEX_CACHE = {}
+_SIOTA_INDEX_CACHE = {}
+_WOTA_INDEX_CACHE = {}
+_ZLOTA_INDEX_CACHE = {}
+_LLOTA_INDEX_CACHE = {}
 
 
 def get_ref_regex_for_sig(sig):
@@ -125,8 +133,12 @@ def populate_sig_ref_info(sig_ref):
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://wwff.co/wwff-data/wwff_directory.csv",
                                                       headers=HTTP_HEADERS)
             if response.ok:
-                wwff_index = {row["reference"]: row for row in csv.DictReader(response.content.decode().splitlines())}
-                row = wwff_index.get(ref_id)
+                global _WWFF_INDEX_CACHE
+                if not bool(_WWFF_INDEX_CACHE) or not response.from_cache:
+                    # New data from WWFF, update our internal map
+                    _WWFF_INDEX_CACHE = {row["reference"]: row for row in
+                                         csv.DictReader(response.content.decode().splitlines())}
+                row = _WWFF_INDEX_CACHE.get(ref_id)
                 if row:
                     sig_ref.name = row["name"] if "name" in row else None
                     sig_ref.url = "https://wwff.co/directory/?showRef=" + ref_id
@@ -143,9 +155,12 @@ def populate_sig_ref_info(sig_ref):
             response = SEMI_STATIC_URL_DATA_CACHE.get("https://www.silosontheair.com/data/silos.csv",
                                                       headers=HTTP_HEADERS)
             if response.ok:
-                siota_index = {row["SILO_CODE"]: row for row in
-                               csv.DictReader(response.content.decode().splitlines())}
-                row = siota_index.get(ref_id)
+                global _SIOTA_INDEX_CACHE
+                if not bool(_SIOTA_INDEX_CACHE) or not response.from_cache:
+                    # New data from SIOTA, update our internal map
+                    _SIOTA_INDEX_CACHE = {row["SILO_CODE"]: row for row in
+                                          csv.DictReader(response.content.decode().splitlines())}
+                row = _SIOTA_INDEX_CACHE.get(ref_id)
                 if row:
                     sig_ref.name = row["NAME"] if "NAME" in row else None
                     sig_ref.grid = row["LOCATOR"] if "LOCATOR" in row else None
@@ -162,19 +177,23 @@ def populate_sig_ref_info(sig_ref):
             if response.ok:
                 data = response.json()
                 if data:
-                    for feature in data.get("features", []):
-                        if feature["properties"]["wotaId"] == ref_id:
-                            sig_ref.name = feature["properties"]["title"]
-                            # Fudge WOTA URLs. Outlying fell (LDO) URLs don't match their ID numbers but require 214 to be
-                            # added to them
-                            sig_ref.url = "https://www.wota.org.uk/MM_" + ref_id
-                            if ref_id.upper().startswith("LDO-"):
-                                number = int(ref_id.upper().replace("LDO-", ""))
-                                sig_ref.url = "https://www.wota.org.uk/MM_LDO-" + str(number + 214)
-                            sig_ref.grid = feature["properties"]["qthLocator"]
-                            sig_ref.latitude = feature["geometry"]["coordinates"][1]
-                            sig_ref.longitude = feature["geometry"]["coordinates"][0]
-                            break
+                    global _WOTA_INDEX_CACHE
+                    if not bool(_WOTA_INDEX_CACHE) or not response.from_cache:
+                        # New data from WOTA, update our internal map
+                        _WOTA_INDEX_CACHE = {feature["properties"]["wotaId"]: feature for feature in
+                                             data.get("features", [])}
+                    feature = _WOTA_INDEX_CACHE.get(ref_id)
+                    if feature:
+                        sig_ref.name = feature["properties"]["title"]
+                        # Fudge WOTA URLs. Outlying fell (LDO) URLs don't match their ID numbers but require 214 to be
+                        # added to them
+                        sig_ref.url = "https://www.wota.org.uk/MM_" + ref_id
+                        if ref_id.upper().startswith("LDO-"):
+                            number = int(ref_id.upper().replace("LDO-", ""))
+                            sig_ref.url = "https://www.wota.org.uk/MM_LDO-" + str(number + 214)
+                        sig_ref.grid = feature["properties"]["qthLocator"]
+                        sig_ref.latitude = feature["geometry"]["coordinates"][1]
+                        sig_ref.longitude = feature["geometry"]["coordinates"][0]
                 elif not response.from_cache:
                     logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
             elif not response.from_cache:
@@ -185,17 +204,20 @@ def populate_sig_ref_info(sig_ref):
             if response.ok:
                 data = response.json()
                 if isinstance(data, list):
-                    for asset in data:
-                        if asset["code"] == ref_id:
-                            sig_ref.name = asset["name"]
-                            sig_ref.url = "https://ontheair.nz/assets/" + ref_id.replace("/", "_")
-                            try:
-                                sig_ref.grid = latlong_to_locator(asset["y"], asset["x"], 6)
-                            except:
-                                logging.debug("Invalid lat/lon received for reference")
-                                sig_ref.latitude = asset["y"]
-                                sig_ref.longitude = asset["x"]
-                            break
+                    global _ZLOTA_INDEX_CACHE
+                    if not bool(_ZLOTA_INDEX_CACHE) or not response.from_cache:
+                        # New data from ZLOTA, update our internal map
+                        _ZLOTA_INDEX_CACHE = {asset["code"]: asset for asset in data}
+                    asset = _ZLOTA_INDEX_CACHE.get(ref_id)
+                    if asset:
+                        sig_ref.name = asset["name"]
+                        sig_ref.url = "https://ontheair.nz/assets/" + ref_id.replace("/", "_")
+                        try:
+                            sig_ref.grid = latlong_to_locator(asset["y"], asset["x"], 6)
+                        except:
+                            logging.debug("Invalid lat/lon received for reference")
+                            sig_ref.latitude = asset["y"]
+                            sig_ref.longitude = asset["x"]
                 elif not response.from_cache:
                     logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
             elif not response.from_cache:
@@ -212,15 +234,18 @@ def populate_sig_ref_info(sig_ref):
             if response.ok:
                 data = response.json()
                 if isinstance(data, list):
-                    for ref in data:
-                        if ref["reference_code"] == ref_id:
-                            sig_ref.name = str(ref["name"])
-                            sig_ref.url = "https://llota.app/list/ref/" + ref_id
-                            sig_ref.grid = str(ref["grid_locator"])
-                            ll = locator_to_latlong(sig_ref.grid)
-                            sig_ref.latitude = ll[0]
-                            sig_ref.longitude = ll[1]
-                            break
+                    global _LLOTA_INDEX_CACHE
+                    if not bool(_LLOTA_INDEX_CACHE) or not response.from_cache:
+                        # New data from LLOTA, update our internal map
+                        _LLOTA_INDEX_CACHE = {ref["reference_code"]: ref for ref in data}
+                    ref = _LLOTA_INDEX_CACHE.get(ref_id)
+                    if ref:
+                        sig_ref.name = str(ref["name"])
+                        sig_ref.url = "https://llota.app/list/ref/" + ref_id
+                        sig_ref.grid = str(ref["grid_locator"])
+                        ll = locator_to_latlong(sig_ref.grid)
+                        sig_ref.latitude = ll[0]
+                        sig_ref.longitude = ll[1]
                 elif not response.from_cache:
                     logging.warning("Malformed response looking up %s ref %s", sig, ref_id)
             elif not response.from_cache:
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 11867dc..23a9cc8 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1785049068"></script>
+<script src="/static/js/add-spot.js?v=1785082221"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index d8db687..75f3540 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1785049068"></script>
+<script src="/static/js/alerts.js?v=1785082221"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index f5d24b5..5c181bd 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785049068"></script>
-<script src="/static/js/bands.js?v=1785049068"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785082221"></script>
+<script src="/static/js/bands.js?v=1785082221"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index c828934..9dd03cb 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1785049068" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1785082221" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/static/js/utils.js?v=1785049068"></script>
-<script src="/static/js/ui-ham.js?v=1785049068"></script>
-<script src="/static/js/geo.js?v=1785049068"></script>
-<script src="/static/js/common.js?v=1785049068"></script>
+<script src="/static/js/utils.js?v=1785082221"></script>
+<script src="/static/js/ui-ham.js?v=1785082221"></script>
+<script src="/static/js/geo.js?v=1785082221"></script>
+<script src="/static/js/common.js?v=1785082221"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 4fe2ef7..9eea747 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1785049068"></script>
+<script src="/static/js/conditions.js?v=1785082221"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 84d0d6f..ad5e684 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -108,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785049068"></script>
-<script src="/static/js/map.js?v=1785049068"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785082221"></script>
+<script src="/static/js/map.js?v=1785082221"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 3387b41..b659a50 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1785049068"></script>
-<script src="/static/js/spots.js?v=1785049068"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1785082221"></script>
+<script src="/static/js/spots.js?v=1785082221"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 813e227..8b0a5ea 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1785049068"></script>
+<script src="/static/js/status.js?v=1785082221"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");