Fix some IDE warnings

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,45 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="Annotator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="BadExpressionStatementJS" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssOverwrittenProperties" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomProperty" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrazieInspection" enabled="false" level="GRAMMAR_ERROR" enabled_by_default="false" />
+    <inspection_tool class="GrazieStyle" enabled="false" level="STYLE_SUGGESTION" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownTag" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="6">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HttpUrlsUsage" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSDeprecatedSymbols" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSIgnoredPromiseFromCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSJQueryEfficiency" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedReference" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="LanguageDetectionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="OutdatedRequirementInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="file://$PROJECT_DIR$" libraries="{redoc.standalone}" />
+  </component>
+</project>

.idea/spothole.iml

@@ -3,8 +3,10 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
+      <excludeFolder url="file://$MODULE_DIR$/webassets/vendor" />
     </content>
     <orderEntry type="jdk" jdkName="Python 3.13 virtualenv at ~/code/spothole/.venv" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="redoc.standalone" level="application" />
   </component>
 </module>

README.md

@@ -22,9 +22,11 @@ You can access the public version's web interface at [https://spothole.app](http
 
 This is a Progressive Web App, so you can also "install" it to your Android or iOS device by accessing it in Chrome or Safari respectively, and following the menu-driven process for installing PWAs.
 
+You are more than welcome to use the data and the API that Spothole provides to power your own software. There are many ways to do this; see below. 
+
 ## Embedding Spothole in another website
 
-You can embed Spothole in another website, e.g. for use as part of a ham radio custom dashboard.
+You can embed Spothole's web interface in another website, e.g. for use as part of a ham radio custom dashboard.
 
 URL parameters can be used to trigger an "embedded" mode which hides the headers, footers and settings. In this mode, you provide configuration for the various filter and display options via additional URL parameters. Any settings that the user has set for Spothole are ignored. This is so that the embedding site can select, for example, their choice of dark mode or SIG filters, which will not impact how Spothole appears when the user accesses it directly. Effectively, it becomes separate to their normal Spothole settings.
 
@@ -90,11 +92,9 @@ Then edit `config.yml` in your text editor of choice to set up the software as y
 
 By default, all outdoor programme providers are enabled, as is one cluster node and the NG3K DXpedition data. The RBN spot providers are turned off by default due to the volume of traffic from CW/RTTY/FT8 skimmers, and the APRS and Packet spot providers are off by default on the assumption that Spothole users want a spot with a human at the other end of it, but all can be easily re-enabled.
 
-`config.yml` has some entries for QRZ.com username & password, and Clublog API keys. If provided, these allow Spothole to retrieve more information about DX spots, such as the country their callsign corresponds to. The software will work just fine without them, but you may find a few country flags etc. are less accurate or missing.
+Other parameters you will want to update include the base URL to your instance, and whether you want to serve a full web-based DX cluster interface or just the API endpoints for client software to use.
 
-Clublog API keys are free, but you'll need to get your own by submitting a helpdesk ticket and explaining what you'll use it for. The admin team are happy with the rate of requests made by my Spothole server, so unless you change the source code of yours to radically increase the rate of querying Clublog, I'm sure they will be fine with your server too.
-
-Free QRZ.com accounts offer only limited access to the site's data via their API. You'll have to sign up for one of their "XML Data Subscriber" plans to gain access to the full data, but if you're on a free account then the software will get what information it can.
+`config.yml` has an entry for a Clublog API key. If provided, this will allow Spothole to retrieve some more information about DX spots. The software will work just fine without it, but you may find a few country flags etc. are less accurate or missing. Clublog API keys are free, but you'll need to get your own by submitting a helpdesk ticket and explaining what you'll use it for. The admin team are happy with the rate of requests made by my Spothole server, so unless you change the source code of yours to radically increase the rate of querying Clublog, I'm sure they will be fine with your server too.
 
 Once you're happy with the content of `config.yml`, you can proceed to running the software.
 
@@ -246,10 +246,6 @@ 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.
 
 ```nginx
-map $request_uri $xssorigin {
-    ~^/api   *;
-}
-
 server {
     server_name spothole.app;
 
@@ -258,21 +254,55 @@ server {
         alias /var/www/html/.well-known/;
     }
     
+    # SSE endpoints
+    location ~ ^/api/v1/(spots|alerts)/stream {
+        proxy_http_version 1.1;
+        proxy_set_header Connection "";
+        proxy_pass http://127.0.0.1:8080;
+        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;
+        proxy_hide_header Access-Control-Allow-Origin;
+        add_header Access-Control-Allow-Origin * always;
+        add_header Cache-Control no-store always;
+        add_header Content-Type text/event-stream always;
+    }
+
+    # Other API endpoints
+    location /api/ {
+        proxy_http_version 1.1;
+        proxy_set_header Connection "";
+        proxy_pass http://127.0.0.1:8080;
+        proxy_buffering on;
+        proxy_cache off;
+        proxy_read_timeout 30s;
+        proxy_connect_timeout 10s;
+        proxy_hide_header Access-Control-Allow-Origin;
+        add_header Access-Control-Allow-Origin * always;
+        add_header Cache-Control no-store always;
+    }
+
+    # Static assets
     location / {
         proxy_http_version 1.1;
         proxy_set_header Connection "";
         proxy_pass http://127.0.0.1:8080;
-        proxy_hide_header Access-Control-Allow-Origin;
-        add_header Access-Control-Allow-Origin $xssorigin;
+        proxy_buffering on;
+        proxy_read_timeout 30s;
+        proxy_connect_timeout 10s;
+        add_header Cache-Control "public, max-age=3600, must-revalidate" always;
     }
 }
 ```
 
-One further change you might want to make to the file above is the `add_header Access-Control-Allow-Origin` statement. This is what's used on
+One further change you might want to make to the file above is the `add_header Access-Control-Allow-Origin` statements. These are what's used on
 my own Spothole server to make sure that other third-party web-based software can get the data from my instance, and applies to any endpoint underneath `/api`. If you want
 *your* Spothole instance to be set up the same way, so that others can write software in JavaScript that can access it,
 leave this intact. But if you want your Spothole instance to only be usable by scripts running on the web server you write,
-you can remove this line. (Note that this doesn't stop other people writing *non-web-based* software that accesses your
+you can remove these lines. (Note that this doesn't stop other people writing *non-web-based* software that accesses your
 Spothole API—the enforcement of cross-origin headers only happens within the user's browser. If you need to lock your
 instance down so that no-one else can access it with *any* software, that's an aspect of nginx or firewall config that you will need
 to find help with elsewhere.)
@@ -318,9 +348,9 @@ To navigate your way around the source code, this list may help.
 * `/webassets` - Root for static files served by the web server
 * `/webassets/apidocs` - Contains the OpenAPI spec (`openapi.yml`)
 * `/webassets/css` - CSS files used by the web front-end
-* `/webassets/fa` - a copy of the FontAwesome library
 * `/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)
 
 *Miscellaneous*
 
@@ -353,11 +383,13 @@ As well as being my work, I have also gratefully received feature patches from S
 
 The project contains GeoJSON files for CQ and ITU zones, in the `/datafiles/` directory. These are MIT-licenced and, to my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet.
 
-The project contains a self-hosted copy of Font Awesome's free library, in the `/webassets/fa/` directory. This is subject to Font Awesome's licence and is not covered by the overall licence declared in the `LICENSE` file. This approach was taken in preference to using their hosted kits due to the popularity of this project exceeding the page view limit for their free hosted offering.
-
 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.
 
-The software uses a number of Python libraries as listed in `requirements.txt`, and a number of JavaScript libraries such as jQuery, Leaflet and Bootstrap. This project would not have been possible without these libraries, so many thanks to their developers.
+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 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 for [this JSON-formatted DXCC data](https://github.com/k0swe/dxcc-json/), and to the developers of `pyhamtools` for making it easy to use country-files.com data as well as QRZ.com and Clublog lookup.
 

alertproviders/http_alert_provider.py

@@ -40,7 +40,7 @@ class HTTPAlertProvider(AlertProvider):
         try:
             # Request data from API
             logging.debug("Polling " + self.name + " alert API...")
-            http_response = requests.get(self._url, headers=HTTP_HEADERS)
+            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.

alertproviders/parksnpeaks.py

@@ -12,7 +12,7 @@ class ParksNPeaks(HTTPAlertProvider):
     """Alert provider for Parks n Peaks"""
 
     POLL_INTERVAL_SEC = 1800
-    ALERTS_URL = "http://parksnpeaks.org/api/ALERTS/"
+    ALERTS_URL = "https://parksnpeaks.org/api/ALERTS/"
 
     def __init__(self, provider_config):
         super().__init__(provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)

config-example.yml

@@ -6,6 +6,14 @@
 # this as "N0CALL" and it shouldn't do any harm, as we're not sending anything to the various networks, only receiving.
 server-owner-callsign: "N0CALL"
 
+# Port to open the local web server on
+web-server-port: 8080
+
+# Run in API-only mode? When enabled, the web UI is not served, only the API endpoints and the OpenAPI documentation
+# page. If you are running your own Spothole instance purely to serve client software, and not wanting visitors to
+# discover a full web-based cluster UI, enable this flag.
+api-only-mode: false
+
 # The base URL at which the software runs.
 base-url: "http://localhost:8080"
 
@@ -183,9 +191,14 @@ solar-condition-providers:
     class: "NOAA3dayForecast"
     name: "NOAA 3-day Forecast"
     enabled: true
-
-# Port to open the local web server on
-web-server-port: 8080
+  -
+    class: "GIROIonosonde"
+    name: "GIRO Ionosonde Data"
+    enabled: true
+  -
+    class: "KC2GProp"
+    name: "KC2G Propagation Data"
+    enabled: true
 
 # Maximum time to keep spots and alerts in the system before deleting them. By default, one hour for spots and one week
 # for alerts.

core/config.py

@@ -21,6 +21,7 @@ SERVER_OWNER_CALLSIGN = config["server-owner-callsign"]
 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)
 
 # 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.

core/constants.py

@@ -3,12 +3,11 @@ from data.band import Band
 from data.sig import SIG
 
 # General software
-SOFTWARE_NAME = "Spothole by M0TRT"
-SOFTWARE_VERSION = "1.3-pre"
+SOFTWARE_VERSION = "1.4-pre"
 
 # HTTP headers used for spot providers that use HTTP
-HTTP_HEADERS = {"User-Agent": SOFTWARE_NAME + ", v" + SOFTWARE_VERSION + " (operated by " + SERVER_OWNER_CALLSIGN + ")"}
-HAMQTH_PRG = (SOFTWARE_NAME + " v" + SOFTWARE_VERSION + " operated by " + SERVER_OWNER_CALLSIGN).replace(" ", "_")
+HTTP_HEADERS = {"User-Agent": "Spothole v" + SOFTWARE_VERSION + " (operated by " + SERVER_OWNER_CALLSIGN + ")"}
+HAMQTH_PRG = ("Spothole v" + SOFTWARE_VERSION + " operated by " + SERVER_OWNER_CALLSIGN).replace(" ", "_")
 
 # Special Interest Groups
 SIGS = [
@@ -62,17 +61,17 @@ MODE_ALIASES = {
 BANDS = [
     Band(name="2200m", start_freq=135700, end_freq=137800),
     Band(name="600m", start_freq=472000, end_freq=479000),
-    Band(name="160m", start_freq=1800000, end_freq=2000000),
-    Band(name="80m", start_freq=3500000, end_freq=4000000),
-    Band(name="60m", start_freq=5250000, end_freq=5410000),
-    Band(name="40m", start_freq=7000000, end_freq=7300000),
-    Band(name="30m", start_freq=10100000, end_freq=10150000),
-    Band(name="20m", start_freq=14000000, end_freq=14350000),
-    Band(name="17m", start_freq=18068000, end_freq=18168000),
-    Band(name="15m", start_freq=21000000, end_freq=21450000),
-    Band(name="12m", start_freq=24890000, end_freq=24990000),
+    Band(name="160m", start_freq=1800000, end_freq=2000000, is_ham_hf=True),
+    Band(name="80m", start_freq=3500000, end_freq=4000000, is_ham_hf=True),
+    Band(name="60m", start_freq=5250000, end_freq=5410000, is_ham_hf=True),
+    Band(name="40m", start_freq=7000000, end_freq=7300000, is_ham_hf=True),
+    Band(name="30m", start_freq=10100000, end_freq=10150000, is_ham_hf=True),
+    Band(name="20m", start_freq=14000000, end_freq=14350000, is_ham_hf=True),
+    Band(name="17m", start_freq=18068000, end_freq=18168000, is_ham_hf=True),
+    Band(name="15m", start_freq=21000000, end_freq=21450000, is_ham_hf=True),
+    Band(name="12m", start_freq=24890000, end_freq=24990000, is_ham_hf=True),
     Band(name="11m", start_freq=26965000, end_freq=27405000),
-    Band(name="10m", start_freq=28000000, end_freq=29700000),
+    Band(name="10m", start_freq=28000000, end_freq=29700000, is_ham_hf=True),
     Band(name="6m", start_freq=50000000, end_freq=54000000),
     Band(name="5m", start_freq=56000000, end_freq=60500000),
     Band(name="4m", start_freq=70000000, end_freq=70500000),

core/lookup_helper.py

@@ -18,7 +18,6 @@ from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.config import config
 from core.constants import BANDS, UNKNOWN_BAND, CW_MODES, PHONE_MODES, DATA_MODES, ALL_MODES, \
     HTTP_HEADERS, HAMQTH_PRG, MODE_ALIASES
-from data.lookup_credentials import LookupCredentials
 
 # QRZ XML field names differ from pyhamtools' normalised names; map them here.
 _QRZ_FIELD_MAP = {
@@ -363,8 +362,12 @@ class LookupHelper:
         """Infer an operator name from a callsign (requires QRZ.com/HamQTH)"""
 
         data = self._get_qrz_data_for_callsign(call, credentials)
+        if data and "name_fmt" in data:
+            return data["name_fmt"]
         if data and "fname" in data:
             name = data["fname"]
+            if "nick" in data:
+                name = name + " \"" + data["nick"] + "\""
             if "name" in data:
                 name = name + " " + data["name"]
             return name

core/sig_utils.py

@@ -70,27 +70,24 @@ def populate_sig_ref_info(sig_ref):
         elif sig.upper() == "WWFF":
             wwff_csv_data = SEMI_STATIC_URL_DATA_CACHE.get("https://wwff.co/wwff-data/wwff_directory.csv",
                                                            headers=HTTP_HEADERS)
-            wwff_dr = csv.DictReader(wwff_csv_data.content.decode().splitlines())
-            for row in wwff_dr:
-                if row["reference"] == ref_id:
+            wwff_index = {row["reference"]: row for row in csv.DictReader(wwff_csv_data.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
-                    break
+                sig_ref.longitude = float(row["longitude"]) if "longitude" in row and row["longitude"] != "-" else None
         elif sig.upper() == "SIOTA":
             siota_csv_data = SEMI_STATIC_URL_DATA_CACHE.get("https://www.silosontheair.com/data/silos.csv",
                                                             headers=HTTP_HEADERS)
-            siota_dr = csv.DictReader(siota_csv_data.content.decode().splitlines())
-            for row in siota_dr:
-                if row["SILO_CODE"] == ref_id:
+            siota_index = {row["SILO_CODE"]: row for row in csv.DictReader(siota_csv_data.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
-                    break
         elif sig.upper() == "WOTA":
             data = SEMI_STATIC_URL_DATA_CACHE.get("https://www.wota.org.uk/mapping/data/summits.json",
                                                   headers=HTTP_HEADERS).json()

data/band.py

@@ -11,3 +11,5 @@ class Band:
     start_freq: float
     # Stop frequency, in Hz
     end_freq: float
+    # Whether this is an HF amateur radio band
+    is_ham_hf: bool = False

data/solar_conditions.py

@@ -161,6 +161,9 @@ class SolarConditions:
     blackout_forecast_r1r2: dict = None
     # NOAA Radio Blackout (R3 or greater) probability forecast, keyed by UNIX timestamp of start of day UTC
     blackout_forecast_r3_or_greater: dict = None
+    # Ionosonde measurements, dict keyed by URSI code, values are dicts with keys: ursi, name, fof2, muf, luf,
+    # band_states. Populated by GIROIonosonde or KC2GProp providers.
+    ionosonde_data: dict = None
 
     # Derived values (populated by infer_descriptions())
     # HF radio blackout risk description, derived from xray
@@ -194,6 +197,7 @@ class SolarConditions:
         self.electron_flux_desc = _lookup_by_threshold(self.electron_flux, ELECTRON_FLUX_DESCRIPTIONS)
 
     def to_json(self):
-        """JSON serialise"""
+        """JSON serialise. Dict key order is insertion order (Python 3.7+ guarantee), so callers receive
+        fields in a predictable, logical sequence without relying on sort_keys."""
 
-        return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True)
+        return json.dumps(self, default=lambda o: o.__dict__)

data/spot.py

@@ -14,7 +14,6 @@ from core.constants import MODE_ALIASES
 from core.geo_utils import lat_lon_to_cq_zone, lat_lon_to_itu_zone
 from core.lookup_helper import lookup_helper, infer_band_from_freq, infer_mode_from_comment, \
     infer_mode_from_frequency, infer_mode_type_from_mode
-from data.lookup_credentials import LookupCredentials
 from core.sig_utils import populate_sig_ref_info, ANY_SIG_REGEX, get_ref_regex_for_sig
 from data.sig_ref import SIGRef
 

datafiles/didbase-stations.csv

@@ -0,0 +1,42 @@
+AA343,"Almaty, Kazakhstan"
+AL945,"Alpena, United States"
+AT138,"Athens, Greece"
+AU930,"Austin, United States"
+BR52P,"Brisbane, Australia"
+BVJ03,"Boa Vista, Brazil"
+CAJ2M,"Cachoeira Paulista, Brazil"
+CB53N,"Canberra, Australia"
+CGK21,"Campo Grande, Brazil"
+DB049,"Dourbes, Belgium"
+DW41K,"Darwin, Australia"
+EA036,"El Arenosillo, Spain"
+EB040,"Roquetes, Spain"
+EG931,"Eglin Air Force Base, United States"
+FF051,"Fairford, United Kingdom"
+GA762,"Gakona, United States"
+GM037,"Gibilmanna, Italy"
+GR13L,"Grahamstown, South Africa"
+HE13N,"Hermanus, South Africa"
+HO54K,"Hobart, Australia"
+IC437,"I-Cheon, South Korea"
+IF843,"Idaho National Laboratory, United States"
+JI91J,"Jicamarca, Peru"
+JR055,"Juliusruh, Germany"
+LAA38,"Lajes Terceira Island, Portugal"
+LL721,"Lualualei, United States"
+LM42B,"Learmonth, Australia"
+LV12P,"Louisvale, South Africa"
+MHJ45,"Millstone Hill, United States"
+ML10L,"Malindi, Kenya"
+NI135,"Nicosia, Cyprus"
+NI63_,"Norfolk, Australia"
+PA836,"Portt Arguello, United States"
+PE43K,"Perth, Australia"
+PF765,"Poker Flat, United States"
+PQ052,"Pruhonice, Czechia"
+RO041,"Rome, Italy"
+SAA0K,"Saoluis, Brazil"
+SO148,"Sopron, Hungary"
+TR169,"Tromso, Norway"
+TV51R,"Townsville, Australia"
+VT139,"San Vito, Italy"

server/handlers/api/addspot.py

@@ -41,8 +41,7 @@ class APISpotHandler(tornado.web.RequestHandler):
                 return
 
             # Reject if format not json
-            if 'Content-Type' not in self.request.headers or self.request.headers.get(
-                    'Content-Type') != "application/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))
@@ -139,7 +138,7 @@ class APISpotHandler(tornado.web.RequestHandler):
 
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - " + str(e), default=serialize_everything))
+            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
             self.set_status(500)
             self.set_header("Cache-Control", "no-store")
             self.set_header("Content-Type", "application/json")

server/handlers/api/alerts.py

@@ -58,7 +58,7 @@ class APIAlertsHandler(tornado.web.RequestHandler):
             self.set_status(400)
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - " + str(e), default=serialize_everything))
+            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
             self.set_status(500)
         self.set_header("Cache-Control", "no-store")
         self.set_header("Content-Type", "application/json")
@@ -98,8 +98,12 @@ class APIAlertsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
             self._heartbeat = tornado.ioloop.PeriodicCallback(self._callback, SSE_HANDLER_QUEUE_CHECK_INTERVAL)
             self._heartbeat.start()
 
+            # Flush headers immediately so nginx doesn't time out waiting for a response
+            self.write_message("keepalive", "")
+
         except Exception as e:
-            logging.warning("Exception when serving SSE socket", e)
+            logging.warning("Exception when serving SSE socket: %s", e, exc_info=True)
+            self.close()
 
     def close(self):
         """When the user closes the socket, empty our queue and remove it from the list so the server no longer fills it"""
@@ -122,6 +126,7 @@ class APIAlertsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
 
         try:
             if self._alert_queue:
+                if not self._alert_queue.empty():
                     while not self._alert_queue.empty():
                         alert = self._alert_queue.get()
                         # If the new alert matches our param filters, send it to the client. If not, ignore it.
@@ -131,11 +136,15 @@ class APIAlertsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
                                 alert.infer_missing(self._credentials)
                             self.write_message(msg=json.dumps(alert, default=serialize_everything))
 
+                else:
+                    # Send a keepalive comment if the queue was empty
+                    self.write_message("keepalive", "")
+
                 if self._alert_queue not in self._sse_alert_queues:
                     logging.error("Web server cleared up a queue of an active connection!")
                     self.close()
-        except:
-            logging.warning("Exception in SSE callback, connection will be closed.")
+        except Exception as e:
+            logging.warning("Exception in SSE callback, connection will be closed: %s", e, exc_info=True)
             self.close()
 
 

server/handlers/api/lookups.py

@@ -70,7 +70,7 @@ class APILookupCallHandler(tornado.web.RequestHandler):
 
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - " + str(e), default=serialize_everything))
+            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
             self.set_status(500)
 
         self.set_header("Cache-Control", "no-store")
@@ -119,7 +119,7 @@ class APILookupSIGRefHandler(tornado.web.RequestHandler):
 
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - " + str(e), default=serialize_everything))
+            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
             self.set_status(500)
 
         self.set_header("Cache-Control", "no-store")
@@ -177,7 +177,7 @@ class APILookupGridHandler(tornado.web.RequestHandler):
 
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - " + str(e), default=serialize_everything))
+            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
             self.set_status(500)
 
         self.set_header("Cache-Control", "no-store")

server/handlers/api/solar_conditions.py

@@ -1,11 +1,9 @@
-import json
 from datetime import datetime
 
 import pytz
 import tornado
 
 from core.prometheus_metrics_handler import api_requests_counter
-from core.utils import serialize_everything
 
 
 class APISolarConditionsHandler(tornado.web.RequestHandler):

server/handlers/api/spots.py

@@ -58,7 +58,7 @@ class APISpotsHandler(tornado.web.RequestHandler):
             self.set_status(400)
         except Exception as e:
             logging.error(e)
-            self.write(json.dumps("Error - " + str(e), default=serialize_everything))
+            self.write(json.dumps("Error - an internal server error occurred.", default=serialize_everything))
             self.set_status(500)
         self.set_header("Cache-Control", "no-store")
         self.set_header("Content-Type", "application/json")
@@ -100,8 +100,12 @@ class APISpotsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
             self._heartbeat = tornado.ioloop.PeriodicCallback(self._callback, SSE_HANDLER_QUEUE_CHECK_INTERVAL)
             self._heartbeat.start()
 
+            # Flush headers immediately so nginx doesn't time out waiting for a response
+            self.write_message("keepalive", "")
+
         except Exception as e:
-            logging.warning("Exception when serving SSE socket", e)
+            logging.warning("Exception when serving SSE socket: %s", e, exc_info=True)
+            self.close()
 
     def close(self):
         """When the user closes the socket, empty our queue and remove it from the list so the server no longer fills it"""
@@ -124,6 +128,7 @@ class APISpotsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
 
         try:
             if self._spot_queue:
+                if not self._spot_queue.empty():
                     while not self._spot_queue.empty():
                         spot = self._spot_queue.get()
                         # If the new spot matches our param filters, send it to the client. If not, ignore it.
@@ -133,11 +138,15 @@ class APISpotsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
                                 spot.infer_missing(self._credentials)
                             self.write_message(msg=json.dumps(spot, default=serialize_everything))
 
+                else:
+                    # Send a keepalive comment if the queue was empty
+                    self.write_message("keepalive", "")
+
                 if self._spot_queue not in self._sse_spot_queues:
                     logging.error("Web server cleared up a queue of an active connection!")
                     self.close()
-        except:
-            logging.warning("Exception in SSE callback, connection will be closed.")
+        except Exception as e:
+            logging.warning("Exception in SSE callback, connection will be closed: %s", e, exc_info=True)
             self.close()
 
 

server/handlers/pagetemplate.py

@@ -3,7 +3,7 @@ from datetime import datetime
 import pytz
 import tornado
 
-from core.config import ALLOW_SPOTTING, WEB_UI_OPTIONS, BASE_URL
+from core.config import ALLOW_SPOTTING, WEB_UI_OPTIONS, BASE_URL, SERVER_OWNER_CALLSIGN
 from core.constants import SOFTWARE_VERSION
 from core.prometheus_metrics_handler import page_requests_counter
 
@@ -11,11 +11,9 @@ from core.prometheus_metrics_handler import page_requests_counter
 class PageTemplateHandler(tornado.web.RequestHandler):
     """Handler for all HTML pages generated from templates"""
 
-    def initialize(self, template_name, web_server_metrics, has_hamqsl=False, has_noaa_forecast=False):
+    def initialize(self, template_name, web_server_metrics):
         self._template_name = template_name
         self._web_server_metrics = web_server_metrics
-        self._has_hamqsl = has_hamqsl
-        self._has_noaa_forecast = has_noaa_forecast
 
     def get(self):
         # Metrics
@@ -25,6 +23,6 @@ class PageTemplateHandler(tornado.web.RequestHandler):
         page_requests_counter.inc()
 
         # Load named template, and provide variables used in templates
-        self.render(self._template_name + ".html", software_version=SOFTWARE_VERSION, allow_spotting=ALLOW_SPOTTING,
-                    web_ui_options=WEB_UI_OPTIONS, baseurl=BASE_URL, current_path=self.request.path,
-                    has_hamqsl=self._has_hamqsl, has_noaa_forecast=self._has_noaa_forecast)
+        self.render(self._template_name + ".html", software_version=SOFTWARE_VERSION,
+                    server_owner_callsign=SERVER_OWNER_CALLSIGN, allow_spotting=ALLOW_SPOTTING,
+                    web_ui_options=WEB_UI_OPTIONS, baseurl=BASE_URL, current_path=self.request.path)

server/webserver.py

@@ -5,10 +5,11 @@ import os
 import tornado
 from tornado.web import StaticFileHandler
 
+from core.config import ALLOW_SPOTTING, WEB_SERVER_PORT, API_ONLY_MODE
 from core.utils import empty_queue
 from server.handlers.api.addspot import APISpotHandler
-from server.handlers.api.dxstats import APIDxStatsHandler
 from server.handlers.api.alerts import APIAlertsHandler, APIAlertsStreamHandler
+from server.handlers.api.dxstats import APIDxStatsHandler
 from server.handlers.api.lookups import APILookupCallHandler, APILookupSIGRefHandler, APILookupGridHandler
 from server.handlers.api.options import APIOptionsHandler
 from server.handlers.api.solar_conditions import APISolarConditionsHandler
@@ -21,7 +22,7 @@ from server.handlers.pagetemplate import PageTemplateHandler
 class WebServer:
     """Provides the public-facing web server."""
 
-    def __init__(self, spots, alerts, solar_conditions, status_data, solar_condition_providers, port):
+    def __init__(self, spots, alerts, solar_conditions, status_data):
         """Constructor"""
 
         self._spots = spots
@@ -30,8 +31,8 @@ class WebServer:
         self._sse_spot_queues = []
         self._sse_alert_queues = []
         self._status_data = status_data
-        self._solar_condition_providers = solar_condition_providers
-        self._port = port
+        self._port = WEB_SERVER_PORT
+        self._api_only_mode = API_ONLY_MODE
         self._shutdown_event = asyncio.Event()
         self.web_server_metrics = {
             "last_page_access_time": None,
@@ -54,50 +55,60 @@ class WebServer:
     async def _start_inner(self):
         """Start method (async). Sets up the Tornado application."""
 
-        provider_classes = [type(p).__name__ for p in self._solar_condition_providers if p.enabled]
-        has_hamqsl = "HamQSL" in provider_classes
-        has_noaa_forecast = "NOAA3dayForecast" in provider_classes
-        page_opts = {"web_server_metrics": self.web_server_metrics, "has_hamqsl": has_hamqsl,
-                     "has_noaa_forecast": has_noaa_forecast}
+        # Prepare a list of common arguments that are passed in to every API & page handler. This is just a basic thing
+        # to avoid copy-pasting the same thing to every route declaration below.
+        handler_opts = {"web_server_metrics": self.web_server_metrics}
 
-        app = tornado.web.Application([
-            # Routes for API calls
-            (r"/api/v1/spots", APISpotsHandler, {"spots": self._spots, "web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/alerts", APIAlertsHandler,
-             {"alerts": self._alerts, "web_server_metrics": self.web_server_metrics}),
+        # API endpoints are always enabled
+        api_routes = [
+            (r"/api/v1/spots", APISpotsHandler, {"spots": self._spots, **handler_opts}),
+            (r"/api/v1/alerts", APIAlertsHandler, {"alerts": self._alerts, **handler_opts}),
             (r"/api/v1/spots/stream", APISpotsStreamHandler,
-             {"sse_spot_queues": self._sse_spot_queues, "web_server_metrics": self.web_server_metrics}),
+             {"sse_spot_queues": self._sse_spot_queues, **handler_opts}),
             (r"/api/v1/alerts/stream", APIAlertsStreamHandler,
-             {"sse_alert_queues": self._sse_alert_queues, "web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/solar", APISolarConditionsHandler,
-             {"solar_conditions": self._solar_conditions, "web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/dxstats", APIDxStatsHandler, {"spots": self._spots, "web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/options", APIOptionsHandler,
-             {"status_data": self._status_data, "web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/status", APIStatusHandler,
-             {"status_data": self._status_data, "web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/lookup/call", APILookupCallHandler, {"web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/lookup/sigref", APILookupSIGRefHandler, {"web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/lookup/grid", APILookupGridHandler, {"web_server_metrics": self.web_server_metrics}),
-            (r"/api/v1/spot", APISpotHandler, {"spots": self._spots, "web_server_metrics": self.web_server_metrics}),
-            # Routes for templated pages
-            (r"/", PageTemplateHandler, {"template_name": "spots", **page_opts}),
-            (r"/map", PageTemplateHandler, {"template_name": "map", **page_opts}),
-            (r"/bands", PageTemplateHandler, {"template_name": "bands", **page_opts}),
-            (r"/alerts", PageTemplateHandler, {"template_name": "alerts", **page_opts}),
-            (r"/add-spot", PageTemplateHandler, {"template_name": "add_spot", **page_opts}),
-            (r"/conditions", PageTemplateHandler, {"template_name": "conditions", **page_opts}),
-            (r"/status", PageTemplateHandler, {"template_name": "status", **page_opts}),
-            (r"/about", PageTemplateHandler, {"template_name": "about", **page_opts}),
-            (r"/apidocs", PageTemplateHandler, {"template_name": "apidocs", **page_opts}),
-            # Route for Prometheus metrics
+             {"sse_alert_queues": self._sse_alert_queues, **handler_opts}),
+            (r"/api/v1/solar", APISolarConditionsHandler, {"solar_conditions": self._solar_conditions, **handler_opts}),
+            (r"/api/v1/dxstats", APIDxStatsHandler, {"spots": self._spots, **handler_opts}),
+            (r"/api/v1/options", APIOptionsHandler, {"status_data": self._status_data, **handler_opts}),
+            (r"/api/v1/status", APIStatusHandler, {"status_data": self._status_data, **handler_opts}),
+            (r"/api/v1/lookup/call", APILookupCallHandler, {**handler_opts}),
+            (r"/api/v1/lookup/sigref", APILookupSIGRefHandler, {**handler_opts}),
+            (r"/api/v1/lookup/grid", APILookupGridHandler, {**handler_opts}),
+            (r"/api/v1/spot", APISpotHandler, {"spots": self._spots, **handler_opts}),
+        ]
+
+        # If in API-only mode, serve a basic homepage; in normal mode, serve the usual UI routes
+        if self._api_only_mode:
+            logging.info("API-only mode is enabled. Web UI will not be served.")
+            ui_routes = [
+                (r"/", PageTemplateHandler, {"template_name": "api_only_home", **handler_opts})
+            ]
+        else:
+            ui_routes = [
+                (r"/", PageTemplateHandler, {"template_name": "spots", **handler_opts}),
+                (r"/map", PageTemplateHandler, {"template_name": "map", **handler_opts}),
+                (r"/bands", PageTemplateHandler, {"template_name": "bands", **handler_opts}),
+                (r"/alerts", PageTemplateHandler, {"template_name": "alerts", **handler_opts}),
+                (r"/conditions", PageTemplateHandler, {"template_name": "conditions", **handler_opts}),
+                (r"/status", PageTemplateHandler, {"template_name": "status", **handler_opts}),
+                (r"/about", PageTemplateHandler, {"template_name": "about", **handler_opts})
+            ]
+            # Only allow the Add Spot page if spotting is allowed
+            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.
+        misc_routes = [
+            (r"/apidocs", PageTemplateHandler, {"template_name": "apidocs", **handler_opts}),
             (r"/metrics", PrometheusMetricsHandler),
-            # Default route to serve from "webassets"
-            (r"/(.*)", StaticFileHandler, {"path": os.path.join(os.path.dirname(__file__), "../webassets")}),
-        ],
+            (r"/(.*)", StaticFileHandler, {"path": os.path.join(os.path.dirname(__file__), "../webassets")})
+        ]
+
+        app = tornado.web.Application(api_routes + ui_routes + misc_routes,
                                       template_path=os.path.join(os.path.dirname(__file__), "../templates"),
                                       debug=False)
         app.listen(self._port)
+        logging.info("Web server running on port " + str(WEB_SERVER_PORT))
         await self._shutdown_event.wait()
 
     def notify_new_spot(self, spot):

solarconditionsproviders/giroionosonde.py

@@ -0,0 +1,165 @@
+import csv
+import logging
+from datetime import datetime, timezone, timedelta
+from threading import Thread, Event
+
+import pytz
+import requests
+
+from core.constants import HTTP_HEADERS
+from solarconditionsproviders.ionosonde_utils import compute_band_states
+from solarconditionsproviders.solar_conditions_provider import SolarConditionsProvider
+
+POLL_INTERVAL = 3600  # 1 hour
+STATIONS_INDEX = "datafiles/didbase-stations.csv"
+LGDC_URL = "https://lgdc.uml.edu/common/DIDBGetValues"
+HISTORY_HOURS = 24
+
+
+class GIROIonosonde(SolarConditionsProvider):
+    """Solar conditions provider using ionosonde data from the GIRO Data Center.
+    Queries foF2, MUF, and LUF measurements for all stations in datafiles/didbase-stations.csv.
+    Can run alongside KC2GProp: GIRO supplements KC2G's foF2/MUF data with LUF readings, and
+    stations from each source that the other does not cover are preserved."""
+
+    def __init__(self, provider_config):
+        super().__init__(provider_config)
+        self._stations = self._load_stations()
+        self._thread = None
+        self._stop_event = Event()
+
+    def _load_stations(self):
+        stations = []
+        with open(STATIONS_INDEX, newline='') as f:
+            for row in csv.reader(f):
+                if len(row) >= 2:
+                    stations.append({"ursi": row[0].strip(), "name": row[1].strip()})
+        return stations
+
+    def setup(self, solar_conditions, solar_conditions_cache):
+        """Pre-populate ionosonde_data with known station names for stations not already present,
+        so the station dropdown is available before the first poll. Does not overwrite existing
+        entries so KC2G cache data is preserved."""
+
+        super().setup(solar_conditions, solar_conditions_cache)
+        existing = solar_conditions.ionosonde_data or {}
+        new_entries = {
+            s["ursi"]: {"ursi": s["ursi"], "name": s["name"], "fof2": None, "muf": None,
+                        "luf": None, "band_states": None}
+            for s in self._stations if s["ursi"] not in existing
+        }
+        if new_entries:
+            self.update_data({"ionosonde_data": {**existing, **new_entries}})
+
+    def start(self):
+        logging.info(f"Set up query of GIRO ionosonde data API every {POLL_INTERVAL} seconds.")
+        self._thread = Thread(target=self._run, daemon=True)
+        self._thread.start()
+
+    def stop(self):
+        self._stop_event.set()
+
+    def _run(self):
+        while True:
+            self._poll()
+            if self._stop_event.wait(timeout=POLL_INTERVAL):
+                break
+
+    def _poll(self):
+        try:
+            logging.debug("Polling GIRO ionosonde data...")
+            now = datetime.now(timezone.utc)
+            from_time = now - timedelta(hours=HISTORY_HOURS)
+            cutoff_ts = from_time.timestamp()
+
+            # Start from the existing ionosonde_data so stations provided by other providers
+            # (e.g. KC2GProp) are preserved for stations GIRO does not cover.
+            ionosonde_data = dict(self._solar_conditions.ionosonde_data or {})
+            updated_count = 0
+
+            for station in self._stations:
+                if self._stop_event.is_set():
+                    break
+                ursi = station["ursi"]
+                name = station["name"]
+                try:
+                    fof2, muf, luf = self._fetch_station_data(ursi, from_time, now)
+                    if not fof2 or not muf:
+                        continue
+
+                    # Merge GIRO's readings into any existing data for this station.
+                    existing = ionosonde_data.get(ursi, {})
+                    merged_fof2 = {**{float(t): v for t, v in (existing.get("fof2") or {}).items()}, **fof2}
+                    merged_muf = {**{float(t): v for t, v in (existing.get("muf") or {}).items()}, **muf}
+                    merged_luf = dict(luf) if luf else {}
+
+                    merged_fof2 = {t: v for t, v in merged_fof2.items() if t >= cutoff_ts}
+                    merged_muf = {t: v for t, v in merged_muf.items() if t >= cutoff_ts}
+                    merged_luf = {t: v for t, v in merged_luf.items() if t >= cutoff_ts}
+
+                    band_states = compute_band_states(merged_fof2, merged_muf, merged_luf)
+                    ionosonde_data[ursi] = {
+                        "ursi": ursi, "name": name,
+                        "fof2": merged_fof2 or None,
+                        "muf": merged_muf or None,
+                        "luf": merged_luf or None,
+                        "band_states": band_states,
+                    }
+                    updated_count += 1
+                except Exception:
+                    logging.warning(f"Could not fetch ionosonde data for {ursi} ({name})")
+
+            self.update_data({"ionosonde_data": ionosonde_data})
+            self.status = "OK"
+            self.last_update_time = datetime.now(pytz.UTC)
+            logging.debug(f"Updated ionosonde data for {updated_count} stations.")
+
+        except Exception:
+            self.status = "Error"
+            logging.exception("Exception in GIRO Ionosonde data provider")
+            self._stop_event.wait(timeout=1)
+
+    def _fetch_station_data(self, ursi, from_time, to_time):
+        """Fetch foF2, MUF and LUF readings for a station. Returns (fof2_dict, muf_dict, luf_dict) keyed by UNIX timestamp."""
+
+        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:
+            return None, None, None
+        return self._parse_all(response.text)
+
+    @staticmethod
+    def _parse_all(text):
+        """Parse web server response and return (fof2_dict, muf_dict, luf_dict) keyed by UNIX timestamp."""
+
+        fof2_data = {}
+        muf_data = {}
+        luf_data = {}
+        for line in text.splitlines():
+            line = line.strip()
+            if not line or line.startswith('#'):
+                continue
+            # Data rows have the following format: timestamp CS foF2 QD MUFD QD fmin QD
+            parts = line.split()
+            if len(parts) >= 5:
+                try:
+                    # Python 3.8 TZ parsing fudge
+                    ts = datetime.fromisoformat(parts[0].replace('Z', '+00:00')).timestamp()
+                except ValueError:
+                    continue
+                try:
+                    fof2_data[ts] = float(parts[2])
+                except ValueError:
+                    pass
+                try:
+                    muf_data[ts] = float(parts[4])
+                except ValueError:
+                    pass
+                if len(parts) >= 7:
+                    try:
+                        luf_data[ts] = float(parts[6])
+                    except ValueError:
+                        pass
+        return fof2_data, muf_data, luf_data

solarconditionsproviders/http_solar_conditions_provider.py

@@ -38,7 +38,7 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
     def _poll(self):
         try:
             logging.debug("Polling " + self.name + " solar conditions API...")
-            http_response = requests.get(self._url, headers=HTTP_HEADERS)
+            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)
 

solarconditionsproviders/ionosonde_utils.py

@@ -0,0 +1,33 @@
+from core.constants import BANDS
+
+HF_BANDS = [b for b in BANDS if b.is_ham_hf]
+
+
+def _latest(d):
+    return d[max(d.keys())] if d else None
+
+
+def compute_band_states(fof2_dict, muf_dict, luf_dict):
+    """Compute HF band states from the latest foF2, MUF and LUF values.
+
+    States:
+      Closed if band frequency is above MUF or below LUF (if known)
+      Short  if band frequency is >= LUF and < foF2 (good for NVIS)
+      Long   if band frequency is >= foF2 and < MUF (good for DX)
+    """
+
+    fof2 = _latest(fof2_dict)
+    muf = _latest(muf_dict)
+    luf = _latest(luf_dict) if luf_dict else None
+    if fof2 is None or muf is None:
+        return {}
+    band_states = {}
+    for band in HF_BANDS:
+        freq = band.start_freq / 1_000_000
+        if freq > muf or (luf is not None and freq < luf):
+            band_states[band.name] = "Closed"
+        elif freq < fof2:
+            band_states[band.name] = "Short"
+        else:
+            band_states[band.name] = "Long"
+    return band_states

solarconditionsproviders/kc2gprop.py

@@ -0,0 +1,121 @@
+import logging
+from datetime import datetime, timezone, timedelta
+from threading import Thread, Event
+
+import pytz
+import requests
+
+from core.constants import HTTP_HEADERS
+from solarconditionsproviders.ionosonde_utils import compute_band_states
+from solarconditionsproviders.solar_conditions_provider import SolarConditionsProvider
+
+POLL_INTERVAL = 900  # 15 minutes
+KC2G_URL = "https://prop.kc2g.com/api/stations.json"
+HISTORY_HOURS = 24
+
+
+class KC2GProp(SolarConditionsProvider):
+    """Solar conditions provider using ionosonde data from prop.kc2g.com. The API returns only the latest reading per
+     station, so this provider polls every 15 minutes and accumulates a 24-hour time series by merging each new reading
+     into the persisted ionosonde_data, producing the same data structure as GIROIonosonde.
+
+     Can run alongside GIROIonosonde: KC2G provides foF2/MUF with good reliability, while GIRO supplements with LUF
+     readings. Stations from each source that the other does not cover are preserved."""
+
+    def __init__(self, provider_config):
+        super().__init__(provider_config)
+        self._thread = None
+        self._stop_event = Event()
+
+    def start(self):
+        logging.info(f"Set up query of KC2G ionosonde data API every {POLL_INTERVAL} seconds.")
+        self._thread = Thread(target=self._run, daemon=True)
+        self._thread.start()
+
+    def stop(self):
+        self._stop_event.set()
+
+    def _run(self):
+        while True:
+            self._poll()
+            if self._stop_event.wait(timeout=POLL_INTERVAL):
+                break
+
+    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}")
+                return
+
+            now = datetime.now(timezone.utc)
+            cutoff_ts = (now - timedelta(hours=HISTORY_HOURS)).timestamp()
+
+            # Start from existing ionosonde_data so the accumulated time series survives across polls and restarts and
+            # stations provided only by GIROIonosonde are not discarded
+            ionosonde_data = dict(self._solar_conditions.ionosonde_data or {})
+            updated_count = 0
+
+            for reading in response.json():
+                station = reading.get("station", {})
+                ursi = station.get("code")
+                name = station.get("name")
+                if not ursi or not name:
+                    continue
+
+                time_str = reading.get("time")
+                if not time_str:
+                    continue
+                try:
+                    ts = datetime.fromisoformat(time_str)
+                    if ts.tzinfo is None:
+                        ts = ts.replace(tzinfo=timezone.utc)
+                    ts_float = ts.timestamp()
+                except ValueError:
+                    continue
+
+                # Skip readings outside our history window (some stations have months-old data)
+                if ts_float < cutoff_ts:
+                    continue
+
+                fof2_val = reading.get("fof2")
+                muf_val = reading.get("mufd")
+                if fof2_val is None and muf_val is None:
+                    continue
+
+                # Merge this reading into the existing time series for the station.
+                existing = ionosonde_data.get(ursi, {})
+                fof2_dict = dict(existing.get("fof2") or {})
+                muf_dict = dict(existing.get("muf") or {})
+                # LUF is not available from KC2G; carry forward whatever GIRO has written.
+                luf_dict = {float(t): v for t, v in (existing.get("luf") or {}).items()}
+
+                fof2_dict[ts_float] = fof2_val
+                muf_dict[ts_float] = muf_val
+
+                # Trim all series to the 24-hour window.
+                fof2_dict = {t: v for t, v in fof2_dict.items() if t >= cutoff_ts}
+                muf_dict = {t: v for t, v in muf_dict.items() if t >= cutoff_ts}
+                luf_dict = {t: v for t, v in luf_dict.items() if t >= cutoff_ts}
+
+                band_states = compute_band_states(fof2_dict, muf_dict, luf_dict)
+                ionosonde_data[ursi] = {
+                    "ursi": ursi,
+                    "name": name,
+                    "fof2": fof2_dict or None,
+                    "muf": muf_dict or None,
+                    "luf": luf_dict or None,
+                    "band_states": band_states,
+                }
+                updated_count += 1
+
+            self.update_data({"ionosonde_data": ionosonde_data})
+            self.status = "OK"
+            self.last_update_time = datetime.now(pytz.UTC)
+            logging.debug(f"Updated KC2G ionosonde data for {updated_count} stations.")
+
+        except Exception:
+            self.status = "Error"
+            logging.exception("Exception in KC2G ionosonde data provider")
+            self._stop_event.wait(timeout=1)

solarconditionsproviders/solar_conditions_provider.py

@@ -16,10 +16,11 @@ class SolarConditionsProvider:
         self.status = "Not Started" if self.enabled else "Disabled"
         self._solar_conditions = None
 
-    def setup(self, solar_conditions):
-        """Set up the provider, giving it the solar conditions dict to update"""
+    def setup(self, solar_conditions, solar_conditions_cache):
+        """Set up the provider, giving it the solar conditions object and its backing cache"""
 
         self._solar_conditions = solar_conditions
+        self._solar_conditions_cache = solar_conditions_cache
 
     def start(self):
         """Start the provider. This should return immediately after spawning threads to access the remote resources"""
@@ -39,3 +40,4 @@ class SolarConditionsProvider:
                 if hasattr(self._solar_conditions, key):
                     setattr(self._solar_conditions, key, value)
             self._solar_conditions.infer_descriptions()
+            self._solar_conditions_cache['solar_conditions'] = self._solar_conditions

spothole.py

@@ -9,8 +9,8 @@ from diskcache import Cache
 
 from core.cleanup import CleanupTimer
 from data.solar_conditions import SolarConditions
-from core.config import config, WEB_SERVER_PORT, SERVER_OWNER_CALLSIGN
-from core.constants import SOFTWARE_NAME, SOFTWARE_VERSION
+from core.config import config, SERVER_OWNER_CALLSIGN
+from core.constants import SOFTWARE_VERSION
 from core.lookup_helper import lookup_helper
 from core.status_reporter import StatusReporter
 from server.webserver import WebServer
@@ -18,7 +18,8 @@ from server.webserver import WebServer
 # Globals
 spots = Cache('cache/spots_cache')
 alerts = Cache('cache/alerts_cache')
-solar_conditions = SolarConditions()
+solar_conditions_cache = Cache('cache/solar_conditions_cache')
+solar_conditions = solar_conditions_cache.get('solar_conditions', SolarConditions())
 web_server = None
 status_data = {}
 spot_providers = []
@@ -48,6 +49,7 @@ def shutdown(sig, frame):
     lookup_helper.stop()
     spots.close()
     alerts.close()
+    solar_conditions_cache.close()
     os._exit(0)
 
 
@@ -88,7 +90,7 @@ if __name__ == '__main__':
 
     logging.info("Starting...")
     logging.info(
-        "This is " + SOFTWARE_NAME + " version " + SOFTWARE_VERSION + ". This instance is run by " + SERVER_OWNER_CALLSIGN + ".")
+        "This is Spothole version " + SOFTWARE_VERSION + ". This instance is run by " + SERVER_OWNER_CALLSIGN + ".")
 
     # Shut down gracefully on SIGINT
     signal.signal(signal.SIGINT, shutdown)
@@ -97,8 +99,7 @@ if __name__ == '__main__':
     lookup_helper.start()
 
     # Set up web server
-    web_server = WebServer(spots=spots, alerts=alerts, solar_conditions=solar_conditions, status_data=status_data,
-                           solar_condition_providers=solar_condition_providers, port=WEB_SERVER_PORT)
+    web_server = WebServer(spots=spots, alerts=alerts, solar_conditions=solar_conditions, status_data=status_data)
 
     # Fetch, set up and start spot providers
     for entry in config["spot-providers"]:
@@ -120,7 +121,7 @@ if __name__ == '__main__':
     for entry in config.get("solar-condition-providers", []):
         solar_condition_providers.append(get_solar_conditions_provider_from_config(entry))
     for p in solar_condition_providers:
-        p.setup(solar_conditions=solar_conditions)
+        p.setup(solar_conditions=solar_conditions, solar_conditions_cache=solar_conditions_cache)
         if p.enabled:
             p.start()
 

spotproviders/hema.py

@@ -35,7 +35,7 @@ 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)
+            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:

spotproviders/http_spot_provider.py

@@ -40,7 +40,7 @@ class HTTPSpotProvider(SpotProvider):
         try:
             # Request data from API
             logging.debug("Polling " + self.name + " spot API...")
-            http_response = requests.get(self._url, headers=HTTP_HEADERS)
+            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.

spotproviders/sota.py

@@ -33,7 +33,7 @@ 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).json()
+            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

templates/about.html

@@ -27,7 +27,7 @@
     <h4 class="mt-4">What data sources are supported?</h4>
     <p>Spothole can retrieve spots from: <a href="https://www.dxcluster.info/telnet/">Telnet-based DX clusters</a>, the <a href="https://www.reversebeacon.net/">Reverse Beacon Network (RBN)</a>, the <a href="https://www.aprs-is.net/">APRS Internet Service (APRS-IS)</a>, <a href="https://pota.app">POTA</a>, <a href="https://www.sota.org.uk/">SOTA</a>, <a href="https://wwff.co/">WWFF</a>, <a href="https://www.cqgma.org/">GMA</a>, <a href="https://wwbota.net/">WWBOTA</a>, <a href="http://www.hema.org.uk/">HEMA</a>, <a href="https://www.parksnpeaks.org/">Parks 'n' Peaks</a>, <a href="https://ontheair.nz">ZLOTA</a>, <a href="https://www.wota.org.uk/">WOTA</a>, <a href="https://llota.app">LLOTA</a>, <a href="https://wwtota.com">WWTOTA</a>, <a href="https://tilesontheair.com/">Tiles on the Air</a>, the <a href="https://ukpacketradio.network/">UK Packet Repeater Network</a>, and any site based on the <a href="https://github.com/nischu/xOTA">xOTA software by nischu</a>.</p>
     <p>Spothole can retrieve alerts from: <a href="https://www.ng3k.com/">NG3K</a>, <a href="https://pota.app">POTA</a>, <a href="https://www.sota.org.uk/">SOTA</a>, <a href="https://wwff.co/">WWFF</a>, <a href="https://www.parksnpeaks.org/">Parks 'n' Peaks</a>, <a href="https://www.wota.org.uk/">WOTA</a> and <a href="https://www.beachesontheair.com/">BOTA</a>.</p>
-    <p>Spothole can retrieve solar and propagation condition data from <a href="https://www.hamqsl.com">HamQSL</a>.</p>
+    <p>Spothole can retrieve solar and propagation condition data from <a href="https://www.hamqsl.com">HamQSL</a>, the <a href="https://www.swpc.noaa.gov/">NOAA Space Weather Prediction Center</a>, the <a href="https://giro.uml.edu/">Lowell GIRO Data Center</a> and <a href="https://prop.kc2g.com/">prop.kc2g.com</a> by KC2G.</p>
     <p>Spothole can also perform lookups for callsign data on behalf of the user from <a href="https://qrz.com">QRZ.com</a> and <a href="https://hamqth.com">HamQTH</a>.</p>
     <p>Note that the server owner has not necessarily enabled all these data sources. In particular it is common to disable RBN, to avoid the server being swamped with FT8 traffic, and to disable APRS-IS and UK Packet Net so that the server only displays stations where there is likely to be an operator physically present for a QSO.</p>
     <p>Between the various data sources, the following Special Interest Groups (SIGs) are supported: Parks on the Air (POTA), Summits on the Air (SOTA), Worldwide Flora & Fauna (WWFF), Global Mountain Activity (GMA), Worldwide Bunkers on the Air (WWBOTA), HuMPs Excluding Marilyns Award (HEMA), Islands on the Air (IOTA), Mills on the Air (MOTA), the Amateur Radio Lighthouse Socirty (ARLHS), International Lighthouse Lightship Weekend (ILLW), Silos on the Air (SIOTA), World Castles Award (WCA), New Zealand on the Air (ZLOTA), Keith Roget Memorial National Parks Award (KRMNPA), Wainwrights on the Air (WOTA), Beaches on the Air (BOTA), Lagos y Lagunas On the Air (LLOTA), Towers on the Air (WWTOTA), Tiles on the Air, Worked All Britain (WAB), Worked All Ireland (WAI), and Toilets on the Air (TOTA).</p>
@@ -69,7 +69,6 @@
     <p>This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.</p>
 </div>
 
-<script src="/js/common.js?v=1778343015"></script>
 <script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/add_spot.html

@@ -21,11 +21,11 @@
             <form class="row g-3">
                 <div class="col-auto">
                     <label for="dx-call" class="form-label">DX Call *</label>
-                    <input type="text" class="form-control" id="dx-call" placeholder="N0CALL" style="max-width: 8em;">
+                    <input type="text" class="form-control input-narrow" id="dx-call" placeholder="N0CALL">
                 </div>
                 <div class="col-auto">
                     <label for="freq" class="form-label">Frequency (kHz) *</label>
-                    <input type="text" class="form-control" id="freq" placeholder="e.g. 14100" style="max-width: 8em;">
+                    <input type="text" class="form-control input-narrow" id="freq" placeholder="e.g. 14100">
                 </div>
                 <div class="col-auto">
                     <label for="mode" class="form-label">Mode</label>
@@ -41,22 +41,22 @@
                 </div>
                 <div class="col-auto">
                     <label for="sig-ref" class="form-label">SIG Reference</label>
-                    <input type="text" class="form-control" id="sig-ref" placeholder="e.g. GB-0001" style="max-width: 8em;">
+                    <input type="text" class="form-control input-narrow" id="sig-ref" placeholder="e.g. GB-0001">
                 </div>
                 <div class="col-auto">
                     <label for="dx-grid" class="form-label">DX Grid</label>
-                    <input type="text" class="form-control" id="dx-grid" placeholder="e.g. AA00aa" style="max-width: 8em;">
+                    <input type="text" class="form-control input-narrow" id="dx-grid" placeholder="e.g. AA00aa">
                 </div>
                 <div class="col-auto">
                     <label for="comment" class="form-label">Comment</label>
-                    <input type="text" class="form-control" id="comment" placeholder="e.g. 59 TNX QSO 73" style="max-width: 12em;">
+                    <input type="text" class="form-control input-medium" id="comment" placeholder="e.g. 59 TNX QSO 73">
                 </div>
                 <div class="col-auto">
                     <label for="de-call" class="form-label">Your Call *</label>
-                    <input type="text" class="form-control storeable-text" id="de-call" placeholder="N0CALL" style="max-width: 8em;">
+                    <input type="text" class="form-control storeable-text input-narrow" id="de-call" placeholder="N0CALL">
                 </div>
                 <div class="col-auto">
-                    <button type="button" class="btn btn-primary" style="margin-top: 2em;" onclick="addSpot();">Spot</button>
+                    <button type="button" class="btn btn-primary mt-2em" onclick="addSpot();">Spot</button>
                 </div>
             </form>
 
@@ -69,8 +69,7 @@
 
 </div>
 
-<script src="/js/common.js?v=1778343015"></script>
-<script src="/js/add-spot.js?v=1778343015"></script>
+<script src="/js/add-spot.js?v=1781893916"></script>
 <script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/alerts.html

@@ -70,8 +70,7 @@
 
 </div>
 
-<script src="/js/common.js?v=1778343015"></script>
-<script src="/js/alerts.js?v=1778343015"></script>
+<script src="/js/alerts.js?v=1781893916"></script>
 <script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/api_only_home.html

@@ -0,0 +1,22 @@
+{% extends "skeleton.html" %}
+{% block head_extra %}
+    <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
+{% end %}
+{% block body %}
+<div class="container mt-5">
+    <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">
+            </div>
+            <div class="card">
+                <div class="card-body">
+                    <p class="card-text">This server is running <strong>Spothole v{{software_version}}</strong>, and is operated by <strong>{{server_owner_callsign}}</strong>.</p>
+                    <p class="card-text">The web UI is not available on this instance because the server is running in API-only mode, intended for use by client software rather than visitors to the website. See the <a href="/apidocs">API documentation</a> for details of how client software can interact with the server.</p>
+                    <p class="card-text">Please see the <a href="https://git.ianrenton.com/ian/spothole#readme">README</a> for details of what Spothole is and how you can run it for yourself.</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% end %}

templates/apidocs.html

@@ -1,8 +1,5 @@
-{% extends "base.html" %}
-{% block content %}
-
+{% extends "skeleton.html" %}
+{% block body %}
 <redoc spec-url="/apidocs/openapi.yml"></redoc>
 <script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"> </script>
-<script>$(document).ready(function() { $("#nav-link-api").addClass("active"); }); <!-- highlight active page in nav --></script>
-
 {% end %}

templates/bands.html

@@ -76,9 +76,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/common.js?v=1778343015"></script>
-<script src="/js/spotsbandsandmap.js?v=1778343015"></script>
-<script src="/js/bands.js?v=1778343015"></script>
+<script src="/js/spotsbandsandmap.js?v=1781893916"></script>
+<script src="/js/bands.js?v=1781893916"></script>
 <script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/base.html

@@ -1,57 +1,21 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
-    <meta name="color-scheme" content="light dark">
-    <meta name="theme-color" content="white"/>
-    <meta name="mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="white-translucent">
+{% extends "skeleton.html" %}
+{% block head_extra %}
+    <link rel="stylesheet" href="/css/style.css?v=1781893916" 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">
 
-    <meta property="og:title" content="Spothole"/>
-    <meta property="twitter:title" content="Spothole"/>
-    <meta name="description" 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"/>
-    <meta name="twitter:card" content="summary_large_image"/>
-    <meta name="author" content="Ian Renton"/>
-    <meta property="og:locale" content="en_GB"/>
-    <meta property="og:type" content="website"/>
+    <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>
 
-    <title>Spothole</title>
-
-    <link rel="stylesheet" href="/css/style.css?v=1778343015" type="text/css">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
-    <link href="/fa/css/fontawesome.min.css" rel="stylesheet" />
-    <link href="/fa/css/solid.min.css" rel="stylesheet" />
-
-    <link rel="icon" type="image/png" href="/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/x-icon" href="/favicon.ico">
-
-    <link rel="manifest" href="manifest.webmanifest">
-
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js"
-            integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI"
-            crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js"></script>
-
-    <script src="https://misc.ianrenton.com/jsutils/utils.js?v=1778343015"></script>
-    <script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1778343015"></script>
-    <script src="https://misc.ianrenton.com/jsutils/geo.js?v=1778343015"></script>
-
-</head>
-<body>
+    <script src="/js/utils.js?v=1781893916"></script>
+    <script src="/js/ui-ham.js?v=1781893916"></script>
+    <script src="/js/geo.js?v=1781893916"></script>
+    <script src="/js/common.js?v=1781893916"></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">
@@ -70,9 +34,7 @@
                   {% if allow_spotting %}
                     <li class="nav-item ms-4"><a href="/add-spot" class="nav-link" id="nav-link-add-spot"><i class="fa-solid fa-comment"></i> Add&nbsp;Spot</a></li>
                   {% end %}
-                  {% if has_hamqsl or has_noaa_forecast %}
                     <li class="nav-item ms-4"><a href="/conditions" class="nav-link" id="nav-link-conditions"><i class="fa-solid fa-sun"></i> Conditions</a></li>
-                  {% end %}
                     <li class="nav-item ms-4"><a href="/status" class="nav-link" id="nav-link-status"><i class="fa-solid fa-chart-simple"></i> Status</a></li>
                     <li class="nav-item ms-4"><a href="/about" class="nav-link" id="nav-link-about"><i class="fa-solid fa-circle-info"></i> About</a></li>
                     <li class="nav-item ms-4"><a href="/apidocs" class="nav-link" id="nav-link-api"><i class="fa-solid fa-gear"></i> API</a></li>
@@ -90,7 +52,7 @@
     <div id="footer" class="hideonmobile hideonmap">
         <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
             <p class="col-md-4 mb-0 text-body-secondary">Made with love by <a href="https://ianrenton.com" class="text-body-secondary">Ian, MØTRT</a> and other contributors.</p>
-            <p class="col-md-4 mb-0 justify-content-center text-body-secondary" style="text-align: center;">Spothole v{{software_version}}</p>
+            <p class="col-md-4 mb-0 justify-content-center text-body-secondary text-center">Spothole v{{software_version}}</p>
             <ul class="nav col-md-4 justify-content-end">
                 <li class="nav-item">
                     <a href="/about#faq" class="nav-link px-3 text-body-secondary">FAQ</a>
@@ -111,5 +73,4 @@
 
 <div id="embeddedModeFooter" class="text-body-secondary pt-2 px-3 pb-1">Powered by <img src="/img/logo.png" class="logo" width="96" height="30" alt="Spothole"></div>
 
-</body>
-</html>
+{% end %}

templates/cards/hamqth.html

@@ -7,10 +7,10 @@
                 <label for="hamqth-enabled" class="form-check-label">Use data from HamQTH</label>
             </div>
             <div class="mb-2">
-                <input type="text" class="storeable-text form-control form-control-sm" id="hamqth-username" placeholder="Username (Callsign)" onchange="saveSettings();" autocomplete="username">
+                <input type="text" class="storeable-text form-control" id="hamqth-username" placeholder="Username (Callsign)" onchange="saveSettings();" autocomplete="username">
             </div>
             <div class="mb-2">
-                <input type="password" class="password-field form-control form-control-sm" id="hamqth-password" placeholder="Password" data-remember-checkbox="hamqth-remember-password" onchange="saveSettings();" autocomplete="current-password">
+                <input type="password" class="password-field form-control" id="hamqth-password" placeholder="Password" data-remember-checkbox="hamqth-remember-password" onchange="saveSettings();" autocomplete="current-password">
             </div>
             <div class="form-check">
                 <input type="checkbox" class="storeable-checkbox form-check-input" id="hamqth-remember-password" onchange="saveSettings();">

templates/cards/qrz.html

@@ -7,10 +7,10 @@
                 <label for="qrz-enabled" class="form-check-label">Use data from QRZ.com</label>
             </div>
             <div class="mb-2">
-                <input type="text" class="storeable-text form-control form-control-sm" id="qrz-username" placeholder="Username (Callsign)" onchange="saveSettings();" autocomplete="username">
+                <input type="text" class="storeable-text form-control" id="qrz-username" placeholder="Username (Callsign)" onchange="saveSettings();" autocomplete="username">
             </div>
             <div class="mb-2">
-                <input type="password" class="password-field form-control form-control-sm" id="qrz-password" placeholder="Password" data-remember-checkbox="qrz-remember-password" onchange="saveSettings();" autocomplete="current-password">
+                <input type="password" class="password-field form-control" id="qrz-password" placeholder="Password" data-remember-checkbox="qrz-remember-password" onchange="saveSettings();" autocomplete="current-password">
             </div>
             <div class="form-check">
                 <input type="checkbox" class="storeable-checkbox form-check-input" id="qrz-remember-password" onchange="saveSettings();">

templates/conditions.html

@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 {% block content %}
 
-{% if has_hamqsl %}
-<div class="card mt-5">
+<div id="hamqsl-section" style="display:none">
+    <div class="card mt-5">
         <div class="card-header">
             Propagation Conditions
         </div>
@@ -82,9 +82,9 @@
             </div>
             <div class="form-text mt-3">Data from <a href="https://hamqsl.com">HamQSL.com</a>.</div>
         </div>
-</div>
+    </div>
 
-<div class="card mt-5">
+    <div class="card mt-5">
         <div class="card-header">
             Solar Weather
         </div>
@@ -126,18 +126,19 @@
             </div>
             <div class="row border-bottom align-items-start me-0">
                 <div class="col-12 col-md-2 fw-bold py-2">Electron Flux</div>
-            <div id="sw-electron-vals" class="col-12 col-md-3 py-2"><strong id="sw-electron-flux"></strong> efu</div>
+                <div id="sw-electron-vals" class="col-12 col-md-3 py-2"><strong id="sw-electron-flux"></strong> efu
+                </div>
                 <div id="sw-electron-desc" class="col-12 col-md-7 py-2"></div>
             </div>
             <div class="form-text mt-3">Data from <a href="https://hamqsl.com">HamQSL.com</a>.</div>
         </div>
+    </div>
 </div>
-{% end %}
 
-{% if has_noaa_forecast %}
-<div class="card mt-5">
+<div id="noaa-section" style="display:none">
+    <div class="card mt-5">
         <div class="card-header">
-        Forecast
+            Solar Weather Forecast
         </div>
         <div class="card-body">
             <div class="row mb-4">
@@ -170,8 +171,61 @@
                 Center</a>.
             </div>
         </div>
+    </div>
+</div>
+
+<div id="ionosonde-section" style="display:none">
+    <div class="card mt-5">
+        <div class="card-header">
+            Ionosonde Data
+        </div>
+        <div class="card-body">
+            <div class="mb-3">
+                <label for="ionosonde-station" class="form-label">Ionosonde station:</label>
+                <select id="ionosonde-station" class="form-select storeable-select d-inline-block ms-2 w-auto"
+                        oninput="ionosondeStationChanged();">
+                </select>
+            </div>
+            <div id="ionosonde-latest" class="mb-3">
+                <div id="ionosonde-no-data" class="alert alert-warning mt-2 mb-0 py-2 js-hidden">No data available for
+                    this station.
+                </div>
+                <div id="ionosonde-data-rows" class="js-hidden">
+                    <div class="row align-items-center me-0">
+                        <div class="col-12 py-2 text-muted">Latest values as of <span id="ionosonde-latest-time"></span>
+                        </div>
+                    </div>
+                    <div class="row align-items-center me-0">
+                        <div class="col-12 col-md-4 py-2">LUF: <strong id="ionosonde-latest-luf"></strong></div>
+                        <div class="col-12 col-md-4 py-2">foF2: <strong id="ionosonde-latest-fof2"></strong></div>
+                        <div class="col-12 col-md-4 py-2">MUF (3000 km): <strong id="ionosonde-latest-muf"></strong>
+                        </div>
+                    </div>
+                    <div id="ionosonde-stale-warning" class="alert alert-warning mt-2 mb-0 py-2 js-hidden">Data is more
+                        than 12 hours old!
+                    </div>
+                </div>
+            </div>
+            <div id="ionosonde-band-state" class="mb-3 js-hidden">
+                <table class="table table-sm table-bordered mb-0 d-none d-md-table table-fixed-on-desktop">
+                    <thead>
+                    <tr id="ionosonde-band-state-head"></tr>
+                    </thead>
+                    <tbody>
+                    <tr id="ionosonde-band-state-row"></tr>
+                    </tbody>
+                </table>
+                <table class="table table-sm table-bordered mb-0 d-md-none">
+                    <tbody id="ionosonde-band-state-body"></tbody>
+                </table>
+            </div>
+            <canvas id="ionosonde-chart" class="mt-3 mb-3 hideonmobile"></canvas>
+            <div class="form-text mt-2">Data from the <a href="https://lgdc.uml.edu/">Lowell GIRO Data Center</a> and/or
+                <a href="https://prop.kc2g.com/">KC2G</a>.
+            </div>
+        </div>
+    </div>
 </div>
-{% end %}
 
 <div class="card mt-5">
     <div class="card-header">
@@ -180,8 +234,8 @@
     <div class="card-body">
         <div class="mb-3">
             <label for="dxstats-de-continent" class="form-label">Your continent:</label>
-            <select id="dxstats-de-continent" class="form-select storeable-select d-inline-block ms-2"
-                    style="width: auto;" oninput="dxStatsContientChanged();">
+            <select id="dxstats-de-continent" class="form-select storeable-select d-inline-block ms-2 w-auto"
+                    oninput="dxStatsContientChanged();">
                 <option value="EU">Europe</option>
                 <option value="NA">North America</option>
                 <option value="SA">South America</option>
@@ -192,7 +246,7 @@
             </select>
         </div>
         <div class="table-responsive">
-            <table class="table table-sm table-bordered mb-0">
+            <table class="table table-sm table-bordered mb-0 table-fixed-on-desktop">
                 <thead>
                 <tr>
                     <th></th>
@@ -229,9 +283,8 @@
     </div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.9/dist/chart.umd.min.js"></script>
-<script src="/js/common.js?v=1778343015"></script>
-<script src="/js/conditions.js?v=1778343015"></script>
+<script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
+<script src="/js/conditions.js?v=1781893916"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/map.html

@@ -2,7 +2,7 @@
 {% block content %}
 
 <div id="map">
-    <div id="settingsButtonRowMap" class="mt-3 px-3" style="z-index: 1002; position: relative;">
+    <div id="settingsButtonRowMap" class="mt-3 px-3">
         <div class="row mb-3">
             <div class="col-auto me-auto pt-3"></div>
             <div class="col-auto">
@@ -76,26 +76,26 @@
     </div>
 </div>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet.min.css">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet-extra-markers@1.2.2/dist/css/leaflet.extra-markers.min.css">
-<script src="https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/leaflet-providers@2.0.0/leaflet-providers.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/leaflet-extra-markers@1.2.2/src/assets/js/leaflet.extra-markers.min.js" type="module"></script>
-<script src="https://cdn.jsdelivr.net/npm/leaflet.geodesic"></script>
-<script src="https://unpkg.com/leaflet.vectorgrid@latest/dist/Leaflet.VectorGrid.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/text-image/dist/text-image.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@joergdietrich/leaflet.terminator@1.1.0/L.Terminator.min.js"></script>
-<script src="https://ianrenton.github.io/Leaflet.Maidenhead/src/L.Maidenhead.js"></script>
-<script src="https://ha8tks.github.io/Leaflet.ITUzones/src/L.ITUzones.js"></script>
-<script src="https://ha8tks.github.io/Leaflet.CQzones/src/L.CQzones.js"></script>
-<script src="https://misc.ianrenton.com/Leaflet.WorkedAllBritainIreland/L.WorkedAllBritainIreland.js"></script>
+<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>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/common.js?v=1778343015"></script>
-<script src="/js/spotsbandsandmap.js?v=1778343015"></script>
-<script src="/js/map.js?v=1778343015"></script>
+<script src="/js/spotsbandsandmap.js?v=1781893916"></script>
+<script src="/js/map.js?v=1781893916"></script>
 <script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/skeleton.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
+    <meta name="color-scheme" content="light dark">
+    <meta name="theme-color" content="white"/>
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="white-translucent">
+
+    <meta property="og:title" content="Spothole"/>
+    <meta property="twitter:title" content="Spothole"/>
+    <meta name="description" 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"/>
+    <meta name="twitter:card" content="summary_large_image"/>
+    <meta name="author" content="Ian Renton"/>
+    <meta property="og:locale" content="en_GB"/>
+    <meta property="og:type" content="website"/>
+
+    <title>Spothole</title>
+
+    <link rel="icon" type="image/png" href="/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/x-icon" href="/favicon.ico">
+
+    <link rel="manifest" href="manifest.webmanifest">
+
+    {% block head_extra %}{% end %}
+</head>
+<body>
+{% block body %}{% end %}
+</body>
+</html>

templates/spots.html

@@ -104,9 +104,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/common.js?v=1778343015"></script>
-<script src="/js/spotsbandsandmap.js?v=1778343015"></script>
-<script src="/js/spots.js?v=1778343015"></script>
+<script src="/js/spotsbandsandmap.js?v=1781893916"></script>
+<script src="/js/spots.js?v=1781893916"></script>
 <script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/status.html

@@ -59,8 +59,7 @@
     </div>
 </div>
 
-<script src="/js/common.js?v=1778343015"></script>
-<script src="/js/status.js?v=1778343015"></script>
+<script src="/js/status.js?v=1781893916"></script>
 <script>
     $(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav -->
 </script>

webassets/css/style.css

@@ -90,7 +90,7 @@ input#search {
 
 i#searchicon {
     position: absolute;
-    left: 0rem;
+    left: 0;
     top: 2px;
     padding: 10px;
     pointer-events: none;
@@ -184,7 +184,7 @@ tr.new td {
     background-color: var(--bs-success-border-subtle);
   }
   100% {
-    background-color: intial;
+    background-color: initial;
   }
 }
 
@@ -211,8 +211,13 @@ div#map {
     font-size: 16px;
 }
 
+#settingsButtonRowMap {
+    position: relative;
+    z-index: 1002;
+}
+
 .leaflet-container {
-    font-family: var(--bs-body-font-family) !important;
+    font-family: var(--bs-body-font-family) sans-serif !important;
 }
 .leaflet-control-attribution {
     background: none;
@@ -323,9 +328,34 @@ div.band-spot:hover span.band-spot-info {
 }
 
 
+/* UTILITY CLASSES */
+
+/* For elements initially hidden and shown/hidden by JS. Unlike Bootstrap's d-none this has no !important,
+   so jQuery's .show() / .hide() / .toggle() can override it with an inline style as expected. */
+.js-hidden {
+    display: none;
+}
+
+.table-fixed-on-desktop {
+    table-layout: fixed;
+}
+
+.input-narrow {
+    max-width: 8em;
+}
+.input-medium {
+    max-width: 12em;
+}
+
+/* Pushes a submit button down to align with labelled inputs in a flex row */
+.mt-2em {
+    margin-top: 2em;
+}
+
+
 /* GENERAL MOBILE SUPPORT */
 
-@media (max-width: 991.99px) {
+@media (max-width: 991px) {
     /* General "hide this on mobile" class */
     .hideonmobile {
         display: none !important;
@@ -346,6 +376,9 @@ div.band-spot:hover span.band-spot-info {
     input#search {
         max-width: 7em;
     }
+    .table-fixed-on-desktop {
+        table-layout: auto !important;
+    }
 }
 
 @media (min-width: 992px) {

webassets/js/add-spot.js

@@ -33,44 +33,44 @@ function addSpot() {
         saveSettings();
 
         // Unpack the user's entered values
-        var dx = $("#dx-call").val().toUpperCase();
-        var freqStr = $("#freq").val();
-        var mode = $("#mode")[0].value;
-        var sig = $("#sig")[0].value;
-        var sigRef = $("#sig-ref").val();
-        var dxGrid = $("#dx-grid").val();
-        var comment = $("#comment").val();
-        var de = $("#de-call").val().toUpperCase();
+        const dx = $("#dx-call").val().toUpperCase();
+        const freqStr = $("#freq").val();
+        const mode = $("#mode")[0].value;
+        const sig = $("#sig")[0].value;
+        const sigRef = $("#sig-ref").val();
+        const dxGrid = $("#dx-grid").val();
+        const comment = $("#comment").val();
+        const de = $("#de-call").val().toUpperCase();
 
-        var spot = {}
-        if (dx != "") {
+        const spot = {};
+        if (dx !== "") {
             spot["dx_call"] = dx;
         } else {
             showAddSpotError("A DX callsign is required in order to spot.");
             return;
         }
-        if (freqStr != "") {
+        if (freqStr !== "") {
             spot["freq"] = parseFloat(freqStr) * 1000;
         } else {
             showAddSpotError("A frequency is required in order to spot.");
             return;
         }
-        if (mode != "") {
+        if (mode !== "") {
             spot["mode"] = mode;
         }
-        if (sig != "") {
+        if (sig !== "") {
             spot["sig"] = sig;
         }
-        if (sigRef != "") {
+        if (sigRef !== "") {
             spot["sig_refs"] = [{id: sigRef}];
         }
-        if (dxGrid != "") {
+        if (dxGrid !== "") {
             spot["dx_grid"] = dxGrid;
         }
-        if (comment != "") {
+        if (comment !== "") {
             spot["comment"] = comment;
         }
-        if (de != "") {
+        if (de !== "") {
             spot["de_call"] = de;
         } else {
             showAddSpotError("A spotter callsign is required in order to spot.");
@@ -83,7 +83,7 @@ function addSpot() {
             contentType : 'application/json',
             type : 'POST',
             timeout: 10000,
-            success: async function (result) {
+            success: async function() {
                 $("#result-good").html("<div class='alert alert-success fade show mb-0 mt-4' role='alert'><i class='fa-solid fa-check'></i> Spot submitted. Returning you to the spots list...</div>");
                 $("#result-bad").html("");
                 setTimeout(() => {
@@ -103,7 +103,11 @@ function addSpot() {
 
 // Show an "add spot" error.
 function showAddSpotError(text) {
-    $("#result-bad").html("<div class='alert alert-danger alert-dismissible fade show mb-0 mt-4' role='alert'><i class='fa-solid fa-triangle-exclamation'></i> " + text + "<button type='button' class='btn-close' data-bs-dismiss='alert' aria-label='Close'></button></div>");
+    const div = $("<div class='alert alert-danger alert-dismissible fade show mb-0 mt-4' role='alert'></div>");
+    div.append("<i class='fa-solid fa-triangle-exclamation'></i> ");
+    div.append(document.createTextNode(text));
+    div.append("<button type='button' class='btn-close' data-bs-dismiss='alert' aria-label='Close'></button>");
+    $("#result-bad").empty().append(div);
 }
 
 // Force callsign and mode capitalisation

webassets/js/alerts.js

@@ -2,11 +2,11 @@
 const REFRESH_INTERVAL_SEC = 60 * 10;
 
 // Storage for the alert data that the server gives us.
-var alerts = []
+let alerts = [];
 
 // Load alerts and populate the table.
 function loadAlerts() {
-    $.getJSON('/api/v1/alerts' + buildQueryString(), function(jsonData) {
+    $.getJSON('/api/v1/alerts' + buildQueryString(false), function(jsonData) {
         // Store last updated time
         lastUpdateTime = moment.utc();
         updateRefreshDisplay();
@@ -18,38 +18,40 @@ function loadAlerts() {
 }
 
 // Build a query string for the API, based on the filters that the user has selected.
-function buildQueryString() {
-    var str =  "?";
+function buildQueryString(includeCredentials) {
+    let str = "?";
     ["dx_continent", "source"].forEach(fn => {
         if (!allFilterOptionsSelected(fn)) {
             str = str + getQueryStringFor(fn) + "&";
         }
     });
     str = str + "limit=" + $("#alerts-to-fetch option:selected").val();
-    var maxDur = $("#max-duration option:selected").val();
-    if (maxDur != "9999999999") {
+    const maxDur = $("#max-duration option:selected").val();
+    if (maxDur !== "9999999999") {
         str = str + "&max_duration=" + maxDur;
     }
     if ($("#dxpeditions_skip_max_duration_check")[0].checked) {
         str = str + "&dxpeditions_skip_max_duration_check=true";
     }
+    if (includeCredentials) {
         str = str + getCredentialQueryString();
+    }
     return str;
 }
 
 // Update the alerts table
 function updateTable() {
     // Use local time instead of UTC?
-    var useLocalTime = $("#timeZone")[0].value == "local";
+    const useLocalTime = $("#timeZone")[0].value === "local";
 
     // Table data toggles
-    var showStartTime = $("#tableShowStartTime")[0].checked;
-    var showEndTime = $("#tableShowEndTime")[0].checked;
-    var showDX = $("#tableShowDX")[0].checked;
-    var showFreqsModes = $("#tableShowFreqsModes")[0].checked;
-    var showComment = $("#tableShowComment")[0].checked;
-    var showSource = $("#tableShowSource")[0].checked;
-    var showRef = $("#tableShowRef")[0].checked;
+    const showStartTime = $("#tableShowStartTime")[0].checked;
+    const showEndTime = $("#tableShowEndTime")[0].checked;
+    const showDX = $("#tableShowDX")[0].checked;
+    const showFreqsModes = $("#tableShowFreqsModes")[0].checked;
+    const showComment = $("#tableShowComment")[0].checked;
+    const showSource = $("#tableShowSource")[0].checked;
+    const showRef = $("#tableShowRef")[0].checked;
 
     // Populate table with headers
     let table = $("#table");
@@ -81,10 +83,10 @@ function updateTable() {
     // Split alerts into three types, each of which will get its own table header: On now, next 24h, and later. "On now"
     // is considered to be events with an end_time where start<now<end, or events with no end time that started in the
     // last hour.
-    onNow = alerts.filter(a => (a["end_time"] != null && a["end_time"] != 0 && moment.unix(a["end_time"]).utc().isSameOrAfter() && moment.unix(a["start_time"]).utc().isBefore())
-        || ((a["end_time"] == null || a["end_time"] == 0) && moment.unix(a["start_time"]).utc().add(1, 'hours').isSameOrAfter() && moment.unix(a["start_time"]).utc().isBefore()));
-    next24h = alerts.filter(a => moment.unix(a["start_time"]).utc().isSameOrAfter() && moment.unix(a["start_time"]).utc().subtract(24, 'hours').isBefore());
-    later = alerts.filter(a => moment.unix(a["start_time"]).utc().subtract(24, 'hours').isSameOrAfter());
+    const onNow = alerts.filter(a => (a["end_time"] != null && a["end_time"] !== 0 && moment.unix(a["end_time"]).utc().isSameOrAfter() && moment.unix(a["start_time"]).utc().isBefore())
+        || ((a["end_time"] == null || a["end_time"] === 0) && moment.unix(a["start_time"]).utc().add(1, 'hours').isSameOrAfter() && moment.unix(a["start_time"]).utc().isBefore()));
+    const next24h = alerts.filter(a => moment.unix(a["start_time"]).utc().isSameOrAfter() && moment.unix(a["start_time"]).utc().subtract(24, 'hours').isBefore());
+    const later = alerts.filter(a => moment.unix(a["start_time"]).utc().subtract(24, 'hours').isSameOrAfter());
 
     if (onNow.length > 0) {
         table.find('tbody').append('<tr><td colspan="100" class="bg-primary-subtle" style="text-align:center;">On Now</td></tr>');
@@ -101,14 +103,14 @@ function updateTable() {
         addAlertRowsToTable(table.find('tbody'), later);
     }
 
-    if (onNow.length == 0 && next24h.length == 0 && later.length == 0) {
+    if (onNow.length === 0 && next24h.length === 0 && later.length === 0) {
         table.find('tbody').append('<tr class="bg-danger-subtle"><td colspan="100" style="text-align:center;">No alerts match your filters.</td></tr>');
     }
 }
 
 // Add a row to tbody for each alert in the provided list
 function addAlertRowsToTable(tbody, alerts) {
-    var count = 0;
+    let count = 0;
     alerts.forEach(a => {
         // Create row
         let $tr = $('<tr>');
@@ -116,29 +118,29 @@ function addAlertRowsToTable(tbody, alerts) {
         // Apply striping to the table. We can't just use Bootstrap's table-striped class because we have all sorts of
         // extra faff to deal with, like the mobile view having extra rows, and the On Now / Next 24h / Later banners
         // which cause the table-striped colouring to go awry.
-        if (count % 2 == 1) {
+        if (count % 2 === 1) {
             $tr.addClass("table-active");
         }
 
         // Use local time instead of UTC?
-        var useLocalTime = $("#timeZone")[0].value == "local";
+        const useLocalTime = $("#timeZone")[0].value === "local";
 
         // Table data toggles
-        var showStartTime = $("#tableShowStartTime")[0].checked;
-        var showEndTime = $("#tableShowEndTime")[0].checked;
-        var showDX = $("#tableShowDX")[0].checked;
-        var showFreqsModes = $("#tableShowFreqsModes")[0].checked;
-        var showComment = $("#tableShowComment")[0].checked;
-        var showSource = $("#tableShowSource")[0].checked;
-        var showRef = $("#tableShowRef")[0].checked;
+        const showStartTime = $("#tableShowStartTime")[0].checked;
+        const showEndTime = $("#tableShowEndTime")[0].checked;
+        const showDX = $("#tableShowDX")[0].checked;
+        const showFreqsModes = $("#tableShowFreqsModes")[0].checked;
+        const showComment = $("#tableShowComment")[0].checked;
+        const showSource = $("#tableShowSource")[0].checked;
+        const showRef = $("#tableShowRef")[0].checked;
 
         // Get times for the alert, and convert to local time if necessary.
-        var start_time_utc = moment.unix(a["start_time"]).utc();
-        var start_time_local = start_time_utc.clone().local();
-        start_time = useLocalTime ? start_time_local : start_time_utc;
-        var end_time_utc = moment.unix(a["end_time"]).utc();
-        var end_time_local = end_time_utc.clone().local();
-        end_time = useLocalTime ? end_time_local : end_time_utc;
+        const start_time_utc = moment.unix(a["start_time"]).utc();
+        const start_time_local = start_time_utc.clone().local();
+        const start_time = useLocalTime ? start_time_local : start_time_utc;
+        const end_time_utc = moment.unix(a["end_time"]).utc();
+        const end_time_local = end_time_utc.clone().local();
+        const end_time = useLocalTime ? end_time_local : end_time_utc;
 
         // Format the times for display. Start time is displayed as e.g. 7 Oct 12:34 unless the time is in a
         // different year to the current year, in which case the year is inserted between month and hour.
@@ -148,22 +150,22 @@ function addAlertRowsToTable(tbody, alerts) {
         // Overriding all of that, if the start time is 00:00 and the end time is 23:59 when considered in UTC, the
         // hours and minutes are stripped out from the display, as we assume the server is just giving us full days.
         // Finally, if there is no end date set, "---" is displayed.
-        var whole_days = start_time_utc.format("HH:mm") == "00:00" &&
-            (end_time_utc != null || end_time_utc > 0 || end_time_utc.format("HH:mm") == "23:59");
-        var hours_minutes_format = whole_days ? "" : " HH:mm";
-        var start_time_formatted = start_time.format("D MMM" + hours_minutes_format);
-        if (start_time.format("YYYY") != moment().format("YYYY")) {
+        const whole_days = start_time_utc.format("HH:mm") === "00:00" &&
+            (end_time_utc === 0 || end_time_utc.format("HH:mm") === "23:59");
+        const hours_minutes_format = whole_days ? "" : " HH:mm";
+        let start_time_formatted = start_time.format("D MMM" + hours_minutes_format);
+        if (start_time.format("YYYY") !== moment().format("YYYY")) {
             start_time_formatted = start_time.format("D MMM YYYY" + hours_minutes_format);
-        } else if (useLocalTime && start_time.format("D MMM YYYY") == moment().format("D MMM YYYY")) {
+        } else if (useLocalTime && start_time.format("D MMM YYYY") === moment().format("D MMM YYYY")) {
             start_time_formatted = start_time.format("[Today]" + hours_minutes_format);
         }
-        var end_time_formatted = "---";
-        if (end_time_utc != null && end_time_utc > 0 && end_time != null) {
-            var end_time_formatted = whole_days ? start_time_formatted : end_time.format("HH:mm");
-            if (end_time.format("D MMM") != start_time.format("D MMM")) {
-                if (end_time.format("YYYY") != moment().format("YYYY")) {
+        let end_time_formatted = "---";
+        if (end_time_utc > 0 && end_time != null) {
+            end_time_formatted = whole_days ? start_time_formatted : end_time.format("HH:mm");
+            if (end_time.format("D MMM") !== start_time.format("D MMM")) {
+                if (end_time.format("YYYY") !== moment().format("YYYY")) {
                     end_time_formatted = end_time.format("D MMM YYYY" + hours_minutes_format);
-                } else if (useLocalTime && end_time.format("D MMM YYYY") == moment().format("D MMM YYYY")) {
+                } else if (useLocalTime && end_time.format("D MMM YYYY") === moment().format("D MMM YYYY")) {
                     end_time_formatted = end_time.format("[Today]" + hours_minutes_format);
                 } else {
                     end_time_formatted = end_time.format("D MMM" + hours_minutes_format);
@@ -172,56 +174,56 @@ function addAlertRowsToTable(tbody, alerts) {
         }
 
         // Format dx country
-        var dx_country = a["dx_country"]
+        let dx_country = a["dx_country"];
         if (dx_country == null) {
             dx_country = "Unknown or not a country"
         }
 
         // Format DX flag
-        var 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) {
+        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}"/>`;
         }
 
         // Format dx calls
-        var dx_calls_html = "";
+        let dx_calls_html = "";
         if (a["dx_calls"] != null) {
             dx_calls_html = a["dx_calls"].map(call => `<a class='dx-link' href='https://qrz.com/db/${call}' target='_new'>${call}</a>`).join(", ");
         }
 
         // Format DXpedition country
-        var dx_country_html = "";
-        if (a["is_dxpedition"] == true && a["dx_country"] != null && a["dx_country"] != "") {
+        let dx_country_html = "";
+        if (a["is_dxpedition"] === true && a["dx_country"] != null && a["dx_country"] !== "") {
             dx_country_html = `<br/>${a["dx_country"]}`;
         }
 
         // Format freqs & modes
-        var freqsModesText = "";
+        let freqsModesText = "";
         if (a["freqs_modes"] != null) {
             freqsModesText = escapeHtml(a["freqs_modes"]);
         }
 
         // Format comment
-        var commentText = "";
+        let commentText = "";
         if (a["comment"] != null) {
             commentText = escapeHtml(a["comment"]);
         }
 
         // Sig or fallback to source
-        var sigSourceText = a["source"];
+        let sigSourceText = a["source"];
         if (a["sig"]) {
             sigSourceText = a["sig"];
         }
 
         // Format sig_refs
-        var sig_refs = "";
+        let sig_refs = "";
         if (a["sig_refs"] != null) {
-            var items = []
-            for (var i = 0; i < a["sig_refs"].length; i++) {
+            const items = [];
+            for (let i = 0; i < a["sig_refs"].length; i++) {
                 if (a["sig_refs"][i]["url"] != null) {
-                    items[i] = `<a href='${a["sig_refs"][i]["url"]}' title='${a["sig_refs"][i]["name"]}' target='_new' class='sig-ref-link'>${a["sig_refs"][i]["id"]}</a>`
+                    items[i] = `<a href='${encodeURI(a["sig_refs"][i]["url"])}' title='${escapeHtml(a["sig_refs"][i]["name"])}' target='_new' class='sig-ref-link'>${escapeHtml(a["sig_refs"][i]["id"])}</a>`
                 } else {
-                    items[i] = `${a["sig_refs"][i]["id"]}`
+                    items[i] = `${escapeHtml(a["sig_refs"][i]["id"])}`
                 }
             }
             sig_refs = items.join(", ");
@@ -252,11 +254,11 @@ function addAlertRowsToTable(tbody, alerts) {
         tbody.append($tr);
 
         // Second row for mobile view only, containing source, ref, freqs/modes & comment
-        $tr2 = $("<tr class='hidenotonmobile'>");
-        if (count % 2 == 1) {
+        const $tr2 = $("<tr class='hidenotonmobile'>");
+        if (count % 2 === 1) {
             $tr2.addClass("table-active");
         }
-        $td2 = $("<td colspan='100'>");
+        const $td2 = $("<td colspan='100'>");
         if (showSource) {
             $td2.append(`<span class='icon-wrapper'><i class='fa-solid ${sigToIcon(a["sig"], "fa-globe-africa")}'></i></span> `);
         }
@@ -317,7 +319,7 @@ $(document).ready(function() {
 
 // Reload alerts on becoming visible. This forces a refresh when used as a PWA and the user switches back to the PWA
 // after some time has passed with it in the background.
-addEventListener("visibilitychange", (event) => {
+addEventListener("visibilitychange", () => {
     if (!document.hidden) {
         loadAlerts();
     }

webassets/js/bands.js

@@ -12,7 +12,7 @@ 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(), function(jsonData) {
+    $.getJSON('/api/v1/spots' + buildQueryString(false), function(jsonData) {
         // Store last updated time
         lastUpdateTime = moment.utc();
         updateRefreshDisplay();
@@ -24,8 +24,8 @@ function loadSpots() {
 }
 
 // Build a query string for the API, based on the filters that the user has selected.
-function buildQueryString() {
-    var str =  "?";
+function buildQueryString(includeCredentials) {
+    let str = "?";
     ["dx_continent", "de_continent", "mode", "source", "band", "sig"].forEach(fn => {
         if (!allFilterOptionsSelected(fn)) {
             str = str + getQueryStringFor(fn) + "&";
@@ -34,14 +34,16 @@ function buildQueryString() {
     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;
 }
 
 // Update the bands display
 function updateBands() {
     // Stop here if nothing to display
-    var bandsContainer = $("#bands-container");
+    const bandsContainer = $("#bands-container");
     if (spots.length === 0) {
         bandsContainer.html("<div class='alert alert-danger' role='alert'>No spots match your filters.</div>");
         return;
@@ -50,7 +52,7 @@ function updateBands() {
     // Do some harsher de-duping. Because we only display callsign, frequency and mode here, the previous
     // de-duplication could have let some through that don't look like dupes on the map, but would do here.
     // Typically that's a person activating two programs at the same time, e.g. POTA & WWFF.
-    spotList = removeDuplicatesForBandPanel(spots);
+    const spotList = removeDuplicatesForBandPanel(spots);
 
     // Convert to a map of band names to the spots on that band. Bands with no
     // spots in view will not be present.
@@ -65,10 +67,10 @@ function updateBands() {
     });
 
     // Track if any columns end up taller than expected, so we can resize the container and avoid vertical scroll.
-    var maxHeightBand = 0;
+    let maxHeightBand = 0;
 
     // Build up table content for each band
-    var table = $('<table id="bands-table">').append('<thead><tr></tr></thead><tbody><tr></tr></tbody>');
+    const table = $('<table id="bands-table">').append('<thead><tr></tr></thead><tbody><tr></tr></tbody>');
     bandToSpots.forEach(function (spotList, bandName) {
         // Get the colours for the band from the first spot, and prepare the header
         table.find('thead tr').append(`<th style='background-color:${bandToColor(spotList[0].band)}; color:${bandToContrastColor(spotList[0].band)}'>${spotList[0].band}</th>`);
@@ -80,7 +82,7 @@ function updateBands() {
 
         // Print the frequency band markers. This is 41 steps to divide the band evenly into 40 markers. One in every
         // four will show the actual frequency, the others will just be dashes.
-        bandMarkersDiv = $('<div class="band-markers">');
+        const bandMarkersDiv = $('<div class="band-markers">');
         const freqStep = (band.end_freq - band.start_freq) / 40.0;
         for (let i = 0; i <= 40; i++) {
             if (i % 4 === 0) {
@@ -93,8 +95,8 @@ function updateBands() {
         }
 
         // Prepare the spots list
-        var bandSpotsDiv = $("<div class='band-spots'>");
-        var lastSpotPxDownBand = -999;
+        const bandSpotsDiv = $("<div class='band-spots'>");
+        let lastSpotPxDownBand = -999;
         // Sort by frequency so have a consistent order in which to plan where they will appear on the band div.
         spotList.sort(function(a, b) { return a.freq - b.freq; });
         // First calculate how we should be displaying the spots. There are three "modes" to try to place them in a
@@ -116,8 +118,8 @@ function updateBands() {
             // Mode 1 or 2. Run through adding things to the list forwards as a test.
             spotList.forEach(s => {
                 // Work out how far down the div to draw it
-                var percentDownBand = (s.freq - band.start_freq) / (band.end_freq - band.start_freq) * 0.97; // not 100% due to fudge, the first and last dashes are not exactly at the top and bottom of the div as some space is needed for text
-                var pxDownBand = percentDownBand * BAND_COLUMN_HEIGHT_PX;
+                const percentDownBand = (s.freq - band.start_freq) / (band.end_freq - band.start_freq) * 0.97; // not 100% due to fudge, the first and last dashes are not exactly at the top and bottom of the div as some space is needed for text
+                let pxDownBand = percentDownBand * BAND_COLUMN_HEIGHT_PX;
                 if (pxDownBand < lastSpotPxDownBand + BAND_COLUMN_SPOT_DIV_HEIGHT_PX) {
                     pxDownBand = lastSpotPxDownBand + BAND_COLUMN_SPOT_DIV_HEIGHT_PX; // Prevent overlap
                 }
@@ -133,8 +135,8 @@ function updateBands() {
                 lastSpotPxDownBand = 999999;
                 spotList.reverse().forEach(s => {
                     // Work out how far down the div to draw it
-                    var percentDownBand = (s.freq - band.start_freq) / (band.end_freq - band.start_freq) * 0.97; // not 100% due to fudge, the first and last dashes are not exactly at the top and bottom of the div as some space is needed for text
-                    var pxDownBand = percentDownBand * BAND_COLUMN_HEIGHT_PX;
+                    const percentDownBand = (s.freq - band.start_freq) / (band.end_freq - band.start_freq) * 0.97; // not 100% due to fudge, the first and last dashes are not exactly at the top and bottom of the div as some space is needed for text
+                    let pxDownBand = percentDownBand * BAND_COLUMN_HEIGHT_PX;
                     if (pxDownBand > lastSpotPxDownBand - BAND_COLUMN_SPOT_DIV_HEIGHT_PX) {
                         pxDownBand = lastSpotPxDownBand - BAND_COLUMN_SPOT_DIV_HEIGHT_PX; // Prevent overlap
                     }
@@ -153,19 +155,19 @@ function updateBands() {
         // Work out how tall the canvas should be. Normally this is matching the normal band column height, but if some
         // spots have gone off the end of the band markers and stretched their div, we need to resize the canvas to
         // match, otherwise we have nowhere to draw their connecting lines.
-        var canvasHeight = Math.max(BAND_COLUMN_HEIGHT_PX, lastSpotPxDownBand + BAND_COLUMN_SPOT_DIV_HEIGHT_PX);
+        const canvasHeight = Math.max(BAND_COLUMN_HEIGHT_PX, lastSpotPxDownBand + BAND_COLUMN_SPOT_DIV_HEIGHT_PX);
         maxHeightBand = Math.max(maxHeightBand, canvasHeight);
 
         // Draw horizontal or diagonal lines to join up the "real" frequency with where the spot div ended up
-        var bandLinesCanvas = $(`<canvas class='band-lines-canvas' width='${BAND_COLUMN_CANVAS_WIDTH_PX}px' height='${canvasHeight}px' style='height:${canvasHeight}px !important;'>`);
+        const bandLinesCanvas = $(`<canvas class='band-lines-canvas' width='${BAND_COLUMN_CANVAS_WIDTH_PX}px' height='${canvasHeight}px' style='height:${canvasHeight}px !important;'>`);
         spotList.forEach(s => {
             // Work out how far down the div to draw it
-            var percentDownBand = (s.freq - band.start_freq) / (band.end_freq - band.start_freq) * 0.97; // not 100% due to fudge, the first and last dashes are not exactly at the top and bottom of the div as some space is needed for text
-            var pxDownBandFreq = (percentDownBand + 0.015) * BAND_COLUMN_HEIGHT_PX; // same fudge but add half to put the left end of the line in the right place
-            var pxDownBandLabel = s["pxDownBandLabel"] + (BAND_COLUMN_SPOT_DIV_HEIGHT_PX / 1.75); // line should be to the vertical text-centre spot, not to the top corner
+            const percentDownBand = (s.freq - band.start_freq) / (band.end_freq - band.start_freq) * 0.97; // not 100% due to fudge, the first and last dashes are not exactly at the top and bottom of the div as some space is needed for text
+            const pxDownBandFreq = (percentDownBand + 0.015) * BAND_COLUMN_HEIGHT_PX; // same fudge but add half to put the left end of the line in the right place
+            const pxDownBandLabel = s["pxDownBandLabel"] + (BAND_COLUMN_SPOT_DIV_HEIGHT_PX / 1.75); // line should be to the vertical text-centre spot, not to the top corner
 
             // Draw the line on the canvas
-            var ctx = bandLinesCanvas[0].getContext('2d');
+            const ctx = bandLinesCanvas[0].getContext('2d');
             ctx.beginPath();
             ctx.lineWidth = 2;
             ctx.lineCap = "round";
@@ -176,8 +178,8 @@ function updateBands() {
         });
 
         // Assemble the table cell
-        td = $("<td>");
-        container = $("<div class='band-container'>");
+        const td = $("<td>");
+        const container = $("<div class='band-container'>");
         container.append(bandLinesCanvas);
         container.append(bandMarkersDiv);
         container.append(bandSpotsDiv);
@@ -211,7 +213,6 @@ function removeDuplicatesForBandPanel(spotList) {
                 if (s.dx_call === check.dx_call && s.freq === check.freq && s.mode === check.mode) {
                     // Find which one to keep and which to delete
                     const checkSpotNewer = check.time > s.time;
-                    const keepSpot = checkSpotNewer ? check : s;
                     const deleteSpot = checkSpotNewer ? s : check;
                     // Aggregate list of spots to remove
                     spotsToRemove.push(deleteSpot.uid);

webassets/js/common.js

@@ -1,7 +1,7 @@
 // Storage for the options that the server gives us. This will define our filters.
-var options = {};
+let options = {};
 // Last time we updated the spots/alerts list on display.
-var lastUpdateTime;
+let lastUpdateTime;
 // Normally load user settings from local storage, unless embedded mode is in use
 let useLocalStorage = true;
 
@@ -21,8 +21,8 @@ function saveSettings() {
         });
         // Password fields are only saved if the corresponding "remember password" checkbox is ticked.
         $(".password-field").each(function () {
-            var pwKey = "#" + $(this)[0].id + ":value";
-            var rememberCheckboxId = $(this).data("remember-checkbox");
+            const pwKey = "#" + $(this)[0].id + ":value";
+            const rememberCheckboxId = $(this).data("remember-checkbox");
             if (rememberCheckboxId && $("#" + rememberCheckboxId)[0] && $("#" + rememberCheckboxId)[0].checked) {
                 localStorage.setItem(pwKey, JSON.stringify($(this)[0].value));
             } else {
@@ -39,7 +39,7 @@ function loadSettings() {
         Object.keys(localStorage).forEach(function (key) {
             if (key.startsWith("#") && key.includes(":")) {
                 // Split the key back into an element ID and a property
-                var split = key.split(":");
+                const split = key.split(":");
                 $(split[0]).prop(split[1], JSON.parse(localStorage.getItem(key)));
             }
         });
@@ -76,21 +76,13 @@ function loadURLParams() {
     updateFilterFromParam(params, "de_continent", "de_continent");
 }
 
-// Update an HTML checkbox element so that its selected matches the given parameter (which must have a true or false value)
-function updateCheckboxFromParam(params, paramName, checkboxID) {
-    let v = params.get(paramName);
-    if (v != null) {
-        $("#" + checkboxID).prop("checked", (v === "true") ? true : false);
-    }
-}
-
 // Update an HTML select element so that its value matches the given parameter
 function updateSelectFromParam(params, paramName, selectID) {
     let v = params.get(paramName);
     if (v != null) {
         $("#" + selectID).prop("value", v);
         // Extra check if this is the "color scheme" select
-        if (selectID == "color-scheme") {
+        if (selectID === "color-scheme") {
             setColorScheme(v);
         }
     }
@@ -128,16 +120,16 @@ function getSelectedFilterOptions(parameter) {
 // For a parameter, such as dx_continent, return true if all possible options are enabled. (In this case, we don't need
 // to bother sending this as one of the query parameters to the API; no parameter provided implies "send everything".)
 function allFilterOptionsSelected(parameter) {
-    var filter = $(".filter-button-" + parameter).filter(function () {
+    const filter = $(".filter-button-" + parameter).filter(function () {
         return !this.checked;
     }).get();
-    return filter.length == 0;
+    return filter.length === 0;
 }
 
 
 // Generate a filter card with inline checkboxes plus All/None links.
 function generateMultiToggleFilterCard(elementID, filterQuery, options) {
-    var $row = $('<div>');
+    const $row = $('<div>');
     options.forEach(o => {
         $row.append(`<div class="form-check form-check-inline"><input type="checkbox" class="form-check-input filter-button-${filterQuery} storeable-checkbox" id="filter-button-${filterQuery}-${o}" value="${o}" autocomplete="off" onClick="filtersUpdated()" checked><label class="form-check-label" for="filter-button-${filterQuery}-${o}">${o}</label></div>`);
     });
@@ -161,12 +153,13 @@ function updateRefreshDisplay() {
         let updatingString = "Updating..."
         if (secSinceUpdate < REFRESH_INTERVAL_SEC) {
             count = REFRESH_INTERVAL_SEC - secSinceUpdate;
+            let number;
             if (count <= 60) {
-                var number = count.toFixed(0);
-                updatingString = "<span class='nowrap'>Updating in " + number + " second" + (number != "1" ? "s" : "") + ".</span>";
+                number = count.toFixed(0);
+                updatingString = "<span class='nowrap'>Updating in " + number + " second" + (number !== "1" ? "s" : "") + ".</span>";
             } else {
-                var number = Math.round(count / 60.0).toFixed(0);
-                updatingString = "<span class='nowrap'>Updating in " + number + " minute" + (number != "1" ? "s" : "") + ".</span>";
+                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);
@@ -188,7 +181,7 @@ function columnsUpdated() {
 // Function to set the colour scheme based on the state of the UI select box
 function setColorSchemeFromUI() {
     let theme = $("#color-scheme option:selected").val();
-    if (theme != "") {
+    if (theme !== "") {
         setColorScheme(theme);
         saveSettings();
     }
@@ -196,8 +189,8 @@ function setColorSchemeFromUI() {
 
 // Function to set the color scheme. Supported values: "dark", "light", "auto"
 function setColorScheme(mode) {
-    let effectiveModeDark = mode == "dark";
-    if (mode == "auto") {
+    let effectiveModeDark = mode === "dark";
+    if (mode === "auto") {
         effectiveModeDark = window.matchMedia('(prefers-color-scheme: dark)').matches
     }
     $("html").attr("data-bs-theme", effectiveModeDark ? "dark" : "light");
@@ -283,16 +276,16 @@ function closeDataPanel() {
 // Build a query string fragment containing any QRZ.com / HamQTH credentials the user has supplied,
 // provided the corresponding "enabled" checkbox is ticked.
 function getCredentialQueryString() {
-    var str = "";
+    let str = "";
     if ($("#qrz-enabled")[0] && $("#qrz-enabled")[0].checked) {
-        var qrzUsername = $("#qrz-username").val();
-        var qrzPassword = $("#qrz-password").val();
+        const qrzUsername = $("#qrz-username").val();
+        const qrzPassword = $("#qrz-password").val();
         if (qrzUsername) str += "&qrz_username=" + encodeURIComponent(qrzUsername);
         if (qrzPassword) str += "&qrz_password=" + encodeURIComponent(qrzPassword);
     }
     if ($("#hamqth-enabled")[0] && $("#hamqth-enabled")[0].checked) {
-        var hamqthUsername = $("#hamqth-username").val();
-        var hamqthPassword = $("#hamqth-password").val();
+        const hamqthUsername = $("#hamqth-username").val();
+        const hamqthPassword = $("#hamqth-password").val();
         if (hamqthUsername) str += "&hamqth_username=" + encodeURIComponent(hamqthUsername);
         if (hamqthPassword) str += "&hamqth_password=" + encodeURIComponent(hamqthPassword);
     }

webassets/js/conditions.js

@@ -1,8 +1,12 @@
 // Cache for the full dxstats API response, so we can reload on the fly if the user changes the value of their continent
 // in the select box
 let dxStatsData = null;
-// Forecast chart
+// Kp forecast chart
 let kpChart = null;
+// Cache for ionosonde data from the API
+let ionosondeData = null;
+// Ionosonde foF2/MUF chart
+let ionosondeChart = null;
 
 // Load solar conditions
 function loadSolarConditions() {
@@ -13,6 +17,7 @@ function loadSolarConditions() {
         const hfConditionClass = {'Good': 'bg-success-subtle', 'Fair': 'bg-warning-subtle', 'Poor': 'bg-danger-subtle'};
 
         if (jsonData.hf_conditions) {
+            $('#hamqsl-section').show();
             Object.entries(jsonData.hf_conditions).forEach(function ([key, condition]) {
                 const cell = $('#hf-conditions-' + key);
                 cell.text(condition);
@@ -109,8 +114,20 @@ function loadSolarConditions() {
                 electronFlux <= 100 ? 'bg-success-subtle' : electronFlux <= 1000 ? 'bg-warning-subtle' : 'bg-danger-subtle');
         }
 
+        // Ionosonde
+
+        if (jsonData.ionosonde_data && Object.keys(jsonData.ionosonde_data).length > 0) {
+            $('#ionosonde-section').show();
+            ionosondeData = jsonData.ionosonde_data;
+            populateIonosondeDropdown(ionosondeData);
+            renderIonosondeData();
+        }
+
         // Forecast
 
+        if (jsonData.k_index_forecast) {
+            $('#noaa-section').show();
+        }
         renderKIndexForecast(jsonData.k_index_forecast);
         renderSolarStormForecast(jsonData.solar_storm_forecast);
         renderBlackoutForecast(jsonData.blackout_forecast_r1r2, jsonData.blackout_forecast_r3_or_greater);
@@ -348,6 +365,257 @@ function renderBlackoutForecast(r1r2Data, r3Data) {
         .append(makeRow('R3 or greater', e => e.r3));
 }
 
+// Populate the ionosonde station dropdown and restore any saved selection
+function populateIonosondeDropdown(data) {
+    const select = $('#ionosonde-station');
+    const savedUrsi = localStorage.getItem('#ionosonde-station:value');
+    const savedValue = savedUrsi ? JSON.parse(savedUrsi) : null;
+    select.empty();
+    // Sort by station name rather than URSI because station name is what's displayed, and any out-of-order names might
+    // confuse the user
+    Object.values(data).sort((a, b) => a.name.localeCompare(b.name)).forEach(function (station) {
+        select.append($('<option>', {value: station.ursi, text: station.name}));
+    });
+    // Select one by default if the user's localStorage has an existing selection for this
+    if (savedValue && select.find('option[value="' + savedValue + '"]').length) {
+        select.val(savedValue);
+    }
+}
+
+// Render the foF2/MUF data and line chart for the currently selected station
+function renderIonosondeData() {
+    // First make sure that we have some data, that a station entry is selected in the drop-down box, and that the
+    // data contains an entry for that station. If not, this represents an odd state (over and above just "no data for
+    // this station", so bail out at this point. The user will have to reselect something from the list, or wait until
+    // the API is behaving itself again.
+    if (!ionosondeData) return;
+    const ursi = $('#ionosonde-station').val();
+    if (!ursi) return;
+    const station = ionosondeData[ursi];
+    if (!station) return;
+
+    // Set up some styles, matching the k-index chart. We use Bootstrap's "primary", "danger", and "success" colours
+    // not for any real reason but just to get a suitable blue, red, and green that match the other colours Spothole uses
+    const style = getComputedStyle(document.documentElement);
+    const fof2Color = style.getPropertyValue('--bs-primary').trim();
+    const mufColor = style.getPropertyValue('--bs-success').trim();
+    const lufColor = style.getPropertyValue('--bs-danger').trim();
+    const textColor = style.getPropertyValue('--bs-body-color').trim() || '#666';
+    const gridColor = style.getPropertyValue('--bs-border-color').trim() || 'rgba(128,128,128,0.3)';
+
+    // Utility function to convert the dict of timestamp-to-value into just a value array in timestamp key order
+    function toSeries(dict) {
+        if (!dict) return [];
+        return Object.entries(dict)
+            .map(([tsStr, val]) => ({ts: parseFloat(tsStr), val}))
+            .sort((a, b) => a.ts - b.ts);
+    }
+
+    const fof2Entries = toSeries(station.fof2);
+    const mufEntries = toSeries(station.muf);
+    const lufEntries = toSeries(station.luf);
+    const allTs = [...fof2Entries, ...mufEntries, ...lufEntries].map(e => e.ts);
+    if (allTs.length === 0) {
+        $('#ionosonde-no-data').show();
+        $('#ionosonde-data-rows').hide();
+        $('#ionosonde-band-state').hide();
+        $('#ionosonde-chart').hide();
+        if (ionosondeChart) { ionosondeChart.destroy(); ionosondeChart = null; }
+        return;
+    }
+    $('#ionosonde-no-data').hide();
+    $('#ionosonde-data-rows').show();
+
+    // Populate latest values summary (visible on all screen sizes)
+    const latestFof2 = fof2Entries.length ? fof2Entries[fof2Entries.length - 1].val : null;
+    const latestMuf = mufEntries.length ? mufEntries[mufEntries.length - 1].val : null;
+    const latestLuf = lufEntries.length ? lufEntries[lufEntries.length - 1].val : null;
+    const minTs = allTs.length ? Math.min(...allTs) : null;
+    const maxTs = allTs.length ? Math.max(...allTs) : null;
+    if (maxTs != null) {
+        const latestDate = moment.utc(maxTs * 1000);
+        $('#ionosonde-latest-time').text(latestDate.format('DD MMM YYYY HH:mm [UTC]') + ' (' + latestDate.fromNow() + ')');
+    }
+    $('#ionosonde-latest-luf').text(latestLuf !== null ? latestLuf.toFixed(2) + ' MHz' : 'Unknown');
+    $('#ionosonde-latest-fof2').text(latestFof2 !== null ? latestFof2.toFixed(2) + ' MHz' : 'Unknown');
+    $('#ionosonde-latest-muf').text(latestMuf !== null ? latestMuf.toFixed(2) + ' MHz' : 'Unknown');
+    $('#ionosonde-stale-warning').toggle(maxTs !== null && (Date.now() / 1000 - maxTs) > 12 * 3600);
+
+    // Populate band state tables. There are actually two tables to populate, which is pretty janky, but allows us to
+    // display horizontally on desktop but flip it around to become a vertical list on mobile.
+    const bandStateClass = {'Closed': 'bg-danger-subtle', 'Short': 'bg-primary-subtle', 'Long': 'bg-success-subtle'};
+    const bandStates = station.band_states;
+    if (bandStates && Object.keys(bandStates).length > 0) {
+        const headRow = $('#ionosonde-band-state-head').empty();
+        const dataRow = $('#ionosonde-band-state-row').empty();
+        const vBody = $('#ionosonde-band-state-body').empty();
+        Object.entries(bandStates).forEach(([band, state]) => {
+            const cls = bandStateClass[state] || '';
+            headRow.append($('<th>').addClass('text-center').text(band));
+            dataRow.append($('<td>').addClass('text-center ' + cls).text(state));
+            vBody.append($('<tr>').append($('<td>').addClass('fw-bold').text(band)).append($('<td>').addClass(cls).text(state)));
+        });
+        $('#ionosonde-band-state').show();
+    } else {
+        $('#ionosonde-band-state').hide();
+    }
+
+    if (ionosondeChart) {
+        ionosondeChart.destroy();
+    }
+
+    // Compute tick positions at 3-hour UTC boundaries so midnight always lands on a tick, which triggers the date being
+    // printed, and in general looks nicer than arbitrary ticks based on min & max timestamp
+    const tickStep = 3 * 3600;
+    const tickValues = [];
+    tickValues.push(minTs);
+    for (let t = Math.ceil(minTs / tickStep) * tickStep; t <= maxTs; t += tickStep) {
+        tickValues.push(t);
+    }
+    tickValues.push(maxTs);
+
+    // Build time axis
+    const timeAxis = {
+        type: 'linear',
+        min: minTs,
+        max: maxTs,
+        title: {display: true, text: 'Time (UTC)', color: textColor},
+        afterBuildTicks(axis) {
+            axis.ticks = tickValues.map(v => ({value: v}));
+        },
+        ticks: {
+            color: textColor,
+            maxRotation: 45,
+            minRotation: 0,
+            callback(value) {
+                // Use the same type of display as in the k-index chart, where the labels on the axis are just HH:mm
+                // unless that's 00:00, in which case add the short date as well.
+                const dt = new Date(value * 1000);
+                const h = dt.getUTCHours();
+                const m = dt.getUTCMinutes();
+                const timeStr = String(h).padStart(2, '0') + ':' + String(m).padStart(2, '0');
+                if (h === 0 && m === 0) {
+                    return [timeStr, dt.toLocaleDateString('en-GB', {day: '2-digit', month: 'short', timeZone: 'UTC'})];
+                }
+                return timeStr;
+            },
+        },
+        grid: {color: gridColor},
+    };
+
+    // Build frequency axis. This is pretty normal except there's no grid, because we draw extra horizontal lines for
+    // the amateur radio bands which function as grid lines for the frequency axis.
+    const freqAxis = {
+        min: 0,
+        title: {display: true, text: 'Frequency (MHz)', color: textColor},
+        ticks: {color: textColor},
+        grid: {display: false},
+    };
+
+    // List of ham bands for drawing horizontal lines
+    const AMATEUR_BANDS = [
+        {label: '160m', freq: 1.8},
+        {label: '80m', freq: 3.5},
+        {label: '60m', freq: 5.3515},
+        {label: '40m', freq: 7.0},
+        {label: '30m', freq: 10.1},
+        {label: '20m', freq: 14.0},
+        {label: '17m', freq: 18.068},
+        {label: '15m', freq: 21.0},
+        {label: '12m', freq: 24.89},
+        {label: '10m', freq: 28.0},
+    ];
+
+    // Build the horizontal lines for each ham band, including a label on the right-hand side.
+    const bandLinesPlugin = {
+        id: 'bandLines',
+        beforeDatasetsDraw(chart) {
+            const {ctx, chartArea, scales} = chart;
+            if (!scales.y) return;
+            ctx.save();
+            ctx.strokeStyle = gridColor;
+            ctx.lineWidth = 1;
+            ctx.setLineDash([]);
+            // Add an extra vertical line for 30MHz, which should correspond to the top of the chart and avoid having
+            // no top "border" gridline
+            const y30 = scales.y.getPixelForValue(30);
+            if (y30 >= chartArea.top && y30 <= chartArea.bottom) {
+                ctx.beginPath();
+                ctx.moveTo(chartArea.left, y30);
+                ctx.lineTo(chartArea.right, y30);
+                ctx.stroke();
+            }
+            ctx.font = '10px sans-serif';
+            ctx.fillStyle = textColor;
+            // Add the ham band "grid lines"
+            AMATEUR_BANDS.forEach(({label, freq}) => {
+                const y = scales.y.getPixelForValue(freq);
+                if (y < chartArea.top || y > chartArea.bottom) return;
+                ctx.beginPath();
+                ctx.moveTo(chartArea.left, y);
+                ctx.lineTo(chartArea.right, y);
+                ctx.stroke();
+                ctx.textAlign = 'right';
+                ctx.textBaseline = 'bottom';
+                ctx.fillText(label, chartArea.right - 4, y - 2);
+            });
+            ctx.restore();
+        }
+    };
+
+    // Create the chart itself
+    ionosondeChart = new Chart(document.getElementById('ionosonde-chart'), {
+        type: 'line',
+        data: {
+            datasets: [
+                {
+                    label: 'LUF',
+                    data: lufEntries.map(e => ({x: e.ts, y: e.val})),
+                    borderColor: lufColor,
+                    backgroundColor: 'transparent',
+                    pointRadius: 0,
+                    tension: 0.2,
+                },
+                {
+                    label: 'foF2',
+                    data: fof2Entries.map(e => ({x: e.ts, y: e.val})),
+                    borderColor: fof2Color,
+                    backgroundColor: 'transparent',
+                    pointRadius: 0,
+                    tension: 0.2,
+                },
+                {
+                    label: 'MUF (3000 km)',
+                    data: mufEntries.map(e => ({x: e.ts, y: e.val})),
+                    borderColor: mufColor,
+                    backgroundColor: 'transparent',
+                    pointRadius: 0,
+                    tension: 0.2,
+                }
+            ]
+        },
+        options: {
+            responsive: true,
+            aspectRatio: 3,
+            plugins: {
+                legend: {display: true, labels: {color: textColor, usePointStyle: true, pointStyle: 'line'}},
+                tooltip: {enabled: false}
+            },
+            scales: {x: timeAxis, y: freqAxis},
+        },
+        plugins: [bandLinesPlugin],
+    });
+
+    // Chart canvas is normally hidden until we get here with some definitely good data. Now we have that so show it
+    $('#ionosonde-chart').show();
+}
+
+// Called when the ionosonde station select changes
+function ionosondeStationChanged() {
+    saveSettings();
+    renderIonosondeData();
+}
+
 // Render the DX stats table for the currently selected DE continent
 function renderDxStats() {
     if (!dxStatsData) {

webassets/js/geo.js

@@ -0,0 +1,104 @@
+//
+// GEOGRAPHIC UTILITY FUNCTIONS
+// Great Circle calculation, Maidenhead grid calcs, etc.
+//
+
+// Calculate great circle bearing between two lat/lon points.
+function calcBearing(lat1, lon1, lat2, lon2) {
+    lat1 *= Math.PI / 180;
+    lon1 *= Math.PI / 180;
+    lat2 *= Math.PI / 180;
+    lon2 *= Math.PI / 180;
+    const lonDelta = lon2 - lon1;
+    const y = Math.sin(lonDelta) * Math.cos(lat2);
+    const x = Math.cos(lat1) * Math.sin(lat2) - Math.sin(lat1) * Math.cos(lat2) * Math.cos(lonDelta);
+    let bearing = Math.atan2(y, x);
+    bearing = bearing * (180 / Math.PI);
+    if ( bearing < 0 ) { bearing += 360; }
+    return bearing;
+}
+
+// Convert a Maidenhead grid reference of arbitrary precision to the lat/long of the centre point of the square.
+// Returns null if the grid format is invalid.
+function latLonForGridCentre(grid) {
+    let [lat, lon, latCellSize, lonCellSize] = latLonForGridSWCornerPlusSize(grid);
+    if (lat != null && lon != null && latCellSize != null && lonCellSize != null) {
+        return [lat + latCellSize / 2.0, lon + lonCellSize / 2.0];
+    } else {
+        return null;
+    }
+}
+
+// Convert a Maidenhead grid reference of arbitrary precision to lat/long, including in the result the size of the
+// lowest grid square. This is a utility method used by the main methods that return the centre, southwest, and
+// northeast coordinates of a grid square.
+// The return type is always an array of size 4. The elements in it are null if the grid format is invalid.
+function latLonForGridSWCornerPlusSize(grid) {
+    // Make sure we are in upper case so our maths works. Case is arbitrary for Maidenhead references
+    grid = grid.toUpperCase();
+
+    // Return null if our Maidenhead string is invalid or too short
+    let len = grid.length;
+    if (len <= 0 || (len % 2) !== 0) {
+        return [null, null, null, null];
+    }
+
+    let lat = 0.0; // aggregated latitude
+    let lon = 0.0; // aggregated longitude
+    let latCellSize = 10; // Size in degrees latitude of the current cell. Starts at 20 and gets smaller as the calculation progresses
+    let lonCellSize = 20; // Size in degrees longitude of the current cell. Starts at 20 and gets smaller as the calculation progresses
+    let latCellNo; // grid latitude cell number this time
+    let lonCellNo; // grid longitude cell number this time
+
+    // Iterate through blocks (two-character sections)
+    for (let block = 0; block * 2 < len; block += 1) {
+        if (block % 2 === 0) {
+            // Letters in this block
+            lonCellNo = grid.charCodeAt(block * 2) - 'A'.charCodeAt(0);
+            latCellNo = grid.charCodeAt(block * 2 + 1) - 'A'.charCodeAt(0);
+            // Bail if the values aren't in range. Allowed values are A-R (0-17) for the first letter block, or
+            // A-X (0-23) thereafter.
+            let maxCellNo = (block === 0) ? 17 : 23;
+            if (latCellNo < 0 || latCellNo > maxCellNo || lonCellNo < 0 || lonCellNo > maxCellNo) {
+                return [null, null, null, null];
+            }
+        } else {
+            // Numbers in this block
+            lonCellNo = parseInt(grid.charAt(block * 2));
+            latCellNo = parseInt(grid.charAt(block * 2 + 1));
+            // Bail if the values aren't in range 0-9..
+            if (latCellNo < 0 || latCellNo > 9 || lonCellNo < 0 || lonCellNo > 9) {
+                return [null, null, null, null];
+            }
+        }
+
+        // Aggregate the angles
+        lat += latCellNo * latCellSize;
+        lon += lonCellNo * lonCellSize;
+
+        // Reduce the cell size for the next block, unless we are on the last cell.
+        if (block * 2 < len - 2) {
+            // Still have more work to do, so reduce the cell size
+            if (block % 2 === 0) {
+                // Just dealt with letters, next block will be numbers so cells will be 1/10 the current size
+                latCellSize = latCellSize / 10.0;
+                lonCellSize = lonCellSize / 10.0;
+            } else {
+                // Just dealt with numbers, next block will be letters so cells will be 1/24 the current size
+                latCellSize = latCellSize / 24.0;
+                lonCellSize = lonCellSize / 24.0;
+            }
+        }
+    }
+
+    // Offset back to (-180, -90) where the grid starts
+    lon -= 180.0;
+    lat -= 90.0;
+
+    // Return nulls on maths errors
+    if (isNaN(lat) || isNaN(lon) || isNaN(latCellSize) ||  isNaN(lonCellSize)) {
+        return [null, null, null, null];
+    }
+
+    return [lat, lon, latCellSize, lonCellSize];
+}

webassets/js/map.js

@@ -12,22 +12,23 @@ const ITU_ZONES_COLOR_DARK = 'rgba(120, 120, 60, 1.0)';
 const WAB_WAI_GRID_COLOR_DARK = 'rgba(60, 60, 120, 1.0)';
 
 // Map layers
-var backgroundTileLayer;
-var markersLayer;
-var geodesicsLayer;
-var terminator;
-var maidenheadGrid;
-var cqZones;
-var ituZones;
-var wabwaiGrid;
+let backgroundTileLayer;
+let markersLayer;
+let geodesicsLayer;
+let oms;
+let terminator;
+let maidenheadGrid;
+let cqZones;
+let ituZones;
+let wabwaiGrid;
 // Tracks the currently-loaded basemap provider string to avoid unnecessary tile reloads
-var loadedBasemap;
+let loadedBasemap;
 // Tracks whether this is the first display of markers after page load
-var firstLoad = true;
+let firstLoad = true;
 
 // Load spots and populate the map.
 function loadSpots() {
-    $.getJSON('/api/v1/spots' + buildQueryString(), function(jsonData) {
+    $.getJSON('/api/v1/spots' + buildQueryString(true), function(jsonData) {
         // Store data
         spots = jsonData;
         // Update map
@@ -39,8 +40,8 @@ function loadSpots() {
 }
 
 // Build a query string for the API, based on the filters that the user has selected.
-function buildQueryString() {
-    var str =  "?";
+function buildQueryString(includeCredentials) {
+    let str = "?";
     ["dx_continent", "de_continent", "mode", "source", "band", "sig"].forEach(fn => {
         if (!allFilterOptionsSelected(fn)) {
             str = str + getQueryStringFor(fn) + "&";
@@ -48,8 +49,10 @@ function buildQueryString() {
     });
     str = str + "max_age=" + $("#max-spot-age option:selected").val();
     // Additional filters for the map view: No dupes, no QRT, only spots with good locations
-    str = str + "&dedupe=true&allow_qrt=false&needs_good_location=true";
+    str = str + "&dedupe=true&allow_qrt=false";
+    if (includeCredentials) {
         str = str + getCredentialQueryString();
+    }
     return str;
 }
 
@@ -58,17 +61,19 @@ function updateMap() {
     // Clear existing content
     markersLayer.clearLayers();
     geodesicsLayer.clearLayers();
+    oms.clearMarkers();
 
     // Make new markers for all spots that match the filter
     spots.forEach(function (s) {
-        var m = L.marker([s["dx_latitude"], s["dx_longitude"]], {icon: getIcon(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 {
-                var geodesic = L.geodesic([[s["de_latitude"], s["de_longitude"]], m.getLatLng()], {
+                const geodesic = L.geodesic([[s["de_latitude"], s["de_longitude"]], m.getLatLng()], {
                     color: bandToColor(s['band']),
                     wrap: false,
                     steps: 5
@@ -83,7 +88,7 @@ function updateMap() {
     // On first load, zoom to the extent of the markers
     if (firstLoad) {
         if (markersLayer.getLayers().length >= 2) {
-            var group = new L.featureGroup(markersLayer.getLayers());
+            const group = new L.featureGroup(markersLayer.getLayers());
             map.fitBounds(group.getBounds().pad(0.1));
         }
         firstLoad = false;
@@ -105,48 +110,50 @@ function getIcon(s) {
 // Tooltip text for the markers
 function getTooltipText(s) {
     // Format DX call
-    var dx_call = s["dx_call"];
+    let dx_call = s["dx_call"];
     if (dx_call == null) {
         dx_call = "";
-        dx_flag = "";
     }
     if (s["dx_ssid"] != null) {
         dx_call = dx_call + "-" + s["dx_ssid"];
     }
 
     // Format DX flag
-    var dx_flag = "<i class='fa-solid fa-globe-africa'></i>";
-    if (s["dx_flag"] && s["dx_flag"] != null && s["dx_flag"] != "") {
+    let dx_flag = "<i class='fa-solid fa-globe-africa'></i>";
+    if (dx_call == null) {
+        dx_flag = "";
+    }
+    if (s["dx_flag"] && s["dx_flag"] != null && s["dx_flag"] !== "") {
         dx_flag = s["dx_flag"];
     }
 
     // Format the frequency
-    var freq_string = "Unknown"
+    let freq_string = "Unknown";
     if (s["freq"] != null) {
-        var mhz = Math.floor(s["freq"] / 1000000.0);
-        var khz = Math.floor((s["freq"] - (mhz * 1000000.0)) / 1000.0);
-        var hz = Math.floor(s["freq"] - (mhz * 1000000.0) - (khz * 1000.0));
-        var hz_string = (hz > 0) ? hz.toFixed(0)[0] : "";
+        const mhz = Math.floor(s["freq"] / 1000000.0);
+        const khz = Math.floor((s["freq"] - (mhz * 1000000.0)) / 1000.0);
+        const hz = Math.floor(s["freq"] - (mhz * 1000000.0) - (khz * 1000.0));
+        const hz_string = (hz > 0) ? hz.toFixed(0)[0] : "";
         freq_string = `<span class='freq-mhz freq-mhz-pad'>${mhz.toFixed(0)}</span><span class='freq-khz'>${khz.toFixed(0).padStart(3, '0')}</span><span class='freq-hz hideonmobile'>${hz_string}</span>`
     }
 
     // Format comment
-    var commentText = "";
+    let commentText = "";
     if (s["comment"] != null) {
         commentText = escapeHtml(s["comment"]);
     }
 
     // Sig or fallback to source
-    var sigSourceText = s["source"];
+    let sigSourceText = s["source"];
     if (s["sig"]) {
         sigSourceText = s["sig"];
     }
 
     // Format sig_refs
-    var sig_refs = "";
+    let sig_refs = "";
     if (s["sig_refs"] != null) {
-        var items = []
-        for (var i = 0; i < s["sig_refs"].length; i++) {
+        const items = [];
+        for (let i = 0; i < s["sig_refs"].length; i++) {
             if (s["sig_refs"][i]["url"] != null) {
                 items[i] = `<a href='${s["sig_refs"][i]["url"]}' title='${s["sig_refs"][i]["name"]}' target='_new' class='sig-ref-link'>${s["sig_refs"][i]["id"]}</a>`
             } else {
@@ -157,7 +164,7 @@ function getTooltipText(s) {
     }
 
     // DX
-    ttt = `<span class='nowrap'><span class='icon-wrapper'>${dx_flag}</span> <a href='https://www.qrz.com/db/${dx_call}' target='_blank' class="dx-link">${dx_call}</a></span><br/>`;
+    let ttt = `<span class='nowrap'><span class='icon-wrapper'>${dx_flag}</span> <a href='https://www.qrz.com/db/${dx_call}' target='_blank' class="dx-link">${dx_call}</a></span><br/>`;
 
     // Frequency & band
     ttt += `<span class='icon-wrapper'><i class='fa-solid fa-radio markerPopupIcon'></i></span>&nbsp;${freq_string}`;
@@ -268,7 +275,7 @@ function setBasemap(basemapname) {
         backgroundTileLayer.addTo(map);
         backgroundTileLayer.bringToBack();
         if (basemapname === "OpenStreetMap.Mapnik.Dark") {
-            var container = backgroundTileLayer.getContainer();
+            const container = backgroundTileLayer.getContainer();
             if (container) {
                 container.style.filter = 'invert(100%) hue-rotate(180deg) brightness(80%)';
             }
@@ -404,7 +411,7 @@ function setUpMap() {
     backgroundTileLayer.addTo(map);
     backgroundTileLayer.bringToBack();
     if (loadedBasemap === "OpenStreetMap.Mapnik.Dark") {
-        var container = backgroundTileLayer.getContainer();
+        const container = backgroundTileLayer.getContainer();
         if (container) {
             container.style.filter = 'invert(100%) hue-rotate(180deg) brightness(80%)';
         }
@@ -414,6 +421,12 @@ function setUpMap() {
     markersLayer = new L.LayerGroup();
     markersLayer.addTo(map);
 
+    // Set up spiderfy for overlapping markers
+    oms = new OverlappingMarkerSpiderfier(map, {keepSpiderfied: true});
+    oms.addListener('click', function(marker) {
+        marker.openPopup();
+    });
+
     // Add geodesic layer
     geodesicsLayer = new L.LayerGroup();
     geodesicsLayer.addTo(map);

webassets/js/spots.js

@@ -4,6 +4,14 @@ let restartSSEOnErrorTimeoutId;
 // Table row count, to alternate shading
 let rowCount = 0;
 
+// Set up a listener to close the SSE connection nicely when we navigate away from the page, to prevent console errors
+// and keep things nice and tidy for the server.
+window.addEventListener('beforeunload', function() {
+    if (evtSource != null) {
+        evtSource.close();
+    }
+});
+
 // Load spots and populate the table.
 function loadSpots() {
     // If we have an ongoing SSE connection, stop it so it doesn't interfere with our reload
@@ -12,7 +20,7 @@ function loadSpots() {
     }
 
     // Make the new query
-    $.getJSON('/api/v1/spots' + buildQueryString(), function(jsonData) {
+    $.getJSON('/api/v1/spots' + buildQueryString(false), function(jsonData) {
         // Store data
         spots = jsonData;
         // Update table
@@ -31,11 +39,11 @@ function startSSEConnection() {
     if (evtSource != null) {
         evtSource.close();
     }
-    evtSource = new EventSource('/api/v1/spots/stream' + buildQueryString());
+    evtSource = new EventSource('/api/v1/spots/stream' + buildQueryString(true));
 
     evtSource.onmessage = function(event) {
         // Get the new spot
-        newSpot = JSON.parse(event.data);
+        const newSpot = JSON.parse(event.data);
         // Awful fudge to ensure new incoming spots at the top of the list don't have timestamps that make them look
         // like they belong further down the list. If the spot is older than the latest one we already have, bump its
         // time up to match it. This isn't great but since we poll spot providers every 2 minutes anyway, it shouldn't
@@ -55,7 +63,7 @@ function startSSEConnection() {
         }
         // If we had zero spots before (i.e. one now), the table will have a "No spots" row that we need to remove now
         // that we have one.
-        if (spots.length == 1) {
+        if (spots.length === 1) {
             $("#table tbody tr").last().remove();
         }
 
@@ -68,7 +76,7 @@ function startSSEConnection() {
         }
     };
 
-    evtSource.onerror = function(err) {
+    evtSource.onerror = function() {
         if (evtSource != null) {
             evtSource.close();
         }
@@ -78,40 +86,42 @@ function startSSEConnection() {
 }
 
 // Build a query string for the API, based on the filters that the user has selected.
-function buildQueryString() {
-    var str =  "?";
+function buildQueryString(includeCredentials) {
+    let str = "?";
     ["dx_continent", "de_continent", "mode", "source", "band", "sig"].forEach(fn => {
         if (!allFilterOptionsSelected(fn)) {
             str = str + getQueryStringFor(fn) + "&";
         }
     });
     str = str + "limit=" + $("#spots-to-fetch option:selected").val();
-    if ($("#search").val() != "") {
+    if ($("#search").val() !== "") {
         str = str + "&text_includes=" + encodeURIComponent($("#search").val());
     }
+    if (includeCredentials) {
         str = str + getCredentialQueryString();
+    }
     return str;
 }
 
 // Update the spots table
 function updateTable() {
     // Use local time instead of UTC?
-    var useLocalTime = $("#timeZone")[0].value == "local";
+    const useLocalTime = $("#timeZone")[0].value === "local";
 
     // Get user grid if valid, this will be null if it's not.
-    var userPos = latLonForGridCentre($("#userGrid").val());
+    const userPos = latLonForGridCentre($("#userGrid").val());
 
     // Table data toggles
-    var showTime = $("#tableShowTime")[0].checked;
-    var showDX = $("#tableShowDX")[0].checked;
-    var showFreq = $("#tableShowFreq")[0].checked;
-    var showMode = $("#tableShowMode")[0].checked;
-    var showComment = $("#tableShowComment")[0].checked;
-    var showBearing = $("#tableShowBearing")[0].checked && userPos != null;
-    var showType = $("#tableShowType")[0].checked;
-    var showRef = $("#tableShowRef")[0].checked;
-    var showDE = $("#tableShowDE")[0].checked;
-    var showWorkedCheckbox = $("#tableShowWorkedCheckbox")[0].checked;
+    const showTime = $("#tableShowTime")[0].checked;
+    const showDX = $("#tableShowDX")[0].checked;
+    const showFreq = $("#tableShowFreq")[0].checked;
+    const showMode = $("#tableShowMode")[0].checked;
+    const showComment = $("#tableShowComment")[0].checked;
+    const showBearing = $("#tableShowBearing")[0].checked && userPos != null;
+    const showType = $("#tableShowType")[0].checked;
+    const showRef = $("#tableShowRef")[0].checked;
+    const showDE = $("#tableShowDE")[0].checked;
+    const showWorkedCheckbox = $("#tableShowWorkedCheckbox")[0].checked;
 
     // Populate table with headers
     let table = $("#table");
@@ -148,7 +158,7 @@ function updateTable() {
     }
 
     table.find('tbody').empty();
-    if (spots.length == 0) {
+    if (spots.length === 0) {
         table.find('tbody').append('<tr class="bg-danger-subtle"><td colspan="100" style="text-align:center;">No spots match your filters.</td></tr>');
     }
 
@@ -172,22 +182,22 @@ function addSpotToTopOfTable(s, highlightNew) {
 // highlightNew = false for an initial load, true for new SSE-loaded spots
 function createNewTableRowsForSpot(s, highlightNew) {
     // Use local time instead of UTC?
-    var useLocalTime = $("#timeZone")[0].value == "local";
+    const useLocalTime = $("#timeZone")[0].value === "local";
 
     // Get user grid if valid, this will be null if it's not.
-    var userPos = latLonForGridCentre($("#userGrid").val());
+    const userPos = latLonForGridCentre($("#userGrid").val());
 
     // Table data toggles
-    var showTime = $("#tableShowTime")[0].checked;
-    var showDX = $("#tableShowDX")[0].checked;
-    var showFreq = $("#tableShowFreq")[0].checked;
-    var showMode = $("#tableShowMode")[0].checked;
-    var showComment = $("#tableShowComment")[0].checked;
-    var showBearing = $("#tableShowBearing")[0].checked && userPos != null;
-    var showType = $("#tableShowType")[0].checked;
-    var showRef = $("#tableShowRef")[0].checked;
-    var showDE = $("#tableShowDE")[0].checked;
-    var showWorkedCheckbox = $("#tableShowWorkedCheckbox")[0].checked;
+    const showTime = $("#tableShowTime")[0].checked;
+    const showDX = $("#tableShowDX")[0].checked;
+    const showFreq = $("#tableShowFreq")[0].checked;
+    const showMode = $("#tableShowMode")[0].checked;
+    const showComment = $("#tableShowComment")[0].checked;
+    const showBearing = $("#tableShowBearing")[0].checked && userPos != null;
+    const showType = $("#tableShowType")[0].checked;
+    const showRef = $("#tableShowRef")[0].checked;
+    const showDE = $("#tableShowDE")[0].checked;
+    const showWorkedCheckbox = $("#tableShowWorkedCheckbox")[0].checked;
 
     // Create row
     let $tr = $('<tr>');
@@ -195,13 +205,13 @@ function createNewTableRowsForSpot(s, highlightNew) {
     // Apply striping to the table. We can't just use Bootstrap's table-striped class because we have all sorts of
     // extra faff to deal with, like the mobile view having extra rows, and the On Now / Next 24h / Later banners
     // which cause the table-striped colouring to go awry.
-    if (rowCount % 2 == 1) {
+    if (rowCount % 2 === 1) {
         $tr.addClass("table-active");
     }
 
     // Show faded out if QRT or already worked
     let alreadyWorkedThis = alreadyWorked(s["dx_call"], s["band"], s["mode"]);
-    if (s["qrt"] == true || alreadyWorkedThis) {
+    if (s["qrt"] === true || alreadyWorkedThis) {
         $tr.addClass("table-faded");
     }
 
@@ -212,65 +222,67 @@ function createNewTableRowsForSpot(s, highlightNew) {
     }
 
     // Format a UTC or local time for display
-    var time = moment.unix(s["time"]).utc();
+    const time = moment.unix(s["time"]).utc();
     if (useLocalTime) {
         time.local();
     }
-    var time_formatted = time.format("HH:mm");
+    const time_formatted = time.format("HH:mm");
 
     // Format DX call
-    var dx_call = s["dx_call"];
+    let dx_call = s["dx_call"];
     if (dx_call == null) {
         dx_call = "";
-        dx_flag = "";
     }
     if (s["dx_ssid"] != null) {
         dx_call = dx_call + "-" + s["dx_ssid"];
     }
 
     // Format dx country
-    var dx_country = s["dx_country"];
+    let dx_country = s["dx_country"];
     if (dx_country == null) {
         dx_country = "Unknown or not a country";
     }
 
     // Format DX flag
-    var dx_flag = "<i class='fa-solid fa-globe-africa'></i>";
-    if (s["dx_dxcc_id"] && s["dx_dxcc_id"] != null && s["dx_dxcc_id"] != 0) {
+    let dx_flag = "<i class='fa-solid fa-globe-africa'></i>";
+    if (dx_call == null) {
+        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}"/>`;
     }
 
     // Format the frequency
-    var freq_string = "Unknown"
+    let freq_string = "Unknown";
     if (s["freq"] != null) {
-        var mhz = Math.floor(s["freq"] / 1000000.0);
-        var khz = Math.floor((s["freq"] - (mhz * 1000000.0)) / 1000.0);
-        var hz = Math.floor(s["freq"] - (mhz * 1000000.0) - (khz * 1000.0));
-        var hz_string = (hz > 0) ? hz.toFixed(0)[0] : "";
+        const mhz = Math.floor(s["freq"] / 1000000.0);
+        const khz = Math.floor((s["freq"] - (mhz * 1000000.0)) / 1000.0);
+        const hz = Math.floor(s["freq"] - (mhz * 1000000.0) - (khz * 1000.0));
+        const hz_string = (hz > 0) ? hz.toFixed(0)[0] : "";
         freq_string = `<span class='freq-mhz freq-mhz-pad'>${mhz.toFixed(0)}</span><span class='freq-khz'>${khz.toFixed(0).padStart(3, '0')}</span><span class='freq-hz hideonmobile'>${hz_string}</span>`
     }
 
     // Format the mode
-    mode_string = s["mode"];
+    let mode_string = s["mode"];
     if (s["mode"] == null) {
         mode_string = "";
-    } else if (s["mode_source"] == "BANDPLAN") {
+    } else if (s["mode_source"] === "BANDPLAN") {
         mode_string = mode_string + "<span class='mode-q hideonmobile'><i class='fa-solid fa-circle-question' title='The mode was not reported via the spotting service. This is a guess based on the frequency.'></i></span>";
     }
 
     // Format comment
-    var commentText = "";
+    let commentText = "";
     if (s["comment"] != null) {
         commentText = escapeHtml(s["comment"]);
     }
 
     // Format bearing text
-    var bearingText = "---<span class='bearing-q hideonmobile'><i class='fa-solid fa-circle-question' title='The position was not reported via the spotting service, and we could not determine one. A bearing to this DX is not available.'></i></span>";
+    let bearingText = "---<span class='bearing-q hideonmobile'><i class='fa-solid fa-circle-question' title='The position was not reported via the spotting service, and we could not determine one. A bearing to this DX is not available.'></i></span>";
     if (userPos != null && s["dx_latitude"] != null && s["dx_longitude"] != null) {
-        var bearing = calcBearing(userPos[0], userPos[1], s["dx_latitude"], s["dx_longitude"]);
+        const bearing = calcBearing(userPos[0], userPos[1], s["dx_latitude"], s["dx_longitude"]);
         bearingText = bearing.toFixed(0).padStart(3, '0') + "°";
-        if (s["dx_location_good"] == null || s["dx_location_good"] == false) {
-            if (s["dx_location_source"] == "HOME QTH") {
+        if (s["dx_location_good"] == null || s["dx_location_good"] === false) {
+            if (s["dx_location_source"] === "HOME QTH") {
                 bearingText = bearingText + "<span class='bearing-q hideonmobile'><i class='fa-solid fa-circle-question' title='The position was not reported via the spotting service. We had to fall back to a QRZ \"home\" location for a portable/mobile/alternative spot, so this bearing may not be accurate if the DX is close to you..'></i></span>";
             } else {
                 bearingText = bearingText + "<span class='bearing-q hideonmobile'><i class='fa-solid fa-circle-question' title='The position was not reported via the spotting service. We had to fall back to just using the centre of a DXCC entity, so this bearing may not be accurate if the DX is close to you.'></i></span>";
@@ -279,39 +291,39 @@ function createNewTableRowsForSpot(s, highlightNew) {
     }
 
     // Format "type" (Sig or fallback to source)
-    var typeText = s["source"];
+    let typeText = s["source"];
     if (s["sig"]) {
         typeText = s["sig"];
     }
 
     // Format sig_refs
-    var sig_refs = "";
+    let sig_refs = "";
     if (s["sig_refs"] != null) {
-        var items = []
-        for (var i = 0; i < s["sig_refs"].length; i++) {
+        const items = [];
+        for (let i = 0; i < s["sig_refs"].length; i++) {
             if (s["sig_refs"][i]["url"] != null) {
-                items[i] = `<span style="white-space: nowrap;"><a href='${s["sig_refs"][i]["url"]}' title='${s["sig_refs"][i]["name"]}' target='_new' class='sig-ref-link'>${s["sig_refs"][i]["id"]}</a></span>`
+                items[i] = `<span style="white-space: nowrap;"><a href='${encodeURI(s["sig_refs"][i]["url"])}' title='${escapeHtml(s["sig_refs"][i]["name"])}' target='_new' class='sig-ref-link'>${escapeHtml(s["sig_refs"][i]["id"])}</a></span>`
             } else {
-                items[i] = `<span style="white-space: nowrap;">${s["sig_refs"][i]["id"]}</span>`
+                items[i] = `<span style="white-space: nowrap;">${escapeHtml(s["sig_refs"][i]["id"])}</span>`
             }
         }
         sig_refs = items.join(", ");
     }
 
     // Format de country
-    var de_country = s["de_country"];
+    let de_country = s["de_country"];
     if (de_country == null) {
         de_country = "Unknown or not a country";
     }
 
     // Format DE flag
-    var 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) {
+    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}"/>`;
     }
 
     // Format de call
-    var de_call = s["de_call"];
+    let de_call = s["de_call"];
     if (de_call == null) {
         de_call = "";
         de_flag = "";
@@ -321,10 +333,10 @@ function createNewTableRowsForSpot(s, highlightNew) {
     }
 
     // Format band name
-    var bandFullName = s['band'] ? s['band'] + " band": "Unknown band";
+    const bandFullName = s['band'] ? s['band'] + " band" : "Unknown band";
 
     // Format "worked" checkbox
-    var workedCheckbox = `<input type="checkbox" ${alreadyWorkedThis ? "checked" : ""} onClick="setWorkedState('${s['dx_call']}', '${s['band']}', '${s['mode']}', ${alreadyWorkedThis ? "false" : "true"});" title="Check this box to record that you have worked this callsign on their current band and mode.">`;
+    const workedCheckbox = `<input type="checkbox" ${alreadyWorkedThis ? "checked" : ""} onClick="setWorkedState('${s['dx_call']}', '${s['band']}', '${s['mode']}', ${alreadyWorkedThis ? "false" : "true"});" title="Check this box to record that you have worked this callsign on their current band and mode.">`;
 
     // Populate the row
     if (showTime) {
@@ -359,21 +371,21 @@ function createNewTableRowsForSpot(s, highlightNew) {
     }
 
     // Second row for mobile view only, containing type, ref & comment
-    $tr2 = $("<tr class='hidenotonmobile'>");
+    const $tr2 = $("<tr class='hidenotonmobile'>");
 
     // Apply styles as per the first row
-    if (rowCount % 2 == 1) {
+    if (rowCount % 2 === 1) {
         $tr2.addClass("table-active");
     }
-    if (s["qrt"] == true || alreadyWorkedThis) {
+    if (s["qrt"] === true || alreadyWorkedThis) {
         $tr2.addClass("table-faded");
     }
     if (highlightNew) {
         $tr2.addClass("new");
     }
 
-    $td2 = $("<td colspan='100'>");
-    $td2floatleft = $(`<div style="float: left;">`);
+    const $td2 = $("<td colspan='100'>");
+    const $td2floatleft = $(`<div style="float: left;">`);
     if (showType) {
         $td2floatleft.append(`<span class='icon-wrapper'><i class='fa-solid ${sigToIcon(s["sig"], "fa-tower-cell")}'></i></span> ${typeText} `);
     }
@@ -381,7 +393,7 @@ function createNewTableRowsForSpot(s, highlightNew) {
         $td2floatleft.append(`${sig_refs} `);
     }
     $td2.append($td2floatleft);
-    $td2floatright = $(`<div style="float: right;">`);
+    const $td2floatright = $(`<div style="float: right;">`);
     if (showBearing) {
         $td2floatright.append(`${bearingText} &nbsp;`);
     }
@@ -449,13 +461,13 @@ function loadOptions() {
 
 // Work out if the user's entered grid is a valid Maidenhead grid
 function isUserGridValid() {
-    userGrid = $("#userGrid").val().toUpperCase();
+    const userGrid = $("#userGrid").val().toUpperCase();
     return latLonForGridCentre(userGrid) != null;
 }
 
 // Method called when the user's grid input is changed.
 function userGridUpdated() {
-    var userGridValid = isUserGridValid();
+    const userGridValid = isUserGridValid();
     if (userGridValid) {
         updateTable();
     }

webassets/js/spotsbandsandmap.js

@@ -1,5 +1,5 @@
 // Storage for the spot data that the server gives us.
-var spots = []
+let spots = [];
 // List of people the user has worked. Each entry has the format callsign-band-mode. These can be added to the list by
 // ticking the checkbox on a row of the table, and cleared from the Display menu. Where a row would be added to the
 // table and the callsign-band-mode is in this list, it is shown struck through as already worked. This is persisted
@@ -9,9 +9,9 @@ let worked = []
 // Dynamically add CSS code for the band checkboxes to show in the appropriate colour.
 // Some band names contain decimal points which are not allowed in CSS classes, so we text-replace them to "p".
 function addBandToggleColourCSS(band_options) {
-    var $style = $('<style>');
+    const $style = $('<style>');
     band_options.forEach(o => {
-        var domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
+        const domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
         $style.append(`#filter-button-label-band-${domSafeName} { padding-left: 0.3em; border-left: 5px solid ${bandToColor(o['name'])};}`);
     });
     $('html > head').append($style);
@@ -19,9 +19,9 @@ function addBandToggleColourCSS(band_options) {
 
 // Generate bands filter card. This one is a special case.
 function generateBandsMultiToggleFilterCard(band_options) {
-    var $grid = $('<div class="row row-cols-3 row-cols-md-2 row-cols-lg-3 row-cols-xxl-4 g-1 mb-1">');
+    const $grid = $('<div class="row row-cols-3 row-cols-md-2 row-cols-lg-3 row-cols-xxl-4 g-1 mb-1">');
     band_options.forEach(o => {
-        var domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
+        const domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
         $grid.append(`<div class="col"><div class="form-check"><input type="checkbox" class="form-check-input filter-button-band storeable-checkbox" id="filter-button-band-${domSafeName}" value="${o['name']}" autocomplete="off" onClick="filtersUpdated()" checked> <label class="form-check-label" id="filter-button-label-band-${domSafeName}" for="filter-button-band-${domSafeName}">${o['name']}</label></div></div>`);
     });
     $("#band-options").append($grid);
@@ -40,9 +40,9 @@ function setHamHFBandToggles() {
 
 // Generate SIGs filter card. This one is also a special case.
 function generateSIGsMultiToggleFilterCard(sig_options) {
-    var $grid = $('<div class="row row-cols-2 row-cols-xxl-3 g-1 mb-1">');
+    const $grid = $('<div class="row row-cols-2 row-cols-xxl-3 g-1 mb-1">');
     sig_options.forEach(o => {
-        var domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
+        const domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
         $grid.append(`<div class="col"><div class="form-check"><input type="checkbox" class="form-check-input filter-button-sig storeable-checkbox" id="filter-button-sig-${domSafeName}" value="${o['name']}" autocomplete="off" onClick="filtersUpdated()" checked><label class="form-check-label" id="filter-button-label-sig-${domSafeName}" for="filter-button-sig-${domSafeName}" title="${o['description']}"><i class="fa-solid ${sigToIcon(o['name'], 'fa-tower-cell')}"></i> ${o['name']}</label></div></div>`);
     });
     // Bonus "NO_SIG" / "General DX" option
@@ -53,9 +53,9 @@ function generateSIGsMultiToggleFilterCard(sig_options) {
 
 // Generate modes filter card. This one is also a special case.
 function generateModesMultiToggleFilterCard(mode_options) {
-    var $grid = $('<div class="row row-cols-3 row-cols-md-2 row-cols-lg-3 g-1 mb-1">');
+    const $grid = $('<div class="row row-cols-3 row-cols-md-2 row-cols-lg-3 g-1 mb-1">');
     mode_options.forEach(o => {
-        var domSafeName = o.replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
+        const domSafeName = o.replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
         $grid.append(`<div class="col"><div class="form-check"><input type="checkbox" class="form-check-input filter-button-mode storeable-checkbox" id="filter-button-mode-${domSafeName}" value="${o}" autocomplete="off" onClick="filtersUpdated()" checked><label class="form-check-label" id="filter-button-label-mode-${domSafeName}" for="filter-button-mode-${domSafeName}">${o}</label></div></div>`);
     });
     $("#mode-options").append($grid);
@@ -84,10 +84,10 @@ function setDigiModeToggles() {
 // set which ones are enabled by default based on config rather than having them all enabled by default. We also sanitise
 // names here for HTML elements.
 function generateSourcesMultiToggleFilterCard(source_options, sources_enabled_by_default) {
-    var $grid = $('<div class="row row-cols-2 row-cols-xxl-3 g-1 mb-1">');
+    const $grid = $('<div class="row row-cols-2 row-cols-xxl-3 g-1 mb-1">');
     source_options.forEach(o => {
-        var enable = sources_enabled_by_default.includes(o);
-        var domSafeName = o.replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
+        const enable = sources_enabled_by_default.includes(o);
+        const domSafeName = o.replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
         $grid.append(`<div class="col"><div class="form-check"><input type="checkbox" class="form-check-input filter-button-source storeable-checkbox" id="filter-button-source-${domSafeName}" value="${o}" autocomplete="off" onClick="filtersUpdated()" ${enable ? "checked" : ""}><label class="form-check-label" for="filter-button-source-${domSafeName}">${o}</label></div></div>`);
     });
     $("#source-options").append($grid);
@@ -115,7 +115,7 @@ function alreadyWorked(callsign, band, mode) {
 
 // Reload spots on becoming visible. This forces a refresh when used as a PWA and the user switches back to the PWA
 // after some time has passed with it in the background.
-addEventListener("visibilitychange", (event) => {
+addEventListener("visibilitychange", () => {
     if (!document.hidden) {
         loadSpots();
     }
@@ -124,7 +124,7 @@ addEventListener("visibilitychange", (event) => {
 // Startup
 $(document).ready(function() {
     // Load worked list
-    var tmpWorked = JSON.parse(localStorage.getItem("worked"));
+    const tmpWorked = JSON.parse(localStorage.getItem("worked"));
     if (tmpWorked) {
         worked = tmpWorked;
     }

webassets/js/ui-ham.js

@@ -0,0 +1,355 @@
+//
+// USER INTERFACE FUNCTIONS (AMATEUR RADIO)
+// Functions providing colour schemes for ham radio bands, SIG icons etc.
+//
+
+const BAND_COLOR_SCHEMES = {
+	"PSK Reporter": {
+		"2200m": "#ff4500",
+		"600m": "#1e90ff",
+		"160m": "#7cfc00",
+		"80m": "#e550e5",
+		"60m": "#00008b",
+		"40m": "#5959ff",
+		"30m": "#62d962",
+		"20m": "#f2c40c",
+		"17m": "#f2f261",
+		"15m": "#cca166",
+		"12m": "#b22222",
+		"11m": "#00ff00",
+		"10m": "#ff69b4",
+		"6m": "#FF0000",
+		"5m": "#e0e0e0",
+		"4m": "#cc0044",
+		"2m": "#FF1493",
+		"1.25m": "#CCFF00",
+		"70cm": "#999900",
+		"23cm": "#5AB8C7",
+		"13cm": "#FF7F50",
+		"5.8GHz": "#cc0099",
+		"10GHz": "#696969",
+		"24GHz": "#f3edc6",
+		"47GHz": "#ffe786",
+		"76GHz": "#baf9d8"
+	},
+	"PSK Reporter (Adjusted)": {
+		"2200m": "#ff4500",
+		"600m": "#1e90ff",
+		"160m": "#7cfc00",
+		"80m": "#b33fb3",
+		"60m": "#00008b",
+		"40m": "#5959ff",
+		"30m": "#62d962",
+		"20m": "#f2c40c",
+		"17m": "#f2f261",
+		"15m": "#cca166",
+		"12m": "#b22222",
+		"11m": "#00ff00",
+		"10m": "#ff7eb4",
+		"6m": "#FF0000",
+		"5m": "#e0e0e0",
+		"4m": "#cc0044",
+		"2m": "#FF1493",
+		"1.25m": "#CCFF00",
+		"70cm": "#999900",
+		"23cm": "#5AB8C7",
+		"13cm": "#FF7F50",
+		"5.8GHz": "#cc0099",
+		"10GHz": "#696969",
+		"24GHz": "#f3edc6",
+		"47GHz": "#ffe786",
+		"76GHz": "#baf9d8"
+	},
+	"RBN": {
+		"2200m": "#000000",
+		"600m": "#aaaaaa",
+		"160m": "#ffe000",
+		"80m": "#093F00",
+		"60m": "#777777",
+		"40m": "#ffa500",
+		"30m": "#ff0000",
+		"20m": "#800080",
+		"17m": "#0000ff",
+		"15m": "#444444",
+		"12m": "#00ffff",
+		"11m": "#000000",
+		"10m": "#ff00ff",
+		"6m": "#ffc0cb",
+		"5m": "#000000",
+		"4m": "#a276ff",
+		"2m": "#92FF7F",
+		"1.25m": "#000000",
+		"70cm": "#000000",
+		"23cm": "#000000",
+		"13cm": "#000000",
+		"5.8GHz": "#000000",
+		"10GHz": "#000000",
+		"24GHz": "#000000",
+		"47GHz": "#000000",
+		"76GHz": "#000000"
+	},
+	"Ham Rainbow": {
+		"2200m": "#8e4f37",
+		"600m": "#8e4f37",
+		"160m": "#8e3737",
+		"80m": "#da2f93",
+		"60m": "#792fda",
+		"40m": "#2f4bda",
+		"30m": "#2fdad2",
+		"20m": "#68da2f",
+		"17m": "#dad52f",
+		"15m": "#da832f",
+		"12m": "#da5c2f",
+		"11m": "#8e8e8e",
+		"10m": "#da2f2f",
+		"6m": "#8e377a",
+		"5m": "#8e8e8e",
+		"4m": "#42378e",
+		"2m": "#37748e",
+		"1.25m": "#8e8e8e",
+		"70cm": "#378e65",
+		"23cm": "#8e8e37",
+		"13cm": "#8e6037",
+		"5.8GHz": "#8e6037",
+		"10GHz": "#8e6037",
+		"24GHz": "#8e6037",
+		"47GHz": "#8e6037",
+		"76GHz": "#8e6037"
+	},
+	"Ham Rainbow (Reverse)": {
+		"2200m": "#42378e",
+		"600m": "#42378e",
+		"160m": "#8e377a",
+		"80m": "#da2f2f",
+		"60m": "#da5c2f",
+		"40m": "#da832f",
+		"30m": "#dad52f",
+		"20m": "#68da2f",
+		"17m": "#2fdad2",
+		"15m": "#2f4bda",
+		"12m": "#792fda",
+		"11m": "#8e8e8e",
+		"10m": "#da2f93",
+		"6m": "#8e3737",
+		"5m": "#8e8e8e",
+		"4m": "#8e4f37",
+		"2m": "#8e6037",
+		"1.25m": "#8e8e8e",
+		"70cm": "#8e8e37",
+		"23cm": "#378e65",
+		"13cm": "#37748e",
+		"5.8GHz": "#37748e",
+		"10GHz": "#37748e",
+		"24GHz": "#37748e",
+		"47GHz": "#37748e",
+		"76GHz": "#37748e",
+	},
+	"Kate Morley": {
+		"2200m": "#817",
+		"600m": "#817",
+		"160m": "#817",
+		"80m": "#a35",
+		"60m": "#c66",
+		"40m": "#e94",
+		"30m": "#ed0",
+		"20m": "#9d5",
+		"17m": "#4d8",
+		"15m": "#2cb",
+		"12m": "#0bc",
+		"11m": "#09c",
+		"10m": "#09c",
+		"6m": "#36b",
+		"5m": "#36b",
+		"4m": "#36b",
+		"2m": "#36b",
+		"1.25m": "#36b",
+		"70cm": "#639",
+		"23cm": "#639",
+		"13cm": "#639",
+		"5.8GHz": "#639",
+		"10GHz": "#639",
+		"24GHz": "#639",
+		"47GHz": "#639",
+		"76GHz": "#639",
+	},
+	"ColorBrewer": {
+		"2200m": "#54278f",
+		"600m": "#756bb1",
+		"160m": "#9e9ac8",
+		"80m": "#cbc9e2",
+		"60m": "#08519c",
+		"40m": "#3182bd",
+		"30m": "#6baed6",
+		"20m": "#bdd7e7",
+		"17m": "#006d2c",
+		"15m": "#31a354",
+		"12m": "#74c476",
+		"11m": "#bae4b3",
+		"10m": "#a63603",
+		"6m": "#e6550d",
+		"5m": "#fd8d3c",
+		"4m": "#fdbe85",
+		"2m": "#a50f15",
+		"1.25m": "#de2d26",
+		"70cm": "#fb6a4a",
+		"23cm": "#fcae91",
+		"13cm": "#636363",
+		"5.8GHz": "#636363",
+		"10GHz": "#969696",
+		"24GHz": "#969696",
+		"47GHz": "#cccccc",
+		"76GHz": "#cccccc",
+	},
+	"IWantHue": {
+		"2200m": "#409271",
+		"600m": "#b03ce1",
+		"160m": "#50c640",
+		"80m": "#d545b7",
+		"60m": "#99b936",
+		"40m": "#7260db",
+		"30m": "#60af57",
+		"20m": "#d54788",
+		"17m": "#58c79f",
+		"15m": "#e2462a",
+		"12m": "#49b1d3",
+		"11m": "#df872f",
+		"10m": "#506bb0",
+		"6m": "#c6a639",
+		"5m": "#9554a3",
+		"4m": "#36783c",
+		"2m": "#da405b",
+		"1.25m": "#657527",
+		"70cm": "#8c97e2",
+		"23cm": "#b44f2f",
+		"13cm": "#d386c8",
+		"5.8GHz": "#aaac66",
+		"10GHz": "#9d4760",
+		"24GHz": "#90672c",
+		"47GHz": "#e08086",
+		"76GHz": "#dc9769",
+	},
+	"IWantHue (Color Blind)": {
+		"2200m": "#bf9e3d",
+		"600m": "#9d2fec",
+		"160m": "#79df39",
+		"80m": "#d445db",
+		"60m": "#5dd175",
+		"40m": "#814dd8",
+		"30m": "#d7ce2f",
+		"20m": "#657af1",
+		"17m": "#8cc34a",
+		"15m": "#d635aa",
+		"12m": "#6cbd80",
+		"11m": "#b860c1",
+		"10m": "#e48721",
+		"6m": "#686ccc",
+		"5m": "#d44e2b",
+		"4m": "#51b3db",
+		"2m": "#d74058",
+		"1.25m": "#56c5ad",
+		"70cm": "#d0478d",
+		"23cm": "#708940",
+		"13cm": "#c380c2",
+		"5.8GHz": "#cab775",
+		"10GHz": "#7a7fc2",
+		"24GHz": "#b87148",
+		"47GHz": "#bd678c",
+		"76GHz": "#c3666b",
+	},
+	"Mokole": {
+		"2200m": "#8b4513",
+		"600m": "#006400",
+		"160m": "#808000",
+		"80m": "#483d8b",
+		"60m": "#5f9ea0",
+		"40m": "#000080",
+		"30m": "#9acd32",
+		"20m": "#8b008b",
+		"17m": "#ff0000",
+		"15m": "#ff8c00",
+		"12m": "#ffd700",
+		"11m": "#7fff00",
+		"10m": "#8a2be2",
+		"6m": "#00ff7f",
+		"5m": "#dc143c",
+		"4m": "#00bfff",
+		"2m": "#0000ff",
+		"1.25m": "#d8bfd8",
+		"70cm": "#ff00ff",
+		"23cm": "#1e90ff",
+		"13cm": "#db7093",
+		"5.8GHz": "#f0e68c",
+		"10GHz": "#ff1493",
+		"24GHz": "#ffa07a",
+		"47GHz": "#ee82ee",
+		"76GHz": "#7fffd4",
+	}
+};
+let bandColorScheme = "PSK Reporter (Adjusted)";
+
+// Set the band colour scheme. Returns true if successful, false if the requested scheme was not known
+function setBandColorScheme(scheme) {
+    let ret = BAND_COLOR_SCHEMES[scheme]
+    if (ret) {
+        bandColorScheme = scheme;
+    }
+    return ret;
+}
+
+// Band name to colour (in the current colour scheme). If the band is unknown, black will be returned.
+function bandToColor(band) {
+    let col = (band != null) ? BAND_COLOR_SCHEMES[bandColorScheme][band] : null;
+    if (col) {
+        return col;
+    } else {
+        return "#000000";
+    }
+}
+
+// Band name to contrast colour (in the current colour scheme). This is either black or white, contrasting as well as
+// possible with the band colour. If the band is unknown, white will be returned.
+function bandToContrastColor(band) {
+    const rgb = hexToRGB(bandToColor(band));
+    const lum = 0.2126*rgb[0] + 0.7152*rgb[1] + 0.0722*rgb[2];
+    return (lum > 128) ? "#000000" : "#ffffff";
+}
+
+const SIG_ICONS = {
+	"POTA": "fa-tree",
+	"SOTA": "fa-mountain-sun",
+	"WWFF": "fa-seedling",
+	"GMA": "fa-person-hiking",
+	"WWBOTA": "fa-radiation",
+	"HEMA": "fa-mound",
+	"IOTA": "fa-book-atlas",
+	"MOTA": "fa-fan",
+	"ARLHS": "fa-house-flood-water",
+	"ILLW": "fa-house-flood-water",
+	"SIOTA": "fa-wheat-awn",
+	"WCA": "fa-chess-rook",
+	"ZLOTA": "fa-kiwi-bird",
+	"WOTA": "fa-w",
+	"BOTA": "fa-umbrella-beach",
+	"KRMNPA": "fa-earth-oceania",
+	"LLOTA": "fa-water",
+	"WWTOTA": "fa-tower-observation",
+	"WAB": "fa-table-cells-large",
+	"WAI": "fa-table-cells-large",
+	"Tiles": "fa-square",
+	"TOTA": "fa-toilet"
+}
+
+// Get the Font Awesome icon for a given SIG. If the SIG is unknown, the provided default symbol will be returned
+function sigToIcon(sig, defaultIcon) {
+    let col = (sig != null) ? SIG_ICONS[sig] : null;
+    if (col) {
+        return col;
+    } else {
+		let col = (sig != null) ? SIG_ICONS[sig.toUpperCase()] : null;
+		if (col) {
+			return col;
+		} else {
+			return defaultIcon;
+		}
+    }
+}

webassets/js/utils.js

@@ -0,0 +1,33 @@
+//
+// GENERAL UTILITY FUNCTIONS
+// OBject, string manipulation etc.
+//
+
+// Utility function to escape HTML characters from a string.
+function escapeHtml(str) {
+    if (typeof str !== 'string') {
+        return '';
+    }
+
+    const escapeCharacter = (match) => {
+        switch (match) {
+            case '&': return '&';
+            case '<': return '&lt;';
+            case '>': return '&gt;';
+            case '"': return '&quot;';
+            case '\'': return '&#039;';
+            case '`': return '&#096;';
+            default: return match;
+        }
+    };
+
+    return str.replace(/[&<>"'`]/g, escapeCharacter);
+}
+
+// Converts an HTML hex colour to an array of [R, G, B] where each is 0-255.
+function hexToRGB(hex) {
+    return hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i
+             ,(m, r, g, b) => '#' + r + r + g + g + b + b)
+    .substring(1).match(/.{2}/g)
+    .map(x => parseInt(x, 16));
+}

webassets/vendor/js/leaflet-maidenhead.js

@@ -0,0 +1,113 @@
+/*
+ * L.Maidenhead displays a Maidenhead Locator of lines on the map.
+ */
+
+L.Maidenhead = L.LayerGroup.extend({
+
+	
+	options: {
+		// Line and label color
+		color: 'rgba(255, 0, 0, 0.4)',
+		// Redraw on move or moveend
+		redraw: 'move'
+	},
+
+	initialize: function (options) {
+		L.LayerGroup.prototype.initialize.call(this);
+		L.Util.setOptions(this, options);
+
+	},
+
+	onAdd: function (map) {
+		this._map = map;
+		var grid = this.redraw();
+		this._map.on('viewreset '+ this.options.redraw, function () {
+			grid.redraw();
+		});
+
+		this.eachLayer(map.addLayer, map);
+	},
+	
+	onRemove: function (map) {
+		// remove layer listeners and elements
+		map.off('viewreset '+ this.options.redraw, this.map);
+		this.eachLayer(this.removeLayer, this);
+	},
+
+	redraw: function () {
+		var d3 =         new Array(20,10,10,10,10,10,1 ,1 ,1 ,1 ,1/24,1/24,1/24,1/24,1/24,1/240,1/240,1/240,1/240/24,1/240/24,1/240/24 );
+		var lat_cor =    new Array(0 ,8 ,8 ,8 ,10,14,6 ,8 ,8 ,8 ,1.4 ,2.5 ,3   ,3.5 ,4   ,4    ,3.5  ,3.5  ,1.47    ,1.8     ,1.6      );
+		var bounds = map.getBounds();
+		var zoom = map.getZoom();
+		var unit = d3[Math.round(zoom)];
+		var lcor = lat_cor[Math.round(zoom)];
+		var w = bounds.getWest();
+		var e = bounds.getEast();
+		var n = bounds.getNorth();
+		var s = bounds.getSouth();
+		if (zoom==1) {var c = 2;} else {var c = 0.1;}
+		if (n > 85) n = 85;
+		if (s < -85) s = -85;
+		var left = Math.floor(w/(unit*2))*(unit*2);
+		var right = Math.ceil(e/(unit*2))*(unit*2);
+		var top = Math.ceil(n/unit)*unit;
+		var bottom = Math.floor(s/unit)*unit;
+		this.eachLayer(this.removeLayer, this);
+		for (var lon = left; lon < right; lon += (unit*2)) {
+			for (var lat = bottom; lat < top; lat += unit) {
+			var bounds = [[lat,lon],[lat+unit,lon+(unit*2)]];
+			this.addLayer(L.rectangle(bounds, {color: this.options.color, weight: 1, fill:false, interactive: false}));
+			//var pont = map.latLngToLayerPoint([lat,lon]);
+			//console.log(pont.x);
+			this.addLayer(this._getLabel(lon+unit-(unit/lcor),lat+(unit/2)+(unit/lcor*c)));
+			}
+		}
+		return this;
+	},
+    	
+	_getLabel: function(lon,lat) {
+	  var title_size = new Array(0 ,10,12,16,20,26,12,16,24,36,12  ,14  ,20  ,36  ,60  ,12   ,20   ,36   ,8   ,12      ,24       );
+	  var zoom = map.getZoom();
+	  var size = title_size[Math.round(zoom)]+'px';
+	  var title = '<span style="cursor: default;"><font style="color:'+this.options.color+'; font-size:'+size+'; font-weight: 900; ">' + this._getLocator(lon,lat) + '</font></span>';
+      var myIcon = L.divIcon({className: 'my-div-icon', html: title});
+      var marker = L.marker([lat,lon], {icon: myIcon}, clickable=false);
+      return marker;
+	},
+	
+	_getLocator: function(lon,lat) {
+	  var ydiv_arr=new Array(10, 1, 1/24, 1/240, 1/240/24);
+	  var d1 = "ABCDEFGHIJKLMNOPQR".split("");
+	  var d2 = "ABCDEFGHIJKLMNOPQRSTUVWX".split("");
+	  var d4 =         new Array(0 ,1 ,1 ,1 ,1 ,1 ,2 ,2 ,2 ,2 ,3   ,3   ,3   ,3   ,3   ,4    ,4    ,4    ,5    ,5       ,5        );
+      var locator = "";
+      var x = lon;
+      var y = lat;
+      var precision = d4[Math.round(map.getZoom())];
+      while (x < -180) {x += 360;}
+      while (x > 180) {x -=360;}
+      x = x + 180;
+      y = y + 90;
+      locator = locator + d1[Math.floor(x/20)] + d1[Math.floor(y/10)];
+      for (var i=0; i<4; i=i+1) {
+		if (precision > i+1) {
+        rlon = x%(ydiv_arr[i]*2);
+        rlat = y%(ydiv_arr[i]);
+			if ((i%2)==0) {
+				locator += Math.floor(rlon/(ydiv_arr[i+1]*2)) +""+ Math.floor(rlat/(ydiv_arr[i+1]));
+			} else {
+				locator += d2[Math.floor(rlon/(ydiv_arr[i+1]*2))] +""+ d2[Math.floor(rlat/(ydiv_arr[i+1]))];	
+			}
+		}
+	  }  
+      return locator;
+	},
+
+  
+	
+
+});
+
+L.maidenhead = function (options) {
+	return new L.Maidenhead(options);
+};

webassets/vendor/js/leaflet-terminator-1.1.0.min.js

@@ -0,0 +1,8 @@
+/**
+ * Minified by jsDelivr using Terser v5.37.0.
+ * Original file: /npm/@joergdietrich/leaflet.terminator@1.1.0/L.Terminator.js
+ *
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i(require("leaflet")):"function"==typeof define&&define.amd?define(["leaflet"],i):(t.L=t.L||{},t.L.terminator=i(t.L))}(this,(function(t){"use strict";var i=(t=t&&t.hasOwnProperty("default")?t.default:t).Polygon.extend({options:{color:"#00",opacity:.5,fillColor:"#00",fillOpacity:.5,resolution:2},initialize:function(i){this.version="0.1.0",this._R2D=180/Math.PI,this._D2R=Math.PI/180,t.Util.setOptions(this,i);var n=this._compute(this.options.time);this.setLatLngs(n)},setTime:function(t){this.options.time=t;var i=this._compute(t);this.setLatLngs(i)},_sunEclipticPosition:function(t){var i=t-2451545,n=280.46+.9856474*i,e=357.528+.9856003*i;return e%=360,{lambda:(n%=360)+1.915*Math.sin(e*this._D2R)+.02*Math.sin(2*e*this._D2R),R:1.00014-.01671*Math.cos(e*this._D2R)-.0014*Math.cos(2*e*this._D2R)}},_eclipticObliquity:function(t){var i=(t-2451545)/36525;return 23.43929111-i*(46.836769/3600-i*(1831e-7/3600+i*(5.565e-7-i*(1.6e-10-4.34e-8*i/3600))))},_sunEquatorialPosition:function(t,i){var n=Math.atan(Math.cos(i*this._D2R)*Math.tan(t*this._D2R))*this._R2D,e=Math.asin(Math.sin(i*this._D2R)*Math.sin(t*this._D2R))*this._R2D;return{alpha:n+=90*Math.floor(t/90)-90*Math.floor(n/90),delta:e}},_hourAngle:function(t,i,n){return 15*(n+t/15)-i.alpha},_latitude:function(t,i){return Math.atan(-Math.cos(t*this._D2R)/Math.tan(i.delta*this._D2R))*this._R2D},_compute:function(t){for(var i=t?new Date(t):new Date,n=i/864e5+2440587.5,e=function(t){return(18.697374558+24.06570982441908*(t-2451545))%24}(n),o=[],s=this._sunEclipticPosition(n),a=this._eclipticObliquity(n),h=this._sunEquatorialPosition(s.lambda,a),r=0;r<=720*this.options.resolution;r++){var u=r/this.options.resolution-360,l=this._hourAngle(u,h,e);o[r+1]=[this._latitude(l,h),u]}return h.delta<0?(o[0]=[90,-360],o[o.length]=[90,360]):(o[0]=[-90,-360],o[o.length]=[-90,360]),o}});return function(t){return new i(t)}}));
+//# sourceMappingURL=/sm/0ad6cc527a0e7748dc9ea3acda4c2088f86401baae9f9dddc41fc73f9afa2de2.map

webassets/vendor/js/leaflet-workedallbritainireland.js

@@ -0,0 +1,259 @@
+L.WorkedAllBritainIreland = L.LayerGroup.extend({
+
+    options: {
+        // Line and label color
+        color: 'rgba(80, 80, 80, 1)',
+        // Grid squares to draw
+        gbSquares: ["HP", "HT", "HU", "HW", "HX", "HY", "HZ", "NA", "NB", "NC", "ND", "NF", "NG", "NH", "NJ", "NK", "NL", "NM", "NN", "NO", "NR", "NS", "NT", "NU", "NW", "NX", "NY", "NZ", "OV", "SC", "SD", "SE", "SH", "SJ", "SK", "SM", "SN", "SO", "SP", "SR", "SS", "ST", "SU", "SV", "SW", "SX", "SY", "SZ", "TA", "TF", "TG", "TL", "TM", "TR", "TQ", "TV"],
+        ieSquares: ["B", "C", "D", "F", "G", "H", "J", "L", "M", "N", "O", "Q", "R", "S", "T", "V", "W", "X"],
+        ciSquares: ["WA", "WV"]
+    },
+
+    initialize: function (options) {
+        // Initialise the LayerGroup superclass and set the options for this class.
+        L.LayerGroup.prototype.initialize.call(this);
+        L.Util.setOptions(this, options);
+
+        // Workaround to load the geodesy modules in non-modular code. Once we have loaded all three modules, trigger a
+        // first draw.
+        import("https://misc.ianrenton.com/Leaflet.WorkedAllBritainIreland/modules/geodesy/osgridref.js")
+            .then(module => {
+                this._osGridLibrary = module;
+                if (this._ieGridLibrary && this._utmLibrary) {
+                    this.redraw();
+                }
+            })
+            .catch(error => {
+                console.log("Error loading OS Grid Ref library, GB WAB squares may not be available.");
+                console.log(error);
+            });
+        import("https://misc.ianrenton.com/Leaflet.WorkedAllBritainIreland/modules/geodesy/iegridref.js")
+            .then(module => {
+                this._ieGridLibrary = module;
+                if (this._osGridLibrary && this._utmLibrary) {
+                    this.redraw();
+                }
+            })
+            .catch(error => {
+                console.log("Error loading IE Grid Ref library, NI WAB squares may not be available.");
+                console.log(error);
+            });
+        import("https://misc.ianrenton.com/Leaflet.WorkedAllBritainIreland/modules/geodesy/utm_ci.js")
+            .then(module => {
+                this._utmLibrary = module;
+                if (this._osGridLibrary && this._ieGridLibrary) {
+                    this.redraw();
+                }
+            })
+            .catch(error => {
+                console.log("Error loading UTM library, Channel Islands WAB squares may not be available.");
+                console.log(error);
+            });
+    },
+
+    onAdd: function (map) {
+        this._map = map;
+        var grid = this.redraw();
+        map.on('moveend', function () { grid.redraw(); });
+        map.on('zoomend', function () { grid.redraw(); });
+        this.eachLayer(map.addLayer, map);
+    },
+
+    onRemove: function (map) {
+        map.off('moveend', this.map);
+        map.off('zoomend', this.map);
+        this.eachLayer(this.removeLayer, this);
+    },
+
+    redraw: function () {
+        // Don't proceed unless we have a map object and our libraries are loaded
+        if (this._map && this._osGridLibrary && this._ieGridLibrary && this._utmLibrary) {
+            // Remove existing content
+            this.eachLayer(this.removeLayer, this);
+
+            // Determine detail level based on current map zoom.
+            const detailLevel = (map.getZoom() > 4) ? (map.getZoom() > 8) ? 2 : 1 : 0;
+
+            // Generate new content for the three grid systems.
+            this.options.gbSquares.forEach(squareRef => {
+                this._addWABGraphicsForSquare(squareRef, "GB", detailLevel);
+            });
+            this.options.ieSquares.forEach(squareRef => {
+                this._addWABGraphicsForSquare(squareRef, "IE", detailLevel);
+            });
+            this.options.ciSquares.forEach(squareRef => {
+                this._addWABGraphicsForSquare(squareRef, "CI", detailLevel);
+            });
+        }
+        return this;
+    },
+
+
+    // Add WAB graphics to the layer for the given square, using the given grid system ("GB", "IE" or "CI") and the
+    // required level of detail.
+    _addWABGraphicsForSquare: function (squareRef, gridSystem, detailLevel) {
+        if (detailLevel === 0 || detailLevel === 1) {
+            // If detail level is 0 or 1, we want a single large square.
+            const swCorner = this._gridRefToLatLon(squareRef + " 00000 00000", gridSystem);
+            const nwCorner = this._gridRefToLatLon(squareRef + " 99999 00000", gridSystem);
+            const neCorner = this._gridRefToLatLon(squareRef + " 99999 99999", gridSystem);
+            const seCorner = this._gridRefToLatLon(squareRef + " 00000 99999", gridSystem);
+            const centre = this._gridRefToLatLon(squareRef + " 50000 50000", gridSystem);
+
+            let square = L.polygon([swCorner, nwCorner, neCorner, seCorner], {color: this.options.color, interactive: false});
+            this.addLayer(square);
+
+            // Additionally if detail level is 1, we want to label it.
+            if (detailLevel === 1) {
+                let label = new L.marker(centre, {
+                    icon: new L.DivIcon({
+                        html: '<span style="position: relative; top: -40%; left: -40%; text-align: center; cursor: hand; color:'+this.options.color+'; font-weight: bold; font-size:120%;">' + squareRef + '</font></span>',
+                        className: 'wabSquareLabel' // Prevent default background & border and provide ability to customise
+                    })
+                }, clickable=false);
+                this.addLayer(label);
+            }
+
+        } else if (detailLevel === 2) {
+            // If detail level is 2, we want to generate all the inner squares (with labels)
+            // instead of just one square. But, doing this for every square will cause CPU issues,
+            // so we only want to generate graphics if they would actually end up on screen.
+            for (let i = 0; i < 10; i++) {
+                for (let j = 0; j < 10; j++) {
+
+                    // Bail out if we have a grid reference that doesn't apply. This is where GB grid overlaps with NI etc.
+                    // are deconflicted.
+                    if (this._validSmallSquare(squareRef, i, j)) {
+
+                        // If we get this far, now calculate the coordinates of the box.
+                        const swCorner = this._gridRefToLatLon(squareRef + " " + i + "0000 " + j + "0000", gridSystem);
+                        const nwCorner = this._gridRefToLatLon(squareRef + " " + i + "9999 " + j + "0000", gridSystem);
+                        const neCorner = this._gridRefToLatLon(squareRef + " " + i + "9999 " + j + "9999", gridSystem);
+                        const seCorner = this._gridRefToLatLon(squareRef + " " + i + "0000 " + j + "9999", gridSystem);
+                        const centre = this._gridRefToLatLon(squareRef + " " + i + "5000 " + j + "5000", gridSystem);
+
+                        // Find out if this box is going to be on our screen. If not, don't draw anything.
+                        if (map.getBounds().contains(swCorner) || map.getBounds().contains(nwCorner)
+                            || map.getBounds().contains(neCorner) || map.getBounds().contains(seCorner)) {
+                            let square = L.polygon([swCorner, nwCorner, neCorner, seCorner], {color: this.options.color, interactive: false});
+                            this.addLayer(square);
+
+                            let label = new L.marker(centre, {
+                                icon: new L.DivIcon({
+                                    html: '<span style="position: relative; top: -20%; left: -100%; text-align: center; cursor: hand; color:'+this.options.color+'; font-weight: bold; font-size:120%;">' + squareRef + i + j + '</font></span>',
+                                    className: 'wabSquareLabelLong' // Prevent default background & border and provide ability to customise
+                                })
+                            }, clickable=false);
+                            this.addLayer(label);
+                        }
+                    }
+                }
+            }
+        }
+    },
+
+    // Determine if a given small square is OK to draw. This is where e.g. overlapping GB and IE squares are
+    // deconflicted in the Irish Sea.
+    _validSmallSquare: function (squareRef, i, j) {
+        let valid = true;
+        if (squareRef === "WA" && j > 1) {
+            valid = false;
+        } else if (squareRef === "TR" && i > 4 && j < 5) {
+            valid = false;
+        } else if (squareRef === "SM" && i < 4) {
+            valid = false;
+        } else if (squareRef === "SM" && i < 7 && j > 4) {
+            valid = false;
+        } else if (squareRef === "TV" && i === 9 && j === 0) {
+            valid = false;
+        } else if (squareRef === "NW" && i < 9) {
+            valid = false;
+        } else if (squareRef === "NR" && i < 5 && j < 3) {
+            valid = false;
+        } else if (squareRef === "C" && j > 6) {
+            valid = false;
+        } else if (squareRef === "D" && (i > 5 || j > 5 || (i > 2 && j > 3))) {
+            valid = false;
+        } else if (squareRef === "J" && i > 6) {
+            valid = false;
+        } else if (squareRef === "O" && i > 8) {
+            valid = false;
+        } else if (squareRef === "T" && i > 6 && j < 5) {
+            valid = false;
+        }
+        return valid;
+    },
+
+    // Convert the given grid reference to lat/lon, using the given grid system ("GB", "IE" or "CI")
+    _gridRefToLatLon: function (grid, gridSystem) {
+        if (gridSystem === "GB") {
+            return this._osgbGridRefToLatLon(grid);
+        } else if (gridSystem === "IE") {
+            return this._osieGridRefToLatLon(grid);
+        } else if (gridSystem === "CI") {
+            return this._ciGridRefToLatLon(grid);
+        } else {
+            return null;
+        }
+    },
+
+    // OSGB grid reference to lat/lon
+    _osgbGridRefToLatLon: function (grid) {
+        if (this._osGridLibrary) {
+            return this._osGridLibrary.default.parse(grid).toLatLon();
+        } else {
+            return null;
+        }
+    },
+
+    // Lat/lon to OSGB grid reference
+    _latLonToOSGBGridRef: function (lat, lon) {
+        if (this._osGridLibrary) {
+            return new this._osGridLibrary.LatLon(lat, lon).toOsGrid();
+        } else {
+            return null;
+        }
+    },
+
+    // OSIE grid reference to lat/lon
+    _osieGridRefToLatLon: function (grid) {
+        if (this._ieGridLibrary) {
+            return this._ieGridLibrary.default.parse(grid).toLatLon();
+        } else {
+            return null;
+        }
+    },
+
+    // Lat/lon to OSIE grid reference
+    _latLonToOSIEGridRef: function (lat, lon) {
+        if (this._ieGridLibrary) {
+            return new this._ieGridLibrary.LatLon(lat, lon).toOsGrid();
+        } else {
+            return null;
+        }
+    },
+
+    // CI grid reference to lat/lon
+    _ciGridRefToLatLon: function (grid) {
+        if (this._utmLibrary) {
+            return this._utmLibrary.default.parseChannelIslandGrid(grid).toLatLon();
+        } else {
+            return null;
+        }
+    },
+
+    // Lat/lon to CI grid reference
+    _latLonToCIGridRef: function (lat, lon) {
+        if (this._utmLibrary) {
+            let utm = (new this._utmLibrary.LatLon(lat, lon)).toUtm();
+            // todo convert UTM coordinate system back to CI grid ref cells
+            return null;
+        } else {
+            return null;
+        }
+    }
+});
+
+L.workedAllBritainIreland = function (options) {
+    return new L.WorkedAllBritainIreland(options);
+};

webassets/vendor/js/text-image-0.7.0.js

@@ -0,0 +1 @@
+!function(){var t,n=document.createElement("pre"),h=document.createElement("canvas"),r=h.getContext("2d"),i={font:"Sans-serif",align:"left",color:"#000000",size:16,background:"rgba(0, 0, 0, 0)",stroke:0,strokeColor:"#FFFFFF",lineHeight:"1.2em",bold:!1,italic:!1};function s(t){t=String(t),n.innerText=t,n.setAttribute("style",this._style),document.body.append(n);var e=t.split("\n"),i=this.style.stroke,s=n.offsetHeight/e.length,l=.25*s;h.width=n.offsetWidth+2*i,h.height=n.offsetHeight,r.clearRect(0,0,h.width,h.height),r.fillStyle=this.style.background,r.beginPath(),r.fillRect(0,0,h.width,h.height),r.fill();var o="";switch(this.style.italic&&(o+="italic "),this.style.bold&&(o+="bold "),o+=this.style.size+"pt "+this.style.font,r.font=o,r.textAlign=this.style.align,r.lineWidth=this.style.stroke,r.strokeStyle=this.style.strokeColor,r.fillStyle=this.style.color,r.textAlign){case"center":i=h.width/2;break;case"right":i=h.width-i}e.forEach(function(t,e){this.style.stroke&&r.strokeText(t,i,s*(e+1)-l),r.fillText(t,i,s*(e+1)-l)}.bind(this)),document.body.removeChild(n)}window.TextImage=function(t){return this instanceof TextImage?(this.setStyle(t),this):new TextImage(t)},(t=window.TextImage.prototype).setStyle=function(t){for(var e in this.style=t||{},i)this.style[e]||(this.style[e]=i[e]);return this._style="font: ",this.style.italic&&(this._style+="italic "),this.style.bold&&(this._style+="bold "),this._style+=this.style.size+"pt "+this.style.font+";",this._style+="line-height:"+this.style.lineHeight+";",this._style+="text-align: "+this.style.align+";",this._style+="color: "+this.style.color+";",this._style+="background-color: "+this.style.background+";",this._style+=";padding: 0; display: block; position: fixed; top: 100%; overflow: hidden;",this},t.toDataURL=function(t){return t&&s.call(this,t),h.toDataURL()},t.toImage=function(t,e){s.call(this,t);var i=new Image;return e&&(i.onload=e),i.src=h.toDataURL(),i}}();