Prevent ruff running on a couple of lines where catching and not logging an exception is a deliberate choice.

Merge branch 'main' into 147-sig-activity-changes
# Conflicts: # core/constants.py # pyproject.toml
2026-09-20 14:27:42 +00:00 · 2026-09-20 09:55:22 +01:00 · 2026-09-20 09:51:29 +01:00 · 2026-09-20 09:48:10 +01:00 · 2026-09-19 15:07:31 +01:00 · 2026-09-19 10:49:36 +01:00
727 changed files with 30793 additions and 8010 deletions
@@ -0,0 +1,7 @@
+/.venv
+__pycache__
+*.pyc
+/config.yml
+/cache/
+.git
+.gitignore
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/datafiles/MUNICIPIOS.csv" charset="ISO-8859-1" />
+  </component>
+</project>
@@ -1,6 +1,77 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
+    <inspection_tool class="Annotator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="BadExpressionStatementJS" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckImageSize" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssOverwrittenProperties" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomProperty" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrazieInspection" enabled="false" level="GRAMMAR_ERROR" enabled_by_default="false" />
+    <inspection_tool class="GrazieStyle" enabled="false" level="STYLE_SUGGESTION" enabled_by_default="false" />
+    <inspection_tool class="HtmlFormInputWithoutLabel" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownTag" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="6">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HttpUrlsUsage" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSDeprecatedSymbols" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSIgnoredPromiseFromCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSJQueryEfficiency" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedReference" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnusedGlobalSymbols" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" />
+    <inspection_tool class="LanguageDetectionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="OutdatedRequirementInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyBroadExceptionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ourVersions">
+        <value>
+          <list size="6">
+            <item index="0" class="java.lang.String" itemvalue="3.15" />
+            <item index="1" class="java.lang.String" itemvalue="3.14" />
+            <item index="2" class="java.lang.String" itemvalue="3.13" />
+            <item index="3" class="java.lang.String" itemvalue="3.12" />
+            <item index="4" class="java.lang.String" itemvalue="3.11" />
+            <item index="5" class="java.lang.String" itemvalue="3.10" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyStringConversionWithoutDunderMethodInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredTypes">
+        <list>
+          <option value="types.NoneType" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyStubPackagesAdvertiser" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <list>
+          <option value="pandas" />
+        </list>
+      </option>
+    </inspection_tool>
    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
      <option name="processCode" value="true" />
      <option name="processLiterals" value="true" />
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="file://$PROJECT_DIR$" libraries="{redoc.standalone}" />
+  </component>
+</project>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PyToolsState">
+    <option name="tools">
+      <map>
+        <entry key="ruff">
+          <value>
+            <ToolEntry>
+              <option name="enabled" value="true" />
+            </ToolEntry>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
@@ -12,6 +12,8 @@
    <option name="IS_MODULE_SDK" value="true" />
    <option name="ADD_CONTENT_ROOTS" value="true" />
    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <option name="DEBUG_JUST_MY_CODE" value="true" />
+    <option name="RUN_TOOL" value="" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/spothole.py" />
    <option name="PARAMETERS" value="" />
    <option name="SHOW_COMMAND_LINE" value="false" />
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
+<module external.system.id="pyproject.toml" type="PYTHON_MODULE" version="4">
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
      <excludeFolder url="file://$MODULE_DIR$/.venv" />
+      <excludeFolder url="file://$MODULE_DIR$/static/vendor" />
    </content>
    <orderEntry type="jdk" jdkName="Python 3.13 virtualenv at ~/code/spothole/.venv" jdkType="Python SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="redoc.standalone" level="application" />
  </component>
 </module>
@@ -0,0 +1,9 @@
+FROM python:3.13-slim
+
+WORKDIR /app
+COPY . .
+RUN pip install --no-cache-dir -r requirements.txt
+EXPOSE 8080
+EXPOSE 7373
+
+CMD ["python3", "spothole.py"]
@@ -1,16 +1,28 @@
-# ![Spothole](/webassets/img/logo.png)
+# ![Spothole](/static/img/logo.png)

-Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an open JSON API as well as a website to browse the data.
+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, and its own telnet server for integration with desktop loggers.
+
+A "main" or example server runs at [https://spothole.app](https://spothole.app/) in case you'd like to try it out.

 ![Screenshot](/images/screenshot.png)

-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.
+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.

-The API is deliberately well-defined with an OpenAPI specification and auto-generated API documentation. 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.
+The API is deliberately well-defined with an OpenAPI specification and auto-generated API documentation. 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.

 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, LLOTA, WWTOTA, Tiles on the Air, the UK Packet Repeater Network, NG3K, and any site based on the xOTA software by nischu.
+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, LLOTA, WWTOTA, Tiles on the Air, the UK Packet
+Repeater Network, NG3K, and any site based on the xOTA software by nischu. It also integrates with QRZ.com and HamQTH,
+retrieves solar data from various sources, provides information about upcoming contests, and more.
+
+You can read more about Spothole on [the "About" page of the main server instance](https://spothole.app/about).

 ![Screenshot](/images/screenshot2.png)

@@ -18,349 +30,45 @@ Supported data sources include DX Clusters, the Reverse Beacon Network (RBN), th

 ## 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.
+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.

-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.
+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 are more than welcome to use the data and the API that Spothole provides to power your own software, to run your own
+Spothole server, or to modify it in any way. More details can be found in the following sections:

-You can embed Spothole in another website, e.g. for use as part of a ham radio custom dashboard.
+* [Embedding Spothole in another website](docs/embedding.md)
+* [Writing your own client](docs/clients.md)
+* [Running your own copy](docs/running.md)
+    * [nginx reverse proxy configuration](docs/nginx.md)
+    * [systemd service file](docs/systemd.md)
+    * [Running in Docker](docs/docker.md)
+    * [Use of multiple cluster logins](docs/multicluster.md)
+* [Modifying the source code](docs/modifying.md)

-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.app/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.app/?embedded=true`. For dark mode showing 70cm TOTA spots only, use `https://spothole.app/?embedded=true&dark-mode=true&sig=TOTA&band=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.                                                                                                                                                |
-| `color-scheme`    | `light`, `dark`, `auto` | `auto`  | `?color-scheme=dark`           | Forces light or dark mode in preference to the operating system default.                                                                                              |
-| `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. |
-| `map-center-lat`  | Numeric (decimal)       | (auto)  | `?map-center-lat=51.5`         | Sets the initial latitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                       |
-| `map-center-lon`  | Numeric (decimal)       | (auto)  | `?map-center-lon=-0.1`         | Sets the initial longitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                      |
-| `map-zoom`        | Numeric (integer)       | (auto)  | `?map-zoom=6`                  | Sets the initial zoom level of the map on the map page. If omitted, the map auto-fits to the loaded spots.                                                            |
-
-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.
-
-As well as the main API endpoints to fetch spots and alerts, with various possible query parameters, there are also Server-Sent Events (SSE) API endpoints to receive a live feed, plus various utility lookup endpoints for things like callsign and park data.
-
-Various approaches exist to writing your own client, but in general:
-
-* Refer to the API docs. These are built on an OpenAPI definition file (`/webassets/apidocs/openapi.yml`), which you can 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 on different approaches. For example, the "map" and "bands" pages simply query the main spot API on a timer, whereas the main/spots page combines this approach with using the Server-Sent Events (SSE) endpoint to update live.
-* 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.
-
-You will require Python version 3.8 or later. If you encounter an error about `gdal-config` during the following process, you will also need `libgdal-dev` installed.
-
-To download and set up Spothole on a Debian server, run the following commands. Other operating systems will likely be similar.
-
-```bash
-git clone ssh://git@git.ianrenton.com/ian/spothole.git
-cd spothole
-python3 -m venv ./.venv
-source .venv/bin/activate
-pip install -r requirements.txt
-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. Mostly, this will involve enabling or disabling the various providers of spot and alert data.
-
-By default, all outdoor programme providers are enabled, as is one cluster node and the NG3K DXpedition data. The RBN spot providers are turned off by default due to the volume of traffic from CW/RTTY/FT8 skimmers, and the APRS and Packet spot providers are off by default on the assumption that Spothole users want a spot with a human at the other end of it, but all can be easily re-enabled.
-
-`config.yml` has some entries for QRZ.com username & password, and Clublog API keys. If provided, these allow Spothole to retrieve more information about DX spots, such as the country their callsign corresponds to. The software will work just fine without them, but you may find a few country flags etc. are less accurate or missing.
-
-Clublog API keys are free, but you'll need to get your own by submitting a helpdesk ticket and explaining what you'll use it for. The admin team are happy with the rate of requests made by my Spothole server, so unless you change the source code of yours to radically increase the rate of querying Clublog, I'm sure they will be fine with your server too.
-
-Free QRZ.com accounts offer only limited access to the site's data via their API. You'll have to sign up for one of their "XML Data Subscriber" plans to gain access to the full data, but if you're on a free account then the software will get what information it can.
-
-Once you're happy with the content of `config.yml`, you can proceed to running the software.
-
-To run the software this time and any future times you want to run it directly from the command line:
-
-```bash
-source .venv/bin/activate
-python3 spothole.py
-```
-
-The software can take a few seconds to start up, mostly because it is downloading an updated file to match callsigns to countries. This is normal, don't panic!
-
-If you see some errors on startup, check your configuration, e.g. in case you have specified a port for the web server that is already in use by something else.
-
-### Multiple cluster nodes with different settings
-
-Dan, S50U has written in with his Spothole cluster settings. He is using a cluster node which provides RBN spots, and uses different SSIDs on his callsign to get different settings when logged into the same cluster node. For example:
-
-```
-  -
-    class: "DXCluster"
-    name: "S50CLX"
-    enabled: true
-    host: "s50clx.si"
-    port: 41112
-    login_prompt: "login: "
-    login_callsign: "callsign-10"
-```
-
-Telnet to DXSpider and log in with "callsign-10" and execute the following commands:
-
-`CLEAR/SPOTS ALL` (delete all previous filters)<br/>
-`UNSET/ANN` (stop announce messages)<br/>
-`UNSET/WCY` (stop wcy messages)<br/>
-`UNSET/WWV` (stop wwv messages)<br/>
-`SET/DX` (enable human DX spots)
-
-```
-  -
-    class: "DXCluster"
-    name: "RBN CW"
-    enabled: true
-    host: "s50clx.si"
-    port: 41112
-    login_prompt: "login: "
-    login_callsign: "callsign-11"
-    allow_rbn_spots: true
-    enabled-by-default-in-web-ui: false
-```
-
-Telnet to DXSpider and log in with "callsign-11" and execute the following commands:
-
-`CLEAR/SPOTS ALL` (delete all previous filters)<br/>
-`UNSET/ANN` (stop announce messages)<br/>
-`UNSET/WCY` (stop wcy messages)<br/>
-`UNSET/WWV` (stop wwv messages)<br/>
-`UNSET/DX` (stop human DX spots)<br/>
-`SET/SKIMMER CW` (enable CW RBN spots)
-
-```
-  -
-    class: "DXCluster"
-    name: "RBN RTTY"
-    enabled: true
-    host: "s50clx.si"
-    port: 41112
-    login_prompt: "login: "
-    login_callsign: "callsign-12"
-    allow_rbn_spots: true
-    enabled-by-default-in-web-ui: false
-```
-
-Telnet to DXSpider and log in with "callsign-12" and execute the following commands:
-
-`CLEAR/SPOTS ALL` (delete all previous filters)<br/>
-`UNSET/ANN` (stop announce messages)<br/>
-`UNSET/WCY` (stop wcy messages)<br/>
-`UNSET/WWV` (stop wwv messages)<br/>
-`UNSET/DX` (stop human DX spots)<br/>
-`SET/SKIMMER RTTY` (enable RTTY RBN spots)
-
-```
-  -
-    class: "DXCluster"
-    name: "RBN FT4/8"
-    enabled: true
-    host: "s50clx.si"
-    port: 41112
-    login_prompt: "login: "
-    login_callsign: "callsign-13"
-    allow_rbn_spots: true
-    enabled-by-default-in-web-ui: false
-```
-
-Telnet to DXSpider and log in with "callsign-13" and execute the following commands:
-
-`CLEAR/SPOTS ALL` (delete all previous filters)<br/>
-`UNSET/ANN` (stop announce messages)<br/>
-`UNSET/WCY` (stop wcy messages)<br/>
-`UNSET/WWV` (stop wwv messages)<br/>
-`UNSET/DX` (stop human DX spots)<br/>
-`SET/SKIMMER FT` (enable FT RBN spots)
-
-For each callsign-SSID, we also specify our basic information with commands:
-
-`SET/NAME Spothole10`, Spothole11... etc.<br/>
-`SET/QTH Cerkno`<br/>
-`SET/QRA JN66XD`<br/>
-`SET/HOME S50CLX`
-
-### 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:
-
-```
-[Unit]
-Description=Spothole
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=spothole
-WorkingDirectory=/home/spothole/spothole
-ExecStart=/home/spothole/spothole/.venv/bin/python /home/spothole/spothole/spothole.py --serve-in-foreground
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
-```
-
-Run the following:
-
-```bash
-sudo systemctl daemon-reload
-sudo systemctl enable spothole
-sudo systemctl start spothole
-```
-
-Check the service has started up correctly with `sudo journalctl -u spothole -f`.
-
-### nginx Reverse Proxy configuration
-
-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.
-
-```nginx
-map $request_uri $xssorigin {
-    ~^/api   *;
-}
-
-server {
-    server_name spothole.app;
-
-    # Wellknown area for Lets Encrypt
-    location /.well-known/ {
-        alias /var/www/html/.well-known/;
-    }
-    
-    location / {
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-        proxy_pass http://127.0.0.1:8080;
-        proxy_hide_header Access-Control-Allow-Origin;
-        add_header Access-Control-Allow-Origin $xssorigin;
-    }
-}
-```
-
-One further change you might want to make to the file above is the `add_header Access-Control-Allow-Origin` statement. This is what's used on
-my own Spothole server to make sure that other third-party web-based software can get the data from my instance, and applies to any endpoint underneath `/api`. If you want
-*your* Spothole instance to be set up the same way, so that others can write software in JavaScript that can access it,
-leave this intact. But if you want your Spothole instance to only be usable by scripts running on the web server you write,
-you can remove this line. (Note that this doesn't stop other people writing *non-web-based* software that accesses your
-Spothole API&mdash;the enforcement of cross-origin headers only happens within the user's browser. If you need to lock your
-instance down so that no-one else can access it with *any* software, that's an aspect of nginx or firewall config that you will need
-to find help with elsewhere.)
-
-Now, make a symbolic link to enable the site:
-
-```bash
-cd /etc/nginx/sites-enabled
-sudo ln -sf ../sites-available/spothole
-```
-
-Test that your nginx config isn't broken using `nginx -t`. If it works, restart nginx with `sudo systemctl restart nginx`.
-
-If you haven't already done so, set up a DNS entry to make sure requests for your domain name end up at the server that's running Spothole.
-
-You should now be able to access the web interface by going to the domain from your browser.
-
-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.
-
-## Modifying the source code
-
-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.
-
-### Code structure
-
-To navigate your way around the source code, this list may help.
-
-*Python back-end code*
-
-* `/core` - Core classes and scripts
-* `/data` - Data storage classes
-* `/spotproviders` - Classes providing spots by accessing the APIs of other services
-* `/alertproviders` - Classes providing alerts by accessing the APIs of other services
-* `/solarconditionsproviders` - Classes providing solar and propagation by accessing the APIs of other services
-* `/server` - Classes for running Spothole's own web server
-
-*Templates*
-
-* `/templates` - Templates used for constructing Spothole's user-targeted HTML pages
-
-*HTML/JS/CSS front-end code*
-
-* `/webassets` - Root for static files served by the web server
-* `/webassets/apidocs` - Contains the OpenAPI spec (`openapi.yml`)
-* `/webassets/css` - CSS files used by the web front-end
-* `/webassets/fa` - a copy of the FontAwesome library
-* `/webassets/img` - image files used by the web front-end
-* `/webassets/js` - JavaScript used by the web front-end
-
-*Miscellaneous*
-
-* `/` - Main script (`spothole.py`), pip `requirements.txt`, config, README, etc.
-* `/images` - Image sources
-* `/datafiles` - Local data sources (differentiated from the majority of data files which are loaded from URLs and cached in `/cache`)
-* `/cache` - Directory where static-ish data downloaded from the internet is cached to avoid rapid re-requests, and where spot/alert data is cached so that it survives a software restart. Created on first run.
-
-### Extending the server
-
-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 "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 `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 `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 `spot_providers` section of `config.yml`, and your provider should be instantiated on startup.
-
-The same approach as above is also used for alert providers.
+![Screenshot](/images/screenshot4.png)

 ## Thanks

-As well as being my work, I have also gratefully received feature patches from Steven, M1SDH.
+[Spothole's "About" page](https://spothole.app/about) contains the full details of the thanks I owe to the various
+programme teams, software library providers, bug fixers etc. The extra detail below contains the extra detail of
+specific files in this repository which are not all my own work and may be subject to other licences.

-The project contains GeoJSON files for CQ and ITU zones, in the `/datafiles/` directory. These are MIT-licenced and, to my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet.
+The project contains GeoJSON files for CQ and ITU zones, in the `/datafiles/` directory. These are MIT-licenced and, to
+my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet. `/datafiles` also contains a
+`MUNICIPIOS.csv` file, from the "Nomenclátor Geográfico de Municipios y Entidades de Población" data set sourced from
+[el Centro Nacional de Información Geográfica](https://centrodedescargas.cnig.es/CentroDescargas/home).
+`didbase-stations.csv` and the TOTA file were created by me based on publicly available data from GIRO and from maps of
+conference centres.

-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
+`/static/img/flags/` directory.

-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
+which are self-hosted in the `/static/vendor/` directory. This project would not have been possible without these
+libraries, so many thanks to their developers. These libraries are subject to their own licences and are not covered by
+the overall licence declared in Spothole's `LICENSE` file.

-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 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.
-
-Amateur radio clusters, outdoor programmes, propagation data providers etc. are almost all volunteer-run services that make no or little profit, and are done for the love of amateur radio. Services like Spothole, which build on top of them, are truly standing on the shoulders of giants. None of this would have been possible without the hard work and dedication of many other people within the amaetur radio community.
-
-The project's name was suggested by Harm, DK4HAA. Thanks!
+Sound effects are CC0-licenced and sourced from [Pixabay](https://pixabay.com).
@@ -1,51 +0,0 @@
-from datetime import datetime, timedelta
-
-import pytz
-from bs4 import BeautifulSoup
-
-from alertproviders.http_alert_provider import HTTPAlertProvider
-from data.alert import Alert
-from data.sig_ref import SIGRef
-
-
-class BOTA(HTTPAlertProvider):
-    """Alert provider for Beaches on the Air"""
-
-    POLL_INTERVAL_SEC = 1800
-    ALERTS_URL = "https://www.beachesontheair.com/"
-
-    def __init__(self, provider_config):
-        super().__init__(provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
-
-    def _http_response_to_alerts(self, http_response):
-        new_alerts = []
-        # Find the table of upcoming alerts
-        bs = BeautifulSoup(http_response.content.decode(), features="lxml")
-        div = bs.body.find('div', attrs={'class': 'view-activations-public'})
-        if div:
-            table = div.find('table', attrs={'class': 'views-table'})
-            if table:
-                tbody = table.find('tbody')
-                for row in tbody.find_all('tr'):
-                    cells = row.find_all('td')
-                    first_cell_text = str(cells[0].find('a').contents[0]).strip()
-                    ref_name = first_cell_text.split(" by ")[0]
-                    dx_call = str(cells[1].find('a').contents[0]).strip().upper()
-
-                    # Get the date, dealing with the fact we get no year so have to figure out if it's last year or next year
-                    date_text = str(cells[2].find('span').contents[0]).strip()
-                    date_time = datetime.strptime(date_text, "%d %b - %H:%M UTC").replace(tzinfo=pytz.UTC)
-                    date_time = date_time.replace(year=datetime.now(pytz.UTC).year)
-                    # If this was more than a day ago, activation is actually next year
-                    if date_time < datetime.now(pytz.UTC) - timedelta(days=1):
-                        date_time = date_time.replace(year=datetime.now(pytz.UTC).year + 1)
-
-                    # Convert to our alert format
-                    alert = Alert(source=self.name,
-                                  dx_calls=[dx_call],
-                                  sig_refs=[SIGRef(id=ref_name, sig="BOTA")],
-                                  start_time=date_time.timestamp(),
-                                  is_dxpedition=False)
-
-                    new_alerts.append(alert)
-        return new_alerts
@@ -1,65 +0,0 @@
-import logging
-from datetime import datetime
-from threading import Thread, Event
-
-import pytz
-import requests
-
-from alertproviders.alert_provider import AlertProvider
-from core.constants import HTTP_HEADERS
-
-
-class HTTPAlertProvider(AlertProvider):
-    """Generic alert provider class for providers that request data via HTTP(S). Just for convenience to avoid code
-    duplication. Subclasses of this query the individual APIs for data."""
-
-    def __init__(self, provider_config, url, poll_interval):
-        super().__init__(provider_config)
-        self._url = url
-        self._poll_interval = poll_interval
-        self._thread = None
-        self._stop_event = Event()
-
-    def start(self):
-        # Fire off the polling thread. It will poll immediately on startup, then sleep for poll_interval between
-        # subsequent polls, so start() returns immediately and the application can continue starting.
-        logging.info("Set up query of " + self.name + " alert API every " + str(self._poll_interval) + " seconds.")
-        self._thread = Thread(target=self._run, daemon=True)
-        self._thread.start()
-
-    def stop(self):
-        self._stop_event.set()
-
-    def _run(self):
-        while True:
-            self._poll()
-            if self._stop_event.wait(timeout=self._poll_interval):
-                break
-
-    def _poll(self):
-        try:
-            # Request data from API
-            logging.debug("Polling " + self.name + " alert API...")
-            http_response = requests.get(self._url, headers=HTTP_HEADERS)
-            # Pass off to the subclass for processing
-            new_alerts = self._http_response_to_alerts(http_response)
-            # Submit the new alerts for processing. There might not be any alerts for the less popular programs.
-            if new_alerts:
-                self._submit_batch(new_alerts)
-
-            self.status = "OK"
-            self.last_update_time = datetime.now(pytz.UTC)
-            logging.debug("Received data from " + self.name + " alert API.")
-
-        except Exception:
-            self.status = "Error"
-            logging.exception("Exception in HTTP JSON Alert Provider (" + self.name + ")")
-            # Brief pause on error before the next poll, but still respond promptly to stop()
-            self._stop_event.wait(timeout=1)
-
-    def _http_response_to_alerts(self, http_response):
-        """Convert an HTTP response returned by the API into alert data. The whole response is provided here so the subclass
-        implementations can check for HTTP status codes if necessary, and handle the response as JSON, XML, text, whatever
-        the API actually provides."""
-
-        raise NotImplementedError("Subclasses must implement this method")
@@ -1,55 +0,0 @@
-import logging
-from datetime import datetime
-
-import pytz
-
-from alertproviders.http_alert_provider import HTTPAlertProvider
-from data.alert import Alert
-from data.sig_ref import SIGRef
-
-
-class ParksNPeaks(HTTPAlertProvider):
-    """Alert provider for Parks n Peaks"""
-
-    POLL_INTERVAL_SEC = 1800
-    ALERTS_URL = "http://parksnpeaks.org/api/ALERTS/"
-
-    def __init__(self, provider_config):
-        super().__init__(provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
-
-    def _http_response_to_alerts(self, http_response):
-        new_alerts = []
-        # Iterate through source data
-        for source_alert in http_response.json():
-            # Calculate some things
-            sig = source_alert["Class"]
-            if " - " in source_alert["Location"]:
-                split = source_alert["Location"].split(" - ")
-                sig_ref = split[0]
-                sig_ref_name = split[1]
-            else:
-                sig_ref = source_alert["WWFFID"]
-                sig_ref_name = source_alert["Location"]
-            start_time = datetime.strptime(source_alert["alTime"], "%Y-%m-%d %H:%M:%S").replace(
-                tzinfo=pytz.UTC).timestamp()
-
-            # Convert to our alert format
-            alert = Alert(source=self.name,
-                          source_id=source_alert["alID"],
-                          dx_calls=[source_alert["CallSign"].upper()],
-                          freqs_modes=source_alert["Freq"] + " " + source_alert["MODE"],
-                          comment=source_alert["Comments"],
-                          sig_refs=[SIGRef(id=sig_ref, sig=sig, name=sig_ref_name)],
-                          start_time=start_time,
-                          is_dxpedition=False)
-
-            # Log a warning for the developer if PnP gives us an unknown programme we've never seen before
-            if sig and sig not in ["POTA", "SOTA", "WWFF", "SiOTA", "ZLOTA", "KRMNPA"]:
-                logging.warning("PNP alert found with sig " + sig + ", developer needs to add support for this!")
-
-            # If this is POTA, SOTA or WWFF data we already have it through other means, so ignore. Otherwise, add to
-            # the alert list. Note that while ZLOTA has its own spots API, it doesn't have its own alerts API. So that
-            # means the PnP *spot* provider rejects ZLOTA spots here, but the PnP *alerts* provider here allows ZLOTA.
-            if sig not in ["POTA", "SOTA", "WWFF"]:
-                new_alerts.append(alert)
-        return new_alerts
@@ -1,42 +0,0 @@
-from datetime import datetime
-
-import pytz
-
-from alertproviders.http_alert_provider import HTTPAlertProvider
-from data.alert import Alert
-from data.sig_ref import SIGRef
-
-
-class POTA(HTTPAlertProvider):
-    """Alert provider for Parks on the Air"""
-
-    POLL_INTERVAL_SEC = 1800
-    ALERTS_URL = "https://api.pota.app/activation"
-
-    def __init__(self, provider_config):
-        super().__init__(provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
-
-    def _http_response_to_alerts(self, http_response):
-        new_alerts = []
-        # Iterate through source data
-        for source_alert in http_response.json():
-            # Convert to our alert format
-            alert = Alert(source=self.name,
-                          source_id=source_alert["scheduledActivitiesId"],
-                          dx_calls=[source_alert["activator"].upper()],
-                          freqs_modes=source_alert["frequencies"],
-                          comment=source_alert["comments"],
-                          sig_refs=[SIGRef(id=source_alert["reference"], sig="POTA", name=source_alert["name"],
-                                           url="https://pota.app/#/park/" + source_alert["reference"])],
-                          start_time=datetime.strptime(source_alert["startDate"] + source_alert["startTime"],
-                                                       "%Y-%m-%d%H:%M").replace(tzinfo=pytz.UTC).timestamp(),
-                          end_time=datetime.strptime(source_alert["endDate"] + source_alert["endTime"],
-                                                     "%Y-%m-%d%H:%M").replace(tzinfo=pytz.UTC).timestamp(),
-                          is_dxpedition=False)
-
-            # Add to our list, but exclude any old spots that POTA can sometimes give us where even the end time is
-            # in the past. Don't worry about de-duping, removing old alerts etc. at this point; other code will do
-            # that for us.
-            if alert.end_time > datetime.now(pytz.UTC).timestamp():
-                new_alerts.append(alert)
-        return new_alerts
@@ -1,44 +0,0 @@
-from datetime import datetime
-
-import pytz
-
-from alertproviders.http_alert_provider import HTTPAlertProvider
-from data.alert import Alert
-from data.sig_ref import SIGRef
-
-
-class SOTA(HTTPAlertProvider):
-    """Alert provider for Summits on the Air"""
-
-    POLL_INTERVAL_SEC = 1800
-    ALERTS_URL = "https://api-db2.sota.org.uk/api/alerts/365/all/all"
-
-    def __init__(self, provider_config):
-        super().__init__(provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
-
-    def _http_response_to_alerts(self, http_response):
-        new_alerts = []
-        # Iterate through source data
-        for source_alert in http_response.json():
-            # Convert to our alert format
-            details = source_alert["summitDetails"].split(", ")
-            summit_name = details[0]
-            summit_points = None
-            if len(details) > 2:
-                summit_points = int(details[-1].split(" ")[0])
-            alert = Alert(source=self.name,
-                          source_id=source_alert["id"],
-                          dx_calls=[source_alert["activatingCallsign"].upper()],
-                          dx_names=[source_alert["activatorName"].upper()],
-                          freqs_modes=source_alert["frequency"],
-                          comment=source_alert["comments"],
-                          sig_refs=[
-                              SIGRef(id=source_alert["associationCode"] + "/" + source_alert["summitCode"], sig="SOTA",
-                                     name=summit_name, activation_score=summit_points)],
-                          start_time=datetime.strptime(source_alert["dateActivated"],
-                                                       "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=pytz.UTC).timestamp(),
-                          is_dxpedition=False)
-
-            # Add to our list
-            new_alerts.append(alert)
-        return new_alerts
@@ -1,62 +0,0 @@
-from datetime import datetime
-
-import pytz
-from rss_parser import Parser as RSSParser
-
-from alertproviders.http_alert_provider import HTTPAlertProvider
-from data.alert import Alert
-from data.sig_ref import SIGRef
-
-
-class WOTA(HTTPAlertProvider):
-    """Alert provider for Wainwrights on the Air"""
-
-    POLL_INTERVAL_SEC = 1800
-    ALERTS_URL = "https://www.wota.org.uk/alerts_rss.php"
-    RSS_DATE_TIME_FORMAT = "%a, %d %b %Y %H:%M:%S %z"
-
-    def __init__(self, provider_config):
-        super().__init__(provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
-
-    def _http_response_to_alerts(self, http_response):
-        new_alerts = []
-        rss = RSSParser.parse(http_response.content.decode())
-        # Iterate through source data
-        for source_alert in rss.channel.items:
-
-            # Reject GUID missing or zero
-            if not source_alert.guid or not source_alert.guid.content or source_alert.guid.content == "http://www.wota.org.uk/alerts/0":
-                continue
-
-            # Pick apart the title
-            title_split = source_alert.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_alert.description.split(". ")
-            freqs_modes = desc_split[0].replace("Frequencies/modes:", "").strip()
-            comment = None
-            if len(desc_split) > 1:
-                comment = desc_split[1].strip()
-
-            time = datetime.strptime(source_alert.pub_date.content, self.RSS_DATE_TIME_FORMAT).astimezone(pytz.UTC)
-
-            # Convert to our alert format
-            alert = Alert(source=self.name,
-                          source_id=source_alert.guid.content,
-                          dx_calls=[dx_call],
-                          freqs_modes=freqs_modes,
-                          comment=comment,
-                          sig_refs=[SIGRef(id=ref, sig="WOTA", name=ref_name)] if ref else [],
-                          start_time=time.timestamp())
-
-            # Add to our list.
-            new_alerts.append(alert)
-        return new_alerts
@@ -1,38 +0,0 @@
-from datetime import datetime
-
-import pytz
-
-from alertproviders.http_alert_provider import HTTPAlertProvider
-from data.alert import Alert
-from data.sig_ref import SIGRef
-
-
-class WWFF(HTTPAlertProvider):
-    """Alert provider for Worldwide Flora and Fauna"""
-
-    POLL_INTERVAL_SEC = 1800
-    ALERTS_URL = "https://spots.wwff.co/static/agendas.json"
-
-    def __init__(self, provider_config):
-        super().__init__(provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
-
-    def _http_response_to_alerts(self, http_response):
-        new_alerts = []
-        # Iterate through source data
-        for source_alert in http_response.json():
-            # Convert to our alert format
-            alert = Alert(source=self.name,
-                          source_id=source_alert["id"],
-                          dx_calls=[source_alert["activator_call"].upper()],
-                          freqs_modes=source_alert["band"] + " " + source_alert["mode"],
-                          comment=source_alert["remarks"],
-                          sig_refs=[SIGRef(id=source_alert["reference"], sig="WWFF")],
-                          start_time=datetime.strptime(source_alert["utc_start"],
-                                                       "%Y-%m-%d %H:%M:%S").replace(tzinfo=pytz.UTC).timestamp(),
-                          end_time=datetime.strptime(source_alert["utc_end"],
-                                                     "%Y-%m-%d %H:%M:%S").replace(tzinfo=pytz.UTC).timestamp(),
-                          is_dxpedition=False)
-
-            # Add to our list
-            new_alerts.append(alert)
-        return new_alerts
@@ -4,73 +4,80 @@
 # Your callsign. Used to log into DX clusters and included in User-Agent when querying HTTP servers. Useful so if your
 # server goes crazy and causes other people problems, they know who to contact :) If you don't have one, you can leave
 # this as "N0CALL" and it shouldn't do any harm, as we're not sending anything to the various networks, only receiving.
-server-owner-callsign: "N0CALL"
+server_owner_callsign: "N0CALL"
+
+# Port to open the local web server on
+web_server_port: 8080
+
+# Run in API-only mode? When enabled, the web UI is not served, only the API endpoints and the OpenAPI documentation
+# page. If you are running your own Spothole instance purely to serve client software, and not wanting visitors to
+# discover a full web-based cluster UI, enable this flag.
+api_only_mode: false

 # The base URL at which the software runs.
-base-url: "http://localhost:8080"
+base_url: "http://localhost:8080"
+
+# Whether to run a telnet spot server as well as the web interface
+telnet_server_enabled: false
+
+# Telnet server address. This is not really needed by the software itself, just displayed in documentation.
+telnet_server_address: "localhost"
+
+# Port to run the telnet server on
+telnet_server_port: 7373

 # Spot providers to use. This is an example set, tailor it to your liking by commenting and uncommenting.
 # RBN and APRS-IS are supported but have such a high data rate, you probably don't want them enabled.
-# Each provider needs a class, a name, and an enabled/disabled state. Some require more config such as hostnames/IP
+# Each provider needs a class and an enabled/disabled state. Some require more config such as hostnames/IP
 # addresses and ports. You can duplicate them if you like, e.g. to support several DX clusters. RBN uses two ports, 7000
 # for CW/RTTY and 7001 for FT8, so if you want both, you need two entries, as shown below.
 # Feel free to write your own provider classes! There are details in the README.
-spot-providers:
-  -
-    class: "POTA"
-    name: "POTA"
+spot_providers:
+  - class: "POTA"
    enabled: true
-  -
-    class: "SOTA"
-    name: "SOTA"
+
+  - class: "SOTA"
    enabled: true
-  -
-    class: "WWFF"
-    name: "WWFF"
+
+  - class: "WWFF"
    enabled: true
-  -
-    class: "WWBOTA"
-    name: "WWBOTA"
+
+  - class: "WWBOTA"
    enabled: true
-  -
-    class: "GMA"
-    name: "GMA"
+
+  - class: "GMA"
    enabled: true
-  -
-    class: "HEMA"
-    name: "HEMA"
+    # GMA requires an API key to fetch spots. After creating an account on cqgma.org, email support and request one.
+    api_key: ""
+
+  - class: "HEMA"
    enabled: true
-  -
-    class: "ParksNPeaks"
-    name: "ParksNPeaks"
+
+  - class: "ParksNPeaks"
    enabled: true
-  -
-    class: "ZLOTA"
-    name: "ZLOTA"
+
+  - class: "ZLOTA"
    enabled: true
-  -
-    class: "WOTA"
-    name: "WOTA"
+
+  - class: "WOTA"
    enabled: true
-  -
-    class: "LLOTA"
-    name: "LLOTA"
+
+  - class: "LLOTA"
    enabled: true
-  -
-    class: "WWTOTA"
-    name: "WWTOTA"
+
+  - class: "Towers"
    enabled: true
-  -
-    class: "Tiles"
-    name: "Tiles"
+
+  - class: "Tiles"
    enabled: true
-  -
-    class: "APRSIS"
-    name: "APRS-IS"
+
+  - class: "APRSIS"
    enabled: false
-  -
-    class: "DXCluster"
-    name: "HRD Cluster"
+
+  - class: "DXCluster"
+    # Clusters have a "name" property in case you want to say which cluster node the data is from, or connect to
+    # several clusters and name them separately. The name will be used as the "source" field for the spots received.
+    name: "Cluster"
    enabled: true
    host: "hrd.wa9pie.net"
    port: 8000
@@ -84,137 +91,305 @@ spot-providers:
    # sure you aren't also separately connecting to RBN directly, otherwise you may get duplicate spots.) Note that not
    # all clusters sent RBN spots anyway.
    allow_rbn_spots: false
-  -
-    class: "DXCluster"
-    name: "W3LPL Cluster"
+
+  - class: "DXCluster"
+    name: "Cluster"
    enabled: false
    host: "w3lpl.net"
    port: 7373
-    # Prompt the cluster node gives when asking for a callsign to log in. Varies between cluster node software.
-    login_prompt: "Please enter your call:"
-    # Callsign Spothole will use to log into this cluster. Ensure the SSID (e.g. -99) is different to any personal
-    # connection you might make to this cluster node.
+    login_prompt: "login:"
    login_callsign: "N0CALL-99"
-    # Whether to allow RBN spots that come via this cluster. If you don't want RBN spots or you are making a separate
-    # connection to RBN directly, leave this as False. If you want RBN spots from this cluster, set this to True. (Make
-    # sure you aren't also separately connecting to RBN directly, otherwise you may get duplicate spots.) Note that not
-    # all clusters sent RBN spots anyway.
    allow_rbn_spots: false
-  -
-    class: "RBN"
+
+  - class: "RBN"
+    # RBN sources have a "name" property in case you want to differentiate between the CW/RTTY and FT8 sources.
    name: "RBN CW/RTTY"
    enabled: false
    port: 7000
    # This setting doesn't affect the spot provider itself, or anything in the back-end of Spothole, just the web UI.
    # By default spots from all enabled providers will be shown in the web UI. However, you might want RBN data to be
    # received by Spothole but not shown on the web UI unless the user explicitly turns it on. For that behaviour,
-    # set enabled to true, but enabled-by-default-in-web-ui to false.
-    enabled-by-default-in-web-ui: false
-  -
-    class: "RBN"
+    # set enabled to true, but enabled_by_default_in_web_ui to false.
+    enabled_by_default_in_web_ui: false
+
+  - class: "RBN"
    name: "RBN FT8"
    enabled: false
    port: 7001
-    enabled-by-default-in-web-ui: false
-  -
-    class: "UKPacketNet"
-    name: "UK Packet Radio Net"
+    enabled_by_default_in_web_ui: false
+
+  - class: "UKPacketNet"
    enabled: false
-    enabled-by-default-in-web-ui: false
-  -
-    class: "XOTA"
-    name: "39C3 TOTA"
+    enabled_by_default_in_web_ui: false
+
+  - class: "XOTA"
+    # xOTA sources have a "name" property so you can define what programme it is for, since xOTA is generic software
+    # for running "something-on-the-air" programmes.
+    name: "C3 TOTA"
    enabled: false
    url: "wss://39c3.totawatch.de/api/spot/live"
-    # Fixed SIG for all spots from a provider & location CSV are 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"
-    locations-csv: "datafiles/39c3-tota.csv"
-  -
-    class: "XOTA"
+    # For the "XOTA" provider, an activity must be set manually here because xOTA is a generic backend for xOTA
+    # programmes and so different URLs potentially provide different programmes.
+    sig: "Toilets"
+    # For Toilets on the Air, we prefix the activity references (T-01 etc) with some characters that define the
+    # conference: C3, EH or HOPE - so we can look up the correct locations in our database, because each conference
+    # starts from T-01 but refers to a toilet in a different building (or continent!)
+    sig_ref_prefix: "C3"
+
+  - class: "XOTA"
    name: "EH23 TOTA"
-    enabled: true
+    enabled: false
    url: "wss://eh23.totawatch.de/api/spot/live"
-    sig: "TOTA"
-    locations-csv: "datafiles/eh23-tota.csv"
+    sig: "Toilets"
+    sig_ref_prefix: "EH"
+
+  - class: "XOTA"
+    name: "HOPE26 TOTA"
+    enabled: false
+    url: "wss://hope-26.totawatch.de/api/spot/live"
+    sig: "Toilets"
+    sig_ref_prefix: "HOPE"


 # Alert providers to use. Same setup as the spot providers list above.
-alert-providers:
-  -
-    class: "POTA"
-    name: "POTA"
+alert_providers:
+  - class: "POTA"
    enabled: true
-  -
-    class: "SOTA"
-    name: "SOTA"
+
+  - class: "SOTA"
    enabled: true
-  -
-    class: "WWFF"
-    name: "WWFF"
+
+  - class: "WWFF"
    enabled: true
-  -
-    class: "ParksNPeaks"
-    name: "ParksNPeaks"
+
+  - class: "ParksNPeaks"
    enabled: true
-  -
-    class: "WOTA"
-    name: "WOTA"
+
+  - class: "WOTA"
    enabled: true
-  -
-    class: "BOTA"
-    name: "BOTA"
+
+  - class: "BOTA"
    enabled: true
-  -
-    class: "NG3K"
-    name: "NG3K"
+
+  - class: "Hamsat"
+    enabled: true
+
+  - class: "NG3K"
+    enabled: true
+
+  - class: "WA7BNM"
+    enabled: true
+
+  - class: "RSGBHFContests"
+    enabled: true
+
+  - class: "RSGBVHFContests"
    enabled: true


 # Solar condition providers to use. These poll external APIs for solar propagation data (SFI, A/K indices, band
-# conditions, etc.) and make it available via the /api/v1/solar endpoint.
-solar-condition-providers:
-  -
-    class: "HamQSL"
-    name: "HamQSL"
-    enabled: true
-  -
-    class: "NOAA3dayForecast"
-    name: "NOAA 3-day Forecast"
+# conditions, etc.) and make it available via the /api/v2/solar endpoint.
+solar_condition_providers:
+  - class: "HamQSL"
    enabled: true

-# Port to open the local web server on
-web-server-port: 8080
+  - class: "NOAA3dayForecast"
+    enabled: true
+
+  - class: "GIROIonosonde"
+    enabled: true
+
+  - class: "KC2GProp"
+    enabled: true
+
+
+# Static reference data providers to use. These allow Spothole to download data such as mapping between callsign
+# prefixes and DXCC entities.
+static_data_providers:
+  - class: "K0SWE"
+    enabled: true
+
+  - class: "CQZoneData"
+    enabled: true
+
+  - class: "ITUZoneData"
+    enabled: true
+
+
+# Activity reference data providers to use. These allow Spothole to download, for example, the WWFF directory that
+# maps WWFF park IDs to their name and location.
+sig_ref_data_providers:
+  - class: "POTA"
+    enabled: true
+
+  - class: "SOTA"
+    enabled: true
+
+  - class: "WWFF"
+    enabled: true
+
+  - class: "WWBOTA"
+    enabled: true
+
+  - class: "GMA"
+    enabled: true
+
+  - class: "MOTA"
+    enabled: true
+
+  - class: "ILLW"
+    enabled: true
+
+  - class: "ARLHS"
+    enabled: true
+
+  - class: "WCA"
+    enabled: true
+
+  - class: "IOTA"
+    enabled: true
+
+  - class: "WOTA"
+    enabled: true
+
+  - class: "SIOTA"
+    enabled: true
+
+  - class: "ZLOTA"
+    enabled: true
+
+  - class: "LLOTA"
+    enabled: true
+
+  - class: "Towers"
+    enabled: true
+
+  - class: "DME"
+    enabled: true
+
+  - class: "FEA"
+    enabled: true
+
+  - class: "DMVE"
+    enabled: true
+
+  - class: "DMUE"
+    enabled: true
+
+  - class: "DCE"
+    enabled: true
+
+  - class: "DEFE"
+    enabled: true
+
+  - class: "KRMNPA"
+    enabled: true
+
+  - class: "SANPCPA"
+    enabled: true
+
+  - class: "DTMBA"
+    enabled: true
+
+  - class: "COTA"
+    enabled: true
+
+  - class: "PGA"
+    enabled: true
+
+  - class: "Toilets"
+    enabled: true
+
+
+# Callsign data providers to use. These allow Spothole to provide information about callsigns, either from static
+# lookups or from web-based services such as QRZ. Note that use of QRZ and HamQTH is *on behalf of the user*, and
+# requires the user to enter their credentials into the website UI or provide them in an API call. Spothole will not
+# look up all calls via QRZ/HamQTH using the server owner's credentials, as this is against their usage policy.
+callsign_data_providers:
+  - class: "QRZ"
+    enabled: true
+    # Callsign data providers can often provide conflicting data, e.g. a home location from QRZ vs the centre of the
+    # DXCC entity from a country file lookup. The priority flag sets which source "wins" in the event of conflict.
+    # Lower numbers take priority over higher numbers. Generally then, QRZ/HamQTH should have low numbers as they are
+    # likely to have the most accurate data.
+    priority: 1
+    # No server-side credentials for QRZ. Users must provide their own as per QRZ policy.
+
+  - class: "HamQTH"
+    enabled: true
+    priority: 2
+    # No server-side credentials for HamQTH. Users must provide their own.
+
+  - class: "CountryFiles"
+    priority: 3
+    enabled: true
+
+  - class: "ClublogAPI"
+    # Querying the Clublog API directly doesn't provide any more data than the XML version, it just provides slightly
+    # more up-to-date information in the rare case that the prefix data changes, at a significant cost of looking up
+    # every callsign via an API call. Normally left disabled but it exists as an option.
+    enabled: false
+    priority: 4
+    # API key for Clublog to look up information. Required in order to enable this provider. Unlike QRZ and HamQTH,
+    # Clublog uses an API key issued to Spothole, not to the end user.
+    api_key: ""
+
+  - class: "ClublogXML"
+    enabled: true
+    priority: 5
+    # API key for Clublog to look up information. Required in order to enable this provider. You will need to request
+    # one via their helpdesk portal if you want to use callsign lookups from Clublog.
+    api_key: ""
+

 # Maximum time to keep spots and alerts in the system before deleting them. By default, one hour for spots and one week
 # for alerts.
-max-spot-age-sec: 3600
-max-alert-age-sec: 604800
-
-# API key for Clublog to look up information. Optional. You sill need to request one via their helpdesk portal if you
-# want to use callsign lookups from Clublog.
-clublog-api-key: ""
+max_spot_age_sec: 3600
+max_alert_age_sec: 604800

 # Allow submitting spots to the Spothole API?
-allow-spotting: true
+allow_spotting: true
+
+# Allow upstream submission of spots to external providers (POTA, SOTA, etc.) via the API?
+# Requires allow_spotting to also be true. Set to false to only accept spots into the local
+# Spothole database, without forwarding them to any external service.
+allow_upstream_spotting: false
+
+# Google reCAPTCHA v2 keys for CAPTCHA protection on upstream spot submission. Both keys must be set to enable CAPTCHA.
+# Leave both empty to disable CAPTCHA (e.g. for a private/trusted server) or if allow_spotting is false, in which case
+# they will do nothing. Note that with CAPTCHA enabled, this will prevent third-party clients submitting spots through
+# Spothole unless the clients are web-based, use the same site key, have their domains enabled in your reCAPTCHA config,
+# and of course their user solves the CAPTCHA.
+# You can sign up for reCAPTCHA at https://www.google.com/recaptcha/
+recaptcha_site_key: ""
+recaptcha_secret_key: ""
+
+# Log web requests? Useful to see what your users are requesting in terms of pages and API endpoints, but will fill up
+# your log quickly on a popular server.
+log_web_requests: false
+
+# Minimum severity of log statements to print to the system log. Defaults to INFO, change to DEBUG if you need more
+# information.
+log_level: INFO

 # Options for the web UI.
-web-ui-options:
-  spot-count: [10, 25, 50, 100]
-  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
+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
  # Default UI colour scheme. Supported values are "light", "dark" and "auto" (i.e. use the browser/OS colour scheme).
  # Users can still override this in the UI to their own preference.
-  color-scheme-default: "auto"
+  color_scheme_default: "auto"
  # Default band colour scheme. Supported values are the full names of any band colour scheme shown in the UI.
  # Users can still override this in the UI to their own preference.
-  band-color-scheme-default: "PSK Reporter (Adjusted)"
+  band_color_scheme_default: "PSK Reporter (Adjusted)"
  # Custom HTML insert. This can be any arbitrary HTML. It will be inserted next to the start/stop buttons on the spots
  # (home) page, although being arbitrary HTML you can also use a div with absolute, relative, float placement etc. This
  # is designed for a "donate/support the server" type button, though you are free to do whatever you want with it.
  # As the server owner you are responsible for the safe usage of this option!
-  support-button-html: ""
+  support_button_html: ""
+  # CartoDB API key. Required to use the CartoDB layers without watermark. Get one from https://carto.com/basemaps/apikey/.
+  cartodb_api_key: ""
@@ -0,0 +1,156 @@
+import logging
+import re
+
+from pyhamtools.locator import latlong_to_locator, locator_to_latlong
+
+from core.activity_utils import get_activity_by_name
+from core.data_store import DATA_STORE
+from core.enums import ActivityName, ActivityRefType
+from core.geo_utils import wab_wai_square_to_lat_lon
+from data.activity_ref import ActivityRef
+
+logger = logging.getLogger(__name__)
+
+
+def get_activity_ref_info(activity_name, ref_id):
+    """Look up details of an activity reference (e.g. POTA park) such as name, lat/lon, and grid. Takes in an
+    activity name and a reference ID (both strings) and returns an ActivityRef object populated with as much data
+    as we can find. This makes use of activity ref data in the data store, live lookups from the web, or just
+    automatic calculation depending on which activity we are getting data for."""
+
+    if activity_name is None or activity_name == "" or ref_id is None or ref_id == "":
+        logger.debug("Failed to look up activity ref info, activity or ref were not set.")
+        return None
+
+    # Sometimes we allow spaces instead of dashes in references due to common usage that way, but official reference
+    # lists never do, so convert them here.
+    ref_id = ref_id.replace(" ", "-")
+
+    # Prepare the object to be returned
+    activity_ref = ActivityRef(sig=activity_name, id=ref_id)
+
+    # We can always get the reference type and the icon from the activity itself
+    activity = get_activity_by_name(activity_name)
+    if activity:
+        activity_ref.ref_type = activity.ref_type
+        activity_ref.icon = activity.icon
+
+    try:
+        ### FUDGES ###
+        #
+        # DME fudge. Our database has leading zeros padding to 5 digits which is the expected format, but not all
+        # activators add leading zeros. We also need to normalise "DME 01234" to "DME-01234" to match what's in our
+        # database.
+        if activity_name.upper() == ActivityName.DME:
+            match = re.match(r"DME[\- ](\d{3,5})", ref_id, re.IGNORECASE)
+            if match:
+                number = match.group(1)
+                ref_id = f"DME-{number.zfill(5)}"
+
+        # DTMBA spotters sometimes include spaces and dashes, our regex allows them but they must be removed here so we
+        # can look up against the official list which doesn't have them
+        if activity_name.upper() == ActivityName.DTMBA:
+            ref_id = ref_id.replace("-", "").replace(" ", "")
+
+        ### NO DATA ACTIVITIES ###
+        #
+        # If the activity is HEMA or BIWOTA, we have no way to either generate useful data or look it up on a
+        # reference list, so just skip the lookup here.
+        if activity_name.upper() == ActivityName.HEMA or activity_name.upper() == ActivityName.BIWOTA:
+            return activity_ref
+
+        ### PROGRAMMATIC DATA GENERATION INSTEAD OF LOOKUPS ###
+        #
+        # If the activity is Tiles, WAB, WAI or BOTA (Beaches), we don't have anything to look up from the data
+        # store, we can calculate all the information we are going to get directly.
+        if activity_name.upper() == ActivityName.TILES.upper():
+            # Tiles on the Air just uses Maidenhead 6-digit squares, so ID, Name and Grid are all the same
+            if not activity_ref.name:
+                activity_ref.name = activity_ref.id
+            if not activity_ref.grid:
+                activity_ref.grid = activity_ref.id
+            if activity_ref.grid and (not activity_ref.latitude or not activity_ref.longitude):
+                ll = locator_to_latlong(str(activity_ref.grid))
+                activity_ref.latitude = ll[0]
+                activity_ref.longitude = ll[1]
+            return activity_ref
+
+        elif activity_name.upper() == ActivityName.WAB or activity_name.upper() == ActivityName.WAI:
+            ll = wab_wai_square_to_lat_lon(ref_id)
+            if ll:
+                activity_ref.name = ref_id
+                try:
+                    activity_ref.grid = latlong_to_locator(ll[0], ll[1], 6)
+                    activity_ref.latitude = ll[0]
+                    activity_ref.longitude = ll[1]
+                except Exception:
+                    logger.warning("Invalid lat/lon received for WAB/WAI reference", exc_info=True)
+            return activity_ref
+
+        elif activity_name.upper() == ActivityName.BOTA:
+            # For BOTA all we can ever generate is the URL, there is no data file or lookup for lat/longs
+            if not activity_ref.name:
+                activity_ref.name = activity_ref.id
+            if activity_ref.name:
+                activity_ref.url = (
+                    f"https://www.beachesontheair.com/beaches/{activity_ref.name.lower().replace(' ', '-')}"
+                )
+            return activity_ref
+
+        elif activity_name.upper() == ActivityName.GMA_ISLANDS.upper():
+            # GMA Islands is a bit of a mess of GMA and IOTA references. Try looking them both up and see what returns
+            # the best result.
+            iota_lookup = get_activity_ref_info(ActivityName.IOTA, ref_id)
+            gma_lookup = get_activity_ref_info(ActivityName.GMA, ref_id)
+            for key, value in iota_lookup.__dict__.items():
+                if value is not None and activity_ref.__dict__.get(key) is None:
+                    activity_ref.__dict__[key] = value
+            for key, value in gma_lookup.__dict__.items():
+                if value is not None and activity_ref.__dict__.get(key) is None:
+                    activity_ref.__dict__[key] = value
+            activity_ref.ref_type = ActivityRefType.ISLAND
+            return activity_ref
+
+        ### ACTUAL LOOKUP ###
+        #
+        # OK, this is something we have to look up. Now check to see if our data store contains reference data and if
+        # so, copy the data into the activity_ref object
+        key = f"{activity_name}:{ref_id}"
+        try:
+            lookup_data = DATA_STORE.activity_refs.get(key) if key in DATA_STORE.activity_refs else None
+            if lookup_data:
+                for attr, value in lookup_data.__dict__.items():
+                    if value is not None and activity_ref.__dict__.get(attr) is None:
+                        activity_ref.__dict__[attr] = value
+
+            else:
+                # Maybe a super new reference we don't know about yet, but more likely a typo or a test reference,
+                # just silently ignore it.
+                logger.debug(f"{activity_name} database did not contain data for ref {ref_id}")
+
+        except (ValueError, KeyError):
+            # Catch exceptions due to e.g. old versions of objects in the cache that are no longer compatible,
+            # and remove them from the cache.
+            del DATA_STORE.activity_refs[key]
+            return None
+
+    except Exception:
+        logger.exception(f"Exception when looking up activity ref info for {activity_name} ref {ref_id}")
+    return activity_ref
+
+
+def populate_missing_activity_ref_info(activity_ref):
+    """Look up details of an activity reference (e.g. POTA park) such as name, lat/lon, and grid. Takes in an
+    activity_ref object which must at minimum have a "sig" and an "id". The rest of the object will be populated
+    and returned. Any data currently in the object will be kept, only missing data in the object will be populated
+    if it can be determined."""
+
+    lookup_data = get_activity_ref_info(activity_ref.sig, activity_ref.id)
+
+    if lookup_data:
+        # Copy new activity ref data into existing object where data was previously missing
+        for key, value in lookup_data.__dict__.items():
+            if value is not None and activity_ref.__dict__.get(key) is None:
+                activity_ref.__dict__[key] = value
+
+    return activity_ref
@@ -0,0 +1,43 @@
+from data.activities import ACTIVITIES
+
+
+def get_activity_by_name(name):
+    """Utility function to resolve an arbitrary, case-insensitive activity name string (e.g. from a spot comment, a
+    provider, or an API request) to the matching known Activity. Returns None if no match is found."""
+
+    if not name:
+        return None
+    for activity_name, activity in ACTIVITIES.items():
+        if activity_name.upper() == name.upper():
+            return activity
+    return None
+
+
+def get_ref_regex_for_activity(activity):
+    """Utility function to get the regex string for an activity reference for a named activity. If no match is
+    found, None will be returned."""
+
+    found = get_activity_by_name(activity)
+    return found.ref_regex if found else None
+
+
+def get_icon_for_activity(activity):
+    """Utility function to get the icon for a named activity. If no match is found, None will be returned."""
+
+    found = get_activity_by_name(activity)
+    return found.icon if found else None
+
+
+def get_activity_name_from_comment_name(activity):
+    """Utility function to get the name of an activity from its "comment name". Generally these will be the same
+    but there are some cases (e.g. is "TOTA" Towers, Tiles or Toilets?) where we need to transform one to the
+    other."""
+
+    for activity_name, a in ACTIVITIES.items():
+        if any(n.upper() == activity.upper() for n in a.comment_names):
+            return activity_name
+    return None
+
+
+# Regex matching any activity's "comment name", i.e. how it may be referred to in spot comments
+ANY_ACTIVITY_REGEX = rf"({'|'.join(n for a in ACTIVITIES.values() for n in a.comment_names)})"
@@ -1,10 +0,0 @@
-from datetime import timedelta
-
-from requests_cache import CachedSession
-
-# Cache for "semi-static" data such as the locations of parks, CSVs of reference lists, etc.
-# This has an expiry time of 30 days, so will re-request from the source after that amount
-# of time has passed. This is used throughout Spothole to cache data that does not change
-# rapidly.
-SEMI_STATIC_URL_DATA_CACHE = CachedSession("cache/semi_static_url_data_cache",
-                                           expire_after=timedelta(days=30))
@@ -0,0 +1,33 @@
+import re
+
+from core.data_providers import DATA_PROVIDERS
+from data.callsign import Callsign
+
+
+def get_call_info(callsign, lookup_credentials):
+    """Utility method to get the best set of data for a callsign as we can, using all enabled providers.
+    lookup_credentials is an optional object that carries the user's QRZ.com/HamQTH credentials, if they provided them,
+    to enable lookup using those providers."""
+
+    callsign_data = Callsign(call=callsign)
+
+    # First check our input looks like a real callsign
+    if callsign and re.match(r"^[A-Za-z0-9/\-]*$", callsign):
+        # Sort callsign providers by priority order, so we query the highest priority (lowest numbers) first, and only
+        # query other providers for data we are missing as we go along.
+        for p in sorted(DATA_PROVIDERS.callsign_data_providers, key=lambda p2: p2.priority):
+            if p.enabled:
+                # Get new lookup data
+                data = p.lookup(callsign, lookup_credentials)
+                if data:
+                    # If we have new data for fields that were previously unpopulated, add them in
+                    for key, value in data.__dict__.items():
+                        if value is not None and callsign_data.__dict__.get(key) is None:
+                            callsign_data.__dict__[key] = value
+
+                    # If callsign data is fully populated, avoid looking up using other providers as their data will not
+                    # be used
+                    if callsign_data.fully_populated():
+                        break
+
+    return callsign_data
@@ -4,22 +4,26 @@ from threading import Event, Thread

 import pytz

+from core.data_store import DATA_STORE
+
+logger = logging.getLogger(__name__)
+

 class CleanupTimer:
    """Provides a timed cleanup of the spot list."""

-    def __init__(self, spots, alerts, web_server, cleanup_interval):
+    def __init__(self):
        """Constructor"""

-        self._spots = spots
-        self._alerts = alerts
-        self._web_server = web_server
-        self._cleanup_interval = cleanup_interval
+        self._cleanup_interval = None
        self.last_cleanup_time = datetime.min.replace(tzinfo=pytz.UTC)
        self.status = "Starting"
        self._thread = None
        self._stop_event = Event()

+    def setup(self, cleanup_interval):
+        self._cleanup_interval = cleanup_interval
+
    def start(self):
        """Start the cleanup timer"""

@@ -30,6 +34,10 @@ class CleanupTimer:
        """Stop any threads and prepare for application shutdown"""

        self._stop_event.set()
+        if self._thread:
+            self._thread.join(timeout=5)
+            if self._thread.is_alive():
+                logger.warning("Cleanup worker thread did not exit on time and will be killed.")

    def _run(self):
        while not self._stop_event.wait(timeout=self._cleanup_interval):
@@ -39,35 +47,31 @@ class CleanupTimer:
        """Perform cleanup and reschedule next timer"""

        try:
-            # Perform cleanup via letting the data expire
-            self._spots.expire()
-            self._alerts.expire()
-
-            # Explicitly clean up any spots and alerts that have expired
-            for i in list(self._spots.iterkeys()):
+            for i in list(DATA_STORE.spots.keys()):
                try:
-                    spot = self._spots[i]
-                    if spot.expired():
-                        self._spots.delete(i)
+                    spot = DATA_STORE.spots.get(i)
+                    if spot and spot.expired():
+                        DATA_STORE.spots.delete(i)
                except KeyError:
                    # Must have already been deleted, OK with that
                    pass
-            for i in list(self._alerts.iterkeys()):
+            for i in list(DATA_STORE.alerts.keys()):
                try:
-                    alert = self._alerts[i]
-                    if alert.expired():
-                        self._alerts.delete(i)
+                    alert = DATA_STORE.alerts.get(i)
+                    if alert and alert.expired():
+                        DATA_STORE.alerts.delete(i)
                except KeyError:
                    # Must have already been deleted, OK with that
                    pass

-            # Clean up web server SSE spot/alert queues
-            self._web_server.clean_up_sse_queues()
-
            self.status = "OK"
            self.last_cleanup_time = datetime.now(pytz.UTC)

        except Exception:
            self.status = "Error"
-            logging.exception("Exception in Cleanup thread")
+            logger.exception("Exception in Cleanup thread")
            self._stop_event.wait(timeout=1)
+
+
+# Global object
+CLEANUP_TIMER = CleanupTimer()
@@ -1,32 +1,54 @@
+import importlib
 import logging
 import os
+import sys

 import yaml

+logger = logging.getLogger(__name__)
+
 # Check you have a config file
 if not os.path.isfile("config.yml"):
-    logging.error(
-        "Your config file is missing. Ensure you have copied config-example.yml to config.yml and updated it according to your needs.")
-    exit()
+    logger.error(
+        "Your config file is missing. Ensure you have copied config-example.yml to config.yml and updated it according to your needs."
+    )
+    sys.exit()

 # Load config
 with open("config.yml") as f:
    config = yaml.safe_load(f)
-logging.info("Loaded config.")
+logger.info("Loaded config.")

-BASE_URL = config["base-url"]
-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"]
-WEB_UI_OPTIONS = config["web-ui-options"]
+BASE_URL = config.get("base_url", "http://localhost:8080")
+MAX_SPOT_AGE = config.get("max_spot_age_sec", 3600)
+MAX_ALERT_AGE = config.get("max_alert_age_sec", 604800)
+SERVER_OWNER_CALLSIGN = config.get("server_owner_callsign", "N0CALL")
+WEB_SERVER_PORT = config.get("web_server_port", 8080)
+TELNET_SERVER_ENABLED = config.get("telnet_server_enabled", False)
+TELNET_SERVER_ADDRESS = config.get("telnet_server_address", "localhost")
+TELNET_SERVER_PORT = config.get("telnet_server_port", 7373)
+ALLOW_SPOTTING = config.get("allow_spotting", True)
+ALLOW_UPSTREAM_SPOTTING = config.get("allow_upstream_spotting", True)
+WEB_UI_OPTIONS = config.get("web_ui_options", {})
+API_ONLY_MODE = config.get("api_only_mode", False)
+RECAPTCHA_SECRET_KEY = config.get("recaptcha_secret_key", "")
+RECAPTCHA_SITE_KEY = config.get("recaptcha_site_key", "")
+LOG_LEVEL = config.get("log_level", "INFO")
+LOG_WEB_REQUESTS = config.get("log_web_requests", False)

-# For ease of config, each spot provider owns its own config about whether it should be enabled by default in the web UI
-# but for consistency we provide this to the front-end in web-ui-options because it has no impact outside of the web UI.
-WEB_UI_OPTIONS["spot-providers-enabled-by-default"] = [p["name"] for p in config["spot-providers"] if p["enabled"] and (
-        "enabled-by-default-in-web-ui" not in p or p["enabled-by-default-in-web-ui"])]
-# If spotting to this server is enabled, "API" is another valid spot source even though it does not come from
-# one of our proviers. We set that to also be enabled by default.
-if ALLOW_SPOTTING:
-    WEB_UI_OPTIONS["spot-providers-enabled-by-default"].append("API")
+WEB_UI_OPTIONS["qrz_enabled"] = any(p["class"] == "QRZ" and p["enabled"] for p in config["callsign_data_providers"])
+WEB_UI_OPTIONS["hamqth_enabled"] = any(
+    p["class"] == "HamQTH" and p["enabled"] for p in config["callsign_data_providers"]
+)
+WEB_UI_OPTIONS["recaptcha_site_key"] = RECAPTCHA_SITE_KEY
+WEB_UI_OPTIONS["allow_upstream_spotting"] = ALLOW_SPOTTING and ALLOW_UPSTREAM_SPOTTING
+
+
+def create_provider_from_config(package, config_providers_entry):
+    """Utility method to get a provider based on the class specified in its config entry. You must also provide the
+    package to look for it in, as there are several types of provider. e.g. package "providers.spot", where the config
+    entry is for a POTA spot provider."""
+
+    module = importlib.import_module(f"{package}.{config_providers_entry['class'].lower()}")
+    provider_class = getattr(module, config_providers_entry["class"])
+    return provider_class(config_providers_entry)
@@ -1,79 +1,29 @@
 from core.config import SERVER_OWNER_CALLSIGN
 from data.band import Band
-from data.sig import SIG

 # General software
-SOFTWARE_NAME = "Spothole by M0TRT"
-SOFTWARE_VERSION = "1.3-pre"
+SOFTWARE_VERSION = "2.2-pre"

 # HTTP headers used for spot providers that use HTTP
-HTTP_HEADERS = {"User-Agent": SOFTWARE_NAME + ", v" + SOFTWARE_VERSION + " (operated by " + SERVER_OWNER_CALLSIGN + ")"}
-HAMQTH_PRG = (SOFTWARE_NAME + " v" + SOFTWARE_VERSION + " operated by " + SERVER_OWNER_CALLSIGN).replace(" ", "_")
-
-# Special Interest Groups
-SIGS = [
-    SIG(name="POTA", description="Parks on the Air", ref_regex=r"[A-Z]{2}\-\d{4,5}"),
-    SIG(name="SOTA", description="Summits on the Air", ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}"),
-    SIG(name="WWFF", description="World Wide Flora & Fauna", ref_regex=r"[A-Z0-9]{1,3}FF\-\d{4}"),
-    SIG(name="GMA", description="Global Mountain Activity", ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}"),
-    SIG(name="WWBOTA", description="Worldwide Bunkers on the Air", ref_regex=r"B\/[A-Z0-9]{1,3}\-\d{3,4}"),
-    SIG(name="HEMA", description="HuMPs Excluding Marilyns Award", ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{3}\-\d{3}"),
-    SIG(name="IOTA", description="Islands on the Air", ref_regex=r"[A-Z]{2}\-\d{3}"),
-    SIG(name="MOTA", description="Mills on the Air", ref_regex=r"X\d{4,6}"),
-    SIG(name="ARLHS", description="Amateur Radio Lighthouse Society", ref_regex=r"[A-Z]{3}\-\d{3,4}"),
-    SIG(name="ILLW", description="International Lighthouse & Lightship Weekend", ref_regex=r"[A-Z]{2}\d{4}"),
-    SIG(name="SIOTA", description="Silos on the Air", ref_regex=r"[A-Z]{2}\-[A-Z]{3}\d"),
-    SIG(name="WCA", description="World Castles Award", ref_regex=r"[A-Z0-9]{1,3}\-\d{5}"),
-    SIG(name="ZLOTA", description="New Zealand on the Air", ref_regex=r"ZL[A-Z]/[A-Z]{2}\-\d{3,4}"),
-    SIG(name="WOTA", description="Wainwrights on the Air", ref_regex=r"[A-Z]{3}-[0-9]{2}"),
-    SIG(name="BOTA", description="Beaches on the Air"),
-    SIG(name="KRMNPA", description="Keith Roget Memorial National Parks Award"),
-    SIG(name="LLOTA", description="Lagos y Lagunas on the Air", ref_regex=r"[A-Z]{2}\-\d{4}"),
-    SIG(name="WWTOTA", description="Towers on the Air", ref_regex=r"[A-Z]{2}R\-\d{4}"),
-    SIG(name="Tiles", description="Tiles on the Air", ref_regex=r"[A-Za-z]{2}[0-9]{2}[A-Za-z]{2}"),
-    SIG(name="WAB", description="Worked All Britain", ref_regex=r"[A-Z]{1,2}[0-9]{2}"),
-    SIG(name="WAI", description="Worked All Ireland", ref_regex=r"[A-Z][0-9]{2}"),
-    SIG(name="TOTA", description="Toilets on the Air", ref_regex=r"T\-[0-9]{2}")
-]
-
-# Modes. Note "DIGI" and "DIGITAL" are also supported but are normalised into "DATA".
-CW_MODES = ["CW"]
-PHONE_MODES = ["PHONE", "SSB", "USB", "LSB", "AM", "FM", "DV", "DMR", "DSTAR", "C4FM", "M17"]
-DATA_MODES = ["DATA", "FT8", "FT4", "RTTY", "SSTV", "JS8", "HELL", "PSK", "OLIVIA", "PKT", "MSK144"]
-ALL_MODES = CW_MODES + PHONE_MODES + DATA_MODES
-MODE_TYPES = ["CW", "PHONE", "DATA"]
-
-# Mode aliases. Sometimes we get spots with a mode described in a different way that is effectively the same as a mode
-# we already know, or we want to normalise things for consistency. The lookup table for this is here. Incoming spots
-# that match a key in this table will be converted to the corresponding value, so only the modes above will actually be
-# present in the spots.
-MODE_ALIASES = {
-    "RTT": "RTTY",
-    "BPSK": "PSK",
-    "PSK31": "PSK",
-    "BPSK31": "PSK",
-    "MFSK": "FSK",
-    "MFSK32": "FSK",
-    "DIGI": "DATA",
-    "DIGITAL": "DATA"
-}
+HTTP_HEADERS = {"User-Agent": f"Spothole v{SOFTWARE_VERSION} (operated by {SERVER_OWNER_CALLSIGN})"}
+HAMQTH_PRG = f"Spothole v{SOFTWARE_VERSION} operated by {SERVER_OWNER_CALLSIGN}".replace(" ", "_")

 # Band definitions
 BANDS = [
    Band(name="2200m", start_freq=135700, end_freq=137800),
    Band(name="600m", start_freq=472000, end_freq=479000),
-    Band(name="160m", start_freq=1800000, end_freq=2000000),
-    Band(name="80m", start_freq=3500000, end_freq=4000000),
-    Band(name="60m", start_freq=5250000, end_freq=5410000),
-    Band(name="40m", start_freq=7000000, end_freq=7300000),
-    Band(name="30m", start_freq=10100000, end_freq=10150000),
-    Band(name="20m", start_freq=14000000, end_freq=14350000),
-    Band(name="17m", start_freq=18068000, end_freq=18168000),
-    Band(name="15m", start_freq=21000000, end_freq=21450000),
-    Band(name="12m", start_freq=24890000, end_freq=24990000),
+    Band(name="160m", start_freq=1800000, end_freq=2000000, is_ham_hf=True),
+    Band(name="80m", start_freq=3500000, end_freq=4000000, is_ham_hf=True),
+    Band(name="60m", start_freq=5250000, end_freq=5410000, is_ham_hf=True),
+    Band(name="40m", start_freq=7000000, end_freq=7300000, is_ham_hf=True),
+    Band(name="30m", start_freq=10100000, end_freq=10150000, is_ham_hf=True),
+    Band(name="20m", start_freq=14000000, end_freq=14350000, is_ham_hf=True),
+    Band(name="17m", start_freq=18068000, end_freq=18168000, is_ham_hf=True),
+    Band(name="15m", start_freq=21000000, end_freq=21450000, is_ham_hf=True),
+    Band(name="12m", start_freq=24890000, end_freq=24990000, is_ham_hf=True),
    Band(name="11m", start_freq=26965000, end_freq=27405000),
-    Band(name="10m", start_freq=28000000, end_freq=29700000),
-    Band(name="6m", start_freq=50000000, end_freq=54000000),
+    Band(name="10m", start_freq=28000000, end_freq=29700000, is_ham_hf=True),
+    Band(name="6m", start_freq=50000000, end_freq=54000000, is_ham_hf=True),
    Band(name="5m", start_freq=56000000, end_freq=60500000),
    Band(name="4m", start_freq=70000000, end_freq=70500000),
    Band(name="2m", start_freq=144000000, end_freq=148000000),
@@ -85,8 +35,22 @@ BANDS = [
    Band(name="10GHz", start_freq=10000000000, end_freq=10500000000),
    Band(name="24GHz", start_freq=24000000000, end_freq=24050000000),
    Band(name="47GHz", start_freq=47000000000, end_freq=47200000000),
-    Band(name="76GHz", start_freq=75500000000, end_freq=81500000000)]
+    Band(name="76GHz", start_freq=75500000000, end_freq=81500000000),
+]
 UNKNOWN_BAND = Band(name="Unknown", start_freq=0, end_freq=0)

-# Continents
-CONTINENTS = ["EU", "NA", "SA", "AS", "AF", "OC", "AN"]
+# Propagation modes used in VHF/UHF DX cluster comments, e.g. "JN61ES<ES>JM56XT". I don't think there's an official list
+# of these anywhere, but here are some I've seen or seen reference to
+PROPAGATION_MODES = {
+    "F2": "F2 layer ionospheric",
+    "ES": "Sporadic-E",
+    "TR": "Tropospheric ducting",
+    "TEP": "Trans-Equatorial Propagation",
+    "EME": "Earth-Moon-Earth",
+    "AU": "Aurora",
+    "MS": "Meteor scatter",
+    "RS": "Rain scatter",
+    "AS": "Aircraft scatter",
+    "ACS": "Aircraft scatter",
+    "SAT": "Satellite",
+}
@@ -0,0 +1,103 @@
+import logging
+import threading
+import time
+
+from core.config import config, create_provider_from_config
+
+logger = logging.getLogger(__name__)
+
+
+class DataProviders:
+    """Global object for storing data providers."""
+
+    def __init__(self):
+        self.spot_providers = []
+        self.alert_providers = []
+        self.solar_condition_providers = []
+        self.static_data_providers = []
+        self.sig_ref_data_providers = []
+        self.callsign_data_providers = []
+        self._startup_timers = []
+
+    def setup(self):
+        for entry in config["spot_providers"]:
+            self.spot_providers.append(create_provider_from_config("providers.spot", entry))
+        for entry in config["alert_providers"]:
+            self.alert_providers.append(create_provider_from_config("providers.alert", entry))
+        for entry in config.get("solar_condition_providers", []):
+            self.solar_condition_providers.append(create_provider_from_config("providers.solarconditions", entry))
+        for entry in config.get("static_data_providers", []):
+            self.static_data_providers.append(create_provider_from_config("providers.staticdata", entry))
+        for entry in config.get("sig_ref_data_providers", []):
+            self.sig_ref_data_providers.append(create_provider_from_config("providers.activityrefdata", entry))
+        for entry in config.get("callsign_data_providers", []):
+            self.callsign_data_providers.append(create_provider_from_config("providers.callsigndata", entry))
+
+    @staticmethod
+    def start_providers(providers, provider_type):
+        """Helper method to activate enabled providers in the list."""
+
+        logger.info(f"Starting {provider_type} providers...")
+        for p in providers:
+            if p.enabled:
+                p.start()
+
+    def start(self):
+        # Start data providers before spot/alert providers so the lookup data is there already for incoming spots.
+        # Each category is fired off after a small delay to give the rest of Spothole chance to start up.
+        self._startup_timers = [
+            threading.Timer(5.0, lambda: self.start_providers(self.static_data_providers, "static data")),
+            threading.Timer(10.0, lambda: self.start_providers(self.callsign_data_providers, "callsign data")),
+            threading.Timer(15.0, lambda: self.start_providers(self.spot_providers, "spot")),
+            threading.Timer(20.0, lambda: self.start_providers(self.alert_providers, "alert")),
+            threading.Timer(
+                25.0,
+                lambda: self.start_providers(self.solar_condition_providers, "solar condition"),
+            ),
+            threading.Timer(30.0, lambda: self.start_providers(self.sig_ref_data_providers, "activity ref data")),
+        ]
+        for t in self._startup_timers:
+            t.daemon = True
+            t.start()
+
+    def stop(self):
+        # Cancel any startup timers that haven't fired yet
+        for t in self._startup_timers:
+            t.cancel()
+
+        # Stop all providers
+        all_providers = [
+            p
+            for p in (
+                self.spot_providers
+                + self.alert_providers
+                + self.solar_condition_providers
+                + self.sig_ref_data_providers
+                + self.static_data_providers
+                + self.callsign_data_providers
+            )
+            if p.enabled
+        ]
+        if not all_providers:
+            return
+
+        def stop_provider(p):
+            try:
+                p.stop()
+            except Exception:
+                logger.exception("Exception stopping provider")
+
+        threads = [threading.Thread(target=stop_provider, args=(p,), daemon=True) for p in all_providers]
+        for t in threads:
+            t.start()
+
+        deadline = time.monotonic() + 15
+        for t in threads:
+            t.join(timeout=max(0.0, deadline - time.monotonic()))
+        still_running = [t for t in threads if t.is_alive()]
+        if still_running:
+            logger.warning("Some threads did not stop in time!")
+
+
+# Global object
+DATA_PROVIDERS = DataProviders()
@@ -0,0 +1,128 @@
+import logging
+import re
+from pathlib import Path
+
+import diskcache
+
+from core.config import MAX_ALERT_AGE, MAX_SPOT_AGE
+from core.live_data_cache import LiveDataCache
+from core.single_object_data_cache import SingleObjectDataCache
+from data.solar_conditions import SolarConditions
+
+logger = logging.getLogger(__name__)
+
+CACHE_DIR = "./cache/"
+
+
+class DataStore:
+    """Data caching/storage object. Handles storage of spots, alerts, solar conditions, activity reference data, and
+    callsign lookup data using different caching strategies for each."""
+
+    def __init__(self):
+        # Constants
+        self._MAX_SPOT_COUNT = 100000
+        self._MAX_ALERT_COUNT = 100000
+        self._SPOT_ALERT_SNAPSHOT_INTERVAL_SEC = 300
+        self.CALLSIGN_DATA_TTL_SEC = 30 * 24 * 60 * 60
+        # Caches
+        self.alerts = None
+        self.spots = None
+        self.callsign_data_countryfiles = None
+        self.callsign_data_clublogxml = None
+        self.callsign_data_clublogapi = None
+        self.callsign_data_qrz = None
+        self.callsign_data_hamqth = None
+        self.dxcc_data = None
+        self.dxcc_lookup_by_call_regex = []
+        self.activity_refs = None
+        self.status = None
+        self.solar_conditions = None
+        # ITU/CQ zone GeoJSON data is only ever loaded statically from a local file so these don't even need to be
+        # caches, they can just be straight objects
+        self.cq_zone_data = None
+        self.itu_zone_data = None
+
+    def setup(self):
+        Path(CACHE_DIR).mkdir(parents=True, exist_ok=True)
+
+        # For solar data and status data, we use a wrapper around disk cache where each cache contains only a single
+        # object exposed to the wider application, and provides a store() method for callers to notify diskcache that
+        # the object has changed and needs to be re-cached.
+        self.solar_conditions = SingleObjectDataCache(f"{CACHE_DIR}solar", SolarConditions())
+        self.status = SingleObjectDataCache(f"{CACHE_DIR}status", {})
+
+        # Standard disk cache for static reference and activity ref data. Separate provider threads will repopulate
+        # these on a regular basis but there's no need for a TTL since old data is better than no data.
+        self.dxcc_data = diskcache.Cache(f"{CACHE_DIR}dxcc_data")
+        self.regenerate_call_regex_to_dxcc_entity_map()
+
+        # For activity reference data specifically, we need to key on both activity *and* reference, and trying to do
+        # two layers of dict in diskcache absolutely destroys performance with unpickling huge dicts, so we have an
+        # ugly "activity:ref" syntax for keys to keep it a single level.
+        self.activity_refs = diskcache.Cache(f"{CACHE_DIR}activity_refs")
+        logger.info(f"Loaded data for {len(self.activity_refs)} activity references.")
+
+        # Standard disk cache for callsign data. This data does have a TTL to trigger an occasional re-lookup.
+        # Old data *is* better than no data, but we can't have a background thread re-looking-up every callsign
+        # we've seen, so we rely on them timing out and this triggering another lookup.
+        self.callsign_data_countryfiles = diskcache.Cache(f"{CACHE_DIR}callsign_data_countryfiles")
+        self.callsign_data_clublogxml = diskcache.Cache(f"{CACHE_DIR}callsign_data_clublogxml")
+        self.callsign_data_clublogapi = diskcache.Cache(f"{CACHE_DIR}callsign_data_clublogapi")
+        self.callsign_data_qrz = diskcache.Cache(f"{CACHE_DIR}callsign_data_qrz")
+        self.callsign_data_hamqth = diskcache.Cache(f"{CACHE_DIR}callsign_data_hamqth")
+        unique_keys = set()
+        for c in [
+            self.callsign_data_countryfiles,
+            self.callsign_data_clublogxml,
+            self.callsign_data_clublogapi,
+            self.callsign_data_qrz,
+            self.callsign_data_hamqth,
+        ]:
+            unique_keys.update(c)
+        logger.info(f"Loaded data for {len(unique_keys)} callsigns.")
+
+        # Special caches for spots and alerts, which have TTL and write snapshots to disk at an interval. We
+        # specifically load these caches *last* so that any activity ref and callsign data is already loaded from disk
+        # cache before the spots and alerts are live in the system.
+        self.spots = LiveDataCache(
+            maxsize=self._MAX_SPOT_COUNT,
+            ttl=MAX_SPOT_AGE,
+            snapshot_dir=f"{CACHE_DIR}spots",
+            snapshot_interval_sec=self._SPOT_ALERT_SNAPSHOT_INTERVAL_SEC,
+        )
+        logger.info(f"Loaded {len(self.spots.keys())} spots from a previous run.")
+
+        self.alerts = LiveDataCache(
+            maxsize=self._MAX_ALERT_COUNT,
+            ttl=MAX_ALERT_AGE,
+            snapshot_dir=f"{CACHE_DIR}alerts",
+            snapshot_interval_sec=self._SPOT_ALERT_SNAPSHOT_INTERVAL_SEC,
+        )
+        logger.info(f"Loaded {len(self.alerts.keys())} alerts from a previous run.")
+
+    def regenerate_call_regex_to_dxcc_entity_map(self):
+        """DXCC entity data from K0SWE includes a regex which we can use to match a callsign, and determine which DXCC
+        entity it belongs to. But getting every DXCC entity data object out of DiskCache, iterating, compiling its regex
+        and testing the callsign every time is expensive. So instead we build a separate in-memory lookup of compiled
+        regex against DXCC entity code, as a list of tuples we can iterate through."""
+
+        self.dxcc_lookup_by_call_regex = []
+        for entry in [DATA_STORE.dxcc_data[key] for key in DATA_STORE.dxcc_data]:
+            self.dxcc_lookup_by_call_regex.append((re.compile(entry["prefixRegex"]), entry["entityCode"]))
+
+    def close(self):
+        self.spots.close()
+        self.alerts.close()
+        self.solar_conditions.close()
+        self.status.close()
+        self.dxcc_data.close()
+        self.activity_refs.close()
+        self.callsign_data_countryfiles.close()
+        self.callsign_data_clublogxml.close()
+        self.callsign_data_clublogapi.close()
+        self.callsign_data_qrz.close()
+        self.callsign_data_hamqth.close()
+
+
+# Global object
+DATA_STORE = DataStore()
@@ -0,0 +1,200 @@
+from enum import Enum
+
+
+class Continent(str, Enum):
+    EU = "EU"
+    NA = "NA"
+    SA = "SA"
+    AS = "AS"
+    AF = "AF"
+    OC = "OC"
+    AN = "AN"
+
+
+class Mode(str, Enum):
+    CW = "CW"
+    PHONE = "PHONE"
+    SSB = "SSB"
+    AM = "AM"
+    FM = "FM"
+    DV = "DV"
+    DATA = "DATA"
+    FT8 = "FT8"
+    FT4 = "FT4"
+    RTTY = "RTTY"
+    SSTV = "SSTV"
+    JS8 = "JS8"
+    HELL = "HELL"
+    PSK = "PSK"
+    FSK = "FSK"
+    OLIVIA = "OLIVIA"
+    PKT = "PKT"
+    MSK144 = "MSK144"
+
+    @property
+    def is_cw(self) -> bool:
+        return self == Mode.CW
+
+    @property
+    def is_phone(self) -> bool:
+        return self in {Mode.PHONE, Mode.SSB, Mode.AM, Mode.FM, Mode.DV}
+
+    @property
+    def is_data(self) -> bool:
+        return not (self.is_cw or self.is_phone)
+
+    @staticmethod
+    def from_name(name):
+        """Convert a string to an enum mode using the alias table."""
+
+        if not name:
+            return None
+
+        try:
+            return Mode(name.upper())
+        except (KeyError, ValueError):
+            try:
+                return Mode(MODE_ALIASES[name.upper()])
+            except (KeyError, ValueError):
+                return None
+
+
+class ModeType(str, Enum):
+    PHONE = "PHONE"
+    CW = "CW"
+    DATA = "DATA"
+
+
+class ModeSource(str, Enum):
+    """Where the mode data came from in a spot."""
+
+    SPOT = "SPOT"
+    COMMENT = "COMMENT"
+    BANDPLAN = "BANDPLAN"
+
+
+class LocationSourceForSpot(str, Enum):
+    """Where the location data came from in a spot."""
+
+    SPOT = "SPOT"
+    SIG_REF_LOOKUP = "SIG REF LOOKUP"
+    GRID = "GRID"
+    HOME_QTH = "HOME QTH"
+    DXCC = "DXCC"
+
+
+class LocationSourceForCallsign(str, Enum):
+    """Where the location data came from in a callsign data object."""
+
+    HOME_QTH = "HOME QTH"
+    DXCC = "DXCC"
+
+
+# Definitions of every activity Spothole knows about, keyed by the ActivityName enum. An enum is used for the
+# names to avoid typos when using literal strings like "POTA" all over the place.
+class ActivityName(str, Enum):
+    """Canonical name of every activity. Spothole uses these rather than literals like "POTA" around the code
+    to ensure I don't accidentally introduce typos."""
+
+    CONTEST = "Contest"
+    DXPEDITION = "DXpedition"
+    SATELLITE = "Satellite"
+    EME = "EME"
+    AERONAUTICAL_MOBILE = "/AM"
+    MARITIME_MOBILE = "/MM"
+    QRP = "QRP"
+    POTA = "POTA"
+    SOTA = "SOTA"
+    WWFF = "WWFF"
+    GMA = "GMA"
+    WWBOTA = "WWBOTA"
+    HEMA = "HEMA"
+    IOTA = "IOTA"
+    GMA_ISLANDS = "GMA Islands"
+    ARLHS = "ARLHS"
+    ILLW = "ILLW"
+    MOTA = "MOTA"
+    SIOTA = "SIOTA"
+    WCA = "WCA"
+    ZLOTA = "ZLOTA"
+    WOTA = "WOTA"
+    BOTA = "BOTA"
+    KRMNPA = "KRMNPA"
+    SANPCPA = "SANPCPA"
+    LLOTA = "LLOTA"
+    TOWERS = "Towers"
+    TILES = "Tiles"
+    RADAR_RALLY = "RaDAR Rally"
+    WAB = "WAB"
+    WAI = "WAI"
+    DMF = "DMF"
+    DME = "DME"
+    FEA = "FEA"
+    DMUE = "DMUE"
+    DMVE = "DMVE"
+    DCE = "DCE"
+    DEFE = "DEFE"
+    DTMBA = "DTMBA"
+    BIWOTA = "BIWOTA"
+    COTA = "COTA"
+    PGA = "PGA"
+    TOILETS = "Toilets"
+
+    def __str__(self):
+        return str(self.value)
+
+
+class ActivityRefType(str, Enum):
+    """Type of an activity reference."""
+
+    PARK = "PARK"
+    SUMMIT = "SUMMIT"
+    CASTLE = "CASTLE"
+    LIGHTHOUSE = "LIGHTHOUSE"
+    ISLAND = "ISLAND"
+    BUNKER = "BUNKER"
+    MILL = "MILL"
+    SILO = "SILO"
+    BEACH = "BEACH"
+    LAKE = "LAKE"
+    TOWER = "TOWER"
+    WATERWAY = "WATERWAY"
+    TOWN = "TOWN"
+    BUILDING = "BUILDING"
+    REGION = "REGION"
+    GRID = "GRID"
+    TOILET = "TOILET"
+
+
+class ActivityType(str, Enum):
+    """Type of an activity. Used to group them in the web UI."""
+
+    TRADITIONAL = "TRADITIONAL"
+    ADVENTURE = "ADVENTURE"
+    REGIONAL = "REGIONAL"
+    EVENT = "EVENT"
+
+
+# Mode aliases. Sometimes we get spots with a mode described in a different way that is effectively the same as a mode
+# we already know, or we want to normalise things for consistency. The lookup table for this is here. Incoming spots
+# that match a key in this table will be converted to the corresponding value, so only the modes above will actually be
+# present in the spots.
+MODE_ALIASES = {
+    "USB": "SSB",
+    "LSB": "SSB",
+    "DIGITALVOICE": "DV",
+    "DIGITALVOI": "DV",
+    "DMR": "DV",
+    "DSTAR": "DV",
+    "C4FM": "DV",
+    "FUSION": "DV",
+    "M17": "DV",
+    "RTT": "RTTY",
+    "BPSK": "PSK",
+    "PSK31": "PSK",
+    "BPSK31": "PSK",
+    "MFSK": "FSK",
+    "MFSK32": "FSK",
+    "DIGI": "DATA",
+    "DIGITAL": "DATA",
+}
@@ -1,66 +1,60 @@
-import json
 import logging
 import re
-from math import floor
+from math import floor, isnan

-import geopandas
 from pyproj import Transformer
-from shapely import prepare
 from shapely.geometry import Point, Polygon

+from core.data_store import DATA_STORE
+
+logger = logging.getLogger(__name__)
+
 TRANSFORMER_OS_GRID_TO_WGS84 = Transformer.from_crs("EPSG:27700", "EPSG:4326")
 TRANSFORMER_IRISH_GRID_TO_WGS84 = Transformer.from_crs("EPSG:29903", "EPSG:4326")
 TRANSFORMER_CI_UTM_GRID_TO_WGS84 = Transformer.from_crs("+proj=utm +zone=30 +ellps=WGS84", "EPSG:4326")

-with open("datafiles/cqzones.geojson") as f:
-    cq_zone_data = geopandas.GeoDataFrame.from_features(json.load(f)["features"])
-with open("datafiles/ituzones.geojson") as f:
-    itu_zone_data = geopandas.GeoDataFrame.from_features(json.load(f)["features"])
-for idx in cq_zone_data.index:
-    prepare(cq_zone_data.at[idx, 'geometry'])
-for idx in itu_zone_data.index:
-    prepare(itu_zone_data.at[idx, 'geometry'])
-

 def lat_lon_to_cq_zone(lat, lon):
    """Finds out which CQ zone a lat/lon point is in."""

-    lon = ((lon + 180) % 360) - 180
-    for index, row in cq_zone_data.iterrows():
-        polygon = Polygon(row["geometry"])
-        test_point = Point(lon, lat)
-        if polygon.contains(test_point):
-            return int(row["name"])
+    if DATA_STORE.cq_zone_data is not None:
+        lon = ((lon + 180) % 360) - 180
+        for index, row in DATA_STORE.cq_zone_data.iterrows():
+            polygon = Polygon(row["geometry"])
+            test_point = Point(lon, lat)
+            if polygon.contains(test_point):
+                return int(row["name"])

-        # Might have problems around the antemeridian, so if we didn't find a match, try offsetting the point by + or -
-        # 360 degrees longitude to try the other side of the Earth
-        if lon < 0:
-            test_point = Point(lon + 360, lat)
-        else:
-            test_point = Point(lon - 360, lat)
-        if polygon.contains(test_point):
-            return int(row["name"])
+            # Might have problems around the antemeridian, so if we didn't find a match, try offsetting the point by + or -
+            # 360 degrees longitude to try the other side of the Earth
+            if lon < 0:
+                test_point = Point(lon + 360, lat)
+            else:
+                test_point = Point(lon - 360, lat)
+            if polygon.contains(test_point):
+                return int(row["name"])
    return None


 def lat_lon_to_itu_zone(lat, lon):
    """Finds out which ITU zone a lat/lon point is in."""

-    lon = ((lon + 180) % 360) - 180
-    for index, row in itu_zone_data.iterrows():
-        polygon = Polygon(row["geometry"])
-        test_point = Point(lon, lat)
-        if polygon.contains(test_point):
-            return int(row["name"])
+    if DATA_STORE.itu_zone_data is not None:
+        lon = ((lon + 180) % 360) - 180
+        for index, row in DATA_STORE.itu_zone_data.iterrows():
+            polygon = Polygon(row["geometry"])
+            test_point = Point(lon, lat)
+            if polygon.contains(test_point):
+                return int(row["name"])

-        # Might have problems around the antemeridian, so if we didn't find a match, try offsetting the point by + or -
-        # 360 degrees longitude to try the other side of the Earth
-        if lon < 0:
-            test_point = Point(lon + 360, lat)
-        else:
-            test_point = Point(lon - 360, lat)
-        if polygon.contains(test_point):
-            return int(row["name"])
+            # Might have problems around the antemeridian, so if we didn't find a match, try offsetting the point by + or -
+            # 360 degrees longitude to try the other side of the Earth
+            if lon < 0:
+                test_point = Point(lon + 360, lat)
+            else:
+                test_point = Point(lon - 360, lat)
+            if polygon.contains(test_point):
+                return int(row["name"])
    return None


@@ -79,7 +73,7 @@ def lat_lon_for_grid_sw_corner(grid):
    """Convert a Maidenhead grid reference of arbitrary precision to the lat/long of the southwest corner of the square.
    Returns None if the grid format is invalid."""

-    lat, lon, lat_cell_size, lon_cell_size = lat_lon_for_grid_sw_corner_plus_size(grid)
+    lat, lon, _lat_cell_size, _lon_cell_size = lat_lon_for_grid_sw_corner_plus_size(grid)
    if lat is not None and lon is not None:
        return [lat, lon]
    else:
@@ -121,8 +115,8 @@ def lat_lon_for_grid_sw_corner_plus_size(grid):
    while block * 2 < length:
        if block % 2 == 0:
            # Letters in this block
-            lon_cell_no = ord(grid[block * 2]) - ord('A')
-            lat_cell_no = ord(grid[block * 2 + 1]) - ord('A')
+            lon_cell_no = ord(grid[block * 2]) - ord("A")
+            lat_cell_no = ord(grid[block * 2 + 1]) - ord("A")
            # Bail if the values aren't in range. Allowed values are A-R (0-17) for the first letter block, or
            # A-X (0-23) thereafter.
            max_cell_no = 17 if block == 0 else 23
@@ -162,7 +156,7 @@ def lat_lon_for_grid_sw_corner_plus_size(grid):
    lat -= 90.0

    # Return None values on maths errors
-    if any(x != x for x in [lat, lon, lat_cell_size, lon_cell_size]):  # NaN check
+    if any(isnan(x) for x in [lat, lon, lat_cell_size, lon_cell_size]):
        return None, None, None, None

    return lat, lon, lat_cell_size, lon_cell_size
@@ -180,7 +174,7 @@ def wab_wai_square_to_lat_lon(ref):
    elif re.match(r"^W[AV][0-9]{2}$", ref):
        return utm_grid_square_to_lat_lon(ref)
    else:
-        logging.warning("Invalid WAB/WAI square: " + ref)
+        logger.warning(f"Invalid WAB/WAI square: {ref}")
        return None


@@ -0,0 +1,114 @@
+import logging
+import threading
+import time
+
+import diskcache
+from cachetools import TTLCache
+
+logger = logging.getLogger(__name__)
+
+
+class LiveDataCache:
+    """Cache for spots and alerts. Uses the fast in-memory TTLCache for normal data I/O, including the TTL to enforce
+    maximum lifetime, and adds a separate diskcache to which we can save and load the TTLCache to provide persistence.
+    Also adds thread safety so spots and alerts can come from any thread, and a listener mechanism so the web server
+    can get a callback when new spots/alerts are added, and send them to any SSE clients."""
+
+    def __init__(self, maxsize, ttl, snapshot_dir, snapshot_interval_sec):
+        self._cache = TTLCache(maxsize=maxsize, ttl=ttl)
+        self._lock = threading.Lock()
+        self._ttl = ttl
+        self._listeners = []
+        self._listeners_lock = threading.Lock()
+        self._snapshot_dir = snapshot_dir
+        self._disk_cache = diskcache.Cache(str(snapshot_dir))
+        self._stop_event = threading.Event()
+        self._snapshot_thread = None
+        self._load_snapshot()
+        self._start_periodic_snapshot(snapshot_interval_sec)
+
+    def set(self, key, value):
+        with self._lock:
+            self._cache[key] = value
+
+        # Notify listeners
+        with self._listeners_lock:
+            listeners = list(self._listeners)
+        for callback in listeners:
+            try:
+                callback(value)
+            except Exception:
+                logger.exception(f"Listener raised an exception for key {key}")
+
+    def get(self, key, default=None):
+        with self._lock:
+            return self._cache.get(key, default)
+
+    def delete(self, key):
+        with self._lock:
+            self._cache.pop(key, None)
+
+    def keys(self):
+        with self._lock:
+            return list(self._cache.keys())
+
+    def values(self):
+        with self._lock:
+            return list(self._cache.values())
+
+    def add_listener(self, callback):
+        """Register callback(value) which will be called whenever a new spot/alert item is added via set(). Used by the
+        web server (via SSEBroadcaster) to send SSE clients an update on every new spot."""
+
+        with self._listeners_lock:
+            self._listeners.append(callback)
+
+    def remove_listener(self, callback):
+        with self._listeners_lock:
+            self._listeners.remove(callback)
+
+    def save_snapshot(self):
+        with self._lock:
+            # Store the time with the data so we can avoid loading anything nxt time that's older than TTL
+            data = [(k, v, time.time()) for k, v in self._cache.items()]
+        try:
+            self._disk_cache.set("snapshot", data)
+        except Exception:
+            logger.exception(f"Failed to write snapshot to {self._snapshot_dir}")
+
+    def _load_snapshot(self):
+        try:
+            data = self._disk_cache.get("snapshot")
+        except Exception:  # noqa: BLE001 (If any exceptions we treat the data as junk and start from scratch, it's probably due to a version upgrade having incompatible data structures, fine to not log the exception in this case)
+            logger.warning(f"Failed to load snapshot from {self._snapshot_dir}, clearing it.")
+            self._disk_cache.clear()
+            return
+        if not data:
+            return
+
+        now = time.time()
+        with self._lock:
+            for key, value, saved_at in data:
+                # Only restore entries that would still be within TTL
+                if now - saved_at < self._ttl:
+                    self._cache[key] = value
+        logger.info(f"Loaded snapshot from {self._snapshot_dir}")
+
+    def _start_periodic_snapshot(self, interval):
+        def loop():
+            while not self._stop_event.wait(timeout=interval):
+                self.save_snapshot()
+
+        self._snapshot_thread = threading.Thread(
+            target=loop, name=f"LiveDataCache-Snapshot-{self._snapshot_dir}", daemon=True
+        )
+        self._snapshot_thread.start()
+
+    def close(self):
+        self._stop_event.set()
+        if self._snapshot_thread:
+            self._snapshot_thread.join(timeout=15)
+            if self._snapshot_thread.is_alive():
+                logger.warning(f"LiveDataCache snapshot thread for {self._snapshot_dir} did not exit on time.")
+        self.save_snapshot()
+        self._disk_cache.close()
@@ -1,682 +0,0 @@
-import gzip
-import json
-import logging
-import re
-import urllib.parse
-from datetime import timedelta
-
-import requests
-import xmltodict
-from diskcache import Cache
-from pyhamtools import LookupLib, Callinfo, callinfo
-from pyhamtools.exceptions import APIKeyMissingError
-from pyhamtools.frequency import freq_to_band
-from pyhamtools.locator import latlong_to_locator
-from requests_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, \
-    HTTP_HEADERS, HAMQTH_PRG, MODE_ALIASES
-from data.lookup_credentials import LookupCredentials
-
-# QRZ XML field names differ from pyhamtools' normalised names; map them here.
-_QRZ_FIELD_MAP = {
-    "lat": "latitude",
-    "lon": "longitude",
-    "grid": "locator",
-    "ituzone": "ituz",
-    "cqzone": "cqz",
-}
-_QRZ_INT_FIELDS = {"adif", "cqz", "ituz"}
-_QRZ_FLOAT_FIELDS = {"latitude", "longitude"}
-
-
-def _normalize_qrz_data(raw):
-    data = {}
-    for k, v in raw.items():
-        if v is None:
-            continue
-        mapped_key = _QRZ_FIELD_MAP.get(k, k)
-        if mapped_key in _QRZ_INT_FIELDS:
-            try:
-                v = int(v)
-            except (ValueError, TypeError):
-                pass
-        elif mapped_key in _QRZ_FLOAT_FIELDS:
-            try:
-                v = float(v)
-            except (ValueError, TypeError):
-                pass
-        data[mapped_key] = v
-    return data
-
-
-class LookupHelper:
-    """Singleton class that provides lookup functionality."""
-
-    def __init__(self):
-        """Create the lookup helper. Note that nothing actually happens until the start() method is called, and that all
-        lookup methods will fail if start() has not yet been called. This therefore needs starting before any spot or
-        alert handlers are created."""
-
-        self._clublog_callsign_data_cache = None
-        self._lookup_lib_clublog_xml = None
-        self._clublog_xml_available = None
-        self._lookup_lib_clublog_api = None
-        self._clublog_xml_download_location = None
-        self._clublog_api_available = None
-        self._clublog_cty_xml_cache = None
-        self._clublog_api_key = None
-        self._qrz_callsign_data_cache = None
-        self._qrz_base_url = "https://xmldata.qrz.com/xml/current/"
-        # QRZ session keys expire after an hour; cache the login response for 55 minutes.
-        self._qrz_session_cache = CachedSession("cache/qrz_session_cache",
-                                                expire_after=timedelta(minutes=55))
-        self._hamqth_callsign_data_cache = None
-        self._hamqth_base_url = "https://www.hamqth.com/xml.php"
-        # HamQTH session keys expire after an hour. Rather than working out how much time has passed manually, we cheat
-        # and cache the HTTP response for 55 minutes, so when the login URL is queried within 55 minutes of the previous
-        # time, you just get the cached response.
-        self._hamqth_session_lookup_cache = CachedSession("cache/hamqth_session_cache",
-                                                          expire_after=timedelta(minutes=55))
-        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
-        # the data once on startup, and requires no login/key, but does not have the best coverage.
-        # If the user provides login details/API keys, we also set up helpers for QRZ.com, HamQTH, Clublog (live API
-        # request), and Clublog (XML download). The lookup functions iterate through these in a sensible order, looking
-        # for suitable data.
-        self._country_files_cty_plist_download_location = "cache/cty.plist"
-        success = self._download_country_files_cty_plist()
-        if success:
-            self._lookup_lib_basic = LookupLib(lookuptype="countryfile",
-                                               filename=self._country_files_cty_plist_download_location)
-        else:
-            self._lookup_lib_basic = LookupLib(lookuptype="countryfile")
-        self._call_info_basic = Callinfo(self._lookup_lib_basic)
-
-        self._qrz_callsign_data_cache = Cache('cache/qrz_callsign_lookup_cache')
-
-        self._hamqth_callsign_data_cache = Cache('cache/hamqth_callsign_lookup_cache')
-
-        self._clublog_api_key = config["clublog-api-key"]
-        self._clublog_cty_xml_cache = CachedSession("cache/clublog_cty_xml_cache", expire_after=timedelta(days=10))
-        self._clublog_api_available = self._clublog_api_key != ""
-        self._clublog_xml_download_location = "cache/cty.xml"
-        if self._clublog_api_available:
-            self._lookup_lib_clublog_api = LookupLib(lookuptype="clublogapi", apikey=self._clublog_api_key)
-            success = self._download_clublog_ctyxml()
-            self._clublog_xml_available = success
-            if success:
-                self._lookup_lib_clublog_xml = LookupLib(lookuptype="clublogxml",
-                                                         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!")
-
-        # Precompile regex matches for DXCCs to improve efficiency when iterating through them
-        for dxcc in (self._dxcc_data.values() if self._dxcc_data else []):
-            dxcc["_prefixRegexCompiled"] = re.compile(dxcc["prefixRegex"])
-
-    def _download_country_files_cty_plist(self):
-        """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
-        requests_cache library to prevent re-downloading too quickly if the software keeps restarting."""
-
-        try:
-            logging.info("Downloading Country-files.com cty.plist...")
-            response = SEMI_STATIC_URL_DATA_CACHE.get("https://www.country-files.com/cty/cty.plist",
-                                                      headers=HTTP_HEADERS).text
-
-            with open(self._country_files_cty_plist_download_location, "w") as f:
-                f.write(response)
-                f.flush()
-                return True
-
-        except Exception as e:
-            logging.error("Exception when downloading Clublog cty.xml", e)
-            return False
-
-    def _download_dxcc_json(self):
-        """Download the dxcc.json file on first startup."""
-
-        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
-
-    def _download_clublog_ctyxml(self):
-        """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."""
-
-        try:
-            logging.info("Downloading Clublog cty.xml.gz...")
-            response = self._clublog_cty_xml_cache.get("https://cdn.clublog.org/cty.php?api=" + self._clublog_api_key,
-                                                       headers=HTTP_HEADERS)
-            logging.info("Caching Clublog cty.xml.gz...")
-            open(self._clublog_xml_download_location + ".gz", 'wb').write(response.content)
-            with gzip.open(self._clublog_xml_download_location + ".gz", "rb") as uncompressed:
-                file_content = uncompressed.read()
-            logging.info("Caching Clublog cty.xml...")
-            with open(self._clublog_xml_download_location, "wb") as f:
-                f.write(file_content)
-                f.flush()
-                return True
-
-        except Exception as e:
-            logging.error("Exception when downloading Clublog cty.xml", e)
-            return False
-
-    def infer_country_from_callsign(self, call, credentials=None):
-        """Infer a country name from a callsign"""
-
-        try:
-            # Start with the basic country-files.com-based decoder.
-            country = self._call_info_basic.get_country_name(call)
-        except (KeyError, ValueError):
-            country = None
-        # Couldn't get anything from basic call info database, try QRZ.com
-        if not country:
-            qrz_data = self._get_qrz_data_for_callsign(call, credentials)
-            if qrz_data and "country" in qrz_data:
-                country = qrz_data["country"]
-        # Couldn't get anything from QRZ.com database, try HamQTH
-        if not country:
-            hamqth_data = self._get_hamqth_data_for_callsign(call, credentials)
-            if hamqth_data and "country" in hamqth_data:
-                country = hamqth_data["country"]
-        # Couldn't get anything from HamQTH database, try Clublog data
-        if not country:
-            clublog_data = self._get_clublog_xml_data_for_callsign(call)
-            if clublog_data and "Name" in clublog_data:
-                country = clublog_data["Name"]
-        if not country:
-            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 DXCC data
-        if not country:
-            dxcc_data = self._get_dxcc_data_for_callsign(call)
-            if dxcc_data and "name" in dxcc_data:
-                country = dxcc_data["name"]
-        return country
-
-    def infer_dxcc_id_from_callsign(self, call, credentials=None):
-        """Infer a DXCC ID from a callsign"""
-
-        try:
-            # Start with the basic country-files.com-based decoder.
-            dxcc = self._call_info_basic.get_adif_id(call)
-        except (KeyError, ValueError):
-            dxcc = None
-        # Couldn't get anything from basic call info database, try QRZ.com
-        if not dxcc:
-            qrz_data = self._get_qrz_data_for_callsign(call, credentials)
-            if qrz_data and "adif" in qrz_data:
-                dxcc = qrz_data["adif"]
-        # Couldn't get anything from QRZ.com database, try HamQTH
-        if not dxcc:
-            hamqth_data = self._get_hamqth_data_for_callsign(call, credentials)
-            if hamqth_data and "adif" in hamqth_data:
-                dxcc = hamqth_data["adif"]
-        # Couldn't get anything from HamQTH database, try Clublog data
-        if not dxcc:
-            clublog_data = self._get_clublog_xml_data_for_callsign(call)
-            if clublog_data and "DXCC" in clublog_data:
-                dxcc = clublog_data["DXCC"]
-        if not dxcc:
-            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 DXCC data
-        if not dxcc:
-            dxcc_data = self._get_dxcc_data_for_callsign(call)
-            if dxcc_data and "entityCode" in dxcc_data:
-                dxcc = dxcc_data["entityCode"]
-        return dxcc
-
-    def infer_continent_from_callsign(self, call, credentials=None):
-        """Infer a continent shortcode from a callsign"""
-
-        try:
-            # Start with the basic country-files.com-based decoder.
-            continent = self._call_info_basic.get_continent(call)
-        except (KeyError, ValueError):
-            continent = None
-        # Couldn't get anything from basic call info database, try HamQTH
-        if not continent:
-            hamqth_data = self._get_hamqth_data_for_callsign(call, credentials)
-            if hamqth_data and "continent" in hamqth_data:
-                continent = hamqth_data["continent"]
-        # Couldn't get anything from HamQTH database, try Clublog data
-        if not continent:
-            clublog_data = self._get_clublog_xml_data_for_callsign(call)
-            if clublog_data and "Continent" in clublog_data:
-                continent = clublog_data["Continent"]
-        if not continent:
-            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 DXCC data
-        if not 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
-
-    def infer_cq_zone_from_callsign(self, call, credentials=None):
-        """Infer a CQ zone from a callsign"""
-
-        try:
-            # Start with the basic country-files.com-based decoder.
-            cqz = self._call_info_basic.get_cqz(call)
-        except (KeyError, ValueError):
-            cqz = None
-        # Couldn't get anything from basic call info database, try QRZ.com
-        if not cqz:
-            qrz_data = self._get_qrz_data_for_callsign(call, credentials)
-            if qrz_data and "cqz" in qrz_data:
-                cqz = qrz_data["cqz"]
-        # Couldn't get anything from QRZ.com database, try HamQTH
-        if not cqz:
-            hamqth_data = self._get_hamqth_data_for_callsign(call, credentials)
-            if hamqth_data and "cq" in hamqth_data:
-                cqz = hamqth_data["cq"]
-        # Couldn't get anything from HamQTH database, try Clublog data
-        if not cqz:
-            clublog_data = self._get_clublog_xml_data_for_callsign(call)
-            if clublog_data and "CQZ" in clublog_data:
-                cqz = clublog_data["CQZ"]
-        if not cqz:
-            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 DXCC data
-        if not 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
-
-    def infer_itu_zone_from_callsign(self, call, credentials=None):
-        """Infer a ITU zone from a callsign"""
-
-        try:
-            # Start with the basic country-files.com-based decoder.
-            ituz = self._call_info_basic.get_ituz(call)
-        except (KeyError, ValueError):
-            ituz = None
-        # Couldn't get anything from basic call info database, try QRZ.com
-        if not ituz:
-            qrz_data = self._get_qrz_data_for_callsign(call, credentials)
-            if qrz_data and "ituz" in qrz_data:
-                ituz = qrz_data["ituz"]
-        # Couldn't get anything from QRZ.com database, try HamQTH
-        if not ituz:
-            hamqth_data = self._get_hamqth_data_for_callsign(call, credentials)
-            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 DXCC data
-        if not 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
-
-    def get_flag_for_dxcc(self, dxcc):
-        """Get an emoji flag for a given DXCC entity ID"""
-
-        return self._dxcc_data[dxcc]["flag"] if dxcc in self._dxcc_data else None
-
-    def infer_name_from_callsign_online_lookup(self, call, credentials=None):
-        """Infer an operator name from a callsign (requires QRZ.com/HamQTH)"""
-
-        data = self._get_qrz_data_for_callsign(call, credentials)
-        if data and "fname" in data:
-            name = data["fname"]
-            if "name" in data:
-                name = name + " " + data["name"]
-            return name
-        data = self._get_hamqth_data_for_callsign(call, credentials)
-        if data and "nick" in data:
-            return data["nick"]
-        else:
-            return None
-
-    def infer_latlon_from_callsign_online_lookup(self, call, credentials=None):
-        """Infer a latitude and longitude from a callsign (requires QRZ.com/HamQTH)
-        Coordinates that look default are rejected (apologies if your position really is 0,0, enjoy your voyage)"""
-
-        data = self._get_qrz_data_for_callsign(call, credentials)
-        if data and "latitude" in data and "longitude" in data and (
-                float(data["latitude"]) != 0 or float(data["longitude"]) != 0) and -89.9 < float(
-                data["latitude"]) < 89.9:
-            return [float(data["latitude"]), float(data["longitude"])]
-        data = self._get_hamqth_data_for_callsign(call, credentials)
-        if data and "latitude" in data and "longitude" in data and (
-                float(data["latitude"]) != 0 or float(data["longitude"]) != 0) and -89.9 < float(
-                data["latitude"]) < 89.9:
-            return [float(data["latitude"]), float(data["longitude"])]
-        else:
-            return None
-
-    def infer_grid_from_callsign_online_lookup(self, call, credentials=None):
-        """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)"""
-
-        data = self._get_qrz_data_for_callsign(call, credentials)
-        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, credentials)
-        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
-
-    def infer_qth_from_callsign_online_lookup(self, call, credentials=None):
-        """Infer a textual QTH from a callsign (requires QRZ.com/HamQTH)"""
-
-        data = self._get_qrz_data_for_callsign(call, credentials)
-        if data and "addr2" in data:
-            return data["addr2"]
-        data = self._get_hamqth_data_for_callsign(call, credentials)
-        if data and "qth" in data:
-            return data["qth"]
-        else:
-            return None
-
-    def infer_latlon_from_callsign_dxcc(self, call):
-        """Infer a latitude and longitude from a callsign (using DXCC, probably very inaccurate)"""
-
-        try:
-            data = self._call_info_basic.get_lat_long(call)
-            if data and "latitude" in data and "longitude" in data:
-                loc = [float(data["latitude"]), float(data["longitude"])]
-            else:
-                loc = None
-        except KeyError:
-            loc = None
-        # Couldn't get anything from basic call info database, try Clublog data
-        if not loc:
-            data = self._get_clublog_xml_data_for_callsign(call)
-            if data and "Lat" in data and "Lon" in data:
-                loc = [float(data["Lat"]), float(data["Lon"])]
-        if not loc:
-            data = self._get_clublog_api_data_for_callsign(call)
-            if data and "Lat" in data and "Lon" in data:
-                loc = [float(data["Lat"]), float(data["Lon"])]
-        return loc
-
-    def infer_grid_from_callsign_dxcc(self, call):
-        """Infer a grid locator from a callsign (using DXCC, probably very inaccurate)"""
-
-        latlon = self.infer_latlon_from_callsign_dxcc(call)
-        grid = None
-        try:
-            grid = latlong_to_locator(latlon[0], latlon[1], 8)
-        except:
-            logging.debug("Invalid lat/lon received for DXCC")
-        return grid
-
-    def _get_qrz_data_for_callsign(self, call, credentials):
-        """Utility method to get QRZ.com data from cache if possible, if not get it from the API and cache it.
-        Returns None immediately if no credentials are provided."""
-
-        # Return from cache if available (a cached None means 'not found in QRZ')
-        if call in self._qrz_callsign_data_cache:
-            return self._qrz_callsign_data_cache.get(call)
-
-        # Obtain session key from credentials
-        session_key = None
-        if credentials and credentials.qrz_session_key:
-            session_key = credentials.qrz_session_key
-        elif credentials and credentials.qrz_username and credentials.qrz_password:
-            try:
-                login_response = self._qrz_session_cache.get(
-                    self._qrz_base_url + "?username=" + urllib.parse.quote_plus(credentials.qrz_username) +
-                    "&password=" + urllib.parse.quote_plus(credentials.qrz_password) + "&agent=spothole",
-                    headers=HTTP_HEADERS).content
-                login_data = xmltodict.parse(login_response)
-                session = login_data.get("QRZDatabase", {}).get("Session", {})
-                if "Key" in session:
-                    session_key = session["Key"]
-                else:
-                    logging.warning("QRZ.com login details incorrect, failed to look up with QRZ.")
-                    return None
-            except Exception:
-                logging.error("Exception when getting QRZ.com session key")
-                return None
-
-        if not session_key:
-            return None
-
-        # Try the call as given, then fall back to the base call (strips /P, /M etc.)
-        calls_to_try = [call]
-        home_call = callinfo.Callinfo.get_homecall(call)
-        if home_call != call:
-            calls_to_try.append(home_call)
-
-        for lookup_call in calls_to_try:
-            try:
-                lookup_response = requests.get(
-                    self._qrz_base_url + "?s=" + session_key + "&callsign=" + urllib.parse.quote_plus(lookup_call),
-                    headers=HTTP_HEADERS, timeout=10).content
-                raw = xmltodict.parse(lookup_response).get("QRZDatabase", {}).get("Callsign")
-                if raw:
-                    data = _normalize_qrz_data(raw)
-                    self._qrz_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
-                    return data
-            except (KeyError, ValueError):
-                continue
-            except Exception:
-                logging.error("Exception when looking up QRZ data")
-                return None
-
-        # Not found in QRZ; cache None so we don't keep retrying
-        self._qrz_callsign_data_cache.add(call, None, expire=604800)  # 1 week in seconds
-        return None
-
-    def _get_hamqth_data_for_callsign(self, call, credentials):
-        """Utility method to get HamQTH data from cache if possible, if not get it from the API and cache it.
-        Returns None immediately if no credentials are provided."""
-
-        # Return from cache if available
-        if call in self._hamqth_callsign_data_cache:
-            return self._hamqth_callsign_data_cache.get(call)
-
-        # Obtain session ID from credentials
-        session_id = None
-        if credentials and credentials.hamqth_session_id:
-            session_id = credentials.hamqth_session_id
-        elif credentials and credentials.hamqth_username and credentials.hamqth_password:
-            try:
-                session_data = self._hamqth_session_lookup_cache.get(
-                    self._hamqth_base_url + "?u=" + urllib.parse.quote_plus(credentials.hamqth_username) +
-                    "&p=" + urllib.parse.quote_plus(credentials.hamqth_password), headers=HTTP_HEADERS).content
-                dict_data = xmltodict.parse(session_data)
-                if "session_id" in dict_data["HamQTH"]["session"]:
-                    session_id = dict_data["HamQTH"]["session"]["session_id"]
-                else:
-                    logging.warning("HamQTH login details incorrect, failed to look up with HamQTH.")
-                    return None
-            except Exception:
-                logging.error("Exception when getting HamQTH session ID")
-                return None
-
-        if not session_id:
-            return None
-
-        # Try the call as given, then fall back to the base call (strips /P, /M etc.)
-        calls_to_try = [call]
-        home_call = callinfo.Callinfo.get_homecall(call)
-        if home_call != call:
-            calls_to_try.append(home_call)
-
-        for lookup_call in calls_to_try:
-            try:
-                lookup_data = SEMI_STATIC_URL_DATA_CACHE.get(
-                    self._hamqth_base_url + "?id=" + session_id + "&callsign=" + urllib.parse.quote_plus(
-                        lookup_call) + "&prg=" + HAMQTH_PRG, headers=HTTP_HEADERS).content
-                data = xmltodict.parse(lookup_data)["HamQTH"]["search"]
-                self._hamqth_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
-                return data
-            except (KeyError, ValueError):
-                continue
-            except Exception:
-                logging.error("Exception when looking up HamQTH data")
-                return None
-
-        # Not found in HamQTH; cache None so we don't keep retrying
-        self._hamqth_callsign_data_cache.add(call, None, expire=604800)  # 1 week in seconds
-        return None
-
-    def _get_clublog_api_data_for_callsign(self, call):
-        """Utility method to get Clublog API data from cache if possible, if not get it from the API and cache it"""
-
-        # Fetch from cache if we can, otherwise fetch from the API and cache it
-        if call in self._clublog_callsign_data_cache:
-            return self._clublog_callsign_data_cache.get(call)
-        elif self._clublog_api_available:
-            try:
-                data = self._lookup_lib_clublog_api.lookup_callsign(callsign=call)
-                self._clublog_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
-                return data
-            except (KeyError, ValueError):
-                # Clublog had no info for the call, but maybe it had prefixes or suffixes. Try again with the base call.
-                try:
-                    data = self._lookup_lib_clublog_api.lookup_callsign(callsign=callinfo.Callinfo.get_homecall(call))
-                    self._clublog_callsign_data_cache.add(call, data, expire=604800)  # 1 week in seconds
-                    return data
-                except (KeyError, ValueError):
-                    # Clublog had no info for the call, that's OK. Cache a None so we don't try to look this up again
-                    self._clublog_callsign_data_cache.add(call, None, expire=604800)  # 1 week in seconds
-                    return None
-            except APIKeyMissingError:
-                # User API key was wrong, warn
-                logging.error("Could not look up via Clublog API, key " + self._clublog_api_key + " was rejected.")
-                return None
-        else:
-            return None
-
-    def _get_clublog_xml_data_for_callsign(self, call):
-        """Utility method to get Clublog XML data from file"""
-
-        if self._clublog_xml_available:
-            try:
-                data = self._lookup_lib_clublog_xml.lookup_callsign(callsign=call)
-                return data
-            except (KeyError, ValueError):
-                # Clublog had no info for the call, that's OK. Cache a None so we don't try to look this up again
-                self._clublog_callsign_data_cache.add(call, None, expire=604800)  # 1 week in seconds
-                return None
-        else:
-            return None
-
-    def _get_dxcc_data_for_callsign(self, call):
-        """Utility method to get generic DXCC data from our lookup table, if we can find it"""
-
-        for entry in self._dxcc_data.values():
-            if entry["_prefixRegexCompiled"].match(call):
-                return entry
-        return None
-
-    def stop(self):
-        """Shutdown method to close down any caches neatly."""
-
-        self._qrz_callsign_data_cache.close()
-        self._hamqth_callsign_data_cache.close()
-        self._clublog_callsign_data_cache.close()
-
-
-# Singleton object
-lookup_helper = LookupHelper()
-
-def infer_mode_from_comment(comment):
-    """Infer a mode from the comment"""
-
-    for mode in ALL_MODES:
-        if mode in comment.upper():
-            return mode
-    for mode in MODE_ALIASES.keys():
-        if mode in comment.upper():
-            return MODE_ALIASES[mode]
-    return None
-
-
-def infer_mode_type_from_mode(mode):
-    """Infer a "mode family" from a mode."""
-
-    if mode.upper() in CW_MODES:
-        return "CW"
-    elif mode.upper() in PHONE_MODES:
-        return "PHONE"
-    elif mode.upper() in DATA_MODES:
-        return "DATA"
-    else:
-        if mode.upper() != "OTHER":
-            logging.warning("Found an unrecognised mode: " + mode + ". Developer should categorise this.")
-        return None
-
-
-def infer_band_from_freq(freq):
-    """Infer a band from a frequency in Hz"""
-
-    for b in BANDS:
-        if b.start_freq <= freq <= b.end_freq:
-            return b
-    return UNKNOWN_BAND
-
-
-def infer_mode_from_frequency(freq):
-    """Infer a mode from the frequency (in Hz) according to the band plan. Just a guess really."""
-
-    try:
-        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
@@ -1,4 +1,10 @@
-from prometheus_client import CollectorRegistry, generate_latest, Counter, disable_created_metrics, Gauge
+from prometheus_client import (
+    CollectorRegistry,
+    Counter,
+    Gauge,
+    disable_created_metrics,
+    generate_latest,
+)

 disable_created_metrics()
 # Prometheus metrics registry
@@ -9,25 +15,13 @@ page_requests_counter = Counter(
    "Total number of page requests received",
    registry=registry,
 )
-api_requests_counter = Counter(
-    "spothole_api_requests",
-    "Total number of API requests received",
-    registry=registry
-)
-spots_gauge = Gauge(
-    "spothole_spots",
-    "Number of spots currently in the software",
-    registry=registry
-)
-alerts_gauge = Gauge(
-    "spothole_alerts",
-    "Number of alerts currently in the software",
-    registry=registry
-)
+api_requests_counter = Counter("spothole_api_requests", "Total number of API requests received", registry=registry)
+spots_gauge = Gauge("spothole_spots", "Number of spots currently in the software", registry=registry)
+alerts_gauge = Gauge("spothole_alerts", "Number of alerts currently in the software", registry=registry)
 memory_use_gauge = Gauge(
    "spothole_memory_usage_bytes",
    "Current memory usage of the software in bytes",
-    registry=registry
+    registry=registry,
 )


@@ -1,175 +0,0 @@
-import csv
-import logging
-
-from pyhamtools.locator import latlong_to_locator, locator_to_latlong
-
-from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
-from core.constants import SIGS, HTTP_HEADERS
-from core.geo_utils import wab_wai_square_to_lat_lon
-
-
-def get_ref_regex_for_sig(sig):
-    """Utility function to get the regex string for a SIG reference for a named SIG. If no match is found, None will be returned."""
-
-    for s in SIGS:
-        if s.name.upper() == sig.upper():
-            return s.ref_regex
-    return None
-
-
-def populate_sig_ref_info(sig_ref):
-    """Look up details of a SIG reference (e.g. POTA park) such as name, lat/lon, and grid. Takes in a sig_ref object which
-    must at minimum have a "sig" and an "id". The rest of the object will be populated and returned.
-    Note there is currently no support for KRMNPA location lookup, see issue #61."""
-
-    if sig_ref.sig is None or sig_ref.id is None:
-        logging.warning("Failed to look up sig_ref info, sig or id were not set.")
-
-    sig = sig_ref.sig
-    ref_id = sig_ref.id
-    try:
-        if sig.upper() == "POTA":
-            data = SEMI_STATIC_URL_DATA_CACHE.get("https://api.pota.app/park/" + 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/" + 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/" + 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/" + ref_id
-                sig_ref.grid = data["locator"] if "locator" in data else None
-                sig_ref.latitude = data["latitude"] if "latitude" in data else None
-                sig_ref.longitude = data["longitude"] if "longitude" in data else None
-                sig_ref.activation_score = data["points"] if "points" in data else None
-        elif sig.upper() == "WWBOTA":
-            data = SEMI_STATIC_URL_DATA_CACHE.get("https://api.wwbota.org/bunkers/" + 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=" + ref_id if ref_id.startswith("B/G") else None
-                sig_ref.grid = data["locator"] if "locator" in data else None
-                sig_ref.latitude = data["lat"] if "lat" in data else None
-                sig_ref.longitude = data["long"] if "long" in data else None
-        elif sig.upper() == "GMA" or sig.upper() == "ARLHS" or sig.upper() == "ILLW" or sig.upper() == "WCA" or sig.upper() == "MOTA" or sig.upper() == "IOTA":
-            data = SEMI_STATIC_URL_DATA_CACHE.get("https://www.cqgma.org/api/ref/?" + 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=" + 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"] == ref_id:
-                    sig_ref.name = row["name"] if "name" in row else None
-                    sig_ref.url = "https://wwff.co/directory/?showRef=" + ref_id
-                    sig_ref.grid = row["iaruLocator"] if "iaruLocator" in row and row["iaruLocator"] != "-" else None
-                    sig_ref.latitude = float(row["latitude"]) if "latitude" in row and row["latitude"] != "-" else None
-                    sig_ref.longitude = float(row["longitude"]) if "longitude" in row and row[
-                        "longitude"] != "-" else None
-                    break
-        elif sig.upper() == "SIOTA":
-            siota_csv_data = SEMI_STATIC_URL_DATA_CACHE.get("https://www.silosontheair.com/data/silos.csv",
-                                                            headers=HTTP_HEADERS)
-            siota_dr = csv.DictReader(siota_csv_data.content.decode().splitlines())
-            for row in siota_dr:
-                if row["SILO_CODE"] == ref_id:
-                    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"] == ref_id:
-                        sig_ref.name = feature["properties"]["title"]
-                        # Fudge WOTA URLs. Outlying fell (LDO) URLs don't match their ID numbers but require 214 to be
-                        # added to them
-                        sig_ref.url = "https://www.wota.org.uk/MM_" + ref_id
-                        if ref_id.upper().startswith("LDO-"):
-                            number = int(ref_id.upper().replace("LDO-", ""))
-                            sig_ref.url = "https://www.wota.org.uk/MM_LDO-" + str(number + 214)
-                        sig_ref.grid = feature["properties"]["qthLocator"]
-                        sig_ref.latitude = feature["geometry"]["coordinates"][1]
-                        sig_ref.longitude = feature["geometry"]["coordinates"][0]
-                        break
-        elif sig.upper() == "ZLOTA":
-            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"] == ref_id:
-                        sig_ref.name = asset["name"]
-                        sig_ref.url = "https://ontheair.nz/assets/ZLI_OT-030" + ref_id.replace("/", "_")
-                        try:
-                            sig_ref.grid = latlong_to_locator(asset["y"], asset["x"], 6)
-                        except:
-                            logging.debug("Invalid lat/lon received for reference")
-                            sig_ref.latitude = asset["y"]
-                            sig_ref.longitude = asset["x"]
-                        break
-        elif sig.upper() == "BOTA":
-            if not sig_ref.name:
-                sig_ref.name = sig_ref.id
-            sig_ref.url = "https://www.beachesontheair.com/beaches/" + sig_ref.name.lower().replace(" ", "-")
-        elif sig.upper() == "LLOTA":
-            data = SEMI_STATIC_URL_DATA_CACHE.get("https://llota.app/api/public/references",
-                                                  headers=HTTP_HEADERS).json()
-            if data:
-                for ref in data:
-                    if ref["reference_code"] == ref_id:
-                        sig_ref.name = ref["name"]
-                        sig_ref.url = "https://llota.app/list/ref/" + ref_id
-                        sig_ref.grid = ref["grid_locator"]
-                        ll = locator_to_latlong(sig_ref.grid)
-                        sig_ref.latitude = ll[0]
-                        sig_ref.longitude = ll[1]
-                        break
-        elif sig.upper() == "WWTOTA":
-            if not sig_ref.name:
-                sig_ref.name = sig_ref.id
-            sig_ref.url = "https://wwtota.com/seznam/karta_rozhledny.php?ref=" + sig_ref.name
-        elif sig.upper() == "TILES":
-            # Tiles on the Air just uses Maidenhead 6-digit squares, so ID, Name and Grid are all the same
-            if not sig_ref.name:
-                sig_ref.name = sig_ref.id
-            if not sig_ref.grid:
-                sig_ref.grid = sig_ref.id
-            if sig_ref.grid and not sig_ref.latitude:
-                ll = locator_to_latlong(sig_ref.grid)
-                sig_ref.latitude = ll[0]
-                sig_ref.longitude = ll[1]
-        elif sig.upper() == "WAB" or sig.upper() == "WAI":
-            ll = wab_wai_square_to_lat_lon(ref_id)
-            if ll:
-                sig_ref.name = ref_id
-                try:
-                    sig_ref.grid = latlong_to_locator(ll[0], ll[1], 6)
-                    sig_ref.latitude = ll[0]
-                    sig_ref.longitude = ll[1]
-                except:
-                    logging.debug("Invalid lat/lon received for reference")
-    except:
-        logging.warning("Failed to look up sig_ref info for " + sig + " ref " + ref_id + ".")
-    return sig_ref
-
-
-# Regex matching any SIG
-ANY_SIG_REGEX = r"(" + r"|".join(list(map(lambda p: p.name, SIGS))) + r")"
-
-# Regex matching any SIG reference
-ANY_XOTA_SIG_REF_REGEX = r"[\w\/]+\-\d+"
@@ -0,0 +1,45 @@
+import logging
+import threading
+
+import diskcache
+
+logger = logging.getLogger(__name__)
+
+
+class SingleObjectDataCache:
+    """Cache for status and solar conditions. This uses DiskCache, but unlike the standard DiskCache users like
+    activity ref and callsign lookup handlers, status and solar conditions are persisted as a single object. If we
+    just load the object from DiskCache and modify it, DiskCache doesn't know that it's been updated and needs
+    re-caching, so we provide a store() method that any functions updating the object can call afterwards."""
+
+    def __init__(self, cache_dir, object_if_empty):
+        """Initialize a SingleObjectDataCache. Provide the directory to load the cache from and save it to. If the cache
+        is empty, the provided object_if_empty parameter will be used to initialise it."""
+
+        self._lock = threading.Lock()
+        self._cache = diskcache.Cache(cache_dir)
+        # This cache stores a single object, doesn't matter what it's called so "object" will do
+        if "object" not in self._cache:
+            self._cache.add("object", object_if_empty)
+        try:
+            self._obj = self._cache.get("object")
+        except Exception:  # noqa: BLE001 (If any exceptions we treat the data as junk and start from scratch, it's probably due to a version upgrade having incompatible data structures, fine to not log the exception in this case)
+            logger.warning(f"Failed to load cache from {cache_dir}, clearing it.")
+            self._cache.clear()
+            self._cache.add("object", object_if_empty)
+            self._obj = object_if_empty
+
+    def get(self):
+        """Get the data object. This can then be manipulated as necessary across multiple threads. Any function
+        modifying the object must remember to call store() afterwards."""
+        return self._obj
+
+    def store(self):
+        """Store the updated object in the cache. Any function modifying the object must remember to call this
+        afterwards."""
+        with self._lock:
+            self._cache.set("object", self._obj)
+
+    def close(self):
+        self.store()
+        self._cache.close()
@@ -1,48 +1,52 @@
+import logging
 import os
 from datetime import datetime
-from threading import Thread, Event
+from threading import Event, Thread

 import psutil
 import pytz

+from core.cleanup import CLEANUP_TIMER
 from core.config import SERVER_OWNER_CALLSIGN
 from core.constants import SOFTWARE_VERSION
-from core.prometheus_metrics_handler import memory_use_gauge, spots_gauge, alerts_gauge
+from core.data_providers import DATA_PROVIDERS
+from core.data_store import DATA_STORE
+from core.prometheus_metrics_handler import alerts_gauge, memory_use_gauge, spots_gauge
+from telnetserver.telnetserver import TELNET_SERVER
+from webserver.webserver import WEB_SERVER
+
+logger = logging.getLogger(__name__)


 class StatusReporter:
    """Provides a timed update of the application's status data."""

-    def __init__(self, status_data, run_interval, web_server, cleanup_timer, spots, spot_providers, alerts,
-                 alert_providers, solar_condition_providers):
+    def __init__(self, run_interval):
        """Constructor"""

-        self._status_data = status_data
        self._run_interval = run_interval
-        self._web_server = web_server
-        self._cleanup_timer = cleanup_timer
-        self._spots = spots
-        self._spot_providers = spot_providers
-        self._alerts = alerts
-        self._alert_providers = alert_providers
-        self._solar_condition_providers = solar_condition_providers
        self._thread = None
        self._stop_event = Event()
        self._startup_time = datetime.now(pytz.UTC)

-        self._status_data["software-version"] = SOFTWARE_VERSION
-        self._status_data["server-owner-callsign"] = SERVER_OWNER_CALLSIGN
+        DATA_STORE.status.get()["software_version"] = SOFTWARE_VERSION
+        DATA_STORE.status.get()["server_owner_callsign"] = SERVER_OWNER_CALLSIGN
+        DATA_STORE.status.store()

    def start(self):
        """Start the reporter thread"""

-        self._thread = Thread(target=self._run, daemon=True)
+        self._thread = Thread(target=self._run, name="StatusReporter", daemon=True)
        self._thread.start()

    def stop(self):
        """Stop any threads and prepare for application shutdown"""

        self._stop_event.set()
+        if self._thread:
+            self._thread.join(timeout=15)
+            if self._thread.is_alive():
+                logger.warning("Status reporter worker thread did not exit on time and will be killed.")

    def _run(self):
        """Thread entry point: report immediately on startup, then on each interval until stopped"""
@@ -55,43 +59,100 @@ class StatusReporter:
    def _report(self):
        """Write status information"""

-        self._status_data["uptime"] = (datetime.now(pytz.UTC) - self._startup_time).total_seconds()
-        self._status_data["mem_use_mb"] = round(psutil.Process(os.getpid()).memory_info().rss / (1024 * 1024), 3)
-        self._status_data["num_spots"] = len(self._spots)
-        self._status_data["num_alerts"] = len(self._alerts)
-        self._status_data["spot_providers"] = list(
-            map(lambda p: {"name": p.name, "enabled": p.enabled, "status": p.status,
-                           "last_updated": p.last_update_time.replace(
-                               tzinfo=pytz.UTC).timestamp() if p.last_update_time.year > 2000 else 0,
-                           "last_spot": p.last_spot_time.replace(
-                               tzinfo=pytz.UTC).timestamp() if p.last_spot_time.year > 2000 else 0},
-                self._spot_providers))
-        self._status_data["alert_providers"] = list(
-            map(lambda p: {"name": p.name, "enabled": p.enabled, "status": p.status,
-                           "last_updated": p.last_update_time.replace(
-                               tzinfo=pytz.UTC).timestamp() if p.last_update_time.year > 2000 else 0},
-                self._alert_providers))
-        self._status_data["solar_condition_providers"] = list(
-            map(lambda p: {"name": p.name, "enabled": p.enabled, "status": p.status,
-                           "last_updated": p.last_update_time.replace(
-                               tzinfo=pytz.UTC).timestamp() if p.last_update_time.year > 2000 else 0},
-                self._solar_condition_providers))
-        self._status_data["cleanup"] = {"status": self._cleanup_timer.status,
-                                        "last_ran": self._cleanup_timer.last_cleanup_time.replace(
-                                            tzinfo=pytz.UTC).timestamp() if self._cleanup_timer.last_cleanup_time else 0}
-        self._status_data["webserver"] = {"status": self._web_server.web_server_metrics["status"],
-                                          "last_api_access": self._web_server.web_server_metrics[
-                                              "last_api_access_time"].replace(
-                                              tzinfo=pytz.UTC).timestamp() if self._web_server.web_server_metrics[
-                                              "last_api_access_time"] else 0,
-                                          "api_access_count": self._web_server.web_server_metrics["api_access_counter"],
-                                          "last_page_access": self._web_server.web_server_metrics[
-                                              "last_page_access_time"].replace(
-                                              tzinfo=pytz.UTC).timestamp() if self._web_server.web_server_metrics[
-                                              "last_page_access_time"] else 0,
-                                          "page_access_count": self._web_server.web_server_metrics["page_access_counter"]}
+        DATA_STORE.status.get()["uptime"] = (datetime.now(pytz.UTC) - self._startup_time).total_seconds()
+        DATA_STORE.status.get()["mem_use_mb"] = round(psutil.Process(os.getpid()).memory_info().rss / (1024 * 1024), 3)
+        DATA_STORE.status.get()["num_spots"] = len(DATA_STORE.spots.values())
+        DATA_STORE.status.get()["num_alerts"] = len(DATA_STORE.alerts.values())
+        DATA_STORE.status.get()["spot_providers"] = [
+            {
+                "name": p.name,
+                "enabled": p.enabled,
+                "enabled_by_default_in_web_ui": p.enabled_by_default_in_web_ui,
+                "status": p.status,
+                "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
+                if p.last_update_time.year > 2000
+                else 0,
+                "last_spot": p.last_spot_time.replace(tzinfo=pytz.UTC).timestamp()
+                if p.last_spot_time.year > 2000
+                else 0,
+            }
+            for p in DATA_PROVIDERS.spot_providers
+        ]
+        DATA_STORE.status.get()["alert_providers"] = [
+            {
+                "name": p.name,
+                "enabled": p.enabled,
+                "status": p.status,
+                "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
+                if p.last_update_time.year > 2000
+                else 0,
+            }
+            for p in DATA_PROVIDERS.alert_providers
+        ]
+        DATA_STORE.status.get()["solar_condition_providers"] = [
+            {
+                "name": p.name,
+                "enabled": p.enabled,
+                "status": p.status,
+                "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
+                if p.last_update_time.year > 2000
+                else 0,
+            }
+            for p in DATA_PROVIDERS.solar_condition_providers
+        ]
+        DATA_STORE.status.get()["static_data_providers"] = [
+            {
+                "name": p.name,
+                "enabled": p.enabled,
+                "status": p.status,
+                "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
+                if p.last_update_time.year > 2000
+                else 0,
+            }
+            for p in DATA_PROVIDERS.static_data_providers
+        ]
+        DATA_STORE.status.get()["sig_ref_data_providers"] = [
+            {
+                "sig_name": p.sig_name,
+                "enabled": p.enabled,
+                "status": p.status,
+                "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
+                if p.last_update_time.year > 2000
+                else 0,
+                "reference_count": p.reference_count,
+            }
+            for p in DATA_PROVIDERS.sig_ref_data_providers
+        ]
+        DATA_STORE.status.get()["callsign_data_providers"] = [
+            {
+                "name": p.name,
+                "enabled": p.enabled,
+                "status": p.status,
+                "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
+                if p.last_update_time.year > 2000
+                else 0,
+                "lookup_count": p.lookup_count,
+            }
+            for p in DATA_PROVIDERS.callsign_data_providers
+        ]
+        DATA_STORE.status.get()["cleanup"] = {
+            "status": CLEANUP_TIMER.status,
+            "last_ran": CLEANUP_TIMER.last_cleanup_time.replace(tzinfo=pytz.UTC).timestamp()
+            if CLEANUP_TIMER.last_cleanup_time
+            else 0,
+        }
+        DATA_STORE.status.get()["webserver"] = {
+            "status": WEB_SERVER.web_server_metrics.status,
+            "api_requests_per_hour": WEB_SERVER.web_server_metrics.api_requests_per_hour(),
+            "page_requests_per_hour": WEB_SERVER.web_server_metrics.page_requests_per_hour(),
+            "sse_client_count": WEB_SERVER.sse_client_count,
+        }
+        DATA_STORE.status.get()["telnet"] = {
+            "client_count": TELNET_SERVER.client_count,
+        }
+        DATA_STORE.status.store()

        # Update Prometheus metrics
        memory_use_gauge.set(psutil.Process(os.getpid()).memory_info().rss)
-        spots_gauge.set(len(self._spots))
-        alerts_gauge.set(len(self._alerts))
+        spots_gauge.set(len(DATA_STORE.spots.values()))
+        alerts_gauge.set(len(DATA_STORE.alerts.values()))
@@ -0,0 +1,27 @@
+import threading
+from datetime import timedelta
+
+from requests_cache import CachedSession
+
+from core.data_store import CACHE_DIR
+
+
+class URLDataCache(CachedSession):
+    """Cache for "semi-static" data retrieved from a URL. This is an extra layer of caching in addition to the normal
+    caching of spots, alerts and other data in the DataStore class. Its purpose is to avoid hitting remote endpoints
+    frequently when e.g. restarting Spothole many times during testing. It should only be used for data that isn't
+    expected to change on a sub-daily basis, so never for spots & alerts. It also implements a lock to allow it to be
+    used across multiple threads, though note that URL lookups will block each other this way, so it is still better to
+    create one of these objects per thread if possible."""
+
+    def __init__(self, name):
+        super().__init__(
+            f"{CACHE_DIR}urls/{name}",
+            expire_after=timedelta(days=1),
+            allowable_codes=(200, 400, 401, 403, 404),
+        )
+        self._lock = threading.Lock()
+
+    def get(self, *args, **kwargs):
+        with self._lock:
+            return super().get(*args, **kwargs)
@@ -1,15 +1,158 @@
-def serialize_everything(obj):
-    """Convert objects to serialisable things. Used by JSON serialiser as a default when it encounters unserializable things.
-    Just converts objects to dict. Try to avoid doing anything clever here when serialising spots, because we also need
-    to receive spots without complex handling."""
-    return obj.__dict__
+import logging
+import re
+
+import simplejson
+from pyhamtools.frequency import freq_to_band
+from pyhamtools.locator import latlong_to_locator
+
+from core.constants import BANDS, UNKNOWN_BAND
+from core.data_store import DATA_STORE
+from core.enums import MODE_ALIASES, Continent, Mode, ModeType
+from data.callsign import Callsign, LocationSourceForCallsign
+
+logger = logging.getLogger(__name__)


-def empty_queue(q):
-    """Empty a queue"""
+def safe_json_dumps(obj):
+    """Safe version of json.dumps that also converts objects to dicts so they can be output, and ignores NaN floats
+    which are invalid in JSON."""

-    while not q.empty():
-        try:
-            q.get_nowait()
-        except:
-            break
+    return simplejson.dumps(obj, ensure_ascii=False, ignore_nan=True, default=lambda o: o.__dict__)
+
+
+def infer_mode_from_comment(comment: str) -> Mode | None:
+    """Infer a mode from the comment"""
+
+    if not comment:
+        return None
+
+    for mode in Mode:
+        if re.search(r"(^|\W)" + mode + r"($|\W)", comment, re.IGNORECASE):
+            return mode
+    for alias in MODE_ALIASES:
+        if re.search(r"(^|\W)" + alias + r"($|\W)", comment, re.IGNORECASE):
+            return Mode(MODE_ALIASES[alias])
+
+    return None
+
+
+def infer_mode_type_from_mode(mode: str) -> ModeType | None:
+    """Infer a "mode family" from a mode ."""
+
+    if not mode:
+        return None
+
+    if mode in MODE_ALIASES:
+        mode = MODE_ALIASES[mode]
+
+    try:
+        mode = Mode(mode.upper())
+        if mode.is_cw:
+            return ModeType.CW
+        if mode.is_phone:
+            return ModeType.PHONE
+        return ModeType.DATA
+
+    except ValueError:
+        if mode.upper() != "OTHER" and mode != "?":
+            logger.warning(f"Found an unrecognised mode: {mode}. Developer should categorise this.")
+        return None
+
+
+def infer_band_from_freq(freq):
+    """Infer a band from a frequency in Hz"""
+
+    for b in BANDS:
+        if b.start_freq <= freq <= b.end_freq:
+            return b
+    return UNKNOWN_BAND
+
+
+def infer_mode_from_frequency(freq):
+    """Infer a mode from the frequency (in Hz) according to the band plan. Just a guess really."""
+
+    try:
+        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 SSB, 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"
+
+        if not mode:
+            return None
+
+        mode = mode.upper()
+        if mode in MODE_ALIASES:
+            mode = MODE_ALIASES[mode]
+
+        return Mode(mode)
+
+    except KeyError:
+        return None
+
+
+def get_flag_for_dxcc(dxcc):
+    """Get an emoji flag for a given DXCC entity ID"""
+
+    dxcc_data = DATA_STORE.dxcc_data.get(dxcc, None)
+    return dxcc_data["flag"] if dxcc_data else None
+
+
+def get_callsign_object_from_pyhamtools_callinfo(callsign, callinfo):
+    """Utility function to take the data provided by a PyHamTools CallInfo object and populate our own Callsign data
+    object from it"""
+
+    try:
+        home_call = callinfo.get_homecall(callsign)
+        data = callinfo.get_all(callsign)
+
+        country = data.get("country", None)
+        dxcc_id = data.get("adif", None)
+        continent = Continent(data["continent"]) if "continent" in data else None
+        cq_zone = data.get("cqz", None)
+        itu_zone = data.get("ituz", None)
+        lat = float(data["latitude"]) if "latitude" in data else None
+        lon = float(data["longitude"]) if "longitude" in data else None
+        grid = None
+        if lat and lon:
+            grid = latlong_to_locator(lat, lon)
+
+        return Callsign(
+            call=callsign,
+            home_call=home_call,
+            country=country,
+            dxcc_id=dxcc_id,
+            continent=continent,
+            cq_zone=cq_zone,
+            itu_zone=itu_zone,
+            latitude=lat,
+            longitude=lon,
+            grid=grid,
+            location_source=LocationSourceForCallsign.DXCC,
+        )
+
+    except (KeyError, ValueError):
+        # Unknown callsign, can't look anything up, return a Callsign object with basic data so that gets cached
+        return Callsign(call=callsign)
@@ -0,0 +1,501 @@
+from core.enums import ActivityName, ActivityRefType, ActivityType
+from data.activity import Activity
+
+ACTIVITIES: dict[ActivityName, Activity] = {
+    ActivityName.CONTEST: Activity(
+        name=ActivityName.CONTEST,
+        description="Contest",
+        sig_type=ActivityType.TRADITIONAL,
+        has_refs=False,
+        refs_globally_unique=False,
+        # No sensible way to determine *which* contest, but if we set comment_names=["CONTEST"] then at least
+        # any spots with "contest" in the comment will get allocated to this activity.
+        comment_names=["CONTEST"],
+        icon="fa-trophy",
+        alerts_possible=True,
+    ),
+    ActivityName.DXPEDITION: Activity(
+        name=ActivityName.DXPEDITION,
+        description="Radio expedition to a remote location",
+        sig_type=ActivityType.TRADITIONAL,
+        has_refs=False,
+        refs_globally_unique=False,
+        # DXpedition stations are never really spotted with "DXpedition" in the comments, but we can assign
+        # this activity to a spot other ways.
+        comment_names=[],
+        icon="fa-book-atlas",
+        alerts_possible=True,
+    ),
+    ActivityName.SATELLITE: Activity(
+        name=ActivityName.SATELLITE,
+        description="Amateur Radio Satellite",
+        sig_type=ActivityType.TRADITIONAL,
+        has_refs=False,
+        refs_globally_unique=False,
+        comment_names=[],
+        icon="fa-satellite",
+        alerts_possible=True,
+    ),
+    ActivityName.EME: Activity(
+        name=ActivityName.EME,
+        description="Earth-Moon-Earth (Moonbounce)",
+        sig_type=ActivityType.TRADITIONAL,
+        has_refs=False,
+        refs_globally_unique=False,
+        comment_names=[],
+        icon="fa-moon",
+    ),
+    ActivityName.AERONAUTICAL_MOBILE: Activity(
+        name=ActivityName.AERONAUTICAL_MOBILE,
+        description="Aeronautical Mobile",
+        sig_type=ActivityType.TRADITIONAL,
+        has_refs=False,
+        refs_globally_unique=False,
+        # Don't pick /AM out of comments, spot.py will handle picking it out of the callsign
+        comment_names=[],
+        icon="fa-plane",
+    ),
+    ActivityName.MARITIME_MOBILE: Activity(
+        name=ActivityName.MARITIME_MOBILE,
+        description="Maritime Mobile",
+        sig_type=ActivityType.TRADITIONAL,
+        has_refs=False,
+        refs_globally_unique=False,
+        # Don't pick /MM out of comments, spot.py will handle picking it out of the callsign
+        comment_names=[],
+        icon="fa-sailboat",
+    ),
+    ActivityName.QRP: Activity(
+        name=ActivityName.QRP,
+        description="Low power",
+        sig_type=ActivityType.TRADITIONAL,
+        has_refs=False,
+        refs_globally_unique=False,
+        comment_names=["QRP"],
+        icon="fa-volume-low",
+        alerts_possible=True,
+    ),
+    ActivityName.POTA: Activity(
+        name=ActivityName.POTA,
+        description="Parks on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.PARK,
+        ref_regex=r"[A-Z]{2}\-\d{4,5}|K\-TEST",
+        comment_names=["POTA"],
+        icon="fa-tree",
+        alerts_possible=True,
+    ),
+    ActivityName.SOTA: Activity(
+        name=ActivityName.SOTA,
+        description="Summits on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.SUMMIT,
+        ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}",
+        comment_names=["SOTA"],
+        icon="fa-mountain-sun",
+        alerts_possible=True,
+    ),
+    ActivityName.WWFF: Activity(
+        name=ActivityName.WWFF,
+        description="World Wide Flora & Fauna",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.PARK,
+        ref_regex=r"[A-Z0-9]{1,3}FF\-\d{4}",
+        comment_names=["WWFF"],
+        icon="fa-seedling",
+        alerts_possible=True,
+    ),
+    ActivityName.GMA: Activity(
+        name=ActivityName.GMA,
+        description="Global Mountain Activity",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.SUMMIT,
+        ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}",
+        comment_names=["GMA"],
+        icon="fa-person-hiking",
+    ),
+    ActivityName.WWBOTA: Activity(
+        name=ActivityName.WWBOTA,
+        description="Worldwide Bunkers on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.BUNKER,
+        ref_regex=r"B\/[A-Z0-9]{1,3}\-\d{3,4}",
+        comment_names=["WWBOTA", "BOTA"],
+        icon="fa-radiation",
+    ),
+    ActivityName.HEMA: Activity(
+        name=ActivityName.HEMA,
+        description="HuMPs Excluding Marilyns Award",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.SUMMIT,
+        ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{3}\-\d{3}",
+        comment_names=["HEMA"],
+        icon="fa-mound",
+        alerts_possible=True,
+    ),
+    ActivityName.IOTA: Activity(
+        name=ActivityName.IOTA,
+        description="Islands on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.ISLAND,
+        ref_regex=r"[A-Z]{2}\-\d{3}",
+        comment_names=["IOTA"],
+        icon="fa-book-atlas",
+    ),
+    ActivityName.GMA_ISLANDS: Activity(
+        name=ActivityName.GMA_ISLANDS,
+        description="Global Mountain Activity - Islands",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.ISLAND,
+        ref_regex=r"(([A-Z]{2}\-\d{3})|([A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}))",
+        comment_names=[],
+        icon="fa-person-hiking",
+    ),
+    ActivityName.ARLHS: Activity(
+        name=ActivityName.ARLHS,
+        description="Amateur Radio Lighthouse Society",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.LIGHTHOUSE,
+        ref_regex=r"[A-Z]{3}[\- ]\d{3,4}",
+        comment_names=["ARLHS"],
+        icon="fa-house-flood-water",
+    ),
+    ActivityName.ILLW: Activity(
+        name=ActivityName.ILLW,
+        description="International Lighthouse & Lightship Weekend",
+        sig_type=ActivityType.EVENT,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.LIGHTHOUSE,
+        ref_regex=r"[A-Z]{2}\d{4}",
+        comment_names=["ILLW"],
+        icon="fa-house-flood-water",
+    ),
+    ActivityName.MOTA: Activity(
+        name=ActivityName.MOTA,
+        description="Mills on the Air",
+        sig_type=ActivityType.EVENT,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.MILL,
+        ref_regex=r"X\d{4,6}",
+        comment_names=["MOTA"],
+        icon="fa-fan",
+    ),
+    ActivityName.SIOTA: Activity(
+        name=ActivityName.SIOTA,
+        description="Silos on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.SILO,
+        ref_regex=r"[A-Z]{2}\-[A-Z]{3}\d",
+        comment_names=["SIOTA"],
+        icon="fa-wheat-awn",
+        alerts_possible=True,
+    ),
+    ActivityName.WCA: Activity(
+        name=ActivityName.WCA,
+        description="World Castles Award",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.CASTLE,
+        ref_regex=r"[A-Z0-9]{1,3}\-\d{5}",
+        comment_names=["WCA"],
+        icon="fa-chess-rook",
+    ),
+    ActivityName.ZLOTA: Activity(
+        name=ActivityName.ZLOTA,
+        description="New Zealand on the Air",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=None,
+        ref_regex=r"ZL[A-Z]/[A-Z]{2}\-\d{3,4}",
+        comment_names=["ZLOTA"],
+        icon="fa-kiwi-bird",
+        region_flag="🇳🇿",
+        alerts_possible=True,
+    ),
+    ActivityName.WOTA: Activity(
+        name=ActivityName.WOTA,
+        description="Wainwrights on the Air",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.SUMMIT,
+        ref_regex=r"[A-Z]{3}-[0-9]{2}",
+        comment_names=["WOTA"],
+        icon="fa-w",
+        region_flag="🇬🇧",
+        alerts_possible=True,
+    ),
+    ActivityName.BOTA: Activity(
+        name=ActivityName.BOTA,
+        description="Beaches on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.BEACH,
+        comment_names=[],
+        icon="fa-umbrella-beach",
+        alerts_possible=True,
+    ),
+    ActivityName.KRMNPA: Activity(
+        name=ActivityName.KRMNPA,
+        description="Keith Roget Memorial National Parks Award",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.PARK,
+        ref_regex=r"VKFF\-\d{4}",
+        comment_names=["KRMNPA"],
+        icon="fa-earth-oceania",
+        region_flag="🇦🇺",
+        alerts_possible=True,
+    ),
+    ActivityName.SANPCPA: Activity(
+        name=ActivityName.SANPCPA,
+        description="South Australian National Parks and Conservation Parks Award",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.PARK,
+        ref_regex=r"VKFF\-\d{4}",
+        comment_names=["SANPCPA"],
+        icon="fa-earth-oceania",
+        region_flag="🇦🇺",
+        alerts_possible=True,
+    ),
+    ActivityName.LLOTA: Activity(
+        name=ActivityName.LLOTA,
+        description="Lagos y Lagunas on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.LAKE,
+        ref_regex=r"LL[A-Z]{2}\-\d{4}",
+        comment_names=["LLOTA"],
+        icon="fa-water",
+        alerts_possible=True,
+    ),
+    ActivityName.TOWERS: Activity(
+        name=ActivityName.TOWERS,
+        description="Towers on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.TOWER,
+        ref_regex=r"[A-Z]{2,3}R\-\d{4}",
+        comment_names=["TOTA"],
+        icon="fa-tower-observation",
+    ),
+    ActivityName.TILES: Activity(
+        name=ActivityName.TILES,
+        description="Tiles on the Air",
+        sig_type=ActivityType.ADVENTURE,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.GRID,
+        ref_regex=r"[A-Za-z]{2}[0-9]{2}[A-Za-z]{2}",
+        comment_names=[],
+        icon="fa-square",
+    ),
+    ActivityName.RADAR_RALLY: Activity(
+        name=ActivityName.RADAR_RALLY,
+        description="RaDAR Rally",
+        sig_type=ActivityType.EVENT,
+        has_refs=False,
+        refs_globally_unique=False,
+        comment_names=["RaDAR"],
+        icon="fa-headset",
+    ),
+    ActivityName.WAB: Activity(
+        name=ActivityName.WAB,
+        description="Worked All Britain",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.GRID,
+        ref_regex=r"[A-Z]{1,2}[0-9]{2}",
+        comment_names=["WAB"],
+        icon="fa-table-cells-large",
+        region_flag="🇬🇧",
+    ),
+    ActivityName.WAI: Activity(
+        name=ActivityName.WAI,
+        description="Worked All Ireland",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.GRID,
+        ref_regex=r"[A-Z][0-9]{2}",
+        comment_names=["WAI"],
+        icon="fa-table-cells-large",
+        region_flag="🇮🇪",
+    ),
+    ActivityName.DMF: Activity(
+        name=ActivityName.DMF,
+        description="Diplôme des Moulins de France",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.MILL,
+        comment_names=["DMF"],
+        icon="fa-fan",
+        region_flag="🇫🇷",
+    ),
+    ActivityName.DME: Activity(
+        name=ActivityName.DME,
+        description="Diploma Municipios de España",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.TOWN,
+        ref_regex=r"DME[\- ]\d{3,5}",
+        comment_names=["DME"],
+        icon="fa-building",
+        region_flag="🇪🇸",
+    ),
+    ActivityName.FEA: Activity(
+        name=ActivityName.FEA,
+        description="Diploma Faros de España",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.LIGHTHOUSE,
+        # FEA references are technically [DE]\-\d{4}(\.\d)? but spotters always seem to miss out the D- or E-
+        # prefix and just use FEA-1234 or FEA 1234, so allow for that. The FEA activity ref data provider adds both
+        # forms to the database.
+        ref_regex=r"([DE]|FEA)[\- ]\d{4}(\.\d)?",
+        comment_names=["FEA"],
+        icon="fa-house-flood-water",
+        region_flag="🇪🇸",
+    ),
+    ActivityName.DMUE: Activity(
+        name=ActivityName.DMUE,
+        description="Diploma Museos de España",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.BUILDING,
+        ref_regex=r"MUE[A-Z]{2}-\d{3}",
+        comment_names=["DMUE"],
+        icon="fa-landmark",
+        region_flag="🇪🇸",
+    ),
+    ActivityName.DMVE: Activity(
+        name=ActivityName.DMVE,
+        description="Diploma Monumentos y Vestigios de España",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.BUILDING,
+        ref_regex=r"MV[A-Z]{1,2}-\d{4}",
+        comment_names=["DMVE"],
+        icon="fa-monument",
+        region_flag="🇪🇸",
+    ),
+    ActivityName.DCE: Activity(
+        name=ActivityName.DCE,
+        description="Diploma Castillos de España",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.CASTLE,
+        ref_regex=r"C[A-Z]{1,2}-\d{3}",
+        comment_names=["DCE"],
+        icon="fa-chess-rook",
+        region_flag="🇪🇸",
+    ),
+    ActivityName.DEFE: Activity(
+        name=ActivityName.DEFE,
+        description="Diploma Estaciones de Ferrocarril de España",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.BUILDING,
+        ref_regex=r"EF[A-Z]{1,2}-\d{3}",
+        comment_names=["DEFE"],
+        icon="fa-train",
+        region_flag="🇪🇸",
+    ),
+    ActivityName.DTMBA: Activity(
+        name=ActivityName.DTMBA,
+        description="Diploma Teatri Musei e Belle Arti",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.BUILDING,
+        ref_regex=r"I-?[0-9]{3,4}\s?[A-Z]{2}",
+        comment_names=["DTMBA"],
+        icon="fa-landmark",
+        region_flag="🇮🇹",
+    ),
+    ActivityName.BIWOTA: Activity(
+        name=ActivityName.BIWOTA,
+        description="British Inland Waterways on the Air",
+        sig_type=ActivityType.EVENT,
+        has_refs=False,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.WATERWAY,
+        comment_names=["BIWOTA"],
+        icon="fa-ship",
+        region_flag="🇬🇧",
+    ),
+    ActivityName.COTA: Activity(
+        name=ActivityName.COTA,
+        description="Castles on the Air",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.CASTLE,
+        ref_regex=r"[A-Z]{3}\-[0-9]{3,5}",
+        comment_names=["COTA"],
+        icon="fa-chess-rook",
+        region_flag="🇩🇪",
+    ),
+    ActivityName.PGA: Activity(
+        name=ActivityName.PGA,
+        description="Polish Gmina Award",
+        sig_type=ActivityType.REGIONAL,
+        has_refs=True,
+        refs_globally_unique=False,
+        ref_type=ActivityRefType.REGION,
+        ref_regex=r"[A-Z]{2}[0-9]{2}",
+        comment_names=["PGA"],
+        icon="fa-g",
+        region_flag="🇵🇱",
+    ),
+    ActivityName.TOILETS: Activity(
+        name=ActivityName.TOILETS,
+        description="Toilets on the Air",
+        sig_type=ActivityType.EVENT,
+        has_refs=True,
+        refs_globally_unique=True,
+        ref_type=ActivityRefType.TOILET,
+        ref_regex=r"T\-[0-9]{2}",
+        comment_names=[],
+        icon="fa-toilet",
+        region_flag="🏴‍☠️",
+    ),
+}
@@ -0,0 +1,49 @@
+from dataclasses import dataclass, field
+
+from core.enums import ActivityName, ActivityRefType, ActivityType
+
+
+@dataclass
+class Activity:
+    """Data class that defines an Activity (formerly referred to as a "Special Interest Group" or "SIG", a term
+    which is still used for the `sig` field name in the API for backwards compatibility). Each contains a name and
+    a longer form description. They also contain comment_names which attempts to separate out the way people might
+    refer to it in cluster comments from how it is referred to in the UI & API. (For example, "TOTA" in cluster
+    spot comments almost always means Towers on the Air, but no single programme is referred to in the UI as "TOTA"
+    as it's ambiguous between Towers, Toilets and Tiles. And while Beaches got the name "BOTA" first, "BOTA" spots
+    are much more likely to be bunkers.) Finally, there is a ref_regex which provides a regular expression to
+    match what references (such as parks and summits) look like for that programme."""
+
+    # Activity name as used in the UI and API, e.g. "Towers"
+    name: ActivityName
+    # Description, e.g. "Towers on the Air"
+    description: str
+    # Type, either Worldwide, Regional or Event. Used for sorting in the web UI.
+    # Note: this field is still named "sig_type" in the API for backwards compatibility.
+    sig_type: ActivityType
+    # Whether this activity has a fixed set of references (e.g. parks) with some sort of ID to "activate"
+    has_refs: bool
+    # Identifies that the activity's reference ID structure defined by its regex is unique across all programmes and
+    # anything else we expect a user to put in a spot comment, and therefore we can pull references out of
+    # spot comments without also needing to see the activity name first. For example, "OHFF-1234" or "B/G-1234" are
+    # obviously WWFF and WWBOTA, nothing else looks like those. But "SZ09" could be WAB or Tiles, "GB1234" could
+    # conceivably be POTA or ILLW, etc. So in those cases we need to see the name of the activity itself immediately
+    # before it.
+    refs_globally_unique: bool
+    # Reference type, what gets activated e.g. Park, Summit. May be None if the activity is for multiple types of
+    # things, in which case the spot data will have to provide this instead.
+    ref_type: ActivityRefType | None = None
+    # Regex matcher for references, e.g. for POTA r"[A-Z]{2}\-\d+". Only set when has_references is True and we know
+    # the fixed format references take for this activity.
+    ref_regex: str | None = None
+    # Activity names as they might appear in cluster spot comments, e.g. ["TOTA"]
+    comment_names: list[str] = field(default_factory=list)
+    # Icon to use in the UI when referencing this activity. Chosen from the Font Awesome set.
+    icon: str | None = None
+    # Emoji flag for the country or region where this activity is relevant, if any. If None, this implies the
+    # activity is in worldwide usage.
+    region_flag: str | None = None
+    # Can alerts ever have this activity? A lot of activities can be figured out from spot comments but can never
+    # occur in alerts, so to avoid showing all activities on the "upcoming" page, we allow it to filter based on
+    # this.
+    alerts_possible: bool = False
@@ -0,0 +1,32 @@
+from dataclasses import dataclass
+
+from core.enums import ActivityRefType
+
+
+@dataclass
+class ActivityRef:
+    """Data class that defines an Activity "info" or reference. As well as the basic reference ID we include a
+    name and a lookup URL."""
+
+    # Activity that this reference is in, e.g. "POTA". Still named "sig" for backwards compatibility with the API.
+    sig: str
+    # Reference ID, e.g. "GB-0001".
+    id: str | None = None
+    # Name of the reference, e.g. "Null Country Park", if known.
+    name: str | None = None
+    # Type of the reference, e.g. "Park", if known.
+    ref_type: ActivityRefType | None = None
+    # URL to look up more information about the reference, if known.
+    url: str | None = None
+    # Icon to use for the reference, derived from the activity. Chosen from the Font Awesome set.
+    icon: str | None = None
+    # Latitude of the reference, in degrees, if known.
+    latitude: float | None = None
+    # Longitude of the reference, in degrees, if known.
+    longitude: float | None = None
+    # Altitude of the reference, in metres, if known.
+    altitude: float | None = None
+    # Maidenhead grid ref of the reference, if known.
+    grid: str | None = None
+    # Activation score. SOTA only
+    activation_score: int | None = None
@@ -1,13 +1,18 @@
-import copy
 import hashlib
 import json
-from dataclasses import dataclass
+import logging
+from dataclasses import dataclass, field
 from datetime import datetime, timedelta

 import pytz

-from core.lookup_helper import lookup_helper
-from core.sig_utils import populate_sig_ref_info
+from core.activity_lookup_helper import populate_missing_activity_ref_info
+from core.activity_utils import get_icon_for_activity
+from core.call_lookup_helper import get_call_info
+from core.enums import Continent
+from core.utils import get_flag_for_dxcc
+
+logger = logging.getLogger(__name__)


@dataclass
@@ -15,118 +20,145 @@ class Alert:
    """Data class that defines an alert."""

    # Unique identifier for the alert
-    id: str = None
+    id: str | None = None
+
+    # DX (alerting) operator info
+
    # Callsigns of the operators that has been alerted
-    dx_calls: list = None
+    dx_calls: list | None = None
    # Names of the operators that has been alerted
-    dx_names: list = None
+    dx_names: list | None = None
    # Country of the DX operator
-    dx_country: str = None
+    dx_country: str | None = None
    # Country flag of the DX operator
-    dx_flag: str = None
+    dx_flag: str | None = None
    # Continent of the DX operator
-    dx_continent: str = None
+    dx_continent: Continent | None = None
    # DXCC ID of the DX operator
-    dx_dxcc_id: int = None
+    dx_dxcc_id: int | None = None
    # CQ zone of the DX operator
-    dx_cq_zone: int = None
+    dx_cq_zone: int | None = None
    # ITU zone of the DX operator
-    dx_itu_zone: int = None
+    dx_itu_zone: int | None = None
+
+    # General alert info
+
    # Intended frequencies & modes of operation. Essentially just a different kind of comment field.
-    freqs_modes: str = None
+    freqs_modes: str | None = None
    # Start time of the activation, UTC seconds since UNIX epoch
-    start_time: float = None
+    start_time: float | None = None
    # Start time of the activation of the alert, ISO 8601
-    start_time_iso: str = None
+    start_time_iso: str | None = None
    # End time of the activation, UTC seconds since UNIX epoch. Optional
-    end_time: float = None
+    end_time: float | None = None
    # End time of the activation of the alert, ISO 8601
-    end_time_iso: str = None
+    end_time_iso: str | None = None
+    # Comment made by the alerter, if any
+    comment: str | None = None
+    # A URL link to more information, if any
+    url: str | None = None
+
+    # Activity info
+
+    # Activity (e.g. outdoor activity programme such as POTA). Still named "sig" for API backwards compatibility.
+    sig: str | None = None
+    # Activity references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO. Still named
+    # "sig_refs" for API backwards compatibility.
+    sig_refs: list = field(default_factory=list)
+
+    # Timing info
+
    # Time that this software received the alert, UTC seconds since UNIX epoch. This is used with the "since_received"
    # call to our API to receive all data that is new to us, even if by a quirk of the API it might be older than the
    # list time the client polled the API.
-    received_time: float = None
+    received_time: float | None = None
    # Time that this software received the alert, ISO 8601
-    received_time_iso: str = None
-    # Comment made by the alerter, if any
-    comment: str = None
-    # Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-    sig: str = None
-    # SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
-    sig_refs: list = None
-    # Whether this alert is for a DXpedition, as opposed to e.g. an xOTA programme.
-    is_dxpedition: bool = False
+    received_time_iso: str | None = None
+
+    # Source info
+
    # Where we got the alert from, e.g. "POTA", "SOTA"...
-    source: str = None
+    source: str | None = None
    # The ID the source gave it, if any.
-    source_id: str = None
+    source_id: str | None = None
+
+    # Display info
+
+    # Icon to use when displaying this alert in the web UI. Chosen from the Font Awesome set.
+    icon: str | None = None

    def infer_missing(self, credentials=None):
        """Infer missing parameters where possible"""

-        # If we somehow don't have a start time, set it to zero so it sorts off the bottom of any list but
-        # clients can still reliably parse it as a number.
-        if not self.start_time:
-            self.start_time = 0
+        try:
+            # If we somehow don't have a start time, set it to zero so it sorts off the bottom of any list but
+            # clients can still reliably parse it as a number.
+            if not self.start_time:
+                self.start_time = 0

-        # If we don't have a received time, this has just been received so set that to "now"
-        if not self.received_time:
-            self.received_time = datetime.now(pytz.UTC).timestamp()
+            # If we don't have a received time, this has just been received so set that to "now"
+            if not self.received_time:
+                self.received_time = datetime.now(pytz.UTC).timestamp()

-        # Fill in ISO versions of times, in case the client prefers that
-        if self.start_time and not self.start_time_iso:
-            self.start_time_iso = datetime.fromtimestamp(self.start_time, pytz.UTC).isoformat()
-        if self.end_time and not self.end_time_iso:
-            self.end_time_iso = datetime.fromtimestamp(self.end_time, pytz.UTC).isoformat()
-        if self.received_time and not self.received_time_iso:
-            self.received_time_iso = datetime.fromtimestamp(self.received_time, pytz.UTC).isoformat()
+            # Fill in ISO versions of times, in case the client prefers that
+            if self.start_time and not self.start_time_iso:
+                self.start_time_iso = datetime.fromtimestamp(self.start_time, pytz.UTC).isoformat()
+            if self.end_time and not self.end_time_iso:
+                self.end_time_iso = datetime.fromtimestamp(self.end_time, pytz.UTC).isoformat()
+            if self.received_time and not self.received_time_iso:
+                self.received_time_iso = datetime.fromtimestamp(self.received_time, pytz.UTC).isoformat()

-        # DX country, continent, zones etc. from callsign. CQ/ITU zone are better looked up with a location but we don't
-        # have a real location for alerts.
-        if self.dx_calls and self.dx_calls[0] and not self.dx_country:
-            self.dx_country = lookup_helper.infer_country_from_callsign(self.dx_calls[0], credentials)
-        if self.dx_calls and self.dx_calls[0] and not self.dx_continent:
-            self.dx_continent = lookup_helper.infer_continent_from_callsign(self.dx_calls[0], credentials)
-        if self.dx_calls and self.dx_calls[0] and not self.dx_cq_zone:
-            self.dx_cq_zone = lookup_helper.infer_cq_zone_from_callsign(self.dx_calls[0], credentials)
-        if self.dx_calls and self.dx_calls[0] and not self.dx_itu_zone:
-            self.dx_itu_zone = lookup_helper.infer_itu_zone_from_callsign(self.dx_calls[0], credentials)
-        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], credentials)
-        if self.dx_dxcc_id and not self.dx_flag:
-            self.dx_flag = lookup_helper.get_flag_for_dxcc(self.dx_dxcc_id)
+            # DX country, continent, zones etc. from callsign. CQ/ITU zone are better looked up with a location but we don't
+            # have a real location for alerts.
+            if self.dx_calls and self.dx_calls[0]:
+                call_info = get_call_info(self.dx_calls[0], credentials)
+                if self.dx_calls and self.dx_calls[0] and not self.dx_country:
+                    self.dx_country = call_info.country
+                if self.dx_calls and self.dx_calls[0] and call_info.continent and not self.dx_continent:
+                    self.dx_continent = Continent(call_info.continent)
+                if self.dx_calls and self.dx_calls[0] and not self.dx_cq_zone:
+                    self.dx_cq_zone = call_info.cq_zone
+                if self.dx_calls and self.dx_calls[0] and not self.dx_itu_zone:
+                    self.dx_itu_zone = call_info.itu_zone
+                if self.dx_calls and self.dx_calls[0] and not self.dx_dxcc_id:
+                    self.dx_dxcc_id = call_info.dxcc_id
+                if self.dx_dxcc_id and not self.dx_flag:
+                    self.dx_flag = 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
-        # from WAB and WAI, which count as a SIG even though there's no real lookup, just maths
-        if self.sig_refs and len(self.sig_refs) > 0:
-            for sig_ref in self.sig_refs:
-                populate_sig_ref_info(sig_ref)
+            # Fetch activity 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 from WAB and WAI, which count as an activity even though there's no real lookup, just maths
+            if self.sig_refs:
+                for activity_ref in self.sig_refs:
+                    populate_missing_activity_ref_info(activity_ref)

-        # If the spot itself doesn't have a SIG yet, but we have at least one SIG reference, take that reference's SIG
-        # and apply it to the whole spot.
-        if self.sig_refs and len(self.sig_refs) > 0 and self.sig_refs[0] and not self.sig:
-            self.sig = self.sig_refs[0].sig
+            # If the spot itself doesn't have an activity yet, but we have at least one activity reference, take that
+            # reference's activity and apply it to the whole spot.
+            if self.sig_refs and self.sig_refs[0] and not self.sig:
+                self.sig = self.sig_refs[0].sig

-        # 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
-        # apart from that they were retrieved from the API at different times. Note that the simple Python hash()
-        # function includes a seed randomly generated at runtime; this is therefore not consistent between runs. But we
-        # use diskcache to store our data between runs, so we use SHA256 which does not include this random element.
-        # The ID is computed before the online lookups below so that it is stable regardless of whether credentials
-        # are provided, allowing the enriched API response to be matched to the stored alert by ID.
-        if not self.id:
-            self_copy = copy.deepcopy(self)
-            self_copy.received_time = 0
-            self_copy.received_time_iso = ""
-            self.id = hashlib.sha256(str(self_copy).encode("utf-8")).hexdigest()
+            # Create an ID based on the source and source ID if possible, as these guaranee uniqueness. If there is no
+            # source ID, use a combination of callsign and start time. Excluding things like the comment here allows for
+            # user updates of their alert comments without duplicating in the system.
+            if not self.id:
+                if self.source and self.source_id:
+                    self.id = hashlib.sha256(str({"s": self.source, "sid": self.source_id}).encode("utf-8")).hexdigest()
+                else:
+                    self.id = hashlib.sha256(
+                        str({"s": self.source, "c": self.dx_calls, "t": self.start_time}).encode("utf-8")
+                    ).hexdigest()

-        # DX operator details lookup, using QRZ.com/HamQTH. This should be the last resort compared to taking the data
-        # from the actual alerting 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_online_lookup(c, credentials), self.dx_calls))
+            # DX operator name lookup, using QRZ.com/HamQTH.
+            if self.dx_calls and not self.dx_names:
+                self.dx_names = [get_call_info(c, credentials).name for c in self.dx_calls]
+
+            # Icon for the alert should be the icon of its activity if known, otherwise a radio tower
+            self.icon = "fa-tower-cell"
+            if self.sig and (activity_icon := get_icon_for_activity(self.sig)):
+                self.icon = activity_icon
+
+        except Exception:
+            logger.exception("Exception while inferring missing data from spot")

    def to_json(self):
        """JSON serialise"""
@@ -139,5 +171,8 @@ class Alert:
        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."""

-        return not self.start_time or (self.end_time and self.end_time < datetime.now(pytz.UTC).timestamp()) or (
-                not self.end_time and self.start_time < (datetime.now(pytz.UTC) - timedelta(hours=3)).timestamp())
+        return (
+            not self.start_time
+            or (self.end_time and self.end_time < datetime.now(pytz.UTC).timestamp())
+            or (not self.end_time and self.start_time < (datetime.now(pytz.UTC) - timedelta(hours=3)).timestamp())
+        )
@@ -11,3 +11,5 @@ class Band:
    start_freq: float
    # Stop frequency, in Hz
    end_freq: float
+    # Whether this is an HF amateur radio band
+    is_ham_hf: bool = False
@@ -0,0 +1,59 @@
+from dataclasses import dataclass
+
+from core.enums import Continent, LocationSourceForCallsign
+
+
+@dataclass
+class Callsign:
+    """Data class that defines a callsign and the data associated with it. This will have been retrieved by a callsign
+    lookup provider using data files or online lookup. This can be used to infer missing data for a spot, though if the
+    spot has an activity (e.g. POTA) reference this data for their home location (or even just their country) will be
+    less accurate and should not be used in preference to that."""
+
+    # Callsign as spotted
+    call: str
+    # "Home" call, i.e. with any prefixes and suffixes stripped off
+    home_call: str | None = None
+    # Operator name
+    name: str | None = None
+    # QTH (location), free text
+    qth: str | None = None
+    # Maidenhead grid locator. Depending on the source of lookup this could be a home location from QRZ/HamQTH or just
+    # the centre of the country they're operating in if no other data is available.
+    grid: str | None = None
+    # Latitude. Depending on the source of lookup this could be a home location from QRZ/HamQTH or just
+    # the centre of the country they're operating in if no other data is available.
+    latitude: float | None = None
+    # Longitude. Depending on the source of lookup this could be a home location from QRZ/HamQTH or just
+    # the centre of the country they're operating in if no other data is available.
+    longitude: float | None = None
+    # Country in which the callsign indicates they are operating
+    country: str | None = None
+    # Continent in which the callsign indicates they are operating
+    continent: Continent | None = None
+    # DXCC ID in which the callsign indicates they are operating
+    dxcc_id: int | None = None
+    # CQ zone in which the callsign indicates they are operating
+    cq_zone: int | None = None
+    # ITU zone in which the callsign indicates they are operating
+    itu_zone: int | None = None
+    # Location source
+    location_source: LocationSourceForCallsign | None = None
+
+    def fully_populated(self):
+        """Utility method to indicate that the callsign data is fully populated. Multiple providers can return data for
+        a callsign, and we try them in sequence until we have all the data we can, in which case there's no point
+        querying any other providers."""
+        return (
+            self.home_call is not None
+            and self.name is not None
+            and self.qth is not None
+            and self.grid is not None
+            and self.latitude is not None
+            and self.longitude is not None
+            and self.country is not None
+            and self.continent is not None
+            and self.dxcc_id is not None
+            and self.cq_zone is not None
+            and self.itu_zone is not None
+        )
@@ -4,23 +4,24 @@ from dataclasses import dataclass
@dataclass
 class LookupCredentials:
    """Per-request credentials for QRZ.com and HamQTH online callsign lookups."""
+
    qrz_username: str = ""
    qrz_password: str = ""
-    qrz_session_key: str = ""      # alternative to username/password
+    qrz_session_key: str = ""  # alternative to username/password
    hamqth_username: str = ""
    hamqth_password: str = ""
-    hamqth_session_id: str = ""    # alternative to username/password
+    hamqth_session_id: str = ""  # alternative to username/password


-def extract_credentials(query_params):
-    """Build a LookupCredentials from HTTP query params; returns None if no usable credentials are present."""
+def extract_credentials(headers):
+    """Build a LookupCredentials from HTTP request headers; returns None if no usable credentials are present."""
    creds = LookupCredentials(
-        qrz_username=query_params.get("qrz_username", ""),
-        qrz_password=query_params.get("qrz_password", ""),
-        qrz_session_key=query_params.get("qrz_session_key", ""),
-        hamqth_username=query_params.get("hamqth_username", ""),
-        hamqth_password=query_params.get("hamqth_password", ""),
-        hamqth_session_id=query_params.get("hamqth_session_id", ""),
+        qrz_username=headers.get("X-QRZ-Username", ""),
+        qrz_password=headers.get("X-QRZ-Password", ""),
+        qrz_session_key=headers.get("X-QRZ-Session-Key", ""),
+        hamqth_username=headers.get("X-HamQTH-Username", ""),
+        hamqth_password=headers.get("X-HamQTH-Password", ""),
+        hamqth_session_id=headers.get("X-HamQTH-Session-ID", ""),
    )
    has_qrz = creds.qrz_session_key or (creds.qrz_username and creds.qrz_password)
    has_hamqth = creds.hamqth_session_id or (creds.hamqth_username and creds.hamqth_password)
@@ -1,13 +0,0 @@
-from dataclasses import dataclass
-
-
-@dataclass
-class SIG:
-    """Data class that defines a Special Interest Group."""
-
-    # SIG name, e.g. "POTA"
-    name: str
-    # Description, e.g. "Parks on the Air"
-    description: str
-    # Regex matcher for references, e.g. for POTA r"[A-Z]{2}\-\d+".
-    ref_regex: str = None
@@ -1,24 +0,0 @@
-from dataclasses import dataclass
-
-
-@dataclass
-class SIGRef:
-    """Data class that defines a Special Interest Group "info" or reference. As well as the basic reference ID we include a
-    name and a lookup URL."""
-
-    # Reference ID, e.g. "GB-0001".
-    id: str
-    # SIG that this reference is in, e.g. "POTA".
-    sig: str
-    # Name of the reference, e.g. "Null Country Park", if known.
-    name: str = None
-    # URL to look up more information about the reference, if known.
-    url: str = None
-    # Latitude of the reference, if known.
-    latitude: float = None
-    # Longitude of the reference, if known.
-    longitude: float = None
-    # Maidenhead grid reference of the reference, if known.
-    grid: str = None
-    # Activation score. SOTA only
-    activation_score: int = None
@@ -82,9 +82,9 @@ def _xray_blackout_scale(xray):
        number = float(xray[1:])
    except ValueError:
        return 0
-    if letter == 'M':
+    if letter == "M":
        return 1 if number < 5 else 2
-    if letter == 'X':
+    if letter == "X":
        if number < 10:
            return 3
        if number < 20:
@@ -110,11 +110,11 @@ class HFBandCondition:
    """Data class representing HF propagation conditions for certain bands and time of day."""

    # Band name, e.g. "80m-40m", "20m-17m", "10m-6m"
-    band: str = None
+    band: str | None = None
    # Time of day: "day" or "night"
-    time: str = None
+    time: str | None = None
    # Propagation condition: "Good", "Fair", or "Poor"
-    condition: str = None
+    condition: str | None = None


@dataclass
@@ -122,63 +122,66 @@ class SolarConditions:
    """Data class representing current solar and propagation conditions."""

    # Time the data was last updated at the source, UTC seconds since UNIX epoch
-    updated: float = None
+    updated: float | None = None
    # Solar Flux Index (SFI)
-    sfi: int = None
+    sfi: int | None = None
    # A-index (daily geomagnetic activity)
-    a_index: int = None
+    a_index: int | None = None
    # K-index (3-hour geomagnetic activity)
-    k_index: int = None
+    k_index: int | None = None
    # X-ray flux class, e.g. "B2.3", "C1.0"
-    xray: str = None
+    xray: str | None = None
    # Proton flux
-    proton_flux: int = None
+    proton_flux: int | None = None
    # Electron flux
-    electron_flux: int = None
+    electron_flux: int | None = None
    # Aurora activity level
-    aurora: int = None
+    aurora: int | None = None
    # Latitude in degrees of the aurora boundary
-    aurora_latitude: float = None
+    aurora_latitude: float | None = None
    # Sunspot count
-    sunspots: int = None
+    sunspots: int | None = None
    # Solar wind speed in km/s
-    solar_wind: float = None
+    solar_wind: float | None = None
    # Interplanetary magnetic field strength in nT
-    magnetic_field: float = None
+    magnetic_field: float | None = None
    # Geomagnetic field condition, e.g. "Quiet", "Unsettled", "Active", "Storm"
-    geomag_field: str = None
+    geomag_field: str | None = None
    # Geomagnetic background noise level, e.g. "S0", "S1", "S2"
-    geomag_noise: str = None
+    geomag_noise: str | None = None
    # HF band propagation conditions, keyed by "{band}-{time}" e.g. "80m-40m-day"
-    hf_conditions: dict = None
+    hf_conditions: dict | None = None
    # VHF propagation conditions, keyed by condition name
-    vhf_conditions: dict = None
+    vhf_conditions: dict | None = None
    # NOAA Kp index 3-day forecast, keyed by UNIX timestamp of the start of each 3-hour UTC period
-    k_index_forecast: dict = None
+    k_index_forecast: dict | None = None
    # NOAA Solar Radiation Storm (S1 or greater) probability forecast, keyed by UNIX timestamp of start of day UTC
-    solar_storm_forecast: dict = None
+    solar_storm_forecast: dict | None = None
    # NOAA Radio Blackout (R1-R2) probability forecast, keyed by UNIX timestamp of start of day UTC
-    blackout_forecast_r1r2: dict = None
+    blackout_forecast_r1r2: dict | None = None
    # NOAA Radio Blackout (R3 or greater) probability forecast, keyed by UNIX timestamp of start of day UTC
-    blackout_forecast_r3_or_greater: dict = None
+    blackout_forecast_r3_or_greater: dict | None = None
+    # Ionosonde measurements, dict keyed by URSI code, values are dicts with keys: ursi, name, fof2, muf, luf,
+    # band_states. Populated by GIROIonosonde or KC2GProp providers.
+    ionosonde_data: dict | None = None

    # Derived values (populated by infer_descriptions())
    # HF radio blackout risk description, derived from xray
-    xray_desc: str = None
+    xray_desc: str | None = None
    # HF radio blackout scale number (R0-R5), derived from xray
-    radio_blackout_scale: int = None
+    radio_blackout_scale: int | None = None
    # Solar radiation storm level description, derived from proton_flux
-    proton_flux_desc: str = None
+    proton_flux_desc: str | None = None
    # Solar radiation storm scale number (S0-S5), derived from proton_flux
-    solar_storm_scale: int = None
+    solar_storm_scale: int | None = None
    # Geomagnetic storm level description, derived from k_index
-    geomag_storm_desc: str = None
+    geomag_storm_desc: str | None = None
    # Geomagnetic storm scale number (G0-G5), derived from k_index
-    geomag_storm_scale: int = None
+    geomag_storm_scale: int | None = None
    # Overall HF band conditions summary, derived from sfi
-    band_conditions_desc: str = None
+    band_conditions_desc: str | None = None
    # Electron flux description, derived from electron_flux
-    electron_flux_desc: str = None
+    electron_flux_desc: str | None = None

    def infer_descriptions(self):
        """Populate derived text description fields from the current numeric/raw field values."""
@@ -194,6 +197,7 @@ class SolarConditions:
        self.electron_flux_desc = _lookup_by_threshold(self.electron_flux, ELECTRON_FLUX_DESCRIPTIONS)

    def to_json(self):
-        """JSON serialise"""
+        """JSON serialise. Dict key order is insertion order (Python 3.7+ guarantee), so callers receive
+        fields in a predictable, logical sequence without relying on sort_keys."""

-        return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True)
+        return json.dumps(self, default=lambda o: o.__dict__)
@@ -1,22 +1,39 @@
-import copy
 import hashlib
 import json
 import logging
 import re
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from datetime import datetime, timedelta
+from math import isnan

 import pytz
-from pyhamtools.locator import locator_to_latlong, latlong_to_locator
+from pyhamtools.locator import latlong_to_locator, locator_to_latlong

+from core.activity_lookup_helper import populate_missing_activity_ref_info
+from core.activity_utils import (
+    ANY_ACTIVITY_REGEX,
+    get_activity_by_name,
+    get_activity_name_from_comment_name,
+    get_icon_for_activity,
+    get_ref_regex_for_activity,
+)
+from core.call_lookup_helper import get_call_info
 from core.config import MAX_SPOT_AGE
-from core.constants import MODE_ALIASES
+from core.constants import PROPAGATION_MODES
+from core.data_store import DATA_STORE
+from core.enums import ActivityName, Continent, LocationSourceForSpot, Mode, ModeSource, ModeType
 from core.geo_utils import lat_lon_to_cq_zone, lat_lon_to_itu_zone
-from core.lookup_helper import lookup_helper, infer_band_from_freq, infer_mode_from_comment, \
-    infer_mode_from_frequency, infer_mode_type_from_mode
-from data.lookup_credentials import LookupCredentials
-from core.sig_utils import populate_sig_ref_info, ANY_SIG_REGEX, get_ref_regex_for_sig
-from data.sig_ref import SIGRef
+from core.utils import (
+    get_flag_for_dxcc,
+    infer_band_from_freq,
+    infer_mode_from_comment,
+    infer_mode_from_frequency,
+    infer_mode_type_from_mode,
+)
+from data.activities import ACTIVITIES
+from data.activity_ref import ActivityRef
+
+logger = logging.getLogger(__name__)


@dataclass
@@ -24,399 +41,508 @@ class Spot:
    """Data class that defines a spot."""

    # Unique identifier for the spot
-    id: str = None
+    id: str | None = None

    # DX (spotted) operator info

    # Callsign of the operator that has been spotted
-    dx_call: str = None
+    dx_call: str | None = 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
+    dx_name: str | None = None
+    # QTH of the operator that has been spotted. This could be from any activity refs or could be from online lookup of
+    # their home QTH.
+    dx_qth: str | None = None
    # Country of the DX operator
-    dx_country: str = None
+    dx_country: str | None = None
    # Country flag of the DX operator
-    dx_flag: str = None
+    dx_flag: str | None = None
    # Continent of the DX operator
-    dx_continent: str = None
+    dx_continent: Continent | None = None
    # DXCC ID of the DX operator
-    dx_dxcc_id: int = None
+    dx_dxcc_id: int | None = None
    # CQ zone of the DX operator
-    dx_cq_zone: int = None
+    dx_cq_zone: int | None = None
    # ITU zone of the DX operator
-    dx_itu_zone: int = None
+    dx_itu_zone: int | None = None
    # If this is an APRS/Packet/etc spot, what SSID was the DX operator using?
-    dx_ssid: str = None
+    dx_ssid: str | None = None
    # Maidenhead grid locator for the DX.  This could be from a geographical reference e.g. POTA, or just from the
    # country
-    dx_grid: str = None
+    dx_grid: str | None = None
    # Latitude & longitude of the DX, in degrees. This could be from a geographical reference e.g. POTA, or from a QRZ
    # lookup
-    dx_latitude: float = None
-    dx_longitude: float = None
-    # DX Location source. Indicates how accurate the location might be. Values: "SPOT", "WAB/WAI GRID", "HOME QTH",
-    # "DXCC", "NONE"
-    dx_location_source: str = "NONE"
+    dx_latitude: float | None = None
+    dx_longitude: float | None = None
+    # DX Location source. Indicates how accurate the location might be.
+    dx_location_source: LocationSourceForSpot | None = None
    # DX Location good. Indicates that the software thinks the location data is good enough to plot on a map. This is
-    # true if the location source is "SPOT" or "WAB/WAI GRID", or if the location source is "HOME QTH" and the DX
-    # callsign doesn't have a suffix like /P.
+    # true if the location source is "SPOT", "SIG REF LOOKUP" or "GRID", or if the location source is "HOME QTH" and
+    # the DX callsign doesn't have a suffix like /P. (Location source retains "SIG" wording for API compatibility.)
    dx_location_good: bool = False

    # DE (Spotter) info

    # Callsign of the spotter
-    de_call: str = None
+    de_call: str | None = None
    # Country of the spotter
-    de_country: str = None
+    de_country: str | None = None
    # Country flag of the spotter
-    de_flag: str = None
+    de_flag: str | None = None
    # Continent of the spotter
-    de_continent: str = None
+    de_continent: Continent | None = None
    # DXCC ID of the spotter
-    de_dxcc_id: int = None
+    de_dxcc_id: int | None = None
    # If this is an APRS/Packet/etc spot, what SSID was the spotter/receiver using?
-    de_ssid: str = None
+    de_ssid: str | None = None
    # Maidenhead grid locator for the spotter. 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.
-    de_grid: str = None
+    de_grid: str | None = None
    # Latitude & longitude of the DX, 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.
-    de_latitude: float = None
-    de_longitude: float = None
+    de_latitude: float | None = None
+    de_longitude: float | None = None

    # General QSO info

    # Reported mode, such as SSB, PHONE, CW, FT8...
-    mode: str = None
-    # Inferred mode "family". One of "CW", "PHONE" or "DIGI".
-    mode_type: str = None
-    # Source of the mode information. "SPOT", "COMMENT", "BANDPLAN" or "NONE"
-    mode_source: str = "NONE"
+    mode: Mode | None = None
+    # Inferred mode "family".
+    mode_type: ModeType | None = None
+    # Source of the mode information.
+    mode_source: ModeSource | None = None
    # Frequency, in Hz
-    freq: float = None
+    freq: float | None = None
    # Band, defined by the frequency, e.g. "40m" or "70cm"
-    band: str = None
+    band: str | None = None
+    # Propagation mode, if known
+    propagation_mode: str | None = None
    # Comment left by the spotter, if any
-    comment: str = None
+    comment: str | None = None
    # QRT state. Some APIs return spots marked as QRT. Otherwise we can check the comments.
    qrt: bool = False

-    # Special Interest Group info
+    # Activity info

-    # Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-    sig: str = None
-    # SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
-    sig_refs: list = None
+    # Activity (e.g. outdoor activity programme such as POTA). Still named "sig" for API backwards compatibility.
+    sig: str | None = None
+    # Activity references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO. Still named
+    # "sig_refs" for API backwards compatibility.
+    sig_refs: list = field(default_factory=list)

    # Timing info

    # Time of the spot, UTC seconds since UNIX epoch
-    time: float = None
+    time: float | None = None
    # Time of the spot, ISO 8601
-    time_iso: str = None
+    time_iso: str | None = None
    # Time that this software received the spot, UTC seconds since UNIX epoch. This is used with the "since_received"
    # call to our API to receive all data that is new to us, even if by a quirk of the API it might be older than the
    # list time the client polled the API.
-    received_time: float = None
+    received_time: float | None = None
    # Time that this software received the spot, ISO 8601
-    received_time_iso: str = None
+    received_time_iso: str | None = None

    # Source info

    # Where we got the spot from, e.g. "POTA", "Cluster"...
-    source: str = None
+    source: str | None = None
    # The ID the source gave it, if any.
-    source_id: str = None
+    source_id: str | None = None
+
+    # Display info
+
+    # Icon to use when displaying this spot in the web UI. Chosen from the Font Awesome set.
+    icon: str | None = None
+
+    def __post_init__(self):
+        """Normalise fields that don't survive a plain dict to Spot conversion. This is used in the "add spot" API
+        endpoint where the client is submitting JSON, and we want to recreate a full Spot object, including nested
+        objects such as the sig_refs list.."""
+
+        if self.sig_refs:
+            self.sig_refs = [
+                activity_ref if isinstance(activity_ref, ActivityRef) else ActivityRef(**activity_ref)
+                for activity_ref in self.sig_refs
+            ]

    def infer_missing(self, credentials=None):
        """Infer missing parameters where possible"""

-        # If we somehow don't have a spot time, set it to zero so it sorts off the bottom of any list but
-        # clients can still reliably parse it as a number.
-        if not self.time:
-            self.time = 0
+        try:
+            # If we somehow don't have a spot time, set it to zero so it sorts off the bottom of any list but
+            # clients can still reliably parse it as a number.
+            if not self.time:
+                self.time = 0

-        # If we don't have a received time, this has just been received so set that to "now"
-        if not self.received_time:
-            self.received_time = datetime.now(pytz.UTC).timestamp()
+            # If we don't have a received time, this has just been received so set that to "now"
+            if not self.received_time:
+                self.received_time = datetime.now(pytz.UTC).timestamp()

-        # Fill in ISO versions of times, in case the client prefers that
-        if self.time and not self.time_iso:
-            self.time_iso = datetime.fromtimestamp(self.time, pytz.UTC).isoformat()
-        if self.received_time and not self.received_time_iso:
-            self.received_time_iso = datetime.fromtimestamp(self.received_time, pytz.UTC).isoformat()
+            # Fill in ISO versions of times, in case the client prefers that
+            if self.time and not self.time_iso:
+                self.time_iso = datetime.fromtimestamp(self.time, pytz.UTC).isoformat()
+            if self.received_time and not self.received_time_iso:
+                self.received_time_iso = datetime.fromtimestamp(self.received_time, pytz.UTC).isoformat()

-        # Clean up DX call if it has an SSID or -# from RBN
-        if self.dx_call and "-" in self.dx_call:
-            split = self.dx_call.split("-")
-            self.dx_call = split[0]
-            if len(split) > 1 and split[1] != "#":
-                self.dx_ssid = split[1]
+            # Clean up DX call if it has an SSID or -# from RBN
+            if self.dx_call and "-" in self.dx_call:
+                split = self.dx_call.split("-")
+                self.dx_call = split[0]
+                if len(split) > 1 and split[1] != "#":
+                    self.dx_ssid = split[1]

-        # DX country, continent etc. from callsign
-        if self.dx_call and not self.dx_country:
-            self.dx_country = lookup_helper.infer_country_from_callsign(self.dx_call, credentials)
-        if self.dx_call and not self.dx_continent:
-            self.dx_continent = lookup_helper.infer_continent_from_callsign(self.dx_call, credentials)
-        if self.dx_call and not self.dx_dxcc_id:
-            self.dx_dxcc_id = lookup_helper.infer_dxcc_id_from_callsign(self.dx_call, credentials)
-        if self.dx_dxcc_id and not self.dx_flag:
-            self.dx_flag = lookup_helper.get_flag_for_dxcc(self.dx_dxcc_id)
+            # DX country, continent etc. from callsign
+            dx_call_info = get_call_info(self.dx_call, credentials)
+            if self.dx_call and not self.dx_country:
+                self.dx_country = dx_call_info.country
+            if self.dx_call and dx_call_info.continent and not self.dx_continent:
+                self.dx_continent = Continent(dx_call_info.continent)
+            if self.dx_call and not self.dx_dxcc_id:
+                self.dx_dxcc_id = dx_call_info.dxcc_id
+            if self.dx_dxcc_id and not self.dx_flag:
+                self.dx_flag = 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:
-            split = self.de_call.split("-")
-            self.de_call = split[0]
-            if len(split) > 1 and split[1] != "#":
-                self.de_ssid = split[1]
+            # Clean up spotter call if it has an SSID or -# from RBN
+            if self.de_call and "-" in self.de_call:
+                split = self.de_call.split("-")
+                self.de_call = split[0]
+                if len(split) > 1 and split[1] != "#":
+                    self.de_ssid = split[1]

-        # If we have a spotter of "RBNHOLE", we should have the actual spotter callsign in the comment, so extract it.
-        # RBNHole posts come from a number of providers, so it's dealt with here in the generic spot handling code.
-        if self.de_call == "RBNHOLE" and self.comment:
-            rbnhole_call_match = re.search(r"\Wat ([a-z0-9/]+)\W", self.comment, re.IGNORECASE)
-            if rbnhole_call_match:
-                self.de_call = rbnhole_call_match.group(1).upper()
+            # If we have a spotter of "RBNHOLE", we should have the actual spotter callsign in the comment, so extract it.
+            # RBNHole posts come from a number of providers, so it's dealt with here in the generic spot handling code.
+            if self.de_call == "RBNHOLE" and self.comment:
+                rbnhole_call_match = re.search(r"\Wat ([a-z0-9/]+)\W", self.comment, re.IGNORECASE)
+                if rbnhole_call_match:
+                    self.de_call = rbnhole_call_match.group(1).upper()

-        # If we have a spotter of "SOTAMAT", we might have the actual spotter callsign in the comment, if so extract it.
-        # SOTAMAT can do POTA as well as SOTA, so it's dealt with here in the generic spot handling code.
-        if self.de_call == "SOTAMAT" and self.comment:
-            sotamat_call_match = re.search(r"\Wfrom ([a-z0-9/]+)]", self.comment, re.IGNORECASE)
-            if sotamat_call_match:
-                self.de_call = sotamat_call_match.group(1).upper()
+            # If we have a spotter of "SOTAMAT", we might have the actual spotter callsign in the comment, if so extract it.
+            # SOTAMAT can do POTA as well as SOTA, so it's dealt with here in the generic spot handling code.
+            if self.de_call == "SOTAMAT" and self.comment:
+                sotamat_call_match = re.search(r"\Wfrom ([a-z0-9/]+)]", self.comment, re.IGNORECASE)
+                if sotamat_call_match:
+                    self.de_call = sotamat_call_match.group(1).upper()

-        # Spotter country, continent, zones etc. from callsign.
-        # DE call with no digits, or 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"):
-            if not self.de_country:
-                self.de_country = lookup_helper.infer_country_from_callsign(self.de_call, credentials)
-            if not self.de_continent:
-                self.de_continent = lookup_helper.infer_continent_from_callsign(self.de_call, credentials)
-            if not self.de_dxcc_id:
-                self.de_dxcc_id = lookup_helper.infer_dxcc_id_from_callsign(self.de_call, credentials)
-            if self.de_dxcc_id and not self.de_flag:
-                self.de_flag = lookup_helper.get_flag_for_dxcc(self.de_dxcc_id)
+            # Spotter country, continent, zones etc. from callsign.
+            # DE call with no digits, or APRS servers starting "T2" are not things we can look up location for
+            de_call_info = get_call_info(self.de_call, credentials)
+            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")
+            ):
+                if not self.de_country:
+                    self.de_country = de_call_info.country
+                if de_call_info.continent and not self.de_continent:
+                    self.de_continent = Continent(de_call_info.continent)
+                if not self.de_dxcc_id:
+                    self.de_dxcc_id = de_call_info.dxcc_id
+                if self.de_dxcc_id and not self.de_flag:
+                    self.de_flag = get_flag_for_dxcc(self.de_dxcc_id)

-        # Remove NaNs in frequency
-        if self.freq and self.freq == float("nan"):
-            self.freq = None
+            # Remove NaNs in frequency
+            if self.freq and isnan(self.freq):
+                self.freq = None

-        # Band from frequency
-        if self.freq and not self.band:
-            band = infer_band_from_freq(self.freq)
-            self.band = band.name
+            # Band from frequency
+            if self.freq and not self.band:
+                band = infer_band_from_freq(self.freq)
+                self.band = band.name

-        # Mode from comments or bandplan
-        if self.mode:
-            self.mode_source = "SPOT"
-        if self.comment and not self.mode:
-            self.mode = infer_mode_from_comment(self.comment)
-            self.mode_source = "COMMENT"
-        if self.freq and not self.mode:
-            self.mode = infer_mode_from_frequency(self.freq)
-            self.mode_source = "BANDPLAN"
+            # Mode from comments or bandplan
+            if self.mode:
+                self.mode_source = ModeSource.SPOT
+            if self.comment and not self.mode:
+                self.mode = infer_mode_from_comment(self.comment)
+                self.mode_source = ModeSource.COMMENT
+            if self.freq and not self.mode:
+                self.mode = infer_mode_from_frequency(self.freq)
+                self.mode_source = ModeSource.BANDPLAN

-        # Normalise mode if necessary.
-        if self.mode in MODE_ALIASES:
-            self.mode = MODE_ALIASES[self.mode]
+            # Mode type from mode
+            if self.mode and not self.mode_type:
+                self.mode_type = infer_mode_type_from_mode(self.mode)

-        # Mode type from mode
-        if self.mode and not self.mode_type:
-            self.mode_type = infer_mode_type_from_mode(self.mode)
+            # If we have a latitude or grid at this point, it can only have been provided by the spot itself
+            if self.dx_latitude or self.dx_grid:
+                self.dx_location_source = LocationSourceForSpot.SPOT

-        # If we have a latitude or grid at this point, it can only have been provided by the spot itself
-        if self.dx_latitude or self.dx_grid:
-            self.dx_location_source = "SPOT"
+            # Set the top-level activity if it is missing but we have at least one activity ref.
+            if not self.sig and self.sig_refs:
+                self.sig = self.sig_refs[0].sig.upper()

-        # 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 an activity reference, but the comment looks like it contains more for the same
+            # activity. This should catch e.g. POTA comments like "2-fer: GB-0001 GB-0002".
+            if self.comment and self.sig_refs and self.sig_refs[0].sig:
+                activity = self.sig_refs[0].sig.upper()
+                regex = get_ref_regex_for_activity(activity)
+                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_activity_ref_if_missing(ActivityRef(id=ref_match.group(2).upper(), sig=activity))

-        # 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 and self.sig_refs[0].sig:
-            sig = self.sig_refs[0].sig.upper()
-            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 activities (and optionally activity 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 comments like "also WWFF GFF-0001".
+            if self.comment:
+                activity_matches = re.finditer(r"(^|\W)" + ANY_ACTIVITY_REGEX + r"($|\W)", self.comment, re.IGNORECASE)
+                for activity_match in activity_matches:
+                    # First of all, if we haven't got an activity for this spot set yet, now we have. This covers
+                    # things like cluster spots where the comment is just "POTA".
+                    found_activity = get_activity_name_from_comment_name(activity_match.group(2))
+                    if not self.sig:
+                        self.sig = found_activity

-        # 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
-        # comments like "also WWFF GFF-0001".
-        if self.comment:
-            sig_matches = re.finditer(r"(^|\W)" + ANY_SIG_REGEX + r"($|\W)", self.comment, re.IGNORECASE)
-            for sig_match in sig_matches:
-                # First of all, if we haven't got a SIG for this spot set yet, now we have. This covers things like cluster
-                # spots where the comment is just "POTA".
-                found_sig = sig_match.group(2).upper()
-                if not self.sig:
-                    self.sig = found_sig
+                    # Now look to see if that activity name was followed by something that looks like a reference ID
+                    # for that activity. If so, add that to the sig_refs list for this spot.
+                    found_activity_info = get_activity_by_name(found_activity)
+                    if found_activity_info and found_activity_info.has_refs and found_activity_info.ref_regex:
+                        ref_matches = re.finditer(
+                            r"(^|\W)" + found_activity + r"([ -])(" + found_activity_info.ref_regex + r")($|\W)",
+                            self.comment,
+                            re.IGNORECASE,
+                        )
+                        for ref_match in ref_matches:
+                            self._append_activity_ref_if_missing(
+                                ActivityRef(id=ref_match.group(3).upper(), sig=found_activity)
+                            )

-                # Now look to see if that SIG name was followed by something that looks like a reference ID for that SIG.
-                # If so, add that to the sig_refs list for this spot.
-                ref_regex = get_ref_regex_for_sig(found_sig)
-                if ref_regex:
-                    ref_matches = re.finditer(r"(^|\W)" + found_sig + r"($|\W)(" + ref_regex + r")($|\W)", self.comment,
-                                              re.IGNORECASE)
-                    for ref_match in ref_matches:
-                        self._append_sig_ref_if_missing(SIGRef(id=ref_match.group(3).upper(), sig=found_sig))
+            # See if the comment looks like it contains any activity references *without* the corresponding activity
+            # name, but where the activity reference is unique-looking enough that we can't confuse it with any other
+            # activity.
+            if self.comment:
+                for activity in ACTIVITIES.values():
+                    if activity.has_refs and activity.refs_globally_unique and activity.ref_regex:
+                        ref_matches = re.finditer(
+                            r"(^|\W)(" + activity.ref_regex + r")($|\W)", self.comment, re.IGNORECASE
+                        )
+                        for ref_match in ref_matches:
+                            # First of all, if we haven't got an activity for this spot set yet, now we have. This
+                            # covers things like cluster spots where the comment is just "OHFF-1234", now we know
+                            # it's WWFF.
+                            if not self.sig:
+                                self.sig = activity.name
+                            self._append_activity_ref_if_missing(
+                                ActivityRef(id=ref_match.group(2).upper(), sig=activity.name)
+                            )

-        # 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
-        # from WAB and WAI, which count as a SIG even though there's no real lookup, just maths
-        if self.sig_refs and len(self.sig_refs) > 0:
-            for sig_ref in self.sig_refs:
-                sig_ref = populate_sig_ref_info(sig_ref)
-                # If the spot itself doesn't have location yet, but the SIG ref does, extract it
-                if sig_ref.grid and not self.dx_grid:
-                    self.dx_grid = sig_ref.grid
-                if sig_ref.latitude and not self.dx_latitude:
-                    self.dx_latitude = sig_ref.latitude
-                    self.dx_longitude = sig_ref.longitude
-                    if self.sig == "WAB" or self.sig == "WAI":
-                        self.dx_location_source = "WAB/WAI GRID"
-                    else:
-                        self.dx_location_source = "SIG REF LOOKUP"
+            # Fetch activity 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 from WAB and WAI, which count as an activity even though there's no real lookup, just maths
+            if self.sig_refs:
+                for activity_ref in self.sig_refs:
+                    activity_ref = populate_missing_activity_ref_info(activity_ref)
+                    # If the spot itself doesn't have location yet, but the activity ref does, extract it
+                    if activity_ref.grid and not self.dx_grid:
+                        self.dx_grid = activity_ref.grid
+                    if (
+                        activity_ref.latitude
+                        and not self.dx_latitude
+                        and activity_ref.longitude
+                        and not self.dx_longitude
+                    ):
+                        self.dx_latitude = activity_ref.latitude
+                        self.dx_longitude = activity_ref.longitude
+                        if self.sig in (ActivityName.WAB, ActivityName.WAI, ActivityName.TILES):
+                            self.dx_location_source = LocationSourceForSpot.GRID
+                        else:
+                            self.dx_location_source = LocationSourceForSpot.SIG_REF_LOOKUP

-        # If the spot itself doesn't have a SIG yet, but we have at least one SIG reference, take that reference's SIG
-        # and apply it to the whole spot.
-        if self.sig_refs and len(self.sig_refs) > 0 and not self.sig:
-            self.sig = self.sig_refs[0].sig
+            # If the spot itself doesn't have an activity yet, but we have at least one activity reference, take that
+            # reference's activity and apply it to the whole spot.
+            if self.sig_refs and not self.sig:
+                self.sig = self.sig_refs[0].sig

-        # DX Grid to lat/lon and vice versa in case one is missing
-        if self.dx_grid and not self.dx_latitude:
-            try:
-                ll = locator_to_latlong(self.dx_grid)
-                self.dx_latitude = ll[0]
-                self.dx_longitude = ll[1]
-            except:
-                logging.debug("Invalid grid received for spot")
-        if self.dx_latitude and self.dx_longitude and not self.dx_grid:
-            try:
-                self.dx_grid = latlong_to_locator(self.dx_latitude, self.dx_longitude, 8)
-            except:
-                logging.debug("Invalid lat/lon received for spot")
+            # Parse "de_grid<prop_mode>dx_grid" structures from the comment, e.g. "JN61ES(ES)JM56XT" or "JO02GQ<>KN17LG".
+            # These are common on cluster spots and can provide grid references in preference to e.g. QRZ lookup, as well as
+            # being the only source we have for propagation mode. Brace for nightmare regex from hell.
+            if self.comment:
+                grid_mode_grid_match = re.search(
+                    r"\b([A-Ra-r]{2}\d{2}(?:[A-Xa-x]{2}(?:\d{2})?)?)(?:<([^>]*)>|\(([^)]*)\))([A-Ra-r]{2}\d{2}(?:[A-Xa-x]{2}(?:\d{2})?)?)\b",
+                    self.comment,
+                )
+                if grid_mode_grid_match:
+                    # regex matches, so extract grids:
+                    if not self.de_grid:
+                        self.de_grid = grid_mode_grid_match.group(1).upper()
+                    if not self.dx_grid:
+                        self.dx_grid = grid_mode_grid_match.group(4).upper()
+                        self.dx_location_source = LocationSourceForSpot.GRID

-        # QRT comment detection
-        if self.comment and not self.qrt:
-            self.qrt = "QRT" in self.comment.upper()
+                    # And extract propagation mode (group 2 for <...>, group 3 for (...)):
+                    mode_tag = (grid_mode_grid_match.group(2) or grid_mode_grid_match.group(3) or "").upper()
+                    if mode_tag and not self.propagation_mode:
+                        if mode_tag in PROPAGATION_MODES:
+                            self.propagation_mode = PROPAGATION_MODES[mode_tag]
+                        else:
+                            self.propagation_mode = mode_tag
+                            logger.info(f"Seen a new propagation mode tag not yet in the system: {mode_tag}")

-        # 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
-        # apart from that they were retrieved from the API at different times. Note that the simple Python hash()
-        # function includes a seed randomly generated at runtime; this is therefore not consistent between runs. But we
-        # use diskcache to store our data between runs, so we use SHA256 which does not include this random element.
-        # The ID is computed before the online lookups below so that it is stable regardless of whether credentials
-        # are provided, allowing the enriched API response to be matched to the stored spot by ID.
-        if not self.id:
-            self_copy = copy.deepcopy(self)
-            self_copy.received_time = 0
-            self_copy.received_time_iso = ""
-            self.id = hashlib.sha256(str(self_copy).encode("utf-8")).hexdigest()
+            # Set activities based on propagation mode
+            if self.propagation_mode == "Satellite" and not self.sig:
+                self.sig = ActivityName.SATELLITE
+            if self.propagation_mode == "Earth-Moon-Earth" and not self.sig:
+                self.sig = ActivityName.EME

-        # DX operator details lookup, using QRZ.com/HamQTH. This should be the last resort compared to taking the data
-        # from 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_online_lookup(self.dx_call, credentials)
-        if self.dx_call and not self.dx_latitude:
-            latlon = lookup_helper.infer_latlon_from_callsign_online_lookup(self.dx_call, credentials)
-            if latlon:
-                self.dx_latitude = latlon[0]
-                self.dx_longitude = latlon[1]
-            self.dx_grid = lookup_helper.infer_grid_from_callsign_online_lookup(self.dx_call, credentials)
-            self.dx_location_source = "HOME QTH"
+            # Set activities based on the DX callsign suffix
+            if self.dx_call and not self.sig:
+                if self.dx_call.upper().endswith(ActivityName.AERONAUTICAL_MOBILE):
+                    self.sig = ActivityName.AERONAUTICAL_MOBILE
+                elif self.dx_call.upper().endswith(ActivityName.MARITIME_MOBILE):
+                    self.sig = ActivityName.MARITIME_MOBILE

-        # Determine a "QTH" string. If we have a SIG ref, pick the first one and turn it into a suitable string,
-        # 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, credentials)
+            # Alright, now let's get really fancy. Check if the DX callsign matches one taking part in a currently
+            # running DXpedition which we know from the alerts list.
+            if self.dx_call and not self.sig:
+                now = datetime.now(pytz.UTC).timestamp()
+                for alert in DATA_STORE.alerts.values():
+                    if (
+                        alert.sig == ActivityName.DXPEDITION
+                        and alert.dx_calls
+                        and alert.start_time
+                        and alert.end_time
+                        and alert.start_time < now < alert.end_time
+                        and self.dx_call.upper() in [c.upper() for c in alert.dx_calls if c]
+                    ):
+                        self.sig = ActivityName.DXPEDITION
+                        break

-        # 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)
-            if latlon:
-                self.dx_latitude = latlon[0]
-                self.dx_longitude = latlon[1]
-                self.dx_grid = lookup_helper.infer_grid_from_callsign_dxcc(self.dx_call)
-                self.dx_location_source = "DXCC"
+            # Parse "de_grid -> dx_grid" structures from the comment
+            if self.comment:
+                grid_mode_grid_match = re.search(
+                    r"\b([A-Ra-r]{2}\d{2}(?:[A-Xa-x]{2}(?:\d{2})?)?)\s*->\s*([A-Ra-r]{2}\d{2}(?:[A-Xa-x]{2}(?:\d{2})?)?)\b",
+                    self.comment,
+                )
+                if grid_mode_grid_match:
+                    # regex matches, so extract grids:
+                    if not self.dx_grid:
+                        self.dx_grid = grid_mode_grid_match.group(1).upper()
+                        self.dx_location_source = LocationSourceForSpot.GRID
+                    if not self.de_grid:
+                        self.de_grid = grid_mode_grid_match.group(2).upper()

-        # It looks like we can sometimes get a string into lat/lon, so try to parse as float, reject if not valid
-        if isinstance(self.dx_latitude, str) or isinstance(self.dx_longitude, str):
-            try:
-                self.dx_latitude = float(self.dx_latitude)
-                self.dx_longitude = float(self.dx_longitude)
-            except (TypeError, ValueError):
-                logging.warning("Received non-numeric strings in lat/lon (" + str(self.dx_latitude) + ", " + str(self.dx_longitude) + ") for call " + self.dx_call + ", rejecting it")
-                self.dx_latitude = None
-                self.dx_longitude = None
+            # DX Grid to lat/lon and vice versa in case one is missing
+            if self.dx_grid and (not self.dx_latitude or not self.dx_longitude):
+                try:
+                    ll = locator_to_latlong(self.dx_grid)
+                    self.dx_latitude = ll[0]
+                    self.dx_longitude = ll[1]
+                except Exception:
+                    logger.debug("Invalid grid received for spot", exc_info=True)
+            if self.dx_latitude and self.dx_longitude and not self.dx_grid:
+                try:
+                    self.dx_grid = latlong_to_locator(self.dx_latitude, self.dx_longitude, 8)
+                except Exception:
+                    logger.debug("Invalid lat/lon received for spot", exc_info=True)

-        # CQ and ITU zone lookup, preferably from location but failing that, from callsign
-        if not self.dx_cq_zone:
-            if self.dx_latitude:
-                self.dx_cq_zone = lat_lon_to_cq_zone(self.dx_latitude, self.dx_longitude)
-            elif self.dx_call:
-                self.dx_cq_zone = lookup_helper.infer_cq_zone_from_callsign(self.dx_call, credentials)
-        if not self.dx_itu_zone:
-            if self.dx_latitude:
-                self.dx_itu_zone = lat_lon_to_itu_zone(self.dx_latitude, self.dx_longitude)
-            elif self.dx_call:
-                self.dx_itu_zone = lookup_helper.infer_itu_zone_from_callsign(self.dx_call, credentials)
+            # QRT comment detection
+            if self.comment and not self.qrt:
+                self.qrt = "QRT" in self.comment.upper()

-        # 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_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))
+            # Create an ID based on the source and source ID if possible, as these guaranee uniqueness. If there is no
+            # source ID, use a combination of callsign and spot time. Spot time is down to the second or even the
+            # millisecond, so we can be reasonably sure two spots that match are the same spot.
+            if not self.id:
+                if self.source and self.source_id:
+                    self.id = hashlib.sha256(str({"s": self.source, "sid": self.source_id}).encode("utf-8")).hexdigest()
+                else:
+                    self.id = hashlib.sha256(
+                        str({"s": self.source, "c": self.dx_call, "t": self.time}).encode("utf-8")
+                    ).hexdigest()

-        # 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/HamQTH.
-            if not self.de_latitude:
-                latlon = lookup_helper.infer_latlon_from_callsign_online_lookup(self.de_call, credentials)
-                if latlon:
-                    self.de_latitude = latlon[0]
-                    self.de_longitude = latlon[1]
-                self.de_grid = lookup_helper.infer_grid_from_callsign_online_lookup(self.de_call, credentials)
+            # DX operator details lookup. This should be the last resort compared to taking the data from the actual
+            # spotting service, e.g. we don't want to accidentally use a user's QRZ.com home lat/lon or DXCC 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 = dx_call_info.name
+            if self.dx_call and (not self.dx_latitude or not self.dx_longitude):
+                self.dx_latitude = dx_call_info.latitude
+                self.dx_longitude = dx_call_info.longitude
+                self.dx_grid = dx_call_info.grid
+                self.dx_location_source = dx_call_info.location_source

-            # Last resort for getting a DE position, use the DXCC entity.
-            if not self.de_latitude:
-                latlon = lookup_helper.infer_latlon_from_callsign_dxcc(self.de_call)
-                if latlon:
-                    self.de_latitude = latlon[0]
-                    self.de_longitude = latlon[1]
-                    self.de_grid = lookup_helper.infer_grid_from_callsign_dxcc(self.de_call)
+            # Determine a "QTH" string. If we have an activity ref, pick the first one and turn it into a suitable
+            # string, otherwise see what they have set on an online lookup service.
+            if self.sig_refs:
+                qth = self.sig_refs[0].id
+                if self.sig_refs[0].name:
+                    qth += f" {self.sig_refs[0].name}"
+                self.dx_qth = qth
+            else:
+                self.dx_qth = dx_call_info.qth
+
+            # CQ and ITU zone lookup, preferably from location but failing that, from callsign
+            if not self.dx_cq_zone:
+                if self.dx_latitude and self.dx_longitude:
+                    self.dx_cq_zone = lat_lon_to_cq_zone(self.dx_latitude, self.dx_longitude)
+                elif self.dx_call:
+                    self.dx_cq_zone = dx_call_info.cq_zone
+            if not self.dx_itu_zone:
+                if self.dx_latitude and self.dx_longitude:
+                    self.dx_itu_zone = lat_lon_to_itu_zone(self.dx_latitude, self.dx_longitude)
+                elif self.dx_call:
+                    self.dx_itu_zone = dx_call_info.itu_zone
+
+            # DXCC lookup from callsign if nothing else has provided it
+            if self.dx_call and not self.dx_dxcc_id:
+                for regex, entity_code in DATA_STORE.dxcc_lookup_by_call_regex:
+                    if regex.pattern and regex.match(self.dx_call):
+                        self.dx_dxcc_id = entity_code
+                        break
+            if self.dx_dxcc_id and not self.dx_flag:
+                self.dx_flag = get_flag_for_dxcc(self.dx_dxcc_id)
+
+            # 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 = bool(
+                self.dx_latitude
+                and self.dx_longitude
+                and (
+                    self.dx_location_source == LocationSourceForSpot.SPOT
+                    or self.dx_location_source == LocationSourceForSpot.SIG_REF_LOOKUP
+                    or self.dx_location_source == LocationSourceForSpot.GRID
+                    or (self.dx_location_source == LocationSourceForSpot.HOME_QTH and "/" not in (self.dx_call or ""))
+                )
+            )
+
+            # 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 str(self.de_call))
+                and not (self.de_call.startswith("T2") and self.source == "APRS-IS")
+                and (not self.de_latitude or not self.de_longitude)
+            ):
+                # DE operator location lookup
+                self.de_latitude = de_call_info.latitude
+                self.de_longitude = de_call_info.longitude
+                self.de_grid = de_call_info.grid
+
+            # Icon for the spot should be the icon of its activity if known, otherwise a radio tower
+            self.icon = "fa-tower-cell"
+            if self.sig and (activity_icon := get_icon_for_activity(self.sig)):
+                self.icon = activity_icon
+
+        except Exception:
+            logger.exception("Exception while inferring missing data from spot")

    def to_json(self):
        """JSON serialise"""

        return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True)

-    def _append_sig_ref_if_missing(self, new_sig_ref):
-        """Append a sig_ref to the list, so long as it's not already there."""
+    def _append_activity_ref_if_missing(self, new_activity_ref):
+        """Append an activity ref to the list, so long as it's not already there."""

-        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 == "":
+        new_activity_ref.id = new_activity_ref.id.strip().upper()
+        new_activity_ref.sig = new_activity_ref.sig.strip().upper()
+        if new_activity_ref.id == "":
            return
-        for sig_ref in self.sig_refs:
-            if sig_ref.id == new_sig_ref.id and sig_ref.sig == new_sig_ref.sig:
+        for activity_ref in self.sig_refs:
+            if activity_ref.id == new_activity_ref.id and activity_ref.sig == new_activity_ref.sig:
                return
-        self.sig_refs.append(new_sig_ref)
+        self.sig_refs.append(new_activity_ref)

    def expired(self):
        """Decide if this spot has expired (in which case it should not be added to the system in the first place, and not
@@ -1,18 +0,0 @@
-ref,lat,lon
-T-01,53.56278090617755,9.984341869295505
-T-02,53.562383404176416,9.98551893027115
-T-03,53.56170184391514,9.985416035619778
-T-04,53.562026534393176,9.986372919078974
-T-11,53.56284641242506,9.98475590239655
-T-12,53.562431705517035,9.98551675702443
-T-13,53.56223704898424,9.985774520335664
-T-14,53.5617893512591,9.986344302837976
-T-21,53.56284641242506,9.98475590239655
-T-22,53.56245816412497,9.985456089490567
-T-23,53.56199560857136,9.985636761412673
-T-24,53.5617893512591,9.986344302837976
-T-31,53.56247470064887,9.985611427551902
-T-32,53.5617893512591,9.986344302837976
-T-41,53.56245039134992,9.985486136112701
-T-91,53.56147934973529,9.984626806439744
-T-92,53.561396810300735,9.987553052152899
@@ -0,0 +1,33 @@
+AA343,"Almaty, Kazakhstan"
+AL945,"Alpena, United States"
+AT138,"Athens, Greece"
+BVJ03,"Boa Vista, Brazil"
+CAJ2M,"Cachoeira Paulista, Brazil"
+CB53N,"Canberra, Australia"
+DB049,"Dourbes, Belgium"
+DW41K,"Darwin, Australia"
+EA036,"El Arenosillo, Spain"
+EB040,"Roquetes, Spain"
+EG931,"Eglin Air Force Base, United States"
+FF051,"Fairford, United Kingdom"
+GA762,"Gakona, United States"
+GM037,"Gibilmanna, Italy"
+GR13L,"Grahamstown, South Africa"
+HE13N,"Hermanus, South Africa"
+HO54K,"Hobart, Australia"
+IF843,"Idaho National Laboratory, United States"
+JI91J,"Jicamarca, Peru"
+JR055,"Juliusruh, Germany"
+LAA38,"Lajes Terceira Island, Portugal"
+LL721,"Lualualei, United States"
+MHJ45,"Millstone Hill, United States"
+NI135,"Nicosia, Cyprus"
+NI63_,"Norfolk, Australia"
+PA836,"Port Arguello, United States"
+PE43K,"Perth, Australia"
+PQ052,"Pruhonice, Czechia"
+RO041,"Rome, Italy"
+SO148,"Sopron, Hungary"
+TR169,"Tromso, Norway"
+TV51R,"Townsville, Australia"
+VT139,"San Vito, Italy"
@@ -1,13 +0,0 @@
-ref,lat,lon
-T-01,50.3636495,7.5584857
-T-02,50.3636495,7.5584857
-T-03,50.3636495,7.5584857
-T-11,50.3636495,7.5584857
-T-13,50.3636495,7.5584857
-T-14,50.3636495,7.5584857
-T-21,50.3636495,7.5584857
-T-31,50.3636495,7.5584857
-T-33,50.3636495,7.5584857
-T-34,50.3636495,7.5584857
-T-41,50.3636495,7.5584857
-T-51,50.3636495,7.5584857
@@ -0,0 +1,35 @@
+ref,lat,lon
+C3 T-01,53.56278090617755,9.984341869295505
+C3 T-02,53.562383404176416,9.98551893027115
+C3 T-03,53.56170184391514,9.985416035619778
+C3 T-04,53.562026534393176,9.986372919078974
+C3 T-11,53.56284641242506,9.98475590239655
+C3 T-12,53.562431705517035,9.98551675702443
+C3 T-13,53.56223704898424,9.985774520335664
+C3 T-14,53.5617893512591,9.986344302837976
+C3 T-21,53.56284641242506,9.98475590239655
+C3 T-22,53.56245816412497,9.985456089490567
+C3 T-23,53.56199560857136,9.985636761412673
+C3 T-24,53.5617893512591,9.986344302837976
+C3 T-31,53.56247470064887,9.985611427551902
+C3 T-32,53.5617893512591,9.986344302837976
+C3 T-41,53.56245039134992,9.985486136112701
+C3 T-91,53.56147934973529,9.984626806439744
+C3 T-92,53.561396810300735,9.987553052152899
+EH T-01,50.3636495,7.5584857
+EH T-02,50.3636495,7.5584857
+EH T-03,50.3636495,7.5584857
+EH T-11,50.3636495,7.5584857
+EH T-13,50.3636495,7.5584857
+EH T-14,50.3636495,7.5584857
+EH T-21,50.3636495,7.5584857
+EH T-31,50.3636495,7.5584857
+EH T-33,50.3636495,7.5584857
+EH T-34,50.3636495,7.5584857
+EH T-41,50.3636495,7.5584857
+EH T-51,50.3636495,7.5584857
+HOPE T-01,40.7527998,-73.9935015
+HOPE T-02,40.7526614,-73.9935752
+HOPE T-03,40.7528663,-73.9936566
+HOPE T-04,40.7527845,-73.9937284
+HOPE T-05,40.7518292,-73.9932781
@@ -0,0 +1,39 @@
+## 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.
+
+As well as the main API endpoints to fetch spots and alerts, with various possible query parameters, there are also
+Server-Sent Events (SSE) API endpoints to receive a live feed, plus various utility lookup endpoints for things like
+callsign and park data.
+
+Various approaches exist to writing your own client, but in general:
+
+* Refer to the API docs. These are built on an OpenAPI definition file (`/static/apidocs/openapi.yml`), which you can
+  automatically use to generate a client skeleton using various software.
+* Call the main "spots" or "alerts" API endpoints to get the data you want. For example, your app could call
+  `https://spothole.app/api/v2/spots` once every few minutes. Apply filters if necessary.
+* Call the "options" API to get an idea of which bands, modes etc. the server knows about. You might want to do that
+  first before calling the spots/alerts APIs, to allow you to populate your filters correctly.
+* Refer to the provided HTML/JS interface for a reference on different approaches. For example, the "alerts"/"upcoming"
+  page simply query the main spot API on a timer, whereas the spots, map and bands pages combine this approach with
+  using the Server-Sent Events (SSE) endpoint to update live.
+* Let me know if you get stuck, I'm happy to help.
+
+Please don't hammer the API with an unnecessarily high request rate. For example, Spothole only queries the POTA API
+once every two minutes, so if your client is interested in POTA data there's no need to poll Spothole any more often
+than that.
+
+If you absolutely must be informed within seconds of a spot arriving in Spothole, please use the SSE endpoints instead,
+e.g. `https://spothole.app/api/v2/spots/stream`.
+
+If you want to handle different types of spot or alert differently within your client, please consider making a single
+request to the Spothole API to retrieve all the data, then filtering on your side. For example, call
+`https://spothole.app/api/v2/spots?sig=POTA,SOTA` rather than making two separate calls to
+`https://spothole.app/api/v2/spots?sig=POTA` and `https://spothole.app/api/v2/spots?sig=SOTA`.
+
+Remember, here at Spothole Inc. we offer an industry-standard "five nines" uptime on our server, with our own unique
+twist: we don't tell you which side of the decimal point the nines start! (Translation: This is a hobby project.
+`spothole.app` runs on the same server as my blog and other stuff. It might go down without warning. By all means base
+your own project on data from the main server if you like, but if you want any control over reliability and downtime,
+please run your own copy instead.)
@@ -0,0 +1,198 @@
+## Running using Docker
+
+Spothole comes with a Docker configuration to make it easy to run it in a containerised environment. To set it up using
+Docker, the easiest way is to use a Docker Compose file. Create a new directory such as `/opt/docker/spothole` and
+create a `compose.yaml` file inside it with the following contents:
+
+```yaml
+services:
+  spothole:
+    container_name: spothole
+    build:
+      context: https://git.ianrenton.com/ian/spothole.git#main
+    restart: unless-stopped
+    ports:
+      - "8080:8080"
+      - "7373:7373" # For telnet if required
+    volumes:
+      - ./config.yml:/app/config.yml
+      - ./cache:/app/cache
+```
+
+You can replace `#main` with any other branch or tag reference, for example `#1.5` to pin the build to tagged version
+1.5.
+
+Save the file. You will still need to create a copy of `config-example.yml` and name it `config.yml`, though with the
+Docker setup nothing has actually been downloaded yet, so you will have to copy the example from the repository some
+other way,
+e.g. [from the repo in a web browser](https://git.ianrenton.com/ian/spothole/src/branch/main/config-example.yml).
+
+With that in place, run `docker compose up` and you should be good to go. To detach, press `d` or run the command with
+the `-d` flag.
+
+### nginx Reverse Proxy with Docker
+
+In a containerised setup, it's typical to run an nginx reverse proxy in one container, alongside certbot for renewal of
+HTTPS certificates, and then applications like Spothole in a separate container. In this case, there are a couple of
+variations of the docker compose file above, and the nginx reverse proxy configuration covered [here](./nginx.md), that
+you will want to make.
+
+1. A port mapping is no longer required in the docker compose file; nginx will access into the docker container directly
+   on e.g. `http://spothole:8080`
+2. Spothole and nginx will need to be on the same docker network.
+
+So your `compose.yaml` might look like this:
+
+```yaml
+services:
+  spothole:
+    container_name: spothole
+    build:
+      context: https://git.ianrenton.com/ian/spothole.git#main
+    restart: unless-stopped
+    networks:
+      - docker-network
+    volumes:
+      - ./config.yml:/app/config.yml
+      - ./cache:/app/cache
+
+networks:
+  docker-network:
+    external: true
+```
+
+In your nginx site configuration, you'll want to refer to the Spothole container directly, and drop the block that
+allows nginx to access static files directly, as these will be inaccessible in another container. So you may end up with
+something like:
+
+```nginx
+server {
+    server_name spothole.app;
+
+    # Global proxy settings
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+    proxy_connect_timeout 10s;
+    proxy_buffering on;
+    
+    # Pass on IP address and host information to Spothole, in case logging this information is required
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Wellknown area for Lets Encrypt
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+    
+    # SSE endpoints
+    location ~ ^/api/v\d*/(spots|alerts)/stream/? {
+        proxy_pass http://spothole:8080;
+        
+        # Remove buffering, remove caching, add suitable timeouts for SSE API calls
+        proxy_buffering off;
+        proxy_cache off;
+        proxy_read_timeout 24h;
+        proxy_send_timeout 24h;
+        proxy_set_header X-Accel-Buffering no;
+        add_header Cache-Control no-store always;
+        
+        # Allow cross-origin requests to API
+        proxy_hide_header Access-Control-Allow-Origin;
+        add_header Access-Control-Allow-Origin * always; 
+    }
+
+    # Other API endpoints
+    location /api/ {
+        proxy_pass http://spothole:8080;
+        
+        # Remove buffering, remove caching, add suitable timeouts for API calls
+        proxy_buffering off;
+        proxy_cache off;
+        proxy_read_timeout 30s;
+        add_header Cache-Control no-store always;
+        
+        # Allow cross-origin requests to API
+        proxy_hide_header Access-Control-Allow-Origin;
+        add_header Access-Control-Allow-Origin * always;
+    }
+
+    # Templated pages and static assets
+    location / {
+        proxy_pass http://spothole:8080;
+        proxy_read_timeout 30s;
+        add_header Cache-Control "no-cache, must-revalidate" always;
+    }
+    
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    ssl_certificate /etc/letsencrypt/live/spothole.app/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/spothole.app/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+}
+
+
+server {
+    if ($host = spothole.app) {
+        return 301 https://$host$request_uri;
+    }
+
+    server_name spothole.app;
+    listen 80;
+    listen [::]:80;
+    return 404;
+}
+```
+
+If desired, you could even change the port on which Spothole runs from 8080 to a plain 80, in which case your
+`proxy_pass` statements could drop the `:8080` suffix. Since Spothole is in a container, it can serve HTTP on port 80 if
+desired, because it doesn't conflict with the host system.
+
+### Restoring the static files bypass
+
+If you would still like to bypass Spothole's web server for the static files, and serve them with nginx, you can do. The
+easiest way is to run another nginx container to serve the files, so your Spothole `compose.yaml` becomes:
+
+```yaml
+services:
+  spothole:
+    container_name: spothole
+    build:
+      context: https://git.ianrenton.com/ian/spothole.git#main
+    restart: unless-stopped
+    networks:
+      - docker-network
+    volumes:
+      - ./config.yml:/app/config.yml
+      - ./cache:/app/cache
+
+  spothole-static-nginx:
+    container_name: spothole-static-nginx
+    build:
+      context: https://git.ianrenton.com/ian/spothole.git#main
+      dockerfile_inline: |
+        FROM nginx:latest
+        COPY static /usr/share/nginx/html
+    restart: unless-stopped
+    networks:
+      - docker-network
+
+networks:
+  docker-network:
+    external: true
+```
+
+Then you can re-add the block that handles the `/static` path in your nginx reverse proxy config, but this time point it
+at the new container rather than at a filesystem path:
+
+```nginx
+    # Load static assets from the spothole-static-nginx container
+    location /static/ {
+        proxy_pass http://spothole-static-nginx/;
+        expires 1h;
+        add_header Cache-Control "public, max-age=3600, must-revalidate";
+    }
+```
@@ -0,0 +1,41 @@
+## Embedding Spothole in another website
+
+You can embed Spothole's web interface in another website, e.g. for use as part of a ham radio custom dashboard.
+
+URL parameters can be used to trigger an "embedded" mode which hides the headers, footers and settings. In this mode,
+you provide configuration for the various filter and display options via additional URL parameters. Any settings that
+the user has set for Spothole are ignored. This is so that the embedding site can select, for example, their choice of
+dark mode or activity 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.app/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.app/?embedded=true`. For dark mode showing 70cm TOTA spots
+only, use `https://spothole.app/?embedded=true&dark-mode=true&sig=TOTA&band=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.                                                                                                                                                |
+| `color_scheme`   | `light`, `dark`, `auto` | `auto`  | `?color_scheme=dark`    | Forces light or dark mode in preference to the operating system default.                                                                                              |
+| `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 activities 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. |
+| `map-center-lat` | Numeric (decimal)       | (auto)  | `?map-center-lat=51.5`  | Sets the initial latitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                       |
+| `map-center-lon` | Numeric (decimal)       | (auto)  | `?map-center-lon=-0.1`  | Sets the initial longitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                      |
+| `map-zoom`       | Numeric (integer)       | (auto)  | `?map-zoom=6`           | Sets the initial zoom level of the map on the map page. If omitted, the map auto-fits to the loaded spots.                                                            |
+
+See the comment at the end of the next section regarding reliability and uptime of the "main" server.
@@ -0,0 +1,79 @@
+## Modifying the source code
+
+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.
+
+### Code structure
+
+To navigate your way around the source code, this list may help.
+
+*Python back-end code*
+
+* `/core` - Core classes and utilities
+* `/data` - Data storage classes
+* `/providers/spot` - Classes providing spots by accessing the APIs of other services
+* `/providers/alert` - Classes providing alerts by accessing the APIs of other services
+* `/providers/solarconditions` - Classes providing solar and propagation by accessing the APIs of other services
+* `/providers/staticdata` - Classes providing static lookup data by accessing bundled data files or the APIs of other
+  services
+* `/providers/callsign` - Classes providing callsign lookup data by accessing bundled data files or the APIs of other
+  services
+* `/providers/activityrefdata` - Classes providing activity reference lookup data by accessing bundled data files or
+  the APIs of other services
+* `/webserver` - Classes for running Spothole's own web server
+* `/telnetserver` - Classes for running Spothole's telnet server
+* `spothole.py` - Main application script
+
+*Templates*
+
+* `/templates` - Templates used for constructing Spothole's user-targeted HTML pages
+
+*HTML/JS/CSS front-end code*
+
+* `/static` - Root for static files served by the web server. These are all served from a path starting `/static/`.
+* `/static/apidocs` - Contains the OpenAPI spec (`openapi.yml`)
+* `/static/audio` - Audio files used by the web front-end
+* `/static/css` - CSS files used by the web front-end
+* `/static/img` - image files used by the web front-end
+* `/static/js` - JavaScript used by the web front-end
+* `/static/vendor` - Third-party libraries (CSS, JS, fonts and images)
+
+*Miscellaneous*
+
+* `/` - pip `requirements.txt`, config, README, etc.
+* `/docs` - Documentation
+* `/images` - Image sources
+* `/datafiles` - Local data files, used by some providers when the data will never change and/or is not easily available
+  online in a format Spothole can handle
+* `/cache` - Directory where Spothole stores all the data it uses that should be persisted to disk. Created on first
+  run.
+
+### Extending the server
+
+Spothole is designed to be easily extensible. If you want to write your own spot provider, for example, simply add a
+module to the `providers.spot` 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 "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 `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 `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 `spot_providers` section of `config.yml`, and your provider should be
+instantiated on startup.
+
+The same approach as above is also used for alerts, and other types of providers. Give me a shout if you need any
+advice.
@@ -0,0 +1,96 @@
+## Multiple cluster nodes with different settings
+
+Dan, S50U has written in with his Spothole cluster settings. He is using a cluster node which provides RBN spots, and
+uses different SSIDs on his callsign to get different settings when logged into the same cluster node. For example:
+
+```
+  -
+    class: "DXCluster"
+    name: "S50CLX"
+    enabled: true
+    host: "s50clx.si"
+    port: 41112
+    login_prompt: "login: "
+    login_callsign: "callsign-10"
+```
+
+Telnet to DXSpider and log in with "callsign-10" and execute the following commands:
+
+`CLEAR/SPOTS ALL` (delete all previous filters)<br/>
+`UNSET/ANN` (stop announce messages)<br/>
+`UNSET/WCY` (stop wcy messages)<br/>
+`UNSET/WWV` (stop wwv messages)<br/>
+`SET/DX` (enable human DX spots)
+
+```
+  -
+    class: "DXCluster"
+    name: "RBN CW"
+    enabled: true
+    host: "s50clx.si"
+    port: 41112
+    login_prompt: "login: "
+    login_callsign: "callsign-11"
+    allow_rbn_spots: true
+    enabled_by_default_in_web_ui: false
+```
+
+Telnet to DXSpider and log in with "callsign-11" and execute the following commands:
+
+`CLEAR/SPOTS ALL` (delete all previous filters)<br/>
+`UNSET/ANN` (stop announce messages)<br/>
+`UNSET/WCY` (stop wcy messages)<br/>
+`UNSET/WWV` (stop wwv messages)<br/>
+`UNSET/DX` (stop human DX spots)<br/>
+`SET/SKIMMER CW` (enable CW RBN spots)
+
+```
+  -
+    class: "DXCluster"
+    name: "RBN RTTY"
+    enabled: true
+    host: "s50clx.si"
+    port: 41112
+    login_prompt: "login: "
+    login_callsign: "callsign-12"
+    allow_rbn_spots: true
+    enabled_by_default_in_web_ui: false
+```
+
+Telnet to DXSpider and log in with "callsign-12" and execute the following commands:
+
+`CLEAR/SPOTS ALL` (delete all previous filters)<br/>
+`UNSET/ANN` (stop announce messages)<br/>
+`UNSET/WCY` (stop wcy messages)<br/>
+`UNSET/WWV` (stop wwv messages)<br/>
+`UNSET/DX` (stop human DX spots)<br/>
+`SET/SKIMMER RTTY` (enable RTTY RBN spots)
+
+```
+  -
+    class: "DXCluster"
+    name: "RBN FT4/8"
+    enabled: true
+    host: "s50clx.si"
+    port: 41112
+    login_prompt: "login: "
+    login_callsign: "callsign-13"
+    allow_rbn_spots: true
+    enabled_by_default_in_web_ui: false
+```
+
+Telnet to DXSpider and log in with "callsign-13" and execute the following commands:
+
+`CLEAR/SPOTS ALL` (delete all previous filters)<br/>
+`UNSET/ANN` (stop announce messages)<br/>
+`UNSET/WCY` (stop wcy messages)<br/>
+`UNSET/WWV` (stop wwv messages)<br/>
+`UNSET/DX` (stop human DX spots)<br/>
+`SET/SKIMMER FT` (enable FT RBN spots)
+
+For each callsign-SSID, we also specify our basic information with commands:
+
+`SET/NAME Spothole10`, Spothole11... etc.<br/>
+`SET/QTH Cerkno`<br/>
+`SET/QRA JN66XD`<br/>
+`SET/HOME S50CLX`
@@ -0,0 +1,118 @@
+## nginx Reverse Proxy configuration
+
+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, and if you installed Spothole somewhere other than `/home/spothole/spothole`,
+adjust the alias location for serving static files.
+
+(The latter section, configuring the nginx server to serve static files directly, improves efficiency because it saves
+Spothole itself from serving JS, CSS etc. files. If you can't do this for some reason, e.g. your nginx and spothole are
+on different computers, you can omit the `location /static/ {}` block.)
+
+```nginx
+server {
+    server_name spothole.app;
+
+    # Global proxy settings
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+    proxy_connect_timeout 10s;
+    proxy_buffering on;
+    
+    # Pass on IP address and host information to Spothole, in case logging this information is required
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Wellknown area for Lets Encrypt
+    location /.well-known/ {
+        alias /var/www/html/.well-known/;
+    }
+
+    # Load static assets directly from the Spothole static directory
+    location /static/ {
+        alias /home/spothole/spothole/static/;
+        expires 1h;
+        add_header Cache-Control "public, max-age=3600, must-revalidate";
+    }
+    
+    # SSE endpoints
+    location ~ ^/api/v\d*/(spots|alerts)/stream/? {
+        proxy_pass http://127.0.0.1:8080;
+        
+        # Remove buffering, remove caching, add suitable timeouts for SSE API calls
+        proxy_buffering off;
+        proxy_cache off;
+        proxy_read_timeout 24h;
+        proxy_send_timeout 24h;
+        proxy_set_header X-Accel-Buffering no;
+        add_header Cache-Control no-store always;
+        
+        # Allow cross-origin requests to API
+        proxy_hide_header Access-Control-Allow-Origin;
+        add_header Access-Control-Allow-Origin * always; 
+    }
+
+    # Other API endpoints
+    location /api/ {
+        proxy_pass http://127.0.0.1:8080;
+        
+        # Remove buffering, remove caching, add suitable timeouts for API calls
+        proxy_buffering off;
+        proxy_cache off;
+        proxy_read_timeout 30s;
+        add_header Cache-Control no-store always;
+        
+        # Allow cross-origin requests to API
+        proxy_hide_header Access-Control-Allow-Origin;
+        add_header Access-Control-Allow-Origin * always;
+    }
+
+    # Templated pages
+    location / {
+        proxy_pass http://127.0.0.1:8080;
+        proxy_read_timeout 30s;
+        add_header Cache-Control "no-cache, must-revalidate" always;
+    }
+}
+```
+
+One further change you might want to make to the file above is the `add_header Access-Control-Allow-Origin` statements.
+These are what's used on my own Spothole server to make sure that other third-party web-based software can get the data
+from my instance, and applies to any endpoint underneath `/api`. If you want *your* Spothole instance to be set up the
+same way, so that others can write software in JavaScript that can access it, leave this intact. But if you want your
+Spothole instance to only be usable by scripts running on the web server you write, you can remove these lines. (Note
+that this doesn't stop other people writing *non-web-based* software that accesses your Spothole API&mdash;the
+enforcement of cross-origin headers only happens within the user's browser. If you need to lock your instance down so
+that no-one else can access it with *any* software, that's an aspect of nginx or firewall config that you will need to
+find help with elsewhere.)
+
+Now, make a symbolic link to enable the site:
+
+```bash
+cd /etc/nginx/sites-enabled
+sudo ln -sf ../sites-available/spothole
+```
+
+Test that your nginx config isn't broken using `nginx -t`. If it works, restart nginx with
+`sudo systemctl restart nginx`.
+
+If you haven't already done so, set up a DNS entry to make sure requests for your domain name end up at the server
+that's running Spothole.
+
+You should now be able to access the web interface by going to the domain from your browser.
+
+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.
@@ -0,0 +1,54 @@
+## 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.
+
+You will require Python version 3.10 or later. If you encounter an error about `gdal-config` during the following
+process, you will also need `libgdal-dev` installed.
+
+To download and set up Spothole on a Debian server, run the following commands. Other operating systems will likely be
+similar.
+
+```bash
+git clone ssh://git@git.ianrenton.com/ian/spothole.git
+cd spothole
+python3 -m venv ./.venv
+source .venv/bin/activate
+pip install -r requirements.txt
+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. Mostly, this will involve
+enabling or disabling the various providers of spot and alert data.
+
+By default, all outdoor programme providers are enabled, as is one cluster node and the NG3K DXpedition data. The RBN
+spot providers are turned off by default due to the volume of traffic from CW/RTTY/FT8 skimmers, and the APRS and Packet
+spot providers are off by default on the assumption that Spothole users want a spot with a human at the other end of it,
+but all can be easily re-enabled.
+
+Other parameters you will want to update include the base URL to your instance, and whether you want to serve a full
+web-based DX cluster interface or just the API endpoints for client software to use.
+
+`config.yml` has an entry for a Clublog API key. If provided, this will allow Spothole to retrieve some more information
+about DX spots. The software will work just fine without it, but you may find a few country flags etc. are less accurate
+or missing. Clublog API keys are free, but you'll need to get your own by submitting a helpdesk ticket and explaining
+what you'll use it for. The admin team are happy with the rate of requests made by my Spothole server, so unless you
+change the source code of yours to radically increase the rate of querying Clublog, I'm sure they will be fine with your
+server too.
+
+Once you're happy with the content of `config.yml`, you can proceed to running the software.
+
+To run the software this time and any future times you want to run it directly from the command line:
+
+```bash
+source .venv/bin/activate
+python3 spothole.py
+```
+
+The software can take a few seconds to start up, particularly if it's been run previously and has a large amount of
+cache data to sort through. This is normal, don't panic! Once you see `You can access your copy of Spothole at
+http://localhost:8080` in the log, your server is good to go.
+
+If you see some errors on startup, check your configuration, e.g. in case you have specified a port for the web server
+that is already in use by something else.
@@ -0,0 +1,34 @@
+## 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:
+
+```
+[Unit]
+Description=Spothole
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=spothole
+WorkingDirectory=/home/spothole/spothole
+ExecStart=/home/spothole/spothole/.venv/bin/python /home/spothole/spothole/spothole.py --serve-in-foreground
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Run the following:
+
+```bash
+sudo systemctl daemon-reload
+sudo systemctl enable spothole
+sudo systemctl start spothole
+```
+
+Check the service has started up correctly with `sudo journalctl -u spothole -f`.
@@ -0,0 +1,55 @@
+import logging
+from datetime import datetime
+from threading import Event
+
+import pytz
+
+from core.data_store import DATA_STORE
+
+logger = logging.getLogger(__name__)
+
+
+class ActivityRefDataProvider:
+    """Generic activity reference data provider class. Subclasses of this query the individual URLs or files for
+    data."""
+
+    def __init__(self, sig_name, provider_config):
+        """Constructor. Note the parameter and attribute are still named "sig_name" for consistency with the API's
+        "sig" field name."""
+
+        self.sig_name = sig_name
+        self.enabled = provider_config["enabled"]
+        self.last_update_time = datetime.min.replace(tzinfo=pytz.UTC)
+        self.status = "Not Started" if self.enabled else "Disabled"
+        self.reference_count = 0
+        self._stop_event = Event()
+
+    def start(self):
+        """Start the provider. This should return immediately after spawning threads to access the remote resources"""
+
+        raise NotImplementedError("Subclasses must implement this method")
+
+    def stop(self):
+        """Stop any threads and prepare for application shutdown. Subclasses should implement this method and call
+        super()."""
+
+        self._stop_event.set()
+
+    def _add_data(self, new_data):
+        """Add all the provided reference data objects to the data store."""
+
+        # with transact() batches all writes together to save making thousands of individual sqlite writes. However,
+        # that means that each provider holds the lock while it writes, and the default behaviour for other attempted
+        # transact()s is to fail if they can't get the lock (?!). This behaviour is fixed by retry=True.
+        with DATA_STORE.activity_refs.transact(retry=True):
+            for d in new_data:
+                DATA_STORE.activity_refs.set(f"{self.sig_name}:{d.id}", d)
+
+                # For the big data sources, loading will take a few minutes. If we want to shut down the software neatly
+                # within the first few minutes of startup, we need a way to abort this expensive process of filling up the
+                # disk cache.
+                if self._stop_event.is_set():
+                    break
+
+        self.reference_count = len(new_data)
+        logger.info(f"Loaded {self.reference_count} references for {self.sig_name} into the data store.")
@@ -0,0 +1,48 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class ARLHS(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Amateur Radio Light House Society"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.ARLHS
+    DATA_URL = "https://www.gma.rocks/download/lighthouse.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()[1:]):
+            if "ARLHS" in row and row["ARLHS"] != "":
+                ref_id = row["ARLHS"]
+                new_data.append(
+                    ActivityRef(
+                        sig=self.ACTIVITY,
+                        id=ref_id,
+                        name=row.get("Name", None),
+                        ref_type=ActivityRefType.LIGHTHOUSE,
+                        url=f"https://www.cqgma.org/zinfo.php?ref={ref_id}",
+                        latitude=float(row["Latitude"]) if "Latitude" in row and row["Latitude"] != "" else None,
+                        longitude=float(row["Longitude"]) if "Longitude" in row and row["Longitude"] != "" else None,
+                        grid=row["Maidenhead Locator"],
+                    )
+                )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,52 @@
+from time import sleep
+
+from pyhamtools.locator import latlong_to_locator
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import FileDownloadActivityRefDataProvider
+
+
+class COTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Castles on the Air"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.COTA
+    DATA_URL = "https://www.cotagroup.org/cotagroup/map/data/castles-all-7d90ee2a5e1175e5dece1bbf9dc87504.json"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        data = http_response.json()
+        if isinstance(data, list):
+            for ref in data[2]:
+                ref_id = ref[3]
+                name = ref[4]
+                lat = float(ref[0])
+                lon = float(ref[1])
+                grid = latlong_to_locator(lat, lon)
+
+                new_data.append(
+                    ActivityRef(
+                        sig=self.ACTIVITY,
+                        id=ref_id,
+                        name=name,
+                        ref_type=ActivityRefType.CASTLE,
+                        grid=grid,
+                        latitude=lat,
+                        longitude=lon,
+                    )
+                )
+
+                # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
+                # of the data in this case
+                if self._stop_event.is_set():
+                    break
+
+                # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+                # is available for other threads e.g. the web server.
+                sleep(0.001)
+
+        return new_data
@@ -0,0 +1,42 @@
+import io
+from time import sleep
+
+import pandas as pd
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import FileDownloadActivityRefDataProvider
+
+
+class DCE(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Diploma Castillos de España"""
+
+    POLL_INTERVAL_DAYS = 365
+    ACTIVITY = ActivityName.DCE
+    DATA_URL = "https://www.acracb.org/dce/descargas/General/directorio_referencias_dce.xls"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+
+        file_stream = io.BytesIO(http_response.content)
+        df = pd.read_excel(file_stream, engine="xlrd", header=None)
+
+        for index, row in df.iterrows():
+            if row.iloc[0] and row.iloc[2]:
+                new_data.append(
+                    ActivityRef(sig=self.ACTIVITY, id=row.iloc[0].strip(), name=row.iloc[2].strip(), ref_type=ActivityRefType.CASTLE)
+                )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,46 @@
+import io
+from time import sleep
+
+import pandas as pd
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import FileDownloadActivityRefDataProvider
+
+
+class DEFE(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Diploma Estationes de Ferrocarril de España"""
+
+    POLL_INTERVAL_DAYS = 365
+    ACTIVITY = ActivityName.DEFE
+    DATA_URL = "https://www.acracb.org/defe/descargas/General/directorio_referencias_defe.xls"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+
+        file_stream = io.BytesIO(http_response.content)
+        df = pd.read_excel(file_stream, engine="xlrd", header=None)
+
+        for index, row in df.iterrows():
+            # Skip the header row
+            if str(row.iloc[0]) == "NºDEFE":
+                continue
+
+            if row.iloc[0] and row.iloc[1]:
+                new_data.append(
+                    ActivityRef(sig=self.ACTIVITY, id=row.iloc[0].strip(), name=row.iloc[1].strip(), ref_type=ActivityRefType.BUILDING)
+                )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,63 @@
+import csv
+from time import sleep
+
+from pyhamtools.locator import latlong_to_locator
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.local_file_activity_ref_data_provider import (
+    LocalFileActivityRefDataProvider,
+)
+
+
+class DME(LocalFileActivityRefDataProvider):
+    """Activity ref data provider for Diploma Municipios de Espana"""
+
+    ACTIVITY = ActivityName.DME
+    PATH = "datafiles/MUNICIPIOS.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.PATH)
+
+    def _file_to_data(self, path):
+        new_data = []
+        with open(path, encoding="latin-1") as _f:
+            for row in csv.DictReader(_f, delimiter=";"):
+                # Store reference IDs with the "DME-" prefix rather than just the number. This will prevent Spothole
+                # from agressively thinking every number in a spot comment is DME after it's seen "DME" once. The only
+                # numbers that count are straight after "DME " or "DME-". The dash versus space is normalised in
+                # activity_lookup_helper.py.
+                ref_id = "DME-" + row["COD_INE"][:5]
+                latitude = (
+                    float(row["LATITUD_ETRS89_REGCAN95"].replace(",", "."))
+                    if row.get("LATITUD_ETRS89_REGCAN95")
+                    else None
+                )
+                longitude = (
+                    float(row["LONGITUD_ETRS89_REGCAN95"].replace(",", "."))
+                    if row.get("LONGITUD_ETRS89_REGCAN95")
+                    else None
+                )
+
+                ref = ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    ref_type=ActivityRefType.TOWN,
+                    name=f"{row['NOMBRE_ACTUAL']}, {row['PROVINCIA']}",
+                    latitude=latitude,
+                    longitude=longitude,
+                )
+                if latitude and longitude:
+                    ref.grid = latlong_to_locator(latitude, longitude, 6)
+                new_data.append(ref)
+
+                # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
+                # of the data in this case
+                if self._stop_event.is_set():
+                    break
+
+                # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+                # is available for other threads e.g. the web server.
+                sleep(0.001)
+
+        return new_data
@@ -0,0 +1,37 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import FileDownloadActivityRefDataProvider
+
+
+class DMUE(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Diploma Museos de España"""
+
+    POLL_INTERVAL_DAYS = 365
+    ACTIVITY = ActivityName.DMUE
+    DATA_URL = "https://dmue.radiogalena.es/nom_dmue.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+
+        for row in csv.reader(http_response.content.decode("utf-8-sig").splitlines(), delimiter=";"):
+            if len(row) > 1 and row[0] and row[1]:
+                new_data.append(
+                    ActivityRef(sig=self.ACTIVITY, id=row[0].strip(), name=row[1].strip(), ref_type=ActivityRefType.BUILDING)
+                )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,50 @@
+import io
+from time import sleep
+
+import pandas as pd
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import FileDownloadActivityRefDataProvider
+
+
+class DMVE(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Diploma Monumentos y Vestigios de España"""
+
+    POLL_INTERVAL_DAYS = 365
+    ACTIVITY = ActivityName.DMVE
+    DATA_URL = "https://www.acracb.org/dmve/descargas/General/directorio_referencias_dmve.xls"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+
+        file_stream = io.BytesIO(http_response.content)
+        # Despide the .xls extension this is actually an xlsx file, so we need openpyxl not xlrd
+        df = pd.read_excel(file_stream, engine="openpyxl", header=None)
+
+        for index, row in df.iterrows():
+            ref = row.iloc[0]
+            name = row.iloc[1]
+
+            # Skip the header row and blank rows
+            if str(ref) == "REF.":
+                continue
+            if pd.isna(ref) or pd.isna(name):
+                continue
+
+            if ref and name:
+                new_data.append(ActivityRef(sig=self.ACTIVITY, id=ref.strip(), name=name.strip(), ref_type=ActivityRefType.BUILDING))
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,35 @@
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import FileDownloadActivityRefDataProvider
+
+
+class DTMBA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Diploma Teatri Musei Belle Arti"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.DTMBA
+    DATA_URL = "https://www.iu1fig.com/share/iz0eik/dtmba/export.php"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in http_response.content.decode("utf-8-sig").splitlines():
+            split = row.split(";")
+            ref_id = split[0]
+            ref_name = split[1]
+            new_data.append(ActivityRef(sig=self.ACTIVITY, id=ref_id, name=ref_name, ref_type=ActivityRefType.BUILDING))
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,56 @@
+from io import BytesIO
+from time import sleep
+
+import pdfplumber
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import FileDownloadActivityRefDataProvider
+
+
+class FEA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Diploma Faros de España"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.FEA
+    DATA_URL = "http://ea5ol.net/Lista%20Faros.pdf"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+
+        # Use PDFPlumber to extract the tables in the PDF
+        with pdfplumber.open(BytesIO(http_response.content)) as pdf:
+            all_rows = []
+
+            for page_number, page in enumerate(pdf.pages, start=1):
+                tables = page.extract_tables()
+
+                for table_number, table in enumerate(tables, start=1):
+                    if not table:
+                        continue
+
+                    rows = [row for row in table if any(cell and cell.strip() for cell in row)]
+                    all_rows.extend(rows)
+
+        for row in all_rows:
+            if not "REF" in row[0] and not "\n" in row[0]:
+                # FEA references are technically [DE]\-\d{4}(\.\d)? but spotters always seem to miss out the D- or E-
+                # prefix and just use FEA-1234 or FEA 1234, so we add both copies to the database.
+                ref_id_1 = row[0].strip()
+                ref_id_2 = ref_id_1.replace("D-", "FEA-").replace("E-", "FEA-")
+                new_data.append(ActivityRef(sig=self.ACTIVITY, id=ref_id_1, name=row[1].strip(), ref_type=ActivityRefType.LIGHTHOUSE))
+                new_data.append(ActivityRef(sig=self.ACTIVITY, id=ref_id_2, name=row[1].strip(), ref_type=ActivityRefType.LIGHTHOUSE))
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,84 @@
+import logging
+from datetime import datetime
+from threading import Thread
+
+import pytz
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
+
+from core.constants import HTTP_HEADERS
+from core.url_data_cache import URLDataCache
+from providers.activityrefdata.activity_ref_data_provider import ActivityRefDataProvider
+
+logger = logging.getLogger(__name__)
+
+
+class FileDownloadActivityRefDataProvider(ActivityRefDataProvider):
+    """Generic activity ref data provider class for providers that fetch their data from the web by downloading a
+    file."""
+
+    def __init__(self, sig_name, provider_config, url, poll_interval):
+        """Set up the provider, note poll_interval is in *days*."""
+        super().__init__(sig_name, provider_config)
+        self._url = url
+        self._poll_interval = poll_interval
+        self._thread = None
+        self._url_data_cache = URLDataCache(f"activity_ref_data_{sig_name}")
+
+    def start(self):
+        # Fire off the polling thread. It will poll immediately on startup, then sleep for poll_interval between
+        # subsequent polls, so start() returns immediately and the application can continue starting.
+        logger.info(f"Set up query of {self.sig_name} activity ref data every {self._poll_interval!s} days.")
+        self._thread = Thread(target=self._run, name=f"FileDownloadActivityRefDataProvider-{self.sig_name}", daemon=True)
+        self._thread.start()
+
+    def stop(self):
+        super().stop()
+        if self._thread:
+            self._thread.join(timeout=12)
+            if self._thread.is_alive():
+                logger.warning(f"{self.sig_name} activity ref data worker thread did not exit on time and will be killed.")
+
+    def _run(self):
+        while True:
+            self._poll()
+            if self._stop_event.wait(timeout=self._poll_interval * 60 * 60 * 24):
+                break
+
+    def _poll(self):
+        try:
+            # Request data from API. Use the data cache (with a TTL of 1 day) here, not as the main mechanism for
+            # caching, but just so continual restarts of the software during testing don't hammer the servers.
+            logger.debug(f"Downloading {self.sig_name} activity ref data...")
+            http_response = self._url_data_cache.get(self._url, headers=HTTP_HEADERS)
+            # Check response code was good
+            if http_response.ok:
+                # Pass off to the subclass for processing
+                new_data = self._http_response_to_data(http_response)
+                # Add the new data to the activity ref data store
+                if new_data:
+                    self._add_data(new_data)
+
+                self.status = "OK"
+                self.last_update_time = datetime.now(pytz.UTC)
+                logger.debug(f"Received activity ref data for {self.sig_name}")
+            else:
+                self.status = "Error"
+                logger.warning(f"HTTP {http_response.status_code} when downloading activity ref data for {self.sig_name}.")
+
+        except ConnectionError:
+            self.status = "Error"
+            logger.warning(f"Connection error when downloading activity ref data for {self.sig_name}.")
+        except (ConnectTimeout, ReadTimeout):
+            self.status = "Error"
+            logger.warning(f"Timeout when downloading activity ref data for {self.sig_name}.")
+        except Exception:
+            self.status = "Error"
+            logger.exception(f"Exception in HTTP Activity Ref Data Provider ({self.sig_name})")
+            self._stop_event.wait(timeout=1)
+
+    def _http_response_to_data(self, http_response):
+        """Convert an HTTP response returned by the server into activity ref data. The whole response is provided here
+        so the subclass implementations can check for HTTP status codes if necessary, and handle the response as
+        JSON, CSV, whatever the remote file actually is."""
+
+        raise NotImplementedError("Subclasses must implement this method")
@@ -0,0 +1,50 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class GMA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Global Mountain Activity"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.GMA
+    DATA_URL = "https://www.gma.rocks/download/summits.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()[1:]):
+            ref_id = row["Reference"]
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=row.get("Name", None),
+                    ref_type=ActivityRefType.SUMMIT,
+                    url=f"https://www.cqgma.org/zinfo.php?ref={ref_id}",
+                    latitude=float(row["Latitude"]) if "Latitude" in row and row["Latitude"] != "" else None,
+                    longitude=float(row["Longitude"]) if "Longitude" in row and row["Longitude"] != "" else None,
+                    altitude=float(row["Height (m)"].replace("m", ""))
+                    if "Height (m)" in row and row["Height (m)"] != ""
+                    else None,
+                    grid=row["Maidenhead Locator"],
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,48 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class ILLW(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for International Lighthouse & Lightship Weekend"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.ILLW
+    DATA_URL = "https://www.gma.rocks/download/lighthouse.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()[1:]):
+            if "ILLW" in row and row["ILLW"] != "":
+                ref_id = row["ILLW"]
+                new_data.append(
+                    ActivityRef(
+                        sig=self.ACTIVITY,
+                        id=ref_id,
+                        name=row.get("Name", None),
+                        ref_type=ActivityRefType.LIGHTHOUSE,
+                        url=f"https://www.cqgma.org/zinfo.php?ref={ref_id}",
+                        latitude=float(row["Latitude"]) if "Latitude" in row and row["Latitude"] != "" else None,
+                        longitude=float(row["Longitude"]) if "Longitude" in row and row["Longitude"] != "" else None,
+                        grid=row["Maidenhead Locator"],
+                    )
+                )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,64 @@
+import logging
+from time import sleep
+
+from pyhamtools.locator import latlong_to_locator
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class IOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Islands on the Air"""
+
+    POLL_INTERVAL_DAYS = 365
+    ACTIVITY = ActivityName.IOTA
+    DATA_URL = "https://www.iota-world.org/islands-on-the-air/downloads/download-file.html?path=groups.json"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        data = http_response.json()
+        if isinstance(data, list):
+            for ref in data:
+                ref_id = ref["refno"]
+                latitude = (float(ref["latitude_min"]) + float(ref["latitude_max"])) / 2.0
+                longitude = (float(ref["longitude_min"]) + float(ref["longitude_max"])) / 2.0
+                grid = None
+                try:
+                    grid = latlong_to_locator(latitude, longitude, 6)
+                except ValueError:
+                    logger.debug(
+                        "Error converting lat/lon to locator for an IOTA reference %f %f",
+                        latitude,
+                        longitude,
+                    )
+
+                new_data.append(
+                    ActivityRef(
+                        sig=self.ACTIVITY,
+                        id=ref_id,
+                        name=ref["name"],
+                        ref_type=ActivityRefType.ISLAND,
+                        grid=grid,
+                        latitude=latitude,
+                        longitude=longitude,
+                    )
+                )
+
+                # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
+                # of the data in this case
+                if self._stop_event.is_set():
+                    break
+
+                # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+                # is available for other threads e.g. the web server.
+                sleep(0.001)
+
+        return new_data
@@ -0,0 +1,15 @@
+from core.enums import ActivityName
+from providers.activityrefdata.pnp_kml_activity_ref_data_provider import (
+    ParksNPeaksKMLActivityRefDataProvider,
+)
+
+
+class KRMNPA(ParksNPeaksKMLActivityRefDataProvider):
+    """Activity ref data provider for the Keith Roget Memorrial National Parks Award (KRMNPA)."""
+
+    POLL_INTERVAL_DAYS = 365
+    ACTIVITY = ActivityName.KRMNPA
+    DATA_URL = "https://parksnpeaks.org/getPOI.php?poiClass=KRMNPA&poiFormat=4"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
@@ -0,0 +1,53 @@
+from time import sleep
+
+from pyhamtools.locator import locator_to_latlong
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class LLOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Lagos y Lagunas on the Air"""
+
+    POLL_INTERVAL_DAYS = 7
+    ACTIVITY = ActivityName.LLOTA
+    DATA_URL = "https://llota.app/api/public/references"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        data = http_response.json()
+        if isinstance(data, list):
+            for ref in data:
+                ref_id = ref["reference_code"]
+                grid = str(ref["grid_locator"])
+                ll = locator_to_latlong(grid)
+
+                new_data.append(
+                    ActivityRef(
+                        sig=self.ACTIVITY,
+                        id=ref_id,
+                        name=str(ref["name"]),
+                        ref_type=ActivityRefType.LAKE,
+                        url=f"https://llota.app/list/ref/{ref_id}",
+                        grid=grid,
+                        latitude=ll[0],
+                        longitude=ll[1],
+                    )
+                )
+
+                # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
+                # of the data in this case
+                if self._stop_event.is_set():
+                    break
+
+                # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+                # is available for other threads e.g. the web server.
+                sleep(0.001)
+
+        return new_data
@@ -0,0 +1,36 @@
+import logging
+from datetime import datetime
+
+import pytz
+
+from providers.activityrefdata.activity_ref_data_provider import ActivityRefDataProvider
+
+logger = logging.getLogger(__name__)
+
+
+class LocalFileActivityRefDataProvider(ActivityRefDataProvider):
+    """Generic activity ref data provider class for providers that fetch their data from a local file on startup."""
+
+    def __init__(self, sig_name, provider_config, path):
+        super().__init__(sig_name, provider_config)
+        self._path = path
+
+    def start(self):
+        logger.debug(f"Loading {self.sig_name} activity ref data from file.")
+        try:
+            new_data = self._file_to_data(self._path)
+            if new_data:
+                self._add_data(new_data)
+                self.status = "OK"
+                self.last_update_time = datetime.now(pytz.UTC)
+            else:
+                self.status = "Error"
+                logger.info(f"Failed to load activity ref data for {self.sig_name}")
+        except Exception:
+            self.status = "Error"
+            logger.exception(f"Exception in local file Activity Ref Data Provider ({self.sig_name})")
+
+    def _file_to_data(self, path):
+        """Load a file on the given path and turn it into activity ref data."""
+
+        raise NotImplementedError("Subclasses must implement this method")
@@ -0,0 +1,47 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class MOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Mills on the Air"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.MOTA
+    DATA_URL = "https://www.gma.rocks/download/mills.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()[1:]):
+            ref_id = row["Reference"]
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=row.get("Name", None),
+                    ref_type=ActivityRefType.MILL,
+                    url=f"https://www.cqgma.org/zinfo.php?ref={ref_id}",
+                    latitude=float(row["Latitude"]) if "Latitude" in row and row["Latitude"] != "" else None,
+                    longitude=float(row["Longitude"]) if "Longitude" in row and row["Longitude"] != "" else None,
+                    grid=row["Maidenhead Locator"],
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,58 @@
+from time import sleep
+
+from bs4 import BeautifulSoup
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import FileDownloadActivityRefDataProvider
+
+
+class PGA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Polish Gmina Award"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.PGA
+    DATA_URL = "http://www.spga.pl/lista_pga2.php"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        soup = BeautifulSoup(http_response.text, "html.parser")
+
+        # Iterate through tables in the page
+        for table in soup.find_all("table"):
+            header_cells = table.find_all(["th", "td"], limit=10)
+            header_texts = [c.get_text(strip=True) for c in header_cells]
+
+            # If it has "PGA" and "Nazwa" in the header, it's the main data table
+            if any("PGA" in t for t in header_texts) and any("Nazwa" in t for t in header_texts):
+                # Iterate through all rows except the first
+                rows = table.find_all("tr")
+                for row in rows[1:]:
+                    cells = row.find_all("td")
+                    ref_id = cells[0].get_text(strip=True)
+                    name = cells[1].get_text(strip=True)
+                    if not ref_id:
+                        continue
+
+                    new_data.append(
+                        ActivityRef(
+                            sig=self.ACTIVITY,
+                            id=ref_id,
+                            name=name,
+                            ref_type=ActivityRefType.REGION,
+                        )
+                    )
+
+                    # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
+                    # of the data in this case
+                    if self._stop_event.is_set():
+                        break
+
+                    # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+                    # is available for other threads e.g. the web server.
+                    sleep(0.001)
+
+        return new_data
@@ -0,0 +1,65 @@
+import re
+from time import sleep
+
+from fastkml import kml
+from pyhamtools.locator import latlong_to_locator
+
+from core.enums import ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class ParksNPeaksKMLActivityRefDataProvider(FileDownloadActivityRefDataProvider):
+    """Base class for activity ref data providers that use parksnpeaks.org KML POI feeds and have references that
+    use the VKFF refs rather than their own system (i.e. KRMNPA and SANPCPA)."""
+
+    REF_PATTERN = re.compile(r"VKFF-\d+")
+
+    def __init__(self, sig_name, provider_config, url, poll_interval):
+        """Set up the provider, note poll_interval is in *days*."""
+        super().__init__(sig_name, provider_config, url, poll_interval)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+
+        k = kml.KML.from_string(http_response.content)
+
+        for document in k.features:
+            # noinspection unresolved-references
+            for folder in document.features:
+                # noinspection unresolved-references
+                for placemark in folder.features:
+                    description = placemark.description or ""
+                    match = self.REF_PATTERN.search(description)
+                    if not match:
+                        # No VKFF reference found in this placemark - skip it (e.g. non-park waypoints)
+                        continue
+                    ref_id = match.group(0)
+
+                    longitude, latitude = placemark.geometry.x, placemark.geometry.y
+
+                    ref = ActivityRef(
+                        sig=self.sig_name,
+                        id=ref_id,
+                        name=placemark.name,
+                        ref_type=ActivityRefType.PARK,
+                        url=f"https://parksnpeaks.org/getPark.php?actPark={ref_id}",
+                        latitude=latitude,
+                        longitude=longitude,
+                    )
+                    if latitude and longitude:
+                        ref.grid = latlong_to_locator(latitude, longitude, 6)
+                    new_data.append(ref)
+
+                    # Bail out if a stop has been requested, i.e. the program is shutting down - no need to
+                    # parse the rest of the data in this case
+                    if self._stop_event.is_set():
+                        return new_data
+
+                    # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+                    # is available for other threads e.g. the web server.
+                    sleep(0.001)
+
+        return new_data
@@ -0,0 +1,47 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class POTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Parks on the Air"""
+
+    POLL_INTERVAL_DAYS = 7
+    ACTIVITY = ActivityName.POTA
+    DATA_URL = "https://pota.app/all_parks_ext.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
+            ref_id = row["reference"]
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=row.get("name", None),
+                    ref_type=ActivityRefType.PARK,
+                    url=f"https://pota.app/#/park/{ref_id}",
+                    grid=row.get("grid", None),
+                    latitude=float(row["latitude"]) if "latitude" in row and row["latitude"] != "" else None,
+                    longitude=float(row["longitude"]) if "longitude" in row and row["longitude"] != "" else None,
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,15 @@
+from core.enums import ActivityName
+from providers.activityrefdata.pnp_kml_activity_ref_data_provider import (
+    ParksNPeaksKMLActivityRefDataProvider,
+)
+
+
+class SANPCPA(ParksNPeaksKMLActivityRefDataProvider):
+    """Activity ref data provider for the South Australia National Parks and Conservation Parks Award (SANPCPA)."""
+
+    POLL_INTERVAL_DAYS = 365
+    ACTIVITY = ActivityName.SANPCPA
+    DATA_URL = "https://parksnpeaks.org/getPOI.php?poiClass=SANPCPA&poiFormat=4"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
@@ -0,0 +1,46 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class SIOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Silos on the Air"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.SIOTA
+    DATA_URL = "https://www.silosontheair.com/data/silos.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
+            ref_id = row["SILO_CODE"]
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=row.get("NAME", None),
+                    ref_type=ActivityRefType.SILO,
+                    grid=row.get("LOCATOR", None),
+                    latitude=float(row["LAT"]) if "LAT" in row else None,
+                    longitude=float(row["LNG"]) if "LNG" in row else None,
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,54 @@
+import csv
+from time import sleep
+
+from pyhamtools.locator import latlong_to_locator
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class SOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Summits on the Air"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.SOTA
+    DATA_URL = "https://storage.sota.org.uk/summitslist.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()[1:]):
+            ref_id = row["SummitCode"]
+            latitude = float(row["Latitude"]) if "Latitude" in row and row["Latitude"] != "" else None
+            longitude = float(row["Longitude"]) if "Longitude" in row and row["Longitude"] != "" else None
+            altitude = float(row["AltM"]) if "AltM" in row and row["AltM"] != "" else None
+            ref = ActivityRef(
+                sig=self.ACTIVITY,
+                id=ref_id,
+                name=row.get("SummitName", None),
+                ref_type=ActivityRefType.SUMMIT,
+                url=f"https://www.sotadata.org.uk/en/summit/{ref_id}",
+                latitude=latitude,
+                longitude=longitude,
+                altitude=altitude,
+                activation_score=int(row["Points"]) if "Points" in row else None,
+            )
+            if latitude and longitude:
+                ref.grid = latlong_to_locator(latitude, longitude, 6)
+            new_data.append(ref)
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,41 @@
+import csv
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.local_file_activity_ref_data_provider import (
+    LocalFileActivityRefDataProvider,
+)
+
+
+class Toilets(LocalFileActivityRefDataProvider):
+    """Activity ref data provider for Toilets on the Air"""
+
+    ACTIVITY = ActivityName.TOILETS
+    PATH = "datafiles/toilets.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.PATH)
+
+    def _file_to_data(self, path):
+        new_data = []
+        with open(path) as _f:
+            csv_data = _f.read()
+            dr = csv.DictReader(csv_data.splitlines())
+            for row in dr:
+                new_data.append(
+                    ActivityRef(
+                        sig=self.ACTIVITY,
+                        id=row["ref"],
+                        name=row["ref"],
+                        ref_type=ActivityRefType.TOILET,
+                        latitude=float(row["lat"]),
+                        longitude=float(row["lon"]),
+                    )
+                )
+
+                # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
+                # of the data in this case
+                if self._stop_event.is_set():
+                    break
+
+        return new_data
@@ -0,0 +1,47 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class Towers(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Towers on the Air"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.TOWERS
+    DATA_URL = "https://wwtota.com/servis/generate_csv.php?ref=&filter=all"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines(), delimiter=";"):
+            ref_id = row["Ref"]
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=row.get("Nazev", None),
+                    ref_type=ActivityRefType.TOWER,
+                    url=f"https://wwtota.com/seznam/karta_rozhledny.php?ref={ref_id}",
+                    grid=row["Lokator"] if "Lokator" in row and row["Lokator"] != "" else None,
+                    latitude=float(row["Lat"]) if "Lat" in row and row["Lat"] != "" else None,
+                    longitude=float(row["Lon"]) if "Lon" in row and row["Lon"] != "" else None,
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,66 @@
+import csv
+import logging
+from time import sleep
+
+from pyhamtools.locator import latlong_to_locator
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class WCA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for World Castles Award"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.WCA
+    DATA_URL = "https://polo.ham2k.com/data/activities/wca/all-castles.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
+            ref_id = row["REF"]
+
+            coords_str = row["COORDINATES"]
+            latitude = None
+            longitude = None
+            grid = None
+            try:
+                if coords_str:
+                    split = coords_str.split(", ")
+                    latitude = float(split[0])
+                    longitude = float(split[1])
+                    grid = latlong_to_locator(latitude, longitude)
+            except ValueError:
+                logger.debug(f"Encountered dodgy formatting in WCA CSV, skipping location data for {ref_id}")
+
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=row.get("CLEAN NAME", None),
+                    ref_type=ActivityRefType.CASTLE,
+                    url=f"https://www.cqgma.org/zinfo.php?ref={ref_id}",
+                    latitude=latitude,
+                    longitude=longitude,
+                    grid=grid,
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,54 @@
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class WOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Wainwrights on the Air"""
+
+    POLL_INTERVAL_DAYS = 365
+    ACTIVITY = ActivityName.WOTA
+    DATA_URL = "https://www.wota.org.uk/mapping/data/summits.json"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for feature in http_response.json().get("features", []):
+            ref_id = feature["properties"]["wotaId"]
+            # Fudge WOTA URLs. Outlying fell (LDO) URLs don't match their ID numbers but require 214 to be
+            # added to them
+            url = f"https://www.wota.org.uk/MM_{ref_id}"
+            if ref_id.upper().startswith("LDO-"):
+                number = int(ref_id.upper().replace("LDO-", ""))
+                url = f"https://www.wota.org.uk/MM_LDO-{number + 214!s}"
+
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=feature["properties"]["title"],
+                    url=url,
+                    ref_type=ActivityRefType.SUMMIT,
+                    grid=feature["properties"]["qthLocator"],
+                    latitude=feature["geometry"]["coordinates"][1],
+                    longitude=feature["geometry"]["coordinates"][0],
+                    altitude=feature["properties"]["height"],
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,47 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class WWBOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Worldwide Bunkers on the Air"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.WWBOTA
+    DATA_URL = "https://api.wwbota.org/bunkers/?format=CSV"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
+            ref_id = row["Reference"]
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=row.get("Name", None),
+                    ref_type=ActivityRefType.BUNKER,
+                    url=f"https://bunkerwiki.org/?s={ref_id}" if ref_id.startswith("B/G") else None,
+                    grid=row["Locator"] if "Locator" in row and row["Locator"] != "" else None,
+                    latitude=float(row["Lat"]) if "Lat" in row and row["Lat"] != "" else None,
+                    longitude=float(row["Long"]) if "Long" in row and row["Long"] != "" else None,
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,51 @@
+import csv
+from time import sleep
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class WWFF(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Worldwide Flora & Fauna"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.WWFF
+    DATA_URL = "https://wwff.co/wwff-data/wwff_directory.csv"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
+            ref_id = row["reference"]
+            new_data.append(
+                ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=row.get("name", None),
+                    ref_type=ActivityRefType.PARK,
+                    url=f"https://wwff.co/directory/?showRef={ref_id}",
+                    grid=row["iaruLocator"] if "iaruLocator" in row and row["iaruLocator"] != "-" else None,
+                    latitude=float(row["latitude"])
+                    if "latitude" in row and row["latitude"] != "" and row["latitude"] != "-"
+                    else None,
+                    longitude=float(row["longitude"])
+                    if "longitude" in row and row["longitude"] != "" and row["longitude"] != "-"
+                    else None,
+                )
+            )
+
+            # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest of
+            # the data in this case
+            if self._stop_event.is_set():
+                break
+
+            # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+            # is available for other threads e.g. the web server.
+            sleep(0.001)
+
+        return new_data
@@ -0,0 +1,65 @@
+from time import sleep
+
+from pyhamtools.locator import latlong_to_locator
+
+from core.enums import ActivityName, ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)
+
+
+class ZLOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for New Zealand on the Air"""
+
+    POLL_INTERVAL_DAYS = 30
+    ACTIVITY = ActivityName.ZLOTA
+    DATA_URL = "https://ontheair.nz/assets/assets.json"
+
+    def __init__(self, provider_config):
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+
+    def _http_response_to_data(self, http_response):
+        new_data = []
+        data = http_response.json()
+        if isinstance(data, list):
+            for ref in data:
+                ref_id = ref["code"]
+                latitude = ref["latitude"]
+                longitude = ref["longitude"]
+                try:
+                    ref_type = ActivityRefType(ref["asset_type"].title().upper())
+                except ValueError:
+                    ref_type = None
+
+                new_ref = ActivityRef(
+                    sig=self.ACTIVITY,
+                    id=ref_id,
+                    name=ref["name"],
+                    ref_type=ref_type,
+                    url=f"https://ontheair.nz/assets/{ref_id.replace('/', '_')}",
+                    latitude=latitude,
+                    longitude=longitude,
+                )
+
+                # Check lat/lon validity and update grid accordingly
+                if latitude and longitude:
+                    try:
+                        new_ref.grid = latlong_to_locator(latitude, longitude, 6)
+                    except ValueError:
+                        # Junk lat/lon, remove from the spot
+                        new_ref.latitude = None
+                        new_ref.longitude = None
+
+                new_data.append(new_ref)
+
+                # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
+                # of the data in this case
+                if self._stop_event.is_set():
+                    break
+
+                # Very short pause. This will extend the time to handle activity refs by a few seconds but will ensure some time
+                # is available for other threads e.g. the web server.
+                sleep(0.001)
+
+        return new_data
@@ -2,27 +2,20 @@ from datetime import datetime

 import pytz

-from core.config import MAX_ALERT_AGE
+from core.data_store import DATA_STORE


 class AlertProvider:
    """Generic alert provider class. Subclasses of this query the individual APIs for alerts."""

-    def __init__(self, provider_config):
+    def __init__(self, name, provider_config):
        """Constructor"""

-        self.name = provider_config["name"]
-        self.enabled = provider_config["enabled"]
+        self.name = name
+        self.enabled = provider_config.get("enabled", True)
        self.last_update_time = datetime.min.replace(tzinfo=pytz.UTC)
        self.status = "Not Started" if self.enabled else "Disabled"
-        self._alerts = None
-        self._web_server = None
-
-    def setup(self, alerts, web_server):
-        """Set up the provider, e.g. giving it the alert list to work from"""
-
-        self._alerts = alerts
-        self._web_server = web_server
+        self._alerts = DATA_STORE.alerts

    def start(self):
        """Start the provider. This should return immediately after spawning threads to access the remote resources"""
@@ -36,7 +29,7 @@ class AlertProvider:

        # Sort the batch so that earliest ones go in first. This helps keep the ordering correct when alerts are fired
        # off to SSE listeners.
-        alerts = sorted(alerts, key=lambda a: (a.start_time if a and a.start_time else 0))
+        alerts = sorted(alerts, key=lambda a: a.start_time if a and a.start_time else 0)
        for alert in alerts:
            # Fill in any blanks and add to the list
            alert.infer_missing()
@@ -44,10 +37,7 @@ class AlertProvider:

    def _add_alert(self, alert):
        if not alert.expired():
-            self._alerts.add(alert.id, alert, expire=MAX_ALERT_AGE)
-            # Ping the web server in case we have any SSE connections that need to see this immediately
-            if self._web_server:
-                self._web_server.notify_new_alert(alert)
+            self._alerts.set(alert.id, alert)

    def stop(self):
        """Stop any threads and prepare for application shutdown"""
@@ -0,0 +1,65 @@
+from datetime import datetime, timedelta
+
+import pytz
+from bs4 import BeautifulSoup
+
+from core.enums import ActivityName
+from data.activity_ref import ActivityRef
+from data.alert import Alert
+from providers.alert.http_alert_provider import HTTPAlertProvider
+
+
+class BOTA(HTTPAlertProvider):
+    """Alert provider for Beaches on the Air"""
+
+    POLL_INTERVAL_SEC = 1800
+    ALERTS_URL = "https://www.beachesontheair.com/"
+
+    def __init__(self, provider_config):
+        super().__init__("BOTA", provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
+
+    def _http_response_to_alerts(self, http_response):
+        new_alerts = []
+        # Find the table of upcoming alerts
+        bs = BeautifulSoup(http_response.content.decode("utf-8-sig"), features="lxml")
+        if not bs.body:
+            return new_alerts
+        div = bs.body.find("div", attrs={"class": "view-activations-public"})
+        if div:
+            table = div.find("table", attrs={"class": "views-table"})
+            if table:
+                tbody = table.find("tbody")
+                if not tbody:
+                    return new_alerts
+                for row in tbody.find_all("tr"):
+                    cells = row.find_all("td")
+                    first_cell_anchor = cells[0].find("a") if len(cells) > 0 else None
+                    second_cell_anchor = cells[1].find("a") if len(cells) > 1 else None
+                    if not first_cell_anchor or not second_cell_anchor:
+                        continue
+                    first_cell_text = first_cell_anchor.get_text().strip()
+                    ref_name = first_cell_text.split(" by ")[0]
+                    dx_call = second_cell_anchor.get_text().strip().upper()
+
+                    # Get the date, dealing with the fact we get no year so have to figure out if it's last year or next year
+                    date_span = cells[2].find("span") if len(cells) > 2 else None
+                    if not date_span:
+                        continue
+                    date_text = date_span.get_text().strip()
+                    date_time = datetime.strptime(date_text, "%d %b - %H:%M UTC").replace(tzinfo=pytz.UTC)
+                    date_time = date_time.replace(year=datetime.now(pytz.UTC).year)
+                    # If this was more than a day ago, activation is actually next year
+                    if date_time < datetime.now(pytz.UTC) - timedelta(days=1):
+                        date_time = date_time.replace(year=datetime.now(pytz.UTC).year + 1)
+
+                    # Convert to our alert format
+                    alert = Alert(
+                        source=self.name,
+                        dx_calls=[dx_call],
+                        sig=ActivityName.BOTA,
+                        sig_refs=[ActivityRef(id=ref_name, sig=ActivityName.BOTA)],
+                        start_time=date_time.timestamp(),
+                    )
+
+                    new_alerts.append(alert)
+        return new_alerts
@@ -0,0 +1,56 @@
+from datetime import datetime
+
+import pytz
+
+from core.enums import ActivityName
+from data.activity_ref import ActivityRef
+from data.alert import Alert
+from providers.alert.http_alert_provider import HTTPAlertProvider
+
+
+class Hamsat(HTTPAlertProvider):
+    """Alert provider for Hamsat (hams.at)"""
+
+    POLL_INTERVAL_SEC = 1800
+    ALERTS_URL = "https://hams.at/api/alerts"
+
+    def __init__(self, provider_config):
+        super().__init__("Hamsat", provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
+
+    def _http_response_to_alerts(self, http_response):
+        new_alerts = []
+        # Iterate through source data
+        for source_alert in http_response.json()["data"]:
+            # Convert to our alert format
+            freqs_modes = source_alert.get("mode", "")
+            if "mhz" in source_alert:
+                if "mhz_direction" in source_alert:
+                    freqs_modes = f"{source_alert['mhz']!s} {source_alert['mhz_direction']}, {freqs_modes}"
+                else:
+                    freqs_modes = f"{source_alert['mhz']!s}, {freqs_modes}"
+
+            alert = Alert(
+                source=self.name,
+                source_id=source_alert["id"],
+                dx_calls=[source_alert["callsign"].upper()],
+                freqs_modes=freqs_modes,
+                comment=source_alert["comment"],
+                sig=ActivityName.SATELLITE,
+                # Fudge an activity ref to provide the remaining bits of data we need: the satellite and the operator's grid
+                sig_refs=[
+                    ActivityRef(
+                        sig=ActivityName.SATELLITE,
+                        id=f"{source_alert['satellite']['name']} from {source_alert['grids'][0]}",
+                    )
+                ],
+                start_time=datetime.strptime(source_alert["aos_at"], "%Y-%m-%dT%H:%M:%SZ")
+                .replace(tzinfo=pytz.UTC)
+                .timestamp(),
+                end_time=datetime.strptime(source_alert["los_at"], "%Y-%m-%dT%H:%M:%SZ")
+                .replace(tzinfo=pytz.UTC)
+                .timestamp(),
+            )
+
+            # Add to our list
+            new_alerts.append(alert)
+        return new_alerts
--- a/Show More
+++ b/Show More