PWA style tweaks

# Conflicts:
#	webassets/apidocs/openapi.yml

README.md

@@ -10,17 +10,62 @@ The API is deliberately well-defined with an OpenAPI specification and auto-gene
 
 Spothole itself is also open source, Public Domain licenced code that anyone can take and modify.
 
-Supported data sources include DX Clusters, the Reverse Beacon Network (RBN), the APRS Internet Service (APRS-IS), POTA, SOTA, WWFF, GMA, WWBOTA, HEMA, Parks 'n' Peaks, ZLOTA, WOTA, BOTA, the UK Packet Repeater Network, and NG3K.
+Supported data sources include DX Clusters, the Reverse Beacon Network (RBN), the APRS Internet Service (APRS-IS), POTA, SOTA, WWFF, GMA, WWBOTA, HEMA, Parks 'n' Peaks, ZLOTA, WOTA, BOTA, the UK Packet Repeater Network, NG3K, and any site based on the xOTA software by nischu.
 
 ![Screenshot](/images/screenshot2.png)
 
 ![Screenshot](/images/screenshot3.png)
 
-### Accessing the public version
+## Accessing the public version
 
 You can access the public version's web interface at [https://spothole.app](https://spothole.app), and see [https://spothole.app/apidocs](https://spothole.app/apidocs) for the API details.
 
-### Running your own copy
+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.
+
+## Embedding Spothole in another website
+
+You can embed Spothole 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.
+
+Setting `embedded` to true is important for the rest of the settings to be applied; otherwise, the user's defaults will be used in preference to the URL params.
+
+These are supplied with the URL to the page you want to embed, for example for an embedded version of the band map in dark mode, use `https://spothole.com/bands?embedded=true&dark-mode=true`. For an embedded version of the main spots/home page in the system light/dark mode, use `https://spothole.com/?embedded=true`. For dark mode showing 70cm TOTA spots only, use `https://spothole.com/?embedded=true&dark-mode=true&filter-sigs=TOTA&filter-bands=70cm`. Providing no URL params causes the page to be loaded in the normal way it would when accessed directly in the user's browser.
+
+The supported parameters are as follows. Generally these match the equivalent parameters in the real Spothole API, where a mapping exists.
+
+| Name           | Allowed Values        | Default | Example                 | Description                                                                                                                                                           |
+|----------------|-----------------------|---------|-------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `embedded`     | `true`, `false`       | `false` | `?embedded=true`        | Enables embedded mode.                                                                                                                                                |
+| `dark-mode`    | `true`, `false`       | `false` | `?dark-mode=true`       | Enables dark mode.                                                                                                                                                    |
+| `time-zone`    | `UTC`, `local`        | `UTC`   | `?time-zone=local`      | Sets times to be in UTC or local time.                                                                                                                                |
+| `limit`        | 10, 25, 50, 100       | 50      | `?limit=50`             | Sets the number of spots that will be displayed on the main spots page                                                                                                |
+| `limit`        | 25, 50, 100, 200, 500 | 100     | `?limit=100`            | Sets the number of alerts that will be displayed on the alerts page                                                                                                   |
+| `max_age`      | 300, 600, 1800, 3600  | 1800    | `?max_age=1800`         | Sets the maximum age of spots displayed on the map and bands pages, in seconds.                                                                                       |
+| `band`         | Comma-separated list  | (all)   | `?band=20m,40m`         | Sets the list of bands that will be shown on the spots, bands and map pages. Available options match the labels of the buttons in the standard web interface.         |
+| `sig`          | Comma-separated list  | (all)   | `?sig=POTA,SOTA,NO_SIG` | Sets the list of SIGs that will be shown on the spots, bands and map pages. Available options match the labels of the buttons in the standard web interface.          |
+| `source`       | Comma-separated list  | (all)   | `?source=Cluster`       | Sets the list of sources that will be shown on any spot or alert pages. Available options match the labels of the buttons in the standard web interface.              |
+| `mode_type`    | Comma-separated list  | (all)   | `?mode_type=PHONE,CW`   | Sets the list of mode types that will be shown on the spots, bands and map pages. Available options match the labels of the buttons in the standard web interface.    |
+| `dx_continent` | Comma-separated list  | (all)   | `?dx_continent=NA,SA`   | Sets the list of DX Continents that will be shown on any spot or alert pages. Available options match the labels of the buttons in the standard web interface.        |
+| `de_continent` | Comma-separated list  | (all)   | `?de_continent=EU`      | Sets the list of DE Continents that will be shown on the spots, bands and map pages. Available options match the labels of the buttons in the standard web interface. |
+
+More will be added soon to allow customisation of filters and other display properties.
+
+## Writing your own client
+
+One of the key strengths of Spothole is that the API is well-defined and open to anyone to use. This means you can build your own software that uses data from Spothole.
+
+Various approaches exist to writing your own client, but in general:
+
+* Refer to the API docs. These are built on an OpenAPI definition file (`/webassets/apidocs/openapi.yml`), which you can automatically use to generate a client skeleton using various software.
+* Call the main "spots" or "alerts" API endpoints to get the data you want. Apply filters if necessary.
+* Call the "options" API to get an idea of which bands, modes etc. the server knows about. You might want to do that first before calling the spots/alerts APIs, to allow you to populate your filters correctly.
+* Refer to the provided HTML/JS interface for a reference
+* Let me know if you get stuck, I'm happy to help!
+
+## Running your own copy
+
+If you want to run a copy of Spothole with different configuration settings than the main instance, you can download it and run it on your own local machine or server.
 
 To download and set up Spothole on a Debian server, run the following commands. Other operating systems will likely be similar.
 
@@ -34,7 +79,7 @@ deactivate
 cp config-example.yml config.yml
 ```
 
-Then edit `config.yml` in your text editor of choice to set up the software as you like it.
+Then edit `config.yml` in your text editor of choice to set up the software as you like it. Mostly, this will involve enabling or disabling the various providers of spot and alert data.
 
 `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.
 
@@ -57,6 +102,8 @@ If you see some errors on startup, check your configuration, e.g. in case you ha
 
 ### systemd configuration
 
+If you want Spothole to run automatically on startup on a Linux distribution that uses `systemd`, follow the instructions here. For distros that don't use `systemd`, or Windows/OSX/etc., you can find generic instructions for your OS online.
+
 Create a file at `/etc/systemd/system/spothole.service`. Give it the following content, adjusting for the user you want to run it as and the directory in which you have installed it:
 
 ```
@@ -87,7 +134,9 @@ Check the service has started up correctly with `sudo journalctl -u spothole -f`
 
 ### nginx Reverse Proxy configuration
 
-It's best not to serve Spothole directly on port 80, as that requires root privileges and prevents us using HTTPS, amongst other reasons. To set up nginx as a reverse proxy that sits in front of Spothole, first ensure it's installed e.g. `sudo apt install nginx`, and enabled e.g. `sudo systemd enable nginx`.
+Web servers generally serve their pages from port 80. However, it's best not to serve Spothole's web interface directly on port 80, as that requires root privileges on a Linux system. It also and prevents us using HTTPS to serve a secure site, since Spothole itself doesn't directly support acting as an HTTPS server. The normal solution to this is to use a "reverse proxy" setup, where a general web server handles HTTP and HTTP requests (to port 80 & 443 respectively), then passes on the request to the back-end application (in this case Spothole). nginx is a common choice for this general web server.
+
+To set up nginx as a reverse proxy that sits in front of Spothole, first ensure it's installed e.g. `sudo apt install nginx`, and enabled e.g. `sudo systemd enable nginx`.
 
 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.
 
@@ -135,17 +184,11 @@ You should now be able to access the web interface by going to the domain from y
 
 Once that's working, [install certbot](https://certbot.eff.org/instructions?ws=nginx&os=snap) onto your server. Run it as root, and when prompted pick your domain name from the list. After a few seconds, it should successfully provision a certificate and modify your nginx config files automatically. You should then be able to access the site via HTTPS.
 
-### Writing your own client
+## Modifying the source code
 
-Various approaches exist to writing your own client, but in general:
+Spothole is Public Domain licenced, so you can grab the source code and start modifying it for your own needs. Contributions of code back to the main repository are encouraged, but completely optional.
 
-* Refer to the API docs. These are built on an OpenAPI definition file (`/webassets/apidocs/openapi.yml`), which you can automatically use to generate a client skeleton using various software.
-* Call the main "spots" API to get the data you want. Apply filters if necessary.
-* Call the "options" API to get an idea of which bands, modes etc. the server knows about. You might want to do that first before calling the spots API.
-* Refer to the provided HTML/JS interface for a reference
-* Let me know if you get stuck, I'm happy to help!
-
-### Structure of the source code
+### Code structure
 
 To navigate your way around the source code, this list may help.
 
@@ -178,28 +221,32 @@ To navigate your way around the source code, this list may help.
 
 ### Extending the server
 
-Spothole is designed to be easily extensible. If you want to write your own provider, simply add a module to the `providers` package containing your class. (Currently, in order to be loaded correctly, the module (file) name should be the same as the class name, but lower case.)
+Spothole is designed to be easily extensible. If you want to write your own spot provider, for example, simply add a module to the `spotproviders` package containing your class. (Currently, in order to be loaded correctly, the module (file) name should be the same as the class name, but lower case.)
 
-Your class should extend "Provider"; if it operates by polling an HTTP Server on a timer, it can instead extend "HTTPProvider" where some of the work is done for you.
+Your class should extend "SpotProvider"; if it operates by polling an HTTP Server on a timer, it can instead extend "HTTPSpotProvider" where some of the work is done for you.
 
 The class will need to implement a constructor that takes in the `provider_config` and provides it to the superclass constructor, while also taking any other config parameters it needs.
 
-If you're extending the base `Provider` class, you will need to implement `start()` and `stop()` methods that start and stop a separate thread which handles the provider's processing needs. The thread should call `submit()` or `submit_batch()` when it has one or more spots to report.
+If you're extending the base `SpotProvider` class, you will need to implement `start()` and `stop()` methods that start and stop a separate thread which handles the provider's processing needs. The thread should call `submit()` or `submit_batch()` when it has one or more spots to report.
 
-If you're extending the `HTTPProvider` class, you will need to provide a URI to query and an interval to the superclass constructor. You'll then need to implement the `http_response_to_spots()` method which is called when new data is retrieved. Your implementation should then call `submit()` or `submit_batch()` when it has one or more spots to report.
+If you're extending the `HTTPSpotProvider` class, you will need to provide a URI to query and an interval to the superclass constructor. You'll then need to implement the `http_response_to_spots()` method which is called when new data is retrieved. Your implementation should then call `submit()` or `submit_batch()` when it has one or more spots to report.
 
 When constructing spots, use the comments in the Spot class and the existing implementations as an example. All parameters are optional, but you will at least want to provide a `time` (which must be timezone-aware) and a `dx_call`.
 
-Finally, simply add the appropriate config to the `providers` section of `config.yml`, and your provider should be instantiated on startup.
+Finally, simply add the appropriate config to the `spot_providers` section of `config.yml`, and your provider should be instantiated on startup.
 
-### Thanks
+The same approach as above is also used for alert providers.
+
+## Thanks
 
 As well as being my work, I have also gratefully received feature patches from Steven, M1SDH.
 
-The project contains a self-hosted copy of Font Awesome's free library, in the `/webasset/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 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.
 
-Particular thanks go to QRZCQ country-files.com for providing country lookup data for amateur radio, and to the developers of `pyhamtools` for making it easy to use this data as well as QRZ.com and Clublog lookup.
+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.
 
 The project's name was suggested by Harm, DK4HAA. Thanks!

alertproviders/alert_provider.py

@@ -1,9 +1,8 @@
-from datetime import datetime, timedelta
+from datetime import datetime
 
 import pytz
 
-from core.config import SERVER_OWNER_CALLSIGN, MAX_ALERT_AGE
-from core.constants import SOFTWARE_NAME, SOFTWARE_VERSION
+from core.config import MAX_ALERT_AGE
 
 
 # Generic alert provider class. Subclasses of this query the individual APIs for alerts.

alertproviders/bota.py

@@ -2,8 +2,8 @@ from datetime import datetime, timedelta
 
 import pytz
 from bs4 import BeautifulSoup
+
 from alertproviders.http_alert_provider import HTTPAlertProvider
-from core.sig_utils import get_icon_for_sig
 from data.alert import Alert
 from data.sig_ref import SIGRef
 

alertproviders/parksnpeaks.py

@@ -4,7 +4,6 @@ from datetime import datetime
 import pytz
 
 from alertproviders.http_alert_provider import HTTPAlertProvider
-from core.sig_utils import get_icon_for_sig
 from data.alert import Alert
 from data.sig_ref import SIGRef
 

alertproviders/pota.py

@@ -3,7 +3,6 @@ from datetime import datetime
 import pytz
 
 from alertproviders.http_alert_provider import HTTPAlertProvider
-from core.sig_utils import get_icon_for_sig
 from data.alert import Alert
 from data.sig_ref import SIGRef
 

alertproviders/sota.py

@@ -3,7 +3,6 @@ from datetime import datetime
 import pytz
 
 from alertproviders.http_alert_provider import HTTPAlertProvider
-from core.sig_utils import get_icon_for_sig
 from data.alert import Alert
 from data.sig_ref import SIGRef
 

alertproviders/wota.py

@@ -4,7 +4,6 @@ import pytz
 from rss_parser import RSSParser
 
 from alertproviders.http_alert_provider import HTTPAlertProvider
-from core.sig_utils import get_icon_for_sig
 from data.alert import Alert
 from data.sig_ref import SIGRef
 

alertproviders/wwff.py

@@ -3,7 +3,6 @@ from datetime import datetime
 import pytz
 
 from alertproviders.http_alert_provider import HTTPAlertProvider
-from core.sig_utils import get_icon_for_sig
 from data.alert import Alert
 from data.sig_ref import SIGRef
 

config-example.yml

@@ -81,6 +81,18 @@ spot-providers:
     class: "UKPacketNet"
     name: "UK Packet Radio Net"
     enabled: false
+  -
+    class: "XOTA"
+    name: "39C3 TOTA"
+    enabled: false
+    url: "https://39c3.c3nav.de/"
+    # Fixed SIG/latitude/longitude for all spots from a provider is currently only a feature for the "XOTA" provider,
+    # the software found at https://github.com/nischu/xOTA/. This is because this is a generic backend for xOTA
+    # programmes and so different URLs provide different programmes.
+    sig: "TOTA"
+    latitude: 53.5622678
+    longitude: 9.9855205
+
 
 # Alert providers to use. Same setup as the spot providers list above.
 alert-providers:
@@ -135,4 +147,13 @@ hamqth-password: ""
 clublog-api-key: ""
 
 # Allow submitting spots to the Spothole API?
-allow-spotting: true
+allow-spotting: true
+
+# Options for the web UI.
+web-ui-options:
+  spot-count: [10, 25, 50, 100]
+  spot-count-default: 50
+  max-spot-age: [5, 10, 30, 60]
+  max-spot-age-default: 30
+  alert-count: [25, 50, 100, 200, 500]
+  alert-count-default: 100

core/cleanup.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import datetime, timedelta
+from datetime import datetime
 from threading import Timer
 from time import sleep
 
@@ -29,16 +29,27 @@ class CleanupTimer:
     # Perform cleanup and reschedule next timer
     def cleanup(self):
         try:
-            # Perform cleanup
+            # Perform cleanup via letting the data expire
             self.spots.expire()
             self.alerts.expire()
 
-            # Alerts can persist in the system for a while, so we want to explicitly clean up any alerts that have
-            # expired
+            # Explicitly clean up any spots and alerts that have expired
+            for id in list(self.spots.iterkeys()):
+                try:
+                    spot = self.spots[id]
+                    if spot.expired():
+                        self.spots.delete(id)
+                except KeyError:
+                    # Must have already been deleted, OK with that
+                    pass
             for id in list(self.alerts.iterkeys()):
-                alert = self.alerts[id]
-                if alert.expired():
-                    self.alerts.delete(id)
+                try:
+                    alert = self.alerts[id]
+                    if alert.expired():
+                        self.alerts.delete(id)
+                except KeyError:
+                    # Must have already been deleted, OK with that
+                    pass
 
             self.status = "OK"
             self.last_cleanup_time = datetime.now(pytz.UTC)

core/config.py

@@ -16,4 +16,5 @@ MAX_SPOT_AGE = config["max-spot-age-sec"]
 MAX_ALERT_AGE = config["max-alert-age-sec"]
 SERVER_OWNER_CALLSIGN = config["server-owner-callsign"]
 WEB_SERVER_PORT = config["web-server-port"]
-ALLOW_SPOTTING = config["allow-spotting"]
+ALLOW_SPOTTING = config["allow-spotting"]
+WEB_UI_OPTIONS = config["web-ui-options"]

core/lookup_helper.py

@@ -1,5 +1,7 @@
 import gzip
+import json
 import logging
+import re
 import urllib.parse
 from datetime import timedelta
 
@@ -14,7 +16,7 @@ from requests_cache import CachedSession
 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, \
-    QRZCQ_CALLSIGN_LOOKUP_DATA, HTTP_HEADERS, HAMQTH_PRG
+    HTTP_HEADERS, HAMQTH_PRG
 
 
 # Singleton class that provides lookup functionality.
@@ -46,6 +48,8 @@ class LookupHelper:
         self.CALL_INFO_BASIC = None
         self.LOOKUP_LIB_BASIC = None
         self.COUNTRY_FILES_CTY_PLIST_DOWNLOAD_LOCATION = None
+        self.DXCC_JSON_DOWNLOAD_LOCATION = None
+        self.DXCC_DATA = None
 
     def start(self):
         # Lookup helpers from pyhamtools. We use five (!) of these. The simplest is country-files.com, which downloads
@@ -84,6 +88,19 @@ class LookupHelper:
                                                         filename=self.CLUBLOG_XML_DOWNLOAD_LOCATION)
         self.CLUBLOG_CALLSIGN_DATA_CACHE = Cache('cache/clublog_callsign_lookup_cache')
 
+        # We also get a lookup of DXCC data from K0SWE to use for additional lookups of e.g. flags.
+        self.DXCC_JSON_DOWNLOAD_LOCATION = "cache/dxcc.json"
+        success = self.download_dxcc_json()
+        if success:
+            with open(self.DXCC_JSON_DOWNLOAD_LOCATION) as f:
+                tmp_dxcc_data = json.load(f)["dxcc"]
+                # Reformat as a map for faster lookup
+                self.DXCC_DATA = {}
+                for dxcc in tmp_dxcc_data:
+                    self.DXCC_DATA[dxcc["entityCode"]] = dxcc
+        else:
+            logging.error("Could not download DXCC data, flags and similar data may be missing!")
+
     # Download the cty.plist file from country-files.com on first startup. The pyhamtools lib can actually download and use
     # this itself, but it's occasionally offline which causes it to throw an error. By downloading it separately, we can
     # catch errors and handle them, falling back to a previous copy of the file in the cache, and we can use the
@@ -103,6 +120,22 @@ class LookupHelper:
             logging.error("Exception when downloading Clublog cty.xml", e)
             return False
 
+    # Download the dxcc.json file on first startup.
+    def download_dxcc_json(self):
+        try:
+            logging.info("Downloading dxcc.json...")
+            response = SEMI_STATIC_URL_DATA_CACHE.get("https://raw.githubusercontent.com/k0swe/dxcc-json/refs/heads/main/dxcc.json",
+                                                      headers=HTTP_HEADERS).text
+
+            with open(self.DXCC_JSON_DOWNLOAD_LOCATION, "w") as f:
+                f.write(response)
+                f.flush()
+                return True
+
+        except Exception as e:
+            logging.error("Exception when downloading dxcc.json", e)
+            return False
+
     # Download the cty.xml (gzipped) file from Clublog on first startup, so we can use it in preference to querying the
     # database live if possible.
     def download_clublog_ctyxml(self):
@@ -175,11 +208,11 @@ class LookupHelper:
             clublog_data = self.get_clublog_api_data_for_callsign(call)
             if clublog_data and "Name" in clublog_data:
                 country = clublog_data["Name"]
-        # Couldn't get anything from Clublog database, try QRZCQ data
+        # Couldn't get anything from Clublog database, try DXCC data
         if not country:
-            qrzcq_data = self.get_qrzcq_data_for_callsign(call)
-            if qrzcq_data and "country" in qrzcq_data:
-                country = qrzcq_data["country"]
+            dxcc_data = self.get_dxcc_data_for_callsign(call)
+            if dxcc_data and "name" in dxcc_data:
+                country = dxcc_data["name"]
         return country
 
     # Infer a DXCC ID from a callsign
@@ -208,11 +241,11 @@ class LookupHelper:
             clublog_data = self.get_clublog_api_data_for_callsign(call)
             if clublog_data and "DXCC" in clublog_data:
                 dxcc = clublog_data["DXCC"]
-        # Couldn't get anything from Clublog database, try QRZCQ data
+        # Couldn't get anything from Clublog database, try DXCC data
         if not dxcc:
-            qrzcq_data = self.get_qrzcq_data_for_callsign(call)
-            if qrzcq_data and "dxcc" in qrzcq_data:
-                dxcc = qrzcq_data["dxcc"]
+            dxcc_data = self.get_dxcc_data_for_callsign(call)
+            if dxcc_data and "entityCode" in dxcc_data:
+                dxcc = dxcc_data["entityCode"]
         return dxcc
 
     # Infer a continent shortcode from a callsign
@@ -236,11 +269,12 @@ class LookupHelper:
             clublog_data = self.get_clublog_api_data_for_callsign(call)
             if clublog_data and "Continent" in clublog_data:
                 continent = clublog_data["Continent"]
-        # Couldn't get anything from Clublog database, try QRZCQ data
+        # Couldn't get anything from Clublog database, try DXCC data
         if not continent:
-            qrzcq_data = self.get_qrzcq_data_for_callsign(call)
-            if qrzcq_data and "continent" in qrzcq_data:
-                continent = qrzcq_data["continent"]
+            dxcc_data = self.get_dxcc_data_for_callsign(call)
+            # Some DXCCs are in two continents, if so don't use the continent data as we can't be sure
+            if dxcc_data and "continent" in dxcc_data and len(dxcc_data["continent"]) == 1:
+                continent = dxcc_data["continent"][0]
         return continent
 
     # Infer a CQ zone from a callsign
@@ -269,11 +303,12 @@ class LookupHelper:
             clublog_data = self.get_clublog_api_data_for_callsign(call)
             if clublog_data and "CQZ" in clublog_data:
                 cqz = clublog_data["CQZ"]
-        # Couldn't get anything from Clublog database, try QRZCQ data
+        # Couldn't get anything from Clublog database, try DXCC data
         if not cqz:
-            qrzcq_data = self.get_qrzcq_data_for_callsign(call)
-            if qrzcq_data and "cqz" in qrzcq_data:
-                cqz = qrzcq_data["cqz"]
+            dxcc_data = self.get_dxcc_data_for_callsign(call)
+            # Some DXCCs are in multiple zones, if so don't use the zone data as we can't be sure
+            if dxcc_data and "cq" in dxcc_data and len(dxcc_data["cq"]) == 1:
+                cqz = dxcc_data["cq"][0]
         return cqz
 
     # Infer a ITU zone from a callsign
@@ -293,15 +328,20 @@ class LookupHelper:
             hamqth_data = self.get_hamqth_data_for_callsign(call)
             if hamqth_data and "itu" in hamqth_data:
                 ituz = hamqth_data["itu"]
-        # Couldn't get anything from HamQTH database, Clublog doesn't provide this, so try QRZCQ data
+        # Couldn't get anything from HamQTH database, Clublog doesn't provide this, so try DXCC data
         if not ituz:
-            qrzcq_data = self.get_qrzcq_data_for_callsign(call)
-            if qrzcq_data and "ituz" in qrzcq_data:
-                ituz = qrzcq_data["ituz"]
+            dxcc_data = self.get_dxcc_data_for_callsign(call)
+            # Some DXCCs are in multiple zones, if so don't use the zone data as we can't be sure
+            if dxcc_data and "itu" in dxcc_data and len(dxcc_data["itu"]) == 1:
+                ituz = dxcc_data["itu"]
         return ituz
 
+    # Get an emoji flag for a given DXCC entity ID
+    def get_flag_for_dxcc(self, dxcc):
+        return self.DXCC_DATA[dxcc]["flag"] if dxcc in self.DXCC_DATA else None
+
     # Infer an operator name from a callsign (requires QRZ.com/HamQTH)
-    def infer_name_from_callsign(self, call):
+    def infer_name_from_callsign_online_lookup(self, call):
         data = self.get_qrz_data_for_callsign(call)
         if data and "fname" in data:
             name = data["fname"]
@@ -315,27 +355,40 @@ class LookupHelper:
             return None
 
     # Infer a latitude and longitude from a callsign (requires QRZ.com/HamQTH)
-    def infer_latlon_from_callsign_qrz(self, call):
+    # Coordinates that look default are rejected (apologies if your position really is 0,0, enjoy your voyage)
+    def infer_latlon_from_callsign_online_lookup(self, call):
         data = self.get_qrz_data_for_callsign(call)
-        if data and "latitude" in data and "longitude" in data:
+        if data and "latitude" in data and "longitude" in data and (data["latitude"] != 0 or data["longitude"] != 0):
             return [data["latitude"], data["longitude"]]
         data = self.get_hamqth_data_for_callsign(call)
-        if data and "latitude" in data and "longitude" in data:
+        if data and "latitude" in data and "longitude" in data and (data["latitude"] != 0 or data["longitude"] != 0):
             return [data["latitude"], data["longitude"]]
         else:
             return None
 
-    # Infer a grid locator from a callsign (requires QRZ.com/HamQTH)
-    def infer_grid_from_callsign_qrz(self, call):
+    # Infer a grid locator from a callsign (requires QRZ.com/HamQTH).
+    # Grids that look default are rejected (apologies if your grid really is AA00aa, enjoy your research)
+    def infer_grid_from_callsign_online_lookup(self, call):
         data = self.get_qrz_data_for_callsign(call)
-        if data and "locator" in data:
+        if data and "locator" in data and data["locator"].upper() != "AA00" and data["locator"].upper() != "AA00AA" and data["locator"].upper() != "AA00AA00":
             return data["locator"]
         data = self.get_hamqth_data_for_callsign(call)
-        if data and "grid" in data:
+        if data and "grid" in data and data["grid"].upper() != "AA00" and data["grid"].upper() != "AA00AA" and data["grid"].upper() != "AA00AA00":
             return data["grid"]
         else:
             return None
 
+    # Infer a textual QTH from a callsign (requires QRZ.com/HamQTH)
+    def infer_qth_from_callsign_online_lookup(self, call):
+        data = self.get_qrz_data_for_callsign(call)
+        if data and "addr2" in data:
+            return data["addr2"]
+        data = self.get_hamqth_data_for_callsign(call)
+        if data and "qth" in data:
+            return data["qth"]
+        else:
+            return None
+
     # Infer a latitude and longitude from a callsign (using DXCC, probably very inaccurate)
     def infer_latlon_from_callsign_dxcc(self, call):
         try:
@@ -365,7 +418,20 @@ class LookupHelper:
     # Infer a mode from the frequency (in Hz) according to the band plan. Just a guess really.
     def infer_mode_from_frequency(self, freq):
         try:
-            return freq_to_band(freq / 1000.0)["mode"]
+            khz = freq / 1000.0
+            mode = freq_to_band(khz)["mode"]
+            # Some additional common digimode ranges in addition to what the 3rd-party freq_to_band function returns.
+            # This is mostly here just because freq_to_band is very specific about things like FT8 frequencies, and e.g.
+            # a spot at 7074.5 kHz will be indicated as LSB, even though it's clearly in the FT8 range. Future updates
+            # might include other common digimode centres of activity here, but this achieves the main goal of keeping
+            # large numbers of clearly-FT* spots off the list of people filtering out digimodes.
+            if (7074 <= khz < 7077) or (10136 <= khz < 10139) or (14074 <= khz < 14077) or (18100 <= khz < 18103) or (
+                    21074 <= khz < 21077) or (24915 <= khz < 24918) or (28074 <= khz < 28077):
+                mode = "FT8"
+            if (7047.5 <= khz < 7050.5) or (10140 <= khz < 10143) or (14080 <= khz < 14083) or (
+                    18104 <= khz < 18107) or (21140 <= khz < 21143) or (24919 <= khz < 24922) or (28180 <= khz < 28183):
+                mode = "FT4"
+            return mode
         except KeyError:
             return None
 
@@ -389,6 +455,11 @@ class LookupHelper:
                     # QRZ had no info for the call, that's OK. Cache a None so we don't try to look this up again
                     self.QRZ_CALLSIGN_DATA_CACHE.add(call, None, expire=604800)  # 1 week in seconds
                     return None
+            except (Exception):
+                # General exception like a timeout when communicating with QRZ. Return None this time, but don't cache
+                # that, so we can try again next time.
+                logging.error("Exception when looking up QRZ data")
+                return None
         else:
             return None
 
@@ -475,11 +546,10 @@ class LookupHelper:
         else:
             return None
 
-    # Utility method to get QRZCQ data from our constants table, if we can find it
-    def get_qrzcq_data_for_callsign(self, call):
-        # Iterate in reverse order - see comments on the data structure itself
-        for entry in reversed(QRZCQ_CALLSIGN_LOOKUP_DATA):
-            if call.startswith(entry["prefix"]):
+    # Utility method to get generic DXCC data from our lookup table, if we can find it
+    def get_dxcc_data_for_callsign(self, call):
+        for entry in self.DXCC_DATA.values():
+            if re.match(entry["prefixRegex"], call):
                 return entry
         return None
 

core/sig_utils.py

@@ -1,4 +1,5 @@
 import csv
+import logging
 
 from pyhamtools.locator import latlong_to_locator
 
@@ -28,89 +29,109 @@ def get_ref_regex_for_sig(sig):
 # Note there is currently no support for KRMNPA location lookup, see issue #61.
 def get_sig_ref_info(sig, sig_ref_id):
     sig_ref = SIGRef(id=sig_ref_id, sig=sig)
-    if sig.upper() == "POTA":
-        data = SEMI_STATIC_URL_DATA_CACHE.get("https://api.pota.app/park/" + sig_ref_id, headers=HTTP_HEADERS).json()
-        if data:
-            fullname = data["name"] if "name" in data else None
-            if fullname and "parktypeDesc" in data and data["parktypeDesc"] != "":
-                fullname = fullname + " " + data["parktypeDesc"]
-            sig_ref.name = fullname
-            sig_ref.url = "https://pota.app/#/park/" + sig_ref_id
-            sig_ref.grid = data["grid6"] if "grid6" in data else None
-            sig_ref.latitude = data["latitude"] if "latitude" in data else None
-            sig_ref.longitude = data["longitude"] if "longitude" in data else None
-    elif sig.upper() == "SOTA":
-        data = SEMI_STATIC_URL_DATA_CACHE.get("https://api-db2.sota.org.uk/api/summits/" + sig_ref_id,
-                                              headers=HTTP_HEADERS).json()
-        if data:
-            sig_ref.name = data["name"] if "name" in data else None
-            sig_ref.url = "https://www.sotadata.org.uk/en/summit/" + sig_ref_id
-            sig_ref.grid = data["locator"] if "locator" in data else None
-            sig_ref.latitude = data["latitude"] if "latitude" in data else None
-            sig_ref.longitude = data["longitude"] if "longitude" in data else None
-    elif sig.upper() == "WWBOTA":
-        data = SEMI_STATIC_URL_DATA_CACHE.get("https://api.wwbota.org/bunkers/" + sig_ref_id,
-                                              headers=HTTP_HEADERS).json()
-        if data:
-            sig_ref.name = data["name"] if "name" in data else None
-            sig_ref.url = "https://bunkerwiki.org/?s=" + sig_ref_id if sig_ref_id.startswith("B/G") else None
-            sig_ref.grid = data["locator"] if "locator" in data else None
-            sig_ref.latitude = data["lat"] if "lat" in data else None
-            sig_ref.longitude = data["long"] if "long" in data else None
-    elif sig.upper() == "GMA" or sig.upper() == "ARLHS" or sig.upper() == "ILLW" or sig.upper() == "WCA" or sig.upper() == "MOTA" or sig.upper() == "IOTA":
-        data = SEMI_STATIC_URL_DATA_CACHE.get("https://www.cqgma.org/api/ref/?" + sig_ref_id,
-                                              headers=HTTP_HEADERS).json()
-        if data:
-            sig_ref.name = data["name"] if "name" in data else None
-            sig_ref.url = "https://www.cqgma.org/zinfo.php?ref=" + sig_ref_id
-            sig_ref.grid = data["locator"] if "locator" in data else None
-            sig_ref.latitude = data["latitude"] if "latitude" in data else None
-            sig_ref.longitude = data["longitude"] if "longitude" in data else None
-    elif sig.upper() == "WWFF":
-        sig_ref.url = "https://wwff.co/directory/?showRef=" + sig_ref_id
-    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"] == sig_ref_id:
-                sig_ref.name = row["NAME"] if "NAME" in row else None
-                sig_ref.grid = row["LOCATOR"] if "LOCATOR" in row else None
-                sig_ref.latitude = float(row["LAT"]) if "LAT" in row else None
-                sig_ref.longitude = float(row["LNG"]) if "LNG" in row else None
-    elif sig.upper() == "WOTA":
-        data = SEMI_STATIC_URL_DATA_CACHE.get("https://www.wota.org.uk/mapping/data/summits.json",
-                                              headers=HTTP_HEADERS).json()
-        if data:
-            for feature in data["features"]:
-                if feature["properties"]["wotaId"] == sig_ref_id:
-                    sig_ref.name = feature["properties"]["title"]
-                    sig_ref.url = "https://www.wota.org.uk/MM_" + sig_ref_id
-                    sig_ref.grid = feature["properties"]["qthLocator"]
-                    sig_ref.latitude = feature["geometry"]["coordinates"][1]
-                    sig_ref.longitude = feature["geometry"]["coordinates"][0]
-    elif sig.upper() == "ZLOTA":
-        data = SEMI_STATIC_URL_DATA_CACHE.get("https://ontheair.nz/assets/assets.json", headers=HTTP_HEADERS).json()
-        if data:
-            for asset in data:
-                if asset["code"] == sig_ref_id:
-                    sig_ref.name = asset["name"]
-                    sig_ref.url = "https://ontheair.nz/assets/ZLI_OT-030" + sig_ref_id.replace("/", "_")
-                    sig_ref.grid = latlong_to_locator(asset["y"], asset["x"], 6)
-                    sig_ref.latitude = asset["y"]
-                    sig_ref.longitude = asset["x"]
-    elif sig.upper() == "BOTA":
-        if not sig_ref.name:
-            sig_ref.name = sig_ref.id
-        sig_ref.url = "https://www.beachesontheair.com/beaches/" + sig_ref.name.lower().replace(" ", "-")
-    elif sig.upper() == "WAB" or sig.upper() == "WAI":
-        ll = wab_wai_square_to_lat_lon(sig_ref_id)
-        if ll:
-            sig_ref.name = sig_ref_id
-            sig_ref.grid = latlong_to_locator(ll[0], ll[1], 6)
-            sig_ref.latitude = ll[0]
-            sig_ref.longitude = ll[1]
-
+    try:
+        if sig.upper() == "POTA":
+            data = SEMI_STATIC_URL_DATA_CACHE.get("https://api.pota.app/park/" + sig_ref_id, headers=HTTP_HEADERS).json()
+            if data:
+                fullname = data["name"] if "name" in data else None
+                if fullname and "parktypeDesc" in data and data["parktypeDesc"] != "":
+                    fullname = fullname + " " + data["parktypeDesc"]
+                sig_ref.name = fullname
+                sig_ref.url = "https://pota.app/#/park/" + sig_ref_id
+                sig_ref.grid = data["grid6"] if "grid6" in data else None
+                sig_ref.latitude = data["latitude"] if "latitude" in data else None
+                sig_ref.longitude = data["longitude"] if "longitude" in data else None
+        elif sig.upper() == "SOTA":
+            data = SEMI_STATIC_URL_DATA_CACHE.get("https://api-db2.sota.org.uk/api/summits/" + sig_ref_id,
+                                                  headers=HTTP_HEADERS).json()
+            if data:
+                sig_ref.name = data["name"] if "name" in data else None
+                sig_ref.url = "https://www.sotadata.org.uk/en/summit/" + sig_ref_id
+                sig_ref.grid = data["locator"] if "locator" in data else None
+                sig_ref.latitude = data["latitude"] if "latitude" in data else None
+                sig_ref.longitude = data["longitude"] if "longitude" in data else None
+        elif sig.upper() == "WWBOTA":
+            data = SEMI_STATIC_URL_DATA_CACHE.get("https://api.wwbota.org/bunkers/" + sig_ref_id,
+                                                  headers=HTTP_HEADERS).json()
+            if data:
+                sig_ref.name = data["name"] if "name" in data else None
+                sig_ref.url = "https://bunkerwiki.org/?s=" + sig_ref_id if sig_ref_id.startswith("B/G") else None
+                sig_ref.grid = data["locator"] if "locator" in data else None
+                sig_ref.latitude = data["lat"] if "lat" in data else None
+                sig_ref.longitude = data["long"] if "long" in data else None
+        elif sig.upper() == "GMA" or sig.upper() == "ARLHS" or sig.upper() == "ILLW" or sig.upper() == "WCA" or sig.upper() == "MOTA" or sig.upper() == "IOTA":
+            data = SEMI_STATIC_URL_DATA_CACHE.get("https://www.cqgma.org/api/ref/?" + sig_ref_id,
+                                                  headers=HTTP_HEADERS).json()
+            if data:
+                sig_ref.name = data["name"] if "name" in data else None
+                sig_ref.url = "https://www.cqgma.org/zinfo.php?ref=" + sig_ref_id
+                sig_ref.grid = data["locator"] if "locator" in data else None
+                sig_ref.latitude = data["latitude"] if "latitude" in data else None
+                sig_ref.longitude = data["longitude"] if "longitude" in data else None
+        elif sig.upper() == "WWFF":
+            wwff_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"] == sig_ref_id:
+                    sig_ref.name = row["name"] if "name" in row else None
+                    sig_ref.url = "https://wwff.co/directory/?showRef=" + sig_ref_id
+                    sig_ref.grid = row["iaruLocator"] if "iaruLocator" in row else None
+                    sig_ref.latitude = float(row["latitude"]) if "latitude" in row else None
+                    sig_ref.longitude = float(row["longitude"]) if "longitude" in row else None
+                    break
+        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"] == sig_ref_id:
+                    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()
+            if data:
+                for feature in data["features"]:
+                    if feature["properties"]["wotaId"] == sig_ref_id:
+                        sig_ref.name = feature["properties"]["title"]
+                        # Fudge WOTA URLs. Outlying fell (LDO) URLs don't match their ID numbers but require 214 to be
+                        # added to them
+                        sig_ref.url = "https://www.wota.org.uk/MM_" + sig_ref_id
+                        if sig_ref_id.upper().startswith("LDO-"):
+                            number = int(sig_ref_id.upper().replace("LDO-", ""))
+                            sig_ref.url = "https://www.wota.org.uk/MM_LDO-" + str(number + 214)
+                        sig_ref.grid = feature["properties"]["qthLocator"]
+                        sig_ref.latitude = feature["geometry"]["coordinates"][1]
+                        sig_ref.longitude = feature["geometry"]["coordinates"][0]
+                        break
+        elif sig.upper() == "ZLOTA":
+            data = SEMI_STATIC_URL_DATA_CACHE.get("https://ontheair.nz/assets/assets.json", headers=HTTP_HEADERS).json()
+            if data:
+                for asset in data:
+                    if asset["code"] == sig_ref_id:
+                        sig_ref.name = asset["name"]
+                        sig_ref.url = "https://ontheair.nz/assets/ZLI_OT-030" + sig_ref_id.replace("/", "_")
+                        sig_ref.grid = latlong_to_locator(asset["y"], asset["x"], 6)
+                        sig_ref.latitude = asset["y"]
+                        sig_ref.longitude = asset["x"]
+                        break
+        elif sig.upper() == "BOTA":
+            if not sig_ref.name:
+                sig_ref.name = sig_ref.id
+            sig_ref.url = "https://www.beachesontheair.com/beaches/" + sig_ref.name.lower().replace(" ", "-")
+        elif sig.upper() == "WAB" or sig.upper() == "WAI":
+            ll = wab_wai_square_to_lat_lon(sig_ref_id)
+            if ll:
+                sig_ref.name = sig_ref_id
+                sig_ref.grid = latlong_to_locator(ll[0], ll[1], 6)
+                sig_ref.latitude = ll[0]
+                sig_ref.longitude = ll[1]
+    except:
+        logging.warn("Failed to look up sig_ref info for " + sig + " ref " + sig_ref_id + ".")
     return sig_ref
 
 

data/alert.py

@@ -6,7 +6,6 @@ from datetime import datetime, timedelta
 
 import pytz
 
-from core.constants import DXCC_FLAGS
 from core.lookup_helper import lookup_helper
 from core.sig_utils import get_icon_for_sig, get_sig_ref_info
 
@@ -95,8 +94,8 @@ class Alert:
             self.dx_itu_zone = lookup_helper.infer_itu_zone_from_callsign(self.dx_calls[0])
         if self.dx_calls and self.dx_calls[0] and not self.dx_dxcc_id:
             self.dx_dxcc_id = lookup_helper.infer_dxcc_id_from_callsign(self.dx_calls[0])
-        if self.dx_dxcc_id and self.dx_dxcc_id in DXCC_FLAGS and not self.dx_flag:
-            self.dx_flag = DXCC_FLAGS[self.dx_dxcc_id]
+        if self.dx_dxcc_id and not self.dx_flag:
+            self.dx_flag = lookup_helper.get_flag_for_dxcc(self.dx_dxcc_id)
 
         # Fetch SIG data. In case a particular API doesn't provide a full set of name, lat, lon & grid for a reference
         # in its initial call, we use this code to populate the rest of the data. This includes working out grid refs
@@ -121,7 +120,7 @@ class Alert:
         # the actual alertting service, e.g. we don't want to accidentally use a user's QRZ.com home lat/lon instead of
         # the one from the park reference they're at.
         if self.dx_calls and not self.dx_names:
-            self.dx_names = list(map(lambda c: lookup_helper.infer_name_from_callsign(c), self.dx_calls))
+            self.dx_names = list(map(lambda c: lookup_helper.infer_name_from_callsign_online_lookup(c), self.dx_calls))
 
         # Always create an ID based on a hash of every parameter *except* received_time. This is used as the index
         # to a map, which as a byproduct avoids us having multiple duplicate copies of the object that are identical
@@ -138,7 +137,7 @@ class Alert:
         return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True)
 
     # Decide if this alert has expired (in which case it should not be added to the system in the first place, and not
-    # returned by the web server if later requested, and removed by the cleanup functions. "Expired" is defined as
+    # returned by the web server if later requested, and removed by the cleanup functions). "Expired" is defined as
     # either having an end_time in the past, or if it only has a start_time, then that start time was more than 3 hours
     # ago. If it somehow doesn't have a start_time either, it is considered to be expired.
     def expired(self):

data/spot.py

@@ -4,12 +4,12 @@ import json
 import logging
 import re
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timedelta
 
 import pytz
 from pyhamtools.locator import locator_to_latlong, latlong_to_locator
 
-from core.constants import DXCC_FLAGS
+from core.config import MAX_SPOT_AGE
 from core.lookup_helper import lookup_helper
 from core.sig_utils import get_icon_for_sig, get_sig_ref_info, ANY_SIG_REGEX, get_ref_regex_for_sig
 from data.sig_ref import SIGRef
@@ -27,6 +27,9 @@ class Spot:
     dx_call: str = None
     # Name of the operator that has been spotted
     dx_name: str = None
+    # QTH of the operator that has been spotted. This could be from any SIG refs or could be from online lookup of their
+    # home QTH.
+    dx_qth: str = None
     # Country of the DX operator
     dx_country: str = None
     # Country flag of the DX operator
@@ -171,8 +174,8 @@ class Spot:
             self.dx_itu_zone = lookup_helper.infer_itu_zone_from_callsign(self.dx_call)
         if self.dx_call and not self.dx_dxcc_id:
             self.dx_dxcc_id = lookup_helper.infer_dxcc_id_from_callsign(self.dx_call)
-        if self.dx_dxcc_id and self.dx_dxcc_id in DXCC_FLAGS and not self.dx_flag:
-            self.dx_flag = DXCC_FLAGS[self.dx_dxcc_id]
+        if self.dx_dxcc_id and not self.dx_flag:
+            self.dx_flag = lookup_helper.get_flag_for_dxcc(self.dx_dxcc_id)
 
         # Clean up spotter call if it has an SSID or -# from RBN
         if self.de_call and "-" in self.de_call:
@@ -204,8 +207,8 @@ class Spot:
                 self.de_continent = lookup_helper.infer_continent_from_callsign(self.de_call)
             if not self.de_dxcc_id:
                 self.de_dxcc_id = lookup_helper.infer_dxcc_id_from_callsign(self.de_call)
-            if self.de_dxcc_id and self.de_dxcc_id in DXCC_FLAGS and not self.de_flag:
-                self.de_flag = DXCC_FLAGS[self.de_dxcc_id]
+            if self.de_dxcc_id and not self.de_flag:
+                self.de_flag = lookup_helper.get_flag_for_dxcc(self.de_dxcc_id)
 
         # Band from frequency
         if self.freq and not self.band:
@@ -237,13 +240,19 @@ class Spot:
         if self.dx_latitude:
             self.dx_location_source = "SPOT"
 
+        # Set the top-level "SIG" if it is missing but we have at least one SIG ref.
+        if not self.sig and self.sig_refs and len(self.sig_refs) > 0:
+            self.sig = self.sig_refs[0].sig.upper()
+
         # See if we already have a SIG reference, but the comment looks like it contains more for the same SIG. This
         # should catch e.g. POTA comments like "2-fer: GB-0001 GB-0002".
-        if self.comment and self.sig_refs and len(self.sig_refs) > 0:
+        if self.comment and self.sig_refs and len(self.sig_refs) > 0 and self.sig_refs[0].sig:
             sig = self.sig_refs[0].sig.upper()
-            all_comment_refs = re.findall(get_ref_regex_for_sig(sig), self.comment)
-            for ref in all_comment_refs:
-                self.append_sig_ref_if_missing(SIGRef(id=ref.upper(), sig=sig))
+            regex = get_ref_regex_for_sig(sig)
+            if regex:
+                all_comment_ref_matches = re.finditer(r"(^|\W)(" + regex + r")(^|\W)", self.comment, re.IGNORECASE)
+                for ref_match in all_comment_ref_matches:
+                    self.append_sig_ref_if_missing(SIGRef(id=ref_match.group(2).upper(), sig=sig))
 
         # See if the comment looks like it contains any SIGs (and optionally SIG references) that we can
         # add to the spot. This should catch cluster spot comments like "POTA GB-0001 WWFF GFF-0001" and e.g. POTA
@@ -294,6 +303,10 @@ class Spot:
         if self.sig:
             self.icon = get_icon_for_sig(self.sig)
 
+        # Default "radio" icon if nothing else has set it
+        if not self.icon:
+            self.icon = "tower-cell"
+
         # DX Grid to lat/lon and vice versa in case one is missing
         if self.dx_grid and not self.dx_latitude:
             ll = locator_to_latlong(self.dx_grid)
@@ -313,15 +326,24 @@ class Spot:
         # the actual spotting service, e.g. we don't want to accidentally use a user's QRZ.com home lat/lon instead of
         # the one from the park reference they're at.
         if self.dx_call and not self.dx_name:
-            self.dx_name = lookup_helper.infer_name_from_callsign(self.dx_call)
+            self.dx_name = lookup_helper.infer_name_from_callsign_online_lookup(self.dx_call)
         if self.dx_call and not self.dx_latitude:
-            latlon = lookup_helper.infer_latlon_from_callsign_qrz(self.dx_call)
+            latlon = lookup_helper.infer_latlon_from_callsign_online_lookup(self.dx_call)
             if latlon:
                 self.dx_latitude = latlon[0]
                 self.dx_longitude = latlon[1]
-            self.dx_grid = lookup_helper.infer_grid_from_callsign_qrz(self.dx_call)
+            self.dx_grid = lookup_helper.infer_grid_from_callsign_online_lookup(self.dx_call)
             self.dx_location_source = "HOME QTH"
 
+        # Determine a "QTH" string. If we have a SIG ref, pick the first one and turn it into a suitable stirng,
+        # otherwise see what they have set on an online lookup service.
+        if self.sig_refs and len(self.sig_refs) > 0:
+            self.dx_qth = self.sig_refs[0].id
+            if self.sig_refs[0].name:
+                self.dx_qth = self.dx_qth + " " + self.sig_refs[0].name
+        else:
+            self.dx_qth = lookup_helper.infer_qth_from_callsign_online_lookup(self.dx_call)
+
         # Last resort for getting a DX position, use the DXCC entity.
         if self.dx_call and not self.dx_latitude:
             latlon = lookup_helper.infer_latlon_from_callsign_dxcc(self.dx_call)
@@ -333,19 +355,20 @@ class Spot:
 
         # DX Location is "good" if it is from a spot, or from QRZ if the callsign doesn't contain a slash, so the operator
         # is likely at home.
-        self.dx_location_good = (self.dx_location_source == "SPOT" or self.dx_location_source == "SIG REF LOOKUP"
-                                 or self.dx_location_source == "WAB/WAI GRID"
-                                 or (self.dx_location_source == "HOME QTH" and not "/" in self.dx_call))
+        self.dx_location_good = self.dx_latitude and self.dx_longitude and (
+                    self.dx_location_source == "SPOT" or self.dx_location_source == "SIG REF LOOKUP"
+                    or self.dx_location_source == "WAB/WAI GRID"
+                    or (self.dx_location_source == "HOME QTH" and not "/" in self.dx_call))
 
         # DE with no digits and APRS servers starting "T2" are not things we can look up location for
         if self.de_call and any(char.isdigit() for char in self.de_call) and not (self.de_call.startswith("T2") and self.source == "APRS-IS"):
             # DE operator position lookup, using QRZ.com.
             if not self.de_latitude:
-                latlon = lookup_helper.infer_latlon_from_callsign_qrz(self.de_call)
+                latlon = lookup_helper.infer_latlon_from_callsign_online_lookup(self.de_call)
                 if latlon:
                     self.de_latitude = latlon[0]
                     self.de_longitude = latlon[1]
-                self.de_grid = lookup_helper.infer_grid_from_callsign_qrz(self.de_call)
+                self.de_grid = lookup_helper.infer_grid_from_callsign_online_lookup(self.de_call)
 
             # Last resort for getting a DE position, use the DXCC entity.
             if not self.de_latitude:
@@ -365,7 +388,7 @@ class Spot:
         self_copy.received_time_iso = ""
         self.id = hashlib.sha256(str(self_copy).encode("utf-8")).hexdigest()
 
-    # JSON serialise
+    # JSON sspoterialise
     def to_json(self):
         return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True)
 
@@ -373,7 +396,18 @@ class Spot:
     def append_sig_ref_if_missing(self, new_sig_ref):
         if not self.sig_refs:
             self.sig_refs = []
+        new_sig_ref.id = new_sig_ref.id.strip().upper()
+        new_sig_ref.sig = new_sig_ref.sig.strip().upper()
+        if new_sig_ref.id == "":
+            return
         for sig_ref in self.sig_refs:
-            if sig_ref.id.upper() == new_sig_ref.id.upper() and sig_ref.sig.upper() == new_sig_ref.sig.upper():
+            if sig_ref.id == new_sig_ref.id and sig_ref.sig == new_sig_ref.sig:
                 return
         self.sig_refs.append(new_sig_ref)
+
+    # Decide if this spot has expired (in which case it should not be added to the system in the first place, and not
+    # returned by the web server if later requested, and removed by the cleanup functions). "Expired" is defined as
+    # either having a time further ago than the server's MAX_SPOT_AGE. If it somehow doesn't have a time either, it is
+    # considered to be expired.
+    def expired(self):
+        return not self.time or self.time < (datetime.now(pytz.UTC) - timedelta(seconds=MAX_SPOT_AGE)).timestamp()

server/webserver.py

@@ -8,7 +8,7 @@ import bottle
 import pytz
 from bottle import run, request, response, template
 
-from core.config import MAX_SPOT_AGE, ALLOW_SPOTTING
+from core.config import MAX_SPOT_AGE, ALLOW_SPOTTING, WEB_UI_OPTIONS
 from core.constants import BANDS, ALL_MODES, MODE_TYPES, SIGS, CONTINENTS, SOFTWARE_VERSION, UNKNOWN_BAND
 from core.lookup_helper import lookup_helper
 from core.prometheus_metrics_handler import page_requests_counter, get_metrics, api_requests_counter
@@ -127,6 +127,7 @@ class WebServer:
             return self.serve_api({
                 "call": call,
                 "name": fake_spot.dx_name,
+                "qth": fake_spot.dx_qth,
                 "country": fake_spot.dx_country,
                 "flag": fake_spot.dx_flag,
                 "continent": fake_spot.dx_continent,
@@ -267,8 +268,6 @@ class WebServer:
 
             # infer missing data, and add it to our database.
             spot.source = "API"
-            if not spot.sig:
-                spot.icon = "desktop"
             spot.infer_missing()
             self.spots.add(spot.id, spot, expire=MAX_SPOT_AGE)
 
@@ -337,11 +336,14 @@ class WebServer:
                     sources = query.get(k).split(",")
                     spots = [s for s in spots if s.source and s.source in sources]
                 case "sig":
-                    # If a list of sigs is provided, the spot must have a sig and it must match one of them
+                    # If a list of sigs is provided, the spot must have a sig and it must match one of them.
+                    # The special "sig" "NO_SIG", when supplied in the list, mathches spots with no sig.
                     sigs = query.get(k).split(",")
-                    spots = [s for s in spots if s.sig and s.sig in sigs]
+                    include_no_sig = "NO_SIG" in sigs
+                    spots = [s for s in spots if (s.sig and s.sig in sigs) or (include_no_sig and not s.sig)]
                 case "needs_sig":
-                    # If true, a sig is required, regardless of what it is, it just can't be missing.
+                    # If true, a sig is required, regardless of what it is, it just can't be missing. Mutually
+                    # exclusive with supplying the special "NO_SIG" parameter to the "sig" query param.
                     needs_sig = query.get(k).upper() == "TRUE"
                     if needs_sig:
                         spots = [s for s in spots if s.sig]
@@ -420,7 +422,6 @@ class WebServer:
             if a is not None:
                 alerts.append(a)
         # We never want alerts that seem to be in the past
-        alerts = list(filter(lambda alert: not alert.expired(), alerts))
         alerts = sorted(alerts, key=lambda alert: (alert.start_time if alert and alert.start_time else 0))
         for k in query.keys():
             match k:
@@ -440,8 +441,11 @@ class WebServer:
                     sources = query.get(k).split(",")
                     alerts = [a for a in alerts if a.source and a.source in sources]
                 case "sig":
+                    # If a list of sigs is provided, the alert must have a sig and it must match one of them.
+                    # The special "sig" "NO_SIG", when supplied in the list, mathches alerts with no sig.
                     sigs = query.get(k).split(",")
-                    alerts = [a for a in alerts if a.sig and a.sig in sigs]
+                    include_no_sig = "NO_SIG" in sigs
+                    spots = [a for a in alerts if (a.sig and a.sig in sigs) or (include_no_sig and not a.sig)]
                 case "dx_continent":
                     dxconts = query.get(k).split(",")
                     alerts = [a for a in alerts if a.dx_continent and a.dx_continent in dxconts]
@@ -468,7 +472,8 @@ class WebServer:
                     map(lambda p: p["name"], filter(lambda p: p["enabled"], self.status_data["alert_providers"]))),
                 "continents": CONTINENTS,
                 "max_spot_age": MAX_SPOT_AGE,
-                "spot_allowed": ALLOW_SPOTTING}
+                "spot_allowed": ALLOW_SPOTTING,
+                "web-ui-options": WEB_UI_OPTIONS}
         # If spotting to this server is enabled, "API" is another valid spot source even though it does not come from
         # one of our proviers.
         if ALLOW_SPOTTING:

spotproviders/dxcluster.py

@@ -72,7 +72,7 @@ class DXCluster(SpotProvider):
                                     de_call=match.group(1),
                                     freq=float(match.group(2)) * 1000,
                                     comment=match.group(4).strip(),
-                                    icon="desktop",
+                                    icon="tower-cell",
                                     time=spot_datetime.timestamp())
 
                         # Add to our list

spotproviders/gma.py

@@ -5,7 +5,6 @@ import pytz
 
 from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.constants import HTTP_HEADERS
-from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
@@ -42,35 +41,47 @@ class GMA(HTTPSpotProvider):
                         dx_longitude=float(source_spot["LON"]) if (source_spot["LON"] and source_spot["LON"] != "") else None)
 
             # GMA doesn't give what programme (SIG) the reference is for until we separately look it up.
-            ref_response = SEMI_STATIC_URL_DATA_CACHE.get(self.REF_INFO_URL_ROOT + source_spot["REF"],
-                                                   headers=HTTP_HEADERS)
-            # Sometimes this is blank, so handle that
-            if ref_response.text is not None and ref_response.text != "":
-                ref_info = ref_response.json()
-                # If this is POTA, SOTA or WWFF data we already have it through other means, so ignore. POTA and WWFF
-                # spots come through with reftype=POTA or reftype=WWFF. SOTA is harder to figure out because both SOTA
-                # and GMA summits come through with reftype=Summit, so we must check for the presence of a "sota" entry
-                # to determine if it's a SOTA summit.
-                if ref_info["reftype"] not in ["POTA", "WWFF"] and (ref_info["reftype"] != "Summit" or ref_info["sota"] == ""):
-                    match ref_info["reftype"]:
-                        case "Summit":
-                            spot.sig_refs[0].sig = "GMA"
-                        case "IOTA Island":
-                            spot.sig_refs[0].sig = "IOTA"
-                        case "Lighthouse (ILLW)":
-                            spot.sig_refs[0].sig = "ILLW"
-                        case "Lighthouse (ARLHS)":
-                            spot.sig_refs[0].sig = "ARLHS"
-                        case "Castle":
-                            spot.sig_refs[0].sig = "WCA"
-                        case "Mill":
-                            spot.sig_refs[0].sig = "MOTA"
-                        case _:
-                            logging.warn("GMA spot found with ref type " + ref_info[
-                                "reftype"] + ", developer needs to add support for this!")
-                            spot.sig_refs[0].sig = ref_info["reftype"]
+            if "REF" in source_spot:
+                try:
+                    ref_response = SEMI_STATIC_URL_DATA_CACHE.get(self.REF_INFO_URL_ROOT + source_spot["REF"],
+                                                                  headers=HTTP_HEADERS)
+                    # Sometimes this is blank, so handle that
+                    if ref_response.text is not None and ref_response.text != "":
+                        ref_info = ref_response.json()
+                        # If this is POTA, SOTA or WWFF data we already have it through other means, so ignore. POTA and WWFF
+                        # spots come through with reftype=POTA or reftype=WWFF. SOTA is harder to figure out because both SOTA
+                        # and GMA summits come through with reftype=Summit, so we must check for the presence of a "sota" entry
+                        # to determine if it's a SOTA summit.
+                        if "reftype" in ref_info and ref_info["reftype"] not in ["POTA", "WWFF"] and (
+                                ref_info["reftype"] != "Summit" or ref_info["sota"] == ""):
+                            match ref_info["reftype"]:
+                                case "Summit":
+                                    spot.sig_refs[0].sig = "GMA"
+                                    spot.sig = "GMA"
+                                case "IOTA Island":
+                                    spot.sig_refs[0].sig = "IOTA"
+                                    spot.sig = "IOTA"
+                                case "Lighthouse (ILLW)":
+                                    spot.sig_refs[0].sig = "ILLW"
+                                    spot.sig = "ILLW"
+                                case "Lighthouse (ARLHS)":
+                                    spot.sig_refs[0].sig = "ARLHS"
+                                    spot.sig = "ARLHS"
+                                case "Castle":
+                                    spot.sig_refs[0].sig = "WCA"
+                                    spot.sig = "WCA"
+                                case "Mill":
+                                    spot.sig_refs[0].sig = "MOTA"
+                                    spot.sig = "MOTA"
+                                case _:
+                                    logging.warn("GMA spot found with ref type " + ref_info[
+                                        "reftype"] + ", developer needs to add support for this!")
+                                    spot.sig_refs[0].sig = ref_info["reftype"]
+                                    spot.sig = ref_info["reftype"]
 
-                    # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
-                    # that for us.
-                    new_spots.append(spot)
+                            # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
+                            # that for us.
+                            new_spots.append(spot)
+                except:
+                    logging.warn("Exception when looking up " + self.REF_INFO_URL_ROOT + source_spot["REF"] + ", ignoring this spot for now")
         return new_spots

spotproviders/hema.py

@@ -5,7 +5,6 @@ import pytz
 import requests
 
 from core.constants import HTTP_HEADERS
-from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
@@ -53,6 +52,7 @@ class HEMA(HTTPSpotProvider):
                                 freq=float(freq_mode_match.group(1)) * 1000000,
                                 mode=freq_mode_match.group(2).upper(),
                                 comment=spotter_comment_match.group(2),
+                                sig="HEMA",
                                 sig_refs=[SIGRef(id=spot_items[3].upper(), sig="HEMA", name=spot_items[4])],
                                 time=datetime.strptime(spot_items[0], "%d/%m/%Y %H:%M").replace(tzinfo=pytz.UTC).timestamp(),
                                 dx_latitude=float(spot_items[7]),

spotproviders/parksnpeaks.py

@@ -4,7 +4,6 @@ from datetime import datetime
 
 import pytz
 
-from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
@@ -33,6 +32,7 @@ class ParksNPeaks(HTTPSpotProvider):
                         # Seen PNP spots with empty frequency, and with comma-separated thousands digits
                         mode=source_spot["actMode"].upper(),
                         comment=source_spot["actComments"],
+                        sig=source_spot["actClass"].upper(),
                         sig_refs=[SIGRef(id=source_spot["actSiteID"], sig=source_spot["actClass"].upper())],
                         time=datetime.strptime(source_spot["actTime"], "%Y-%m-%d %H:%M:%S").replace(
                             tzinfo=pytz.UTC).timestamp())

spotproviders/pota.py

@@ -1,9 +1,7 @@
-import re
 from datetime import datetime
 
 import pytz
 
-from core.sig_utils import get_icon_for_sig, get_ref_regex_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
@@ -31,6 +29,7 @@ class POTA(HTTPSpotProvider):
                         freq=float(source_spot["frequency"]) * 1000,
                         mode=source_spot["mode"].upper(),
                         comment=source_spot["comments"],
+                        sig="POTA",
                         sig_refs=[SIGRef(id=source_spot["reference"], sig="POTA", name=source_spot["name"])],
                         time=datetime.strptime(source_spot["spotTime"], "%Y-%m-%dT%H:%M:%S").replace(
                             tzinfo=pytz.UTC).timestamp(),

spotproviders/sota.py

@@ -3,7 +3,6 @@ from datetime import datetime
 import requests
 
 from core.constants import HTTP_HEADERS
-from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
@@ -45,6 +44,7 @@ class SOTA(HTTPSpotProvider):
                             freq=(float(source_spot["frequency"]) * 1000000) if (source_spot["frequency"] is not None) else None, # Seen SOTA spots with no frequency!
                             mode=source_spot["mode"].upper(),
                             comment=source_spot["comments"],
+                            sig="SOTA",
                             sig_refs=[SIGRef(id=source_spot["summitCode"], sig="SOTA", name=source_spot["summitName"])],
                             time=datetime.fromisoformat(source_spot["timeStamp"]).timestamp(),
                             activation_score=source_spot["points"])

spotproviders/spot_provider.py

@@ -2,8 +2,7 @@ from datetime import datetime
 
 import pytz
 
-from core.constants import SOFTWARE_NAME, SOFTWARE_VERSION
-from core.config import SERVER_OWNER_CALLSIGN, MAX_SPOT_AGE
+from core.config import MAX_SPOT_AGE
 
 
 # Generic spot provider class. Subclasses of this query the individual APIs for data.
@@ -35,8 +34,9 @@ class SpotProvider:
             if datetime.fromtimestamp(spot.time, pytz.UTC) > self.last_spot_time:
                 # Fill in any blanks
                 spot.infer_missing()
-                # Add to the list
-                self.spots.add(spot.id, spot, expire=MAX_SPOT_AGE)
+                # Add to the list, provided it heas not already expired.
+                if not spot.expired():
+                    self.spots.add(spot.id, spot, expire=MAX_SPOT_AGE)
         self.last_spot_time = datetime.fromtimestamp(max(map(lambda s: s.time, spots)), pytz.UTC)
 
     # Submit a single spot retrieved from the provider. This will be added to the list regardless of its age. Spots
@@ -45,9 +45,10 @@ class SpotProvider:
     def submit(self, spot):
         # Fill in any blanks
         spot.infer_missing()
-        # Add to the list
-        self.spots.add(spot.id, spot, expire=MAX_SPOT_AGE)
-        self.last_spot_time = datetime.fromtimestamp(spot.time, pytz.UTC)
+        # Add to the list, provided it heas not already expired.
+        if not spot.expired():
+            self.spots.add(spot.id, spot, expire=MAX_SPOT_AGE)
+            self.last_spot_time = datetime.fromtimestamp(spot.time, pytz.UTC)
 
     # Stop any threads and prepare for application shutdown
     def stop(self):

spotproviders/sse_spot_provider.py

@@ -9,6 +9,7 @@ from requests_sse import EventSource
 from core.constants import HTTP_HEADERS
 from spotproviders.spot_provider import SpotProvider
 
+
 # Spot provider using Server-Sent Events.
 class SSESpotProvider(SpotProvider):
 

spotproviders/ukpacketnet.py

@@ -1,11 +1,8 @@
 import re
-from datetime import datetime, timedelta
+from datetime import datetime
 
 import pytz
-from requests_cache import CachedSession
 
-from core.constants import HTTP_HEADERS
-from core.sig_utils import get_icon_for_sig, get_ref_regex_for_sig
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
 

spotproviders/wota.py

@@ -1,9 +1,10 @@
+import logging
+import re
 from datetime import datetime
 
 import pytz
 from rss_parser import RSSParser
 
-from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
@@ -25,47 +26,52 @@ class WOTA(HTTPSpotProvider):
         # Iterate through source data
         for source_spot in rss.channel.items:
 
-            # Reject GUID missing or zero
-            if not source_spot.guid or not source_spot.guid.content or source_spot.guid.content == "http://www.wota.org.uk/spots/0":
-                continue
+            try:
+                # Reject GUID missing or zero
+                if not source_spot.guid or not source_spot.guid.content or source_spot.guid.content == "http://www.wota.org.uk/spots/0":
+                    continue
 
-            # Pick apart the title
-            title_split = source_spot.title.split(" on ")
-            dx_call = title_split[0]
-            ref = None
-            ref_name = None
-            if len(title_split) > 1:
-                ref_split = title_split[1].split(" - ")
-                ref = ref_split[0]
-                if len(ref_split) > 1:
-                    ref_name = ref_split[1]
+                # Pick apart the title
+                title_split = source_spot.title.split(" on ")
+                dx_call = title_split[0]
+                ref = None
+                ref_name = None
+                if len(title_split) > 1:
+                    ref_split = title_split[1].split(" - ")
+                    ref = ref_split[0]
+                    if len(ref_split) > 1:
+                        ref_name = ref_split[1]
 
-            # Pick apart the description
-            desc_split = source_spot.description.split(". ")
-            freq_mode = desc_split[0].replace("Frequencies/modes:", "").strip()
-            freq_mode_split = freq_mode.split("-")
-            freq_hz = float(freq_mode_split[0]) * 1000000
-            mode = freq_mode_split[1]
+                # Pick apart the description
+                desc_split = source_spot.description.split(". ")
+                freq_mode = desc_split[0].replace("Frequencies/modes:", "").strip()
+                freq_mode_split = re.split(r'[\-\s]+', freq_mode)
+                freq_hz = float(freq_mode_split[0]) * 1000000
+                if len(freq_mode_split) > 1:
+                    mode = freq_mode_split[1].upper()
 
-            comment = None
-            if len(desc_split) > 1:
-                comment = desc_split[1].strip()
-            spotter = None
-            if len(desc_split) > 2:
-                spotter = desc_split[2].replace("Spotted by ", "").replace(".", "").strip()
+                comment = None
+                if len(desc_split) > 1:
+                    comment = desc_split[1].strip()
+                spotter = None
+                if len(desc_split) > 2:
+                    spotter = desc_split[2].replace("Spotted by ", "").replace(".", "").upper().strip()
 
-            time = datetime.strptime(source_spot.pub_date.content, self.RSS_DATE_TIME_FORMAT).astimezone(pytz.UTC)
+                time = datetime.strptime(source_spot.pub_date.content, self.RSS_DATE_TIME_FORMAT).astimezone(pytz.UTC)
 
-            # Convert to our spot format
-            spot = Spot(source=self.name,
-                        source_id=source_spot.guid.content,
-                        dx_call=dx_call,
-                        de_call=spotter,
-                        freq=freq_hz,
-                        mode=mode,
-                        comment=comment,
-                        sig_refs=[SIGRef(id=ref, sig="WOTA", name=ref_name)] if ref else [],
-                        time=time.timestamp())
+                # Convert to our spot format
+                spot = Spot(source=self.name,
+                            source_id=source_spot.guid.content,
+                            dx_call=dx_call,
+                            de_call=spotter,
+                            freq=freq_hz,
+                            mode=mode,
+                            comment=comment,
+                            sig="WOTA",
+                            sig_refs=[SIGRef(id=ref, sig="WOTA", name=ref_name)] if ref else [],
+                            time=time.timestamp())
 
-            new_spots.append(spot)
+                new_spots.append(spot)
+            except Exception as e:
+                logging.error("Exception parsing WOTA spot", e)
         return new_spots

spotproviders/wwbota.py

@@ -1,7 +1,6 @@
 import json
 from datetime import datetime
 
-from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.sse_spot_provider import SSESpotProvider
@@ -29,6 +28,7 @@ class WWBOTA(SSESpotProvider):
                     freq=float(source_spot["freq"]) * 1000000,
                     mode=source_spot["mode"].upper(),
                     comment=source_spot["comment"],
+                    sig="WWBOTA",
                     sig_refs=refs,
                     time=datetime.fromisoformat(source_spot["time"]).timestamp(),
                     # WWBOTA spots can contain multiple references for bunkers being activated simultaneously. For

spotproviders/wwff.py

@@ -2,7 +2,6 @@ from datetime import datetime
 
 import pytz
 
-from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
@@ -28,6 +27,7 @@ class WWFF(HTTPSpotProvider):
                         freq=float(source_spot["frequency_khz"]) * 1000,
                         mode=source_spot["mode"].upper(),
                         comment=source_spot["remarks"],
+                        sig="WWFF",
                         sig_refs=[SIGRef(id=source_spot["reference"], sig="WWFF", name=source_spot["reference_name"])],
                         time=datetime.fromtimestamp(source_spot["spot_time"], tz=pytz.UTC).timestamp(),
                         dx_latitude=source_spot["latitude"],

spotproviders/xota.py

@@ -0,0 +1,43 @@
+from datetime import datetime
+
+from data.sig_ref import SIGRef
+from data.spot import Spot
+from spotproviders.http_spot_provider import HTTPSpotProvider
+
+
+# Spot provider for servers based on the "xOTA" software at https://github.com/nischu/xOTA/
+# The provider typically doesn't give us a lat/lon or SIG explicitly, so our own config provides this information. This
+# functionality is implemented for TOTA events.
+class XOTA(HTTPSpotProvider):
+    POLL_INTERVAL_SEC = 300
+    FIXED_LATITUDE = None
+    FIXED_LONGITUDE = None
+    SIG = None
+
+    def __init__(self, provider_config):
+        super().__init__(provider_config, provider_config["url"] + "/api/spot/all", self.POLL_INTERVAL_SEC)
+        self.FIXED_LATITUDE = provider_config["latitude"] if "latitude" in provider_config else None
+        self.FIXED_LONGITUDE = provider_config["longitude"] if "longitude" in provider_config else None
+        self.SIG = provider_config["sig"] if "sig" in provider_config else None
+
+    def http_response_to_spots(self, http_response):
+        new_spots = []
+        # Iterate through source data
+        for source_spot in http_response.json():
+            # Convert to our spot format
+            spot = Spot(source=self.name,
+                        source_id=source_spot["id"],
+                        dx_call=source_spot["stationCallSign"].upper(),
+                        freq=float(source_spot["freq"]) * 1000,
+                        mode=source_spot["mode"].upper(),
+                        sig=self.SIG,
+                        sig_refs=[SIGRef(id=source_spot["reference"]["title"], sig=self.SIG, url=source_spot["reference"]["website"])],
+                        time=datetime.fromisoformat(source_spot["modificationDate"]).timestamp(),
+                        dx_latitude=self.FIXED_LATITUDE,
+                        dx_longitude=self.FIXED_LONGITUDE,
+                        qrt=source_spot["state"] != "active")
+
+            # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
+            # that for us.
+            new_spots.append(spot)
+        return new_spots

spotproviders/zlota.py

@@ -2,7 +2,6 @@ from datetime import datetime
 
 import pytz
 
-from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from spotproviders.http_spot_provider import HTTPSpotProvider
@@ -34,6 +33,7 @@ class ZLOTA(HTTPSpotProvider):
                         freq=freq_hz,
                         mode=source_spot["mode"].upper().strip(),
                         comment=source_spot["comments"],
+                        sig="ZLOTA",
                         sig_refs=[SIGRef(id=source_spot["reference"], sig="ZLOTA", name=source_spot["name"])],
                         time=datetime.fromisoformat(source_spot["referenced_time"]).astimezone(pytz.UTC).timestamp())
 

views/webpage_about.tpl

@@ -3,28 +3,45 @@
 <div id="info-container" class="mt-4">
     <h2 class="mt-4 mb-4">About Spothole</h2>
     <p>Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an open JSON API as well as a website to browse the data.</p>
-    <p>While there are several other web-based interfaces to DX clusters, and sites that aggregate spots from various outdoor activity programmes for amateur radio, Spothole differentiates itself by supporting a large number of data sources, and by being "API first" rather than just providing a web front-end. This allows other software to be built on top of it.</p>
+    <p>While there are several other web-based interfaces to DX clusters, and sites that aggregate spots from various outdoor activity programmes for amateur radio, Spothole differentiates itself by supporting a larger number of data sources, and by being "API first" rather than just providing a web front-end. This allows other software to be built on top of it.</p>
     <p>The API is deliberately well-defined with an <a href="/apidocs/openapi.yml">OpenAPI specification</a> and <a href="/apidocs">API documentation</a>. The API delivers spots in a consistent format regardless of the data source, freeing developers from needing to know how each individual data source presents its data.</p>
-    <p>Spothole itself is also open source, Public Domain licenced code that anyone can take and modify. <a href="https://git.ianrenton.com/ian/metaspot/">The source code is here</a>. If you want to run your own copy of Spothole, or start modifying it for your own purposes, the <a href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README file</a> contains a description of how the software works and how it's laid out, as well as instructions for configuring systemd, nginx and anything else you might need to run your own server.</p>
-    <p>The software was written by <a href="https://ianrenton.com">Ian Renton, MØTRT</a> and other contributors. Full details are available in the README.</p>
+    <p>Spothole itself is also open source, Public Domain licenced code that anyone can take and modify. <a href="https://git.ianrenton.com/ian/metaspot/">The source code is here</a>.</p>
+    <p>The software was written by <a href="https://ianrenton.com">Ian Renton, MØTRT</a> and other contributors. Full details are available in the <a href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README file</a>.</p>
     <p>This server is running Spothole version {{software_version}}.</p>
+    <h2 class="mt-4 mb-4">Using Spothole</h2>
+    <p>There are a number of different ways to use Spothole, depending on what you want to do with it and your level of technical skill:</p>
+    <ol><li>You can <b>use it on the web</b>, like you are (probably) doing right now. This is how most people use it, to look up spots and alerts, and make interesting QSOs.</li>
+    <li>If you are using an Android or iOS device, you can <b>"install" it on your device</b>. Spothole is a Progressive Web App, meaning it's not delivered through app stores, but if you open the page on Chrome (Android) or Safari (iOS) there will be an option in the menu to install it. It will then appear in your main app menu.</li>
+    <li>You can <b>embed the web interface in another website</b> to show its spots in a custom dashboard or the like. The usage is explained in more detail in the <a href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README file</a>.</li>
+    <li>You can <b>write your own client using the Spothole API</b>, using the main Spothole instance to provide data, and do whatever you like with it. The README contains guidance on how to do this, and the full API docs are linked above. You can also find reference implementations in the form of Spothole's own web-based front end, plus my other two tools built on Spothole: <a href="https://fieldspotter.radio">Field Spotter</a> and the <a href="https://qsomap.m0trt.radio">QSO Map Tool</a>.</li>
+    <li>If you want to <b>run your own version of Spothole</b> so you can customise the configuration, such as enabling sources that I disable on the main instance, you can do that too. The README contains not only advice on how to set up Spothole but how to get it auto-starting with systemd, using an nginx reverse proxy, and setting up HTTPS support with certbot.</li>
+    <li>Finally, you can of course download the source code and <b>develop Spothole to meet your needs</b>. Whether you contribute your changes back to the main repository is up to you. As usual, the README file contains some advice on the structure of the repository, and how to get started writing your own spot provider.</li></ol>
     <h2 id="faq" class="mt-4">FAQ</h2>
     <h4 class="mt-4">"Spots"? "DX Clusters"? What does any of this mean?</h4>
     <p>This is a tool for amateur ("ham") radio users. Many amateur radio operators like to make contacts with others who are doing something more interesting than sitting in their home "shack", such as people in rarely-seen countries, remote islands, or on mountaintops. Such operators are often "spotted", i.e. when someone speaks to them, they will put the details such as their operating frequency into an online system, to let others know where to find them. A DX Cluster is one type of those systems. Most outdoor radio awards programmes, such as "Parks on the Air" (POTA) have their own websites for posting spots.</p>
     <p>Spothole is an "aggregator" for those spots, so it checks lots of different services for data, and brings it all together in one place. So no matter what kinds of interesting spots you are looking for, you can find them here.</p>
     <p>As well as spots, it also provides a similar feed of "alerts". This is where amateur radio users who are going to interesting places soon will announce their intentions.</p>
     <h4 class="mt-4">What are "DX", "DE" and modes?</h4>
-    <p>In amateur radio terminology, the "DX" contact is the "interesting" one that is using the frequency shown. They might be on a remote island or just in a local park, but either way it's interesting enough that someone has "spotted" them. The callsign listed under "DE" is the person who spotted the "DX" operator. "Modes" are the type of communication they are using. You might see "CW" which is Morse Code, or voice "modes" like SSB or FM, or more exotic "data" modes which are used for computer-to-computer communication.</p>
+    <p>In amateur radio terminology, the "DX" contact is the "interesting" one that is using the frequency shown and looking for callers. They might be on a remote island or just in a local park, but either way it's interesting enough that someone has "spotted" them. The callsign listed under "DE" is the person who entered the spot of the "DX" operator. "Modes" are the type of communication they are using. For example you might see "CW" which is Morse Code, or voice "modes" like SSB or FM, or more exotic "data" modes which are used for computer-to-computer communication.</p>
     <h4 class="mt-4">What data sources are supported?</h4>
-    <p>Spothole can retrieve spots from: Telnet-based DX clusters, the Reverse Beacon Network (RBN), the APRS Internet Service (APRS-IS), POTA, SOTA, WWFF, GMA, WWBOTA, HEMA, Parks 'n' Peaks, ZLOTA, WOTA, and the UK Packet Repeater Network.</p>
-    <p>Spothole can retrieve alerts from: NG3K, POTA, SOTA, WWFF, Parks 'n' Peaks, WOTA and BOTA.</p>
+    <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>, 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>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: POTA, SOTA, WWFF, GMA, WWBOTA, HEMA, IOTA, MOTS, ARLHS, ILLW, SIOTA, WCA, ZLOTA, KRMNPA, WOTA, BOTA, WAB & WAI.</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), Worked All Britain (WAB), Worked All Ireland (WAI), and Toilets on the Air (TOTA).</p>
+    <p>As of the time of writing in November 2025, I think Spothole captures essentially all outdoor radio programmes that have a defined reference list, and almost certainly those that have a spotting/alerting API. If you know of one I've missed, please let me know!</p>
+    <h4 class="mt-4">Why can I filter spots by both SIG and Source? Isn't that basically the same thing?</h4>
+    <p>Mostly, but not quite. While POTA spots generally come from the POTA source and so on, there are a few exceptions:</p>
+    <ol><li>Sources like GMA and Parks 'n' Peaks provide spots for multiple different programmes (SIGs).</li>
+    <li>Cluster spots may name SIGs in their comment, in which case the source remains the Cluster, but a SIG is assigned.</li>
+    <li>Some SIGs, such as Worked all Britain (WAB), don't have their own spotting site and can <em>only</em> be identified through comments on spots retrieved from other sources.</li>
+    <li>SIGs have well-defined names, whereas the server owner may name the sources as they see fit.</li></ol>
+    <p>Spothole's web interface exists not just for the end user, but also as a reference implementation for the API, so I have chosen to demonstrate both methods of filtering.</p>
     <h4 class="mt-4">How is this better than DXheat, DXsummit, POTA's own website, etc?</h4>
     <p>It's probably not? But it's nice to have choice.</p>
-    <p>I think it's got two key advantages over those sites:</p>
+    <p>I think it's got three key advantages over those sites:</p>
     <ol><li>It provides a public, <a href="/apidocs">well-documented API</a> with an <a href="/apidocs/openapi.yml">OpenAPI specification</a>. Other sites don't have official APIs or don't bother documenting them publicly, because they want people to use their web page. I like Spothole's web page, but you don't have to use it&mdash;if you're a programmer, you can build your own software on Spothole's API. Spothole does the hard work of taking all the various data sources and providing a consistent, well-documented data set. You can then do the fun bit of writing your own application.</li>
-    <li>It grabs data from a lot more sources, and it's easy to add more. Since it's open source, anyone can contribute a new data source and share it with the community.</li></ol>
+    <li>It grabs data from a lot more sources. I've seen other sites that pull in DX Cluster and POTA spots together, but nothing on the scale of what Spothole supports.</li>
+    <li>Spothole is open source, so anyone can contribute the code to support a new data source or add new features, and share them with the community.</li></ol>
     <h4 class="mt-4">Why does this website ask me if I want to install it?</h4>
     <p>Spothole is a Progressive Web App, which means you can install it on an Android or iOS device by opening the site in Chrome or Safari respectively, and clicking "Install" on the pop-up panel. It'll only prompt you once, so if you dismiss the prompt and change your mind, you'll find an Install / Add to Home Screen option on your browser's menu.</p>
     <p>Installing Spothole on your phone is completely optional, the website works exactly the same way as the "app" does.</p>
@@ -32,6 +49,8 @@
     <p>To avoid putting too much load on the various servers that Spothole connects to, the Spothole server only polls them once every two minutes for spots, and once every hour for alerts. (Some sources, such as DX clusters, RBN, APRS-IS and WWBOTA use a non-polling mechanism, and their updates will therefore arrive more quickly.) Then if you are using the web interface, that has its own rate at which it reloads the data from Spothole, which is once a minute for spots or 30 minutes for alerts. So you could be waiting around three minutes to see a newly added spot, or 90 minutes to see a newly added alert.</p>
     <h4 class="mt-4">What licence does Spothole use?</h4>
     <p>Spothole's source code is licenced under the Public Domain. You can write a Spothole client, run your own server, modify it however you like, you can claim you wrote it and charge people £1000 for a copy, I don't really mind. (Please don't do the last one. But if you're using my code for something cool, it would be nice to hear from you!)</p>
+    <h2 class="mt-4">Data Accuracy</h2>
+    <p>Please note that the data coming out of Spothole is only as good as the data going in. People mis-hear and make typos when spotting callsigns all the time. There are also plenty of cases where Spothole's data, particularly location data, may be inaccurate. For example, there are POTA parks that span multiple US states, countries that span multiple CQ zones, portable operators with no requirement to sign /P, etc. If you are doing something where accuracy is important, such as contesting, you should not rely on Spothole's data to fill in any gaps in your log.</p>
     <h2 id="privacy" class="mt-4">Privacy</h2>
     <p>Spothole collects no data about you, and there is no way to enter personally identifying information into the site apart from by spotting and alerting through Spothole or the various services it connects to. All spots and alerts are "timed out" and deleted from the system after a set interval, which by default is one hour for spots and one week for alerts.</p>
     <p>Settings you select from Spothole's menus are sent to the server, in order to provide the data with the requested filters. They are also stored in your browser's local storage, so that your preferences are remembered between sessions.</p>
@@ -39,7 +58,9 @@
     <p>Spothole is open source, so you can audit <a href="https://git.ianrenton.com/ian/spothole">the code</a> if you like.</p>
     <h2 class="mt-4">Thanks</h2>
     <p>This project would not have been possible without those volunteers who have taken it upon themselves to run DX clusters, xOTA programmes, DXpedition lists, callsign lookup databases, and other online tools on which Spothole's data is based.</p>
-    <p>Spothole is also dependent on a number of Python libraries, in particular pyhamtools, and many JavaScript libraries, as well as the Font Awesome icon set.</p>
+    <p>Spothole is also dependent on a number of Python libraries, in particular pyhamtools, and many JavaScript libraries, as well as the Font Awesome icon set and flag icons from the Noto Color Emoji set.</p>
+    <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=1"></script>
 <script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>

views/webpage_add_spot.tpl

@@ -68,6 +68,6 @@
 
 </div>
 
-<script src="/js/common.js"></script>
-<script src="/js/add-spot.js"></script>
+<script src="/js/common.js?v=1"></script>
+<script src="/js/add-spot.js?v=1"></script>
 <script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>

views/webpage_alerts.tpl

@@ -1,7 +1,7 @@
 % rebase('webpage_base.tpl')
 
 <div class="mt-3">
-    <div class="row">
+    <div id="settingsButtonRow" class="row">
         <div class="col-auto me-auto pt-3">
             <p id="timing-container">Loading...</p>
         </div>
@@ -101,17 +101,25 @@
                             <h5 class="card-title">Number of Alerts</h5>
                             <p class="card-text spothole-card-text">Show up to
                                 <select id="alerts-to-fetch" class="storeable-select form-select ms-2" oninput="filtersUpdated();"  style="width: 5em;display: inline-block;">
-                                    <option value="25">25</option>
-                                    <option value="50">50</option>
-                                    <option value="100" selected>100</option>
-                                    <option value="200">200</option>
-                                    <option value="500">500</option>
                                 </select>
                                 alerts
                             </p>
                         </div>
                     </div>
                 </div>
+                <div class="col">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title">Theme</h5>
+                                <div class="form-group">
+                                    <div class="form-check form-check-inline">
+                                        <input class="form-check-input storeable-checkbox" type="checkbox" id="darkMode" value="darkMode" oninput="toggleDarkMode();">
+                                        <label class="form-check-label" for="darkMode">Dark mode</label>
+                                    </div>
+                                </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="col">
                     <div class="card">
                         <div class="card-body">
@@ -157,6 +165,6 @@
 
 </div>
 
-<script src="/js/common.js"></script>
-<script src="/js/alerts.js"></script>
+<script src="/js/common.js?v=1"></script>
+<script src="/js/alerts.js?v=1"></script>
 <script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>

views/webpage_bands.tpl

@@ -1,7 +1,7 @@
 % rebase('webpage_base.tpl')
 
 <div class="mt-3">
-    <div class="row">
+    <div id="settingsButtonRow" class="row">
         <div class="col-auto me-auto pt-3">
             <p id="timing-container">Loading...</p>
         </div>
@@ -26,7 +26,7 @@
 
         </div>
         <div class="card-body">
-            <div class="row row-cols-1 g-4 mb-4">
+            <div class="row row-cols-1 g-4 mb-4 row-cols-md-3">
                 <div class="col">
                     <div class="card">
                         <div class="card-body">
@@ -35,8 +35,24 @@
                         </div>
                     </div>
                 </div>
+                <div class="col">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title">SIGs</h5>
+                            <p id="sig-options" class="card-text spothole-card-text"></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title">Sources</h5>
+                            <p id="source-options" class="card-text spothole-card-text"></p>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div class="row row-cols-1 row-cols-md-4 g-4">
+            <div class="row row-cols-1 row-cols-md-3 g-4">
                 <div class="col">
                     <div class="card">
                         <div class="card-body">
@@ -61,14 +77,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="col">
-                    <div class="card">
-                        <div class="card-body">
-                            <h5 class="card-title">Sources</h5>
-                            <p id="source-options" class="card-text spothole-card-text"></p>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
@@ -93,16 +101,25 @@
                             <h5 class="card-title">Spot Age</h5>
                             <p class="card-text spothole-card-text">Last
                                 <select id="max-spot-age" class="storeable-select form-select ms-2 me-2 d-inline-block" oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
-                                    <option value="300">5</option>
-                                    <option value="600">10</option>
-                                    <option value="1800" selected>30</option>
-                                    <option value="3600">60</option>
                                 </select>
                                 minutes
                             </p>
                         </div>
                     </div>
                 </div>
+                <div class="col">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title">Theme</h5>
+                                <div class="form-group">
+                                    <div class="form-check form-check-inline">
+                                        <input class="form-check-input storeable-checkbox" type="checkbox" id="darkMode" value="darkMode" oninput="toggleDarkMode();">
+                                        <label class="form-check-label" for="darkMode">Dark mode</label>
+                                    </div>
+                                </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -111,7 +128,7 @@
 
 </div>
 
-<script src="/js/common.js"></script>
-<script src="/js/spotandmap.js"></script>
-<script src="/js/bands.js"></script>
+<script src="/js/common.js?v=1"></script>
+<script src="/js/spotsbandsandmap.js?v=1"></script>
+<script src="/js/bands.js?v=1"></script>
 <script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>

views/webpage_base.tpl

@@ -3,7 +3,7 @@
 <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">
+    <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">
@@ -48,15 +48,15 @@
 </head>
 <body>
 <div class="container">
-    <nav class="navbar navbar-expand-lg bg-body p-0 border-bottom">
+    <nav id="header" class="navbar navbar-expand-lg bg-body p-0 border-bottom">
         <div class="container-fluid p-0">
             <a class="navbar-brand" href="/">
-                <img src="/img/logo.png" width="192" height="60" alt="Spothole">
+                <img src="/img/logo.png" class="logo" width="192" height="60" alt="Spothole">
             </a>
-            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarTogglerDemo02" aria-controls="navbarTogglerDemo02" aria-expanded="false" aria-label="Toggle navigation">
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-toggler-content" aria-controls="navbar-toggler-content" aria-expanded="false" aria-label="Toggle navigation">
               <span class="navbar-toggler-icon"></span>
             </button>
-            <div class="collapse navbar-collapse" id="navbarTogglerDemo02">
+            <div class="collapse navbar-collapse" id="navbar-toggler-content">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item ms-4"><a href="/" class="nav-link" id="nav-link-spots"><i class="fa-solid fa-tower-cell"></i> Spots</a></li>
                     <li class="nav-item ms-4"><a href="/map" class="nav-link" id="nav-link-map"><i class="fa-solid fa-map"></i> Map</a></li>
@@ -79,7 +79,7 @@
 
     </main>
 
-    <div class="hideonmobile hideonmap">
+    <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>
@@ -101,5 +101,7 @@
     </div>
 </div>
 
+<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>

views/webpage_map.tpl

@@ -1,7 +1,7 @@
 % rebase('webpage_base.tpl')
 
 <div id="map">
-    <div id="maptools" class="mt-3 px-3" style="z-index: 1002; position: relative;">
+    <div id="settingsButtonRowMap" class="mt-3 px-3" style="z-index: 1002; position: relative;">
         <div class="row">
             <div class="col-auto me-auto pt-3"></div>
             <div class="col-auto">
@@ -25,7 +25,7 @@
 
             </div>
             <div class="card-body">
-                <div class="row row-cols-1 g-4 mb-4">
+                <div class="row row-cols-1 g-4 mb-4 row-cols-md-3">
                     <div class="col">
                         <div class="card">
                             <div class="card-body">
@@ -34,8 +34,24 @@
                             </div>
                         </div>
                     </div>
+                    <div class="col">
+                        <div class="card">
+                            <div class="card-body">
+                                <h5 class="card-title">SIGs</h5>
+                                <p id="sig-options" class="card-text spothole-card-text"></p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="card">
+                            <div class="card-body">
+                                <h5 class="card-title">Sources</h5>
+                                <p id="source-options" class="card-text spothole-card-text"></p>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class="row row-cols-1 row-cols-md-4 g-4">
+                <div class="row row-cols-1 row-cols-md-3 g-4">
                     <div class="col">
                         <div class="card">
                             <div class="card-body">
@@ -60,14 +76,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col">
-                        <div class="card">
-                            <div class="card-body">
-                                <h5 class="card-title">Sources</h5>
-                                <p id="source-options" class="card-text spothole-card-text"></p>
-                            </div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -92,10 +100,6 @@
                                 <h5 class="card-title">Spot Age</h5>
                                 <p class="card-text spothole-card-text">Last
                                     <select id="max-spot-age" class="storeable-select form-select ms-2 me-2 d-inline-block" oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
-                                        <option value="300">5</option>
-                                        <option value="600">10</option>
-                                        <option value="1800" selected>30</option>
-                                        <option value="3600">60</option>
                                     </select>
                                     minutes
                                 </p>
@@ -115,6 +119,19 @@
                             </div>
                         </div>
                     </div>
+                    <div class="col">
+                        <div class="card">
+                            <div class="card-body">
+                                <h5 class="card-title">Theme</h5>
+                                    <div class="form-group">
+                                        <div class="form-check form-check-inline">
+                                            <input class="form-check-input storeable-checkbox" type="checkbox" id="darkMode" value="darkMode" oninput="toggleDarkMode();">
+                                            <label class="form-check-label" for="darkMode">Dark mode</label>
+                                        </div>
+                                    </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -129,7 +146,7 @@
 <script src="https://cdn.jsdelivr.net/npm/leaflet.geodesic"></script>
 <script src="https://cdn.jsdelivr.net/npm/@joergdietrich/leaflet.terminator@1.1.0/L.Terminator.min.js"></script>
 
-<script src="/js/common.js"></script>
-<script src="/js/spotandmap.js"></script>
-<script src="/js/map.js"></script>
+<script src="/js/common.js?v=1"></script>
+<script src="/js/spotsbandsandmap.js?v=1"></script>
+<script src="/js/map.js?v=1"></script>
 <script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>

views/webpage_spots.tpl

@@ -8,7 +8,7 @@
 </div>
 
 <div class="mt-3">
-    <div class="row">
+    <div id="settingsButtonRow" class="row">
         <div class="col-auto me-auto pt-3">
             <p id="timing-container">Loading...</p>
         </div>
@@ -16,7 +16,7 @@
             <p class="d-inline-flex gap-1">
                 <span style="position: relative;">
                     <i class="fa-solid fa-magnifying-glass" style="position: absolute; left: 0px; top: 2px; padding: 10px; pointer-events: none;"></i>
-                    <input id="filter-dx-call" type="text" class="form-control" oninput="filtersUpdated();" placeholder="Search for call">
+                    <input id="filter-dx-call" type="search" class="form-control" oninput="filtersUpdated();" placeholder="Callsign">
                 </span>
                 <button id="filters-button" type="button" class="btn btn-outline-primary" data-bs-toggle="button" onclick="toggleFiltersPanel();"><i class="fa-solid fa-filter"></i> Filters</button>
                 <button id="display-button" type="button" class="btn btn-outline-primary" data-bs-toggle="button" onclick="toggleDisplayPanel();"><i class="fa-solid fa-desktop"></i> Display</button>
@@ -37,7 +37,7 @@
 
         </div>
         <div class="card-body">
-            <div class="row row-cols-1 g-4 mb-4">
+            <div class="row row-cols-1 g-4 mb-4 row-cols-md-3">
                 <div class="col">
                     <div class="card">
                         <div class="card-body">
@@ -46,8 +46,24 @@
                         </div>
                     </div>
                 </div>
+                <div class="col">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title">SIGs</h5>
+                            <p id="sig-options" class="card-text spothole-card-text"></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title">Sources</h5>
+                            <p id="source-options" class="card-text spothole-card-text"></p>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div class="row row-cols-1 row-cols-md-4 g-4">
+            <div class="row row-cols-1 row-cols-md-3 g-4">
                 <div class="col">
                     <div class="card">
                         <div class="card-body">
@@ -72,14 +88,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="col">
-                    <div class="card">
-                        <div class="card-body">
-                            <h5 class="card-title">Sources</h5>
-                            <p id="source-options" class="card-text spothole-card-text"></p>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
@@ -117,16 +125,36 @@
                             <h5 class="card-title">Number of Spots</h5>
                             <p class="card-text spothole-card-text">Show up to
                                 <select id="spots-to-fetch" class="storeable-select form-select ms-2 me-2 d-inline-block" oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
-                                    <option value="10">10</option>
-                                    <option value="25">25</option>
-                                    <option value="50" selected>50</option>
-                                    <option value="100">100</option>
                                 </select>
                                 spots
                             </p>
                         </div>
                     </div>
                 </div>
+                <div class="col">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title">Location</h5>
+                                <div class="form-group spothole-card-text">
+                                    <label for="userGrid">Your grid:</label>
+                                    <input type="text" class="storeable-text form-control" id="userGrid" placeholder="AA00aa" oninput="userGridUpdated();" style="width: 10em; display: inline-block;">
+                                </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title">Theme</h5>
+                                <div class="form-group">
+                                    <div class="form-check form-check-inline">
+                                        <input class="form-check-input storeable-checkbox" type="checkbox" id="darkMode" value="darkMode" oninput="toggleDarkMode();">
+                                        <label class="form-check-label" for="darkMode">Dark mode</label>
+                                    </div>
+                                </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="col">
                     <div class="card">
                         <div class="card-body">
@@ -172,17 +200,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="col">
-                    <div class="card">
-                        <div class="card-body">
-                            <h5 class="card-title">Location</h5>
-                                <div class="form-group spothole-card-text">
-                                    <label for="userGrid">Your grid:</label>
-                                    <input type="text" class="storeable-text form-control" id="userGrid" placeholder="AA00aa" oninput="userGridUpdated();" style="width: 10em; display: inline-block;">
-                                </div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
@@ -191,7 +208,7 @@
 
 </div>
 
-<script src="/js/common.js"></script>
-<script src="/js/spotandmap.js"></script>
-<script src="/js/spots.js"></script>
+<script src="/js/common.js?v=1"></script>
+<script src="/js/spotsbandsandmap.js?v=1"></script>
+<script src="/js/spots.js?v=1"></script>
 <script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>

views/webpage_status.tpl

@@ -2,6 +2,6 @@
 
 <div id="status-container" class="row row-cols-1 row-cols-md-4 g-4 mt-4"></div>
 
-<script src="/js/common.js"></script>
-<script src="/js/status.js"></script>
+<script src="/js/common.js?v=1"></script>
+<script src="/js/status.js?v=1"></script>
 <script>$(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav --></script>

webassets/apidocs/openapi.yml

@@ -5,6 +5,10 @@ info:
     Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an open JSON API as well as a website to browse the data.
     
     While there are other web-based interfaces to DX clusters, and sites that aggregate spots from various outdoor activity programmes for amateur radio, Spothole differentiates itself by supporting a large number of data sources, and by being "API first" rather than just providing a web front-end. This allows other software to be built on top of it. Spothole itself is also open source, Public Domain licenced code that anyone can take and modify.
+    
+    The API calls described below allow third-party software to access data from Spothole, and receive data on spots and alerts in a consistent format regardless of the data sources used by Spothole itself. Utility calls are also provided for general data lookups.
+    
+    Please note that the data coming out of Spothole is only as good as the data going in. People mis-hear and make typos when spotting callsigns all the time, and there are plenty of areas where Spothole's location data may be inaccurate. If you are doing something where accuracy is important, such as contesting, you should not rely on Spothole's data to fill in any gaps in your log.
   contact:
     email: ian@ianrenton.com
   license:
@@ -51,49 +55,16 @@ paths:
           description: "Limit the spots to only ones from one or more sources. To select more than one source, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - POTA
-              - SOTA
-              - WWFF
-              - WWBOTA
-              - GMA
-              - HEMA
-              - ParksNPeaks
-              - ZLOTA
-              - WOTA
-              - BOTA
-              - Cluster
-              - RBN
-              - APRS-IS
-              - UKPacketNet
+            $ref: "#/components/schemas/Source"
         - name: sig
           in: query
-          description: "Limit the spots to only ones from one or more Special Interest Groups provided as an argument. To select more than one SIG, supply a comma-separated list."
+          description: "Limit the spots to only ones from one or more Special Interest Groups provided as an argument. To select more than one SIG, supply a comma-separated list. The special `sig` name `NO_SIG` matches spots with no sig set. You can use `sig=NO_SIG` to specifically only return generic spots with no associated SIG. You can also use combinations to request for example POTA + no SIG, but reject other SIGs. If you want to request 'every SIG and not No SIG', see the `needs_sig` query parameter for a shortcut."
           required: false
           schema:
-            type: string
-            enum:
-              - POTA
-              - SOTA
-              - WWFF
-              - WWBOTA
-              - GMA
-              - HEMA
-              - WCA
-              - MOTA
-              - SIOTA
-              - ARLHS
-              - ILLW
-              - ZLOTA
-              - IOTA
-              - WOTA
-              - BOTA
-              - WAB
-              - WAI
+            $ref: "#/components/schemas/SIGNameIncludingNoSIG"
         - name: needs_sig
           in: query
-          description: "Limit the spots to only ones with a Special Interest Group such as POTA. Because supplying all known SIGs as a `sigs` parameter is unwieldy, and leaving `sigs` blank will also return spots with *no* SIG, this parameter can be set true to return only spots with a SIG, regardless of what it is, so long as it's not blank. This is what Field Spotter uses to exclude generic cluster spots and only retrieve xOTA things."
+          description: "Limit the spots to only ones with a Special Interest Group such as POTA. Because supplying all known SIGs as a `sigs` parameter is unwieldy, and leaving `sigs` blank will also return spots with *no* SIG, this parameter can be set true to return only spots with a SIG, regardless of what it is, so long as it's not blank. This is the equivalent of supplying the `sig` query param with a list of every known SIG apart from the special `NO_SIG` value. This is what Field Spotter uses to exclude generic cluster spots and only retrieve xOTA things."
           required: false
           schema:
             type: boolean
@@ -110,96 +81,31 @@ paths:
           description: "Limit the spots to only ones from one or more bands. To select more than one band, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - 160m
-              - 80m
-              - 60m
-              - 40m
-              - 30m
-              - 20m
-              - 17m
-              - 15m
-              - 12m
-              - 10m
-              - 6m
-              - 4m
-              - 2m
-              - 70cm
-              - 23cm
-              - 13cm
+            $ref: "#/components/schemas/BandName"
         - name: mode
           in: query
           description: "Limit the spots to only ones from one or more modes. To select more than one mode, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - CW
-              - PHONE
-              - SSB
-              - USB
-              - LSB
-              - AM
-              - FM
-              - DV
-              - DMR
-              - DSTAR
-              - C4FM
-              - M17
-              - DIGI
-              - DATA
-              - FT8
-              - FT4
-              - RTTY
-              - SSTV
-              - JS8
-              - HELL
-              - BPSK
-              - PSK
-              - BPSK31
-              - OLIVIA
-              - MFSK
-              - MFSK32
-              - PKT
+            $ref: "#/components/schemas/Mode"
         - name: mode_type
           in: query
           description: "Limit the spots to only ones from one or more mode families. To select more than one mode family, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - CW
-              - PHONE
-              - DATA
+            $ref: "#/components/schemas/Mode"
         - name: dx_continent
           in: query
           description: "Limit the spots to only ones where the DX (the operator being spotted) is on the given continent(s). To select more than one continent, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - EU
-              - NA
-              - SA
-              - AS
-              - AF
-              - OC
-              - AN
+            $ref: "#/components/schemas/Continent"
         - name: de_continent
           in: query
           description: "Limit the spots to only ones where the spotteris on the given continent(s). To select more than one continent, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - EU
-              - NA
-              - SA
-              - AS
-              - AF
-              - OC
-              - AN
+            $ref: "#/components/schemas/Continent"
         - name: dedupe
           in: query
           description: "\"De-duplicate\" the spots, returning only the latest spot for any given callsign."
@@ -281,60 +187,19 @@ paths:
           description: "Limit the alerts to only ones from one or more sources. To select more than one source, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - POTA
-              - SOTA
-              - WWFF
-              - WWBOTA
-              - GMA
-              - HEMA
-              - ParksNPeaks
-              - ZLOTA
-              - WOTA
-              - BOTA
-              - Cluster
-              - RBN
-              - APRS-IS
-              - UKPacketNet
+            $ref: "#/components/schemas/Source"
         - name: sig
           in: query
-          description: "Limit the alerts to only ones from one or more Special Interest Groups. To select more than one SIG, supply a comma-separated list."
+          description: "Limit the alerts to only ones from one or more Special Interest Groups. To select more than one SIG, supply a comma-separated list. The special value 'NO_SIG' can be included to return alerts specifically without an associated SIG (i.e. general DXpeditions)."
           required: false
           schema:
-            type: string
-            enum:
-              - POTA
-              - SOTA
-              - WWFF
-              - WWBOTA
-              - GMA
-              - HEMA
-              - WCA
-              - MOTA
-              - SIOTA
-              - ARLHS
-              - ILLW
-              - ZLOTA
-              - IOTA
-              - WOTA
-              - BOTA
-              - WAB
-              - WAI
+            $ref: "#/components/schemas/SIGNameIncludingNoSIG"
         - name: dx_continent
           in: query
           description: "Limit the alerts to only ones where the DX operator is on the given continent(s). To select more than one continent, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - EU
-              - NA
-              - SA
-              - AS
-              - AF
-              - OC
-              - AN
+            $ref: "#/components/schemas/Continent"
         - name: dx_call_includes
           in: query
           description: "Limit the alerts to only ones where the DX callsign includes the supplied string (case-insensitive). Generally a complete callsign, but you can supply a shorter string for partial matches."
@@ -434,7 +299,7 @@ paths:
       tags:
         - General
       summary: Get enumeration options
-      description: Retrieves the list of options for various enumerated types, which can be found in the spots and also provided back to the API as query parameters. While these enumerated options are defined in this spec anyway, providing them in an API call allows us to define extra parameters, like the colours associated with bands, and also allows clients to set up their filters and features without having to have internal knowledge about, for example, what bands the server knows about.
+      description: Retrieves the list of options for various enumerated types, which can be found in the spots and also provided back to the API as query parameters. While these enumerated options are defined in this spec anyway, providing them in an API call allows us to define extra parameters, like the colours associated with bands, and also allows clients to set up their filters and features without having to have internal knowledge about, for example, what bands the server knows about. The call also returns a variety of other parameters that may be of use to a web UI, including the contents of the "web-ui-options" config section, which provides guidance for web UI implementations such as the built-in one on sensible configuration options such as the number of spots/alerts to retrieve, or the maximum age of spots to retrieve.
       operationId: options
       responses:
         '200':
@@ -486,6 +351,39 @@ paths:
                     type: boolean
                     description: Whether the POST /spot call, to add spots to the server directly via its API, is permitted on this server.
                     example: true
+                  web-ui-options:
+                    type: object
+                    properties:
+                      spot-count:
+                        type: array
+                        description: An array of suggested "spot counts" that the web UI can retrieve from the API
+                        items:
+                          type: integer
+                          example: 50
+                      spot-count-default:
+                        type: integer
+                        example: 50
+                        description: The suggested default "spot count" that the web UI should retrieve from the API
+                      max-spot-age:
+                        type: array
+                        description: An array of suggested "maximum spot ages" that the web UI can retrieve from the API
+                        items:
+                          type: integer
+                          example: 30
+                      max-spot-age-default:
+                        type: integer
+                        example: 30
+                        description: The suggested default "maximum spot age" that the web UI should retrieve from the API
+                      alert-count:
+                        type: array
+                        description: An array of suggested "alert counts" that the web UI can retrieve from the API
+                        items:
+                          type: integer
+                          example: 100
+                      alert-count-default:
+                        type: integer
+                        example: 100
+                        description: The suggested default "alert count" that the web UI should retrieve from the API
 
 
   /lookup/call:
@@ -518,26 +416,21 @@ paths:
                     type: string
                     description: Name of the operator
                     example: Ian
+                  qth:
+                    type: string
+                    description: QTH of the operator. This could be from any SIG refs or could be from online lookup of their home QTH.
+                    example: Dorset
                   country:
                     type: string
-                    description: Country of the operator
-                    example: United Kingdom
+                    description: Country of the operator. Note that this is named "country" for commonality with other amateur radio tools, but in reality this is more of a "DXCC Name", as it includes many options which are not countries, just territories that DXCC uniquely identifies.
+                    example: England
                   flag:
                     type: string
-                    description: Country flag of the operator
+                    description: Country flag of the operator. This is limited to the range of emoji flags. For some DXCCs there may not be an official emoji flag, e.g. Northern Ireland, so the appearance may vary depending on your browser and operating system. Some small islands may also have no flag. Many DXCCs may also share a flag, e.g. mainland Spain, Balearic Islands, etc.
                     example: ""
                   continent:
-                    type: string
                     description: Continent of the operator
-                    enum:
-                      - EU
-                      - NA
-                      - SA
-                      - AS
-                      - AF
-                      - OC
-                      - AN
-                    example: EU
+                    $ref: "#/components/schemas/Continent"
                   dxcc_id:
                     type: integer
                     description: DXCC ID of the operator
@@ -563,13 +456,8 @@ paths:
                     description: Longitude of the opertor's QTH, in degrees. This could be from an online lookup service, or just based on the DXCC.
                     example: -1.2345
                   location_source:
-                    type: string
                     description: Where we got the location (grid/latitude/longitude) from. Unlike a spot where we might have a summit position or WAB square, here the only options are an online QTH lookup, or a location based purely on DXCC, or nothing.
-                    enum:
-                      - "HOME QTH"
-                      - DXCC
-                      - NONE
-                    example: "HOME QTH"
+                    $ref: "#/components/schemas/LocationSourceForAlert"
         '422':
           description: Validation error e.g. callsign missing or format incorrect
           content:
@@ -591,26 +479,7 @@ paths:
           in: query
           description: Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
           required: true
-          type: string
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - WCA
-            - MOTA
-            - SIOTA
-            - ARLHS
-            - ILLW
-            - ZLOTA
-            - IOTA
-            - WOTA
-            - BOTA
-            - WAB
-            - WAI
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         - name: id
           in: query
           description: ID of a reference in that SIG
@@ -680,6 +549,184 @@ paths:
 
 components:
   schemas:
+    Source:
+      type: string
+      enum:
+        - POTA
+        - SOTA
+        - WWFF
+        - WWBOTA
+        - GMA
+        - HEMA
+        - ParksNPeaks
+        - ZLOTA
+        - WOTA
+        - Cluster
+        - RBN
+        - APRS-IS
+        - UKPacketNet
+      example: POTA
+
+    SIGName:
+      type: string
+      enum:
+        - POTA
+        - SOTA
+        - WWFF
+        - WWBOTA
+        - GMA
+        - HEMA
+        - WCA
+        - MOTA
+        - SIOTA
+        - ARLHS
+        - ILLW
+        - ZLOTA
+        - KRMNPA
+        - IOTA
+        - WOTA
+        - BOTA
+        - WAB
+        - WAI
+        - TOTA
+      example: POTA
+
+    SIGNameIncludingNoSIG:
+      type: string
+      enum:
+        - POTA
+        - SOTA
+        - WWFF
+        - WWBOTA
+        - GMA
+        - HEMA
+        - WCA
+        - MOTA
+        - SIOTA
+        - ARLHS
+        - ILLW
+        - ZLOTA
+        - KRMNPA
+        - IOTA
+        - WOTA
+        - BOTA
+        - WAB
+        - WAI
+        - TOTA
+        - NO_SIG
+      example: POTA
+
+    Continent:
+      type: string
+      enum:
+        - EU
+        - NA
+        - SA
+        - AS
+        - AF
+        - OC
+        - AN
+      example: EU
+
+    BandName:
+      type: string
+      enum:
+        - 2200m
+        - 600m
+        - 160m
+        - 80m
+        - 60m
+        - 40m
+        - 30m
+        - 20m
+        - 17m
+        - 15m
+        - 12m
+        - 11m
+        - 10m
+        - 6m
+        - 5m
+        - 4m
+        - 2m
+        - 1.25m
+        - 70cm
+        - 23cm
+        - 2.4GHz
+        - 5.8GHz
+        - 10GHz
+        - 24GHz
+        - 47GHz
+        - 76GHz
+      example: 40m
+
+    Mode:
+      type: string
+      enum:
+        - CW
+        - PHONE
+        - SSB
+        - USB
+        - LSB
+        - AM
+        - FM
+        - DV
+        - DMR
+        - DSTAR
+        - C4FM
+        - M17
+        - DIGI
+        - DATA
+        - FT8
+        - FT4
+        - RTTY
+        - SSTV
+        - JS8
+        - HELL
+        - BPSK
+        - PSK
+        - BPSK31
+        - OLIVIA
+        - MFSK
+        - MFSK32
+        - PKT
+    example: SSB
+
+    ModeType:
+      type: string
+      enum:
+        - CW
+        - PHONE
+        - DATA
+      example: CW
+
+    ModeSource:
+      type: string
+      enum:
+        - SPOT
+        - COMMENT
+        - BANDPLAN
+        - NONE
+      example: SPOT
+
+    LocationSourceForSpot:
+      type: string
+      enum:
+        - SPOT
+        - "SIG REF LOOKUP"
+        - "WAB/WAI GRID"
+        - "HOME QTH"
+        - DXCC
+        - NONE
+      example: SPOT
+
+    LocationSourceForAlert:
+      type: string
+      enum:
+        - "HOME QTH"
+        - DXCC
+        - NONE
+      example: "HOME QTH"
+
     SIGRef:
       type: object
       properties:
@@ -688,27 +735,8 @@ components:
           description: SIG reference ID.
           example: GB-0001
         sig:
-          type: string
           description: SIG that this reference is in.
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - WCA
-            - MOTA
-            - SIOTA
-            - ARLHS
-            - ILLW
-            - ZLOTA
-            - IOTA
-            - WOTA
-            - BOTA
-            - WAB
-            - WAI
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         name:
           type: string
           description: SIG reference name
@@ -745,26 +773,21 @@ components:
           type: string
           description: Name of the operator that has been spotted
           example: Ian
+        dx_qth:
+          type: string
+          description: QTH of the operator that has been spotted. This could be from any SIG refs or could be from online lookup of their home QTH.
+          example: Dorset
         dx_country:
           type: string
-          description: Country of the DX operator
-          example: United Kingdom
+          description: Country of the operator. Note that this is named "country" for commonality with other amateur radio tools, but in reality this is more of a "DXCC Name", as it includes many options which are not countries, just territories that DXCC uniquely identifies.
+          example: England
         dx_flag:
           type: string
-          description: Country flag of the DX operator
+          description: Country flag of the DX operator. This is limited to the range of emoji flags. For some DXCCs there may not be an official emoji flag, e.g. Northern Ireland, so the appearance may vary depending on your browser and operating system. Some small islands may also have no flag. Many DXCCs may also share a flag, e.g. mainland Spain, Balearic Islands, etc.
           example: ""
         dx_continent:
-          type: string
           description: Continent of the DX operator
-          enum:
-            - EU
-            - NA
-            - SA
-            - AS
-            - AF
-            - OC
-            - AN
-          example: EU
+          $ref: "#/components/schemas/Continent"
         dx_dxcc_id:
           type: integer
           description: DXCC ID of the DX operator
@@ -794,16 +817,8 @@ components:
           description: Longitude of the DX spot, in degrees. This could be from a geographical reference e.g. POTA, or from a QRZ lookup
           example: -1.2345
         dx_location_source:
-          type: string
           description: Where we got the DX location (grid/latitude/longitude) from. If this was from the spot itself, or from a lookup of the SIG ref (e.g. park) it's likely quite accurate, but if we had to fall back to QRZ lookup, or even a location based on the DXCC itself, it will be a lot less accurate.
-          enum:
-            - SPOT
-            - "SIG REF LOOKUP"
-            - "WAB/WAI GRID"
-            - "HOME QTH"
-            - DXCC
-            - NONE
-          example: SPOT
+          $ref: "#/components/schemas/LocationSourceForSpot"
         dx_location_good:
           type: boolean
           description: Does the software think the location is good enough to put a marker on a map? This is true if the source is "SPOT", "SIG REF LOOKUP" or "WAB/WAI GRID", or alternatively if the source is "HOME QTH" and the callsign doesn't have a slash in it (i.e. operator likely at home).
@@ -814,24 +829,15 @@ components:
           example: M0TEST
         de_country:
           type: string
-          description: Country of the spotter
-          example: United Kingdom
+          description: Country of the operator. Note that this is named "country" for commonality with other amateur radio tools, but in reality this is more of a "DXCC Name", as it includes many options which are not countries, just territories that DXCC uniquely identifies.
+          example: England
         de_flag:
           type: string
-          description: Country flag of the spotter
+          description: Country flag of the spotter. This is limited to the range of emoji flags. For some DXCCs there may not be an official emoji flag, e.g. Northern Ireland, so the appearance may vary depending on your browser and operating system. Some small islands may also have no flag. Many DXCCs may also share a flag, e.g. mainland Spain, Balearic Islands, etc.
           example: ""
         de_continent:
-          type: string
-          enum:
-            - EU
-            - NA
-            - SA
-            - AS
-            - AF
-            - OC
-            - AN
           description: Continent of the spotter
-          example: EU
+          $ref: "#/components/schemas/Continent"
         de_dxcc_id:
           type: integer
           description: DXCC ID of the spotter
@@ -853,79 +859,22 @@ components:
           description: Longitude of the DX spotspotter, in degrees. This is not going to be from a xOTA reference so it will likely just be a QRZ or DXCC lookup. If the spotter is also portable, this is probably wrong, but it's good enough for some simple mapping.
           example: -1.2345
         mode:
-          type: string
           description: Reported mode.
-          enum:
-            - CW
-            - PHONE
-            - SSB
-            - USB
-            - LSB
-            - AM
-            - FM
-            - DV
-            - DMR
-            - DSTAR
-            - C4FM
-            - M17
-            - DIGI
-            - DATA
-            - FT8
-            - FT4
-            - RTTY
-            - SSTV
-            - JS8
-            - HELL
-            - BPSK
-            - PSK
-            - BPSK31
-            - OLIVIA
-            - MFSK
-            - MFSK32
-            - PKT
+          $ref: "#/components/schemas/Mode"
           example: SSB
         mode_type:
-          type: string
           description: Inferred mode "family".
-          enum:
-            - CW
-            - PHONE
-            - DATA
-          example: PHONE
+          $ref: "#/components/schemas/ModeType"
         mode_source:
-          type: string
           description: Where we got the mode from. If this was from the spot itself, it's likely quite accurate, but if we had to fall back to the bandplan, it might not be correct.
-          enum:
-            - SPOT
-            - COMMENT
-            - BANDPLAN
-            - NONE
+          $ref: "#/components/schemas/ModeSource"
         freq:
           type: number
           description: Frequency, in Hz
           example: 7150500
         band:
-          type: string
           description: Band, defined by the frequency.
-          enum:
-            - 160m
-            - 80m
-            - 60m
-            - 40m
-            - 30m
-            - 20m
-            - 17m
-            - 15m
-            - 12m
-            - 10m
-            - 6m
-            - 4m
-            - 2m
-            - 70cm
-            - 23cm
-            - 13cm
-            - Unknown
-          example: 40m
+          $ref: "#/components/schemas/BandName"
         time:
           type: number
           description: Time of the spot, UTC seconds since UNIX epoch
@@ -947,27 +896,8 @@ components:
           description: Comment left by the spotter, if any
           example: "59 in NY 73"
         sig:
-          type: string
           description: Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - WCA
-            - MOTA
-            - SIOTA
-            - ARLHS
-            - ILLW
-            - ZLOTA
-            - IOTA
-            - WOTA
-            - BOTA
-            - WAB
-            - WAI
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         sig_refs:
           type: array
           items:
@@ -984,7 +914,7 @@ components:
         band_color:
           type: string
           descripton: Colour to represent this spot, if a client chooses to colour spots based on their frequency band, using PSK Reporter's default colours. HTML colour e.g. hex.
-          example: #ff0000"
+          example: "#ff0000"
         band_contrast_color:
           type: string
           descripton: Black or white, whichever best contrasts with "band_color".
@@ -994,23 +924,8 @@ components:
           description: QRT state. Some APIs return spots marked as QRT. Otherwise we can check the comments.
           example: false
         source:
-          type: string
           description: Where we got the spot from.
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - ParksNPeaks
-            - ZLOTA
-            - WOTA
-            - Cluster
-            - RBN
-            - APRS-IS
-            - UKPacketNet
-          example: POTA
+          $ref: "#/components/schemas/Source"
         source_id:
           type: string
           description: The ID the source gave it, if any.
@@ -1038,24 +953,15 @@ components:
             example: Ian
         dx_country:
           type: string
-          description: Country of the DX operator. This, and the subsequent fields, assume that all activators will be in the same country!
-          example: United Kingdom
+          description: Country of the DX operator. Country of the operator. Note that this is named "country" for commonality with other amateur radio tools, but in reality this is more of a "DXCC Name", as it includes many options which are not countries, just territories that DXCC uniquely identifies. This, and the subsequent fields, assume that all activators will be in the same country!
+          example: England
         dx_flag:
           type: string
-          description: Country flag of the DX operator
+          description: Country flag of the DX operator. This is limited to the range of emoji flags. For some DXCCs there may not be an official emoji flag, e.g. Northern Ireland, so the appearance may vary depending on your browser and operating system. Some small islands may also have no flag. Many DXCCs may also share a flag, e.g. mainland Spain, Balearic Islands, etc.
           example: ""
         dx_continent:
-          type: string
           description: Continent of the DX operator
-          enum:
-            - EU
-            - NA
-            - SA
-            - AS
-            - AF
-            - OC
-            - AN
-          example: EU
+          $ref: "#/components/schemas/Continent"
         dx_dxcc_id:
           type: integer
           description: DXCC ID of the DX operator
@@ -1101,27 +1007,8 @@ components:
           description: Comment made by the activator, if any
           example: "2025 DXpedition to null island"
         sig:
-          type: string
           description: Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - WCA
-            - MOTA
-            - SIOTA
-            - ARLHS
-            - ILLW
-            - ZLOTA
-            - IOTA
-            - WOTA
-            - BOTA
-            - WAB
-            - WAI
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         sig_refs:
           type: array
           items:
@@ -1138,22 +1025,7 @@ components:
         source:
           type: string
           description: Where we got the alert from.
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - ParksNPeaks
-            - ZLOTA
-            - WOTA
-            - BOTA
-            - Cluster
-            - RBN
-            - APRS-IS
-            - UKPacketNet
-          example: POTA
+          $ref: "#/components/schemas/Source"
         source_id:
           type: string
           description: The ID the source gave it, if any.
@@ -1163,9 +1035,8 @@ components:
       type: object
       properties:
         name:
-          type: string
           description: The name of the provider.
-          example: POTA
+          $ref: "#/components/schemas/Source"
         enabled:
           type: boolean
           description: Whether the provider is enabled or not.
@@ -1187,9 +1058,8 @@ components:
       type: object
       properties:
         name:
-          type: string
           description: The name of the provider.
-          example: POTA
+          $ref: "#/components/schemas/Source"
         enabled:
           type: boolean
           description: Whether the provider is enabled or not.
@@ -1207,9 +1077,8 @@ components:
       type: object
       properties:
         name:
-          type: string
           description: The name of the band
-          example: 40m
+          $ref: "#/components/schemas/BandName"
         start_freq:
           type: int
           description: The start frequency of this band, in Hz.
@@ -1231,9 +1100,8 @@ components:
       type: object
       properties:
         name:
-          type: string
           description: The abbreviated name of the SIG
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         description:
           type: string
           description: The full name of the SIG

webassets/css/style.css

@@ -4,6 +4,38 @@
   font-weight: bold;
 }
 
+/* In embedded mode, hide header/footer/settings. "#header div" is kind of janky but for some reason if we hide the
+whole of #header, the map vertical sizing breaks. */
+[embedded-mode=true] #header div, [embedded-mode=true] #footer,
+[embedded-mode=true] #settingsButtonRow, [embedded-mode=true] #settingsButtonRowMap {
+    display: none;
+}
+
+/* Display floating footer in embedded mode only */
+#embeddedModeFooter {
+    display: none;
+    position: fixed;
+    bottom: 0;
+    right: 0;
+    background: var(--bs-body-bg);
+    border-radius: 1em 0 0 0;
+    font-size: 0.9em;
+    border-top: 1px solid grey;
+    border-left: 1px solid grey;
+}
+[embedded-mode=true] #embeddedModeFooter {
+    display: block;
+}
+#embeddedModeFooter img.logo {
+    position: relative;
+    top: -2px;
+}
+
+/* Invert logo colours in dark mode */
+[data-bs-theme=dark] .logo {
+    filter: invert(100%) hue-rotate(180deg) brightness(80%);
+}
+
 
 /* INTRO/WARNING BOXES */
 
@@ -26,8 +58,13 @@ div.container {
    min-height:100svh;
 }
 
+[embedded-mode=true] div.container {
+    width: 100% !important;
+    max-width: 100% !important;
+}
 
-/* ABOUT PAGE*/
+
+/* ABOUT PAGE */
 
 #info-container{
     width: 100%;
@@ -44,7 +81,7 @@ div.container {
 /* SPOTS/ALERTS PAGES, SETTINGS/STATUS AREAS */
 
 input#filter-dx-call {
-    max-width: 10em;
+    max-width: 12em;
     margin-right: 1rem;
     padding-left: 2em;
 }
@@ -71,11 +108,16 @@ td.nowrap, span.nowrap {
 
 span.flag-wrapper {
     display: inline-block;
-    width: 1.7em;
+    width: 1.8em;
     text-align: center;
     cursor: default;
 }
 
+img.flag {
+    position: relative;
+    top: -2px;
+}
+
 span.band-bullet {
     display: inline-block;
     cursor: default;
@@ -132,6 +174,18 @@ tr.table-faded td span {
     text-decoration: line-through !important;
 }
 
+/* Fudge apply our own "dark primary" and "dark danger" backgrounds as Bootstrap doesn't do this itself */
+[data-bs-theme=dark] tr.table-primary {
+    --bs-table-bg: #053680;
+    --bs-table-border-color: #021b42;
+    --bs-table-color: white;
+}
+[data-bs-theme=dark] tr.table-danger {
+    --bs-table-bg: #74272e;
+    --bs-table-border-color: #530208;
+    --bs-table-color: white;
+}
+
 
 /* MAP */
 div#map {
@@ -147,6 +201,12 @@ div#map {
     font-family: var(--bs-body-font-family) !important;
 }
 
+[data-bs-theme=dark] .leaflet-layer,
+[data-bs-theme=dark] .leaflet-control-attribution {
+  filter: invert(100%) hue-rotate(180deg) brightness(95%) contrast(90%);
+}
+
+
 
 /* BANDS PANEL */
 
@@ -222,6 +282,10 @@ div.band-spot {
     cursor: default;
 }
 
+[data-bs-theme=dark] div.band-spot {
+    background-color: black;
+}
+
 div.band-spot:hover {
     z-index: 999;
 }
@@ -256,16 +320,16 @@ div.band-spot:hover span.band-spot-info {
         margin-right: -1em;
     }
     /* Avoid map page filters panel being larger than the map itself */
-    #maptools .appearing-panel {
+    #settingsButtonRowMap .appearing-panel {
         max-height: 30em;
     }
-    #maptools .appearing-panel .card-body {
+    #settingsButtonRowMap .appearing-panel .card-body {
         max-height: 26em;
         overflow: scroll;
     }
     /* Filter/search DX Call field should be smaller on mobile */
     input#filter-dx-call {
-        max-width: 6em;
+        max-width: 9em;
         margin-right: 0;
     }
 }