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-21 06:47: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
217 changed files with 7576 additions and 3688 deletions
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
@@ -3,6 +3,7 @@
    <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" />
@@ -43,6 +44,34 @@
    <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" />
@@ -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,5 +1,5 @@
 <?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" />
@@ -4,5 +4,6 @@ WORKDIR /app
 COPY . .
 RUN pip install --no-cache-dir -r requirements.txt
 EXPOSE 8080
+EXPOSE 7373

 CMD ["python3", "spothole.py"]
@@ -1,7 +1,9 @@
 # ![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.
+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)

@@ -17,10 +19,10 @@ Spothole itself is also open source, Public Domain licenced code that anyone can

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

-Additional Special Interest Groups (SIGs) without their own specific data source include KRMNPA, SANPCPA, WAB, WAI and
-DME.
+You can read more about Spothole on [the "About" page of the main server instance](https://spothole.app/about).

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

@@ -34,50 +36,39 @@ see [https://spothole.app/apidocs](https://spothole.app/apidocs) for the API det
 This is a Progressive Web App, so you can also "install" it to your Android or iOS device by accessing it in Chrome or
 Safari respectively, and following the menu-driven process for installing PWAs.

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

 * [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)
+    * [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)

+![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. `/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.
+`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 set of flag icons generated using the "Noto Color Emoji" font on a Debian system, in the
 `/static/img/flags/` directory.

-The software uses a number of Python libraries as listed in `requirements.txt`, and a number of JavaScript libraries.
-This project would not have been possible without these libraries, so many thanks to their developers.
+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.

-### Third Party Libraries
-
-A number of third-party libraries are self-hosted in the `/static/vendor/` directory. These files are subject to
-their own licences and are not covered by the overall licence declared in the `LICENSE` file.
-
-A number of third-party libraries are self-hosted in the `/webassets/vendor/` directory. These files are subject to
-their own licences and are not covered by the overall licence declared in the `LICENSE` file.
-
-Particular thanks go to country-files.com for providing country lookup data for amateur radio, to K0SWE
-for [this JSON-formatted DXCC data](https://github.com/k0swe/dxcc-json/), and to the developers of `pyhamtools` for
-making it easy to use country-files.com data as well as QRZ.com and Clublog lookup.
-
-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).
@@ -17,6 +17,15 @@ api_only_mode: false
 # The base URL at which the software runs.
 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 and an enabled/disabled state. Some require more config such as hostnames/IP
@@ -67,8 +76,8 @@ spot_providers:

  - 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.
-    name: "HRD Cluster"
+    # 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,11 +93,11 @@ spot_providers:
    allow_rbn_spots: false

  - class: "DXCluster"
-    name: "W3LPL Cluster"
+    name: "Cluster"
    enabled: false
    host: "w3lpl.net"
    port: 7373
-    login_prompt: "Please enter your call:"
+    login_prompt: "login:"
    login_callsign: "N0CALL-99"
    allow_rbn_spots: false

@@ -119,12 +128,12 @@ spot_providers:
    name: "C3 TOTA"
    enabled: false
    url: "wss://39c3.totawatch.de/api/spot/live"
-    # For the "XOTA" provider, a SIG must be set menually here because xOTA is a generic backend for 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 SIG 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!)
+    # 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"
@@ -162,9 +171,21 @@ alert_providers:
  - class: "BOTA"
    enabled: true

+  - 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/v2/solar endpoint.
@@ -195,8 +216,8 @@ static_data_providers:
    enabled: true


-# SIG 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.
+# 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
@@ -246,12 +267,36 @@ sig_ref_data_providers:
  - 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

@@ -275,27 +320,27 @@ callsign_data_providers:
    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: 3
+    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: 4
+    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: ""

-  - class: "CountryFiles"
-    priority: 5
-    enabled: true
-

 # Maximum time to keep spots and alerts in the system before deleting them. By default, one hour for spots and one week
 # for alerts.
@@ -345,4 +390,6 @@ web_ui_options:
  # (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,3 +1,5 @@
+import re
+
 from core.data_providers import DATA_PROVIDERS
 from data.callsign import Callsign

@@ -9,10 +11,11 @@ def get_call_info(callsign, lookup_credentials):

    callsign_data = Callsign(call=callsign)

-    if 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 p: p.priority):
+        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)
@@ -27,4 +30,4 @@ def get_call_info(callsign, lookup_credentials):
                    if callsign_data.fully_populated():
                        break

-    return callsign_data
+    return callsign_data
@@ -0,0 +1,77 @@
+import logging
+from datetime import datetime
+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):
+        """Constructor"""
+
+        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"""
+
+        self._thread = Thread(target=self._run, 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=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):
+            self._cleanup()
+
+    def _cleanup(self):
+        """Perform cleanup and reschedule next timer"""
+
+        try:
+            for i in list(DATA_STORE.spots.keys()):
+                try:
+                    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(DATA_STORE.alerts.keys()):
+                try:
+                    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
+
+            self.status = "OK"
+            self.last_cleanup_time = datetime.now(pytz.UTC)
+
+        except Exception:
+            self.status = "Error"
+            logger.exception("Exception in Cleanup thread")
+            self._stop_event.wait(timeout=1)
+
+
+# Global object
+CLEANUP_TIMER = CleanupTimer()
@@ -1,25 +1,32 @@
 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.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", {})
@@ -30,7 +37,9 @@ LOG_LEVEL = config.get("log_level", "INFO")
 LOG_WEB_REQUESTS = config.get("log_web_requests", False)

 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["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

@@ -40,6 +49,6 @@ def create_provider_from_config(package, config_providers_entry):
    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(package + "." + config_providers_entry["class"].lower())
+    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,65 +1,12 @@
 from core.config import SERVER_OWNER_CALLSIGN
 from data.band import Band
-from data.sig import SIG

 # General software
-SOFTWARE_VERSION = "2.0-pre"
+SOFTWARE_VERSION = "2.2-pre"

 # HTTP headers used for spot providers that use HTTP
-HTTP_HEADERS = {"User-Agent": "Spothole v" + SOFTWARE_VERSION + " (operated by " + SERVER_OWNER_CALLSIGN + ")"}
-HAMQTH_PRG = ("Spothole v" + SOFTWARE_VERSION + " operated by " + SERVER_OWNER_CALLSIGN).replace(" ", "_")
-
-# Special Interest Groups
-SIGS = [
-    SIG(name="POTA", comment_names=["POTA"], description="Parks on the Air", ref_regex=r"[A-Z]{2}\-\d{4,5}|K\-TEST"),
-    SIG(name="SOTA", comment_names=["SOTA"], description="Summits on the Air", ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}"),
-    SIG(name="WWFF", comment_names=["WWFF"], description="World Wide Flora & Fauna", ref_regex=r"[A-Z0-9]{1,3}FF\-\d{4}"),
-    SIG(name="GMA", comment_names=["GMA"], description="Global Mountain Activity", ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}"),
-    SIG(name="WWBOTA", comment_names=["WWBOTA", "BOTA"], description="Worldwide Bunkers on the Air", ref_regex=r"B\/[A-Z0-9]{1,3}\-\d{3,4}"),
-    SIG(name="HEMA", comment_names=["HEMA"], description="HuMPs Excluding Marilyns Award", ref_regex=r"[A-Z0-9]{1,3}\/[A-Z]{3}\-\d{3}"),
-    SIG(name="IOTA", comment_names=["IOTA"], description="Islands on the Air", ref_regex=r"[A-Z]{2}\-\d{3}"),
-    SIG(name="MOTA", comment_names=["MOTA"], description="Mills on the Air", ref_regex=r"X\d{4,6}"),
-    SIG(name="ARLHS", comment_names=["ARLHS"], description="Amateur Radio Lighthouse Society", ref_regex=r"[A-Z]{3}[\- ]\d{3,4}"),
-    SIG(name="ILLW", comment_names=["ILLW"], description="International Lighthouse & Lightship Weekend", ref_regex=r"[A-Z]{2}\d{4}"),
-    SIG(name="SIOTA", comment_names=["SIOTA"], description="Silos on the Air", ref_regex=r"[A-Z]{2}\-[A-Z]{3}\d"),
-    SIG(name="WCA", comment_names=["WCA"], description="World Castles Award", ref_regex=r"[A-Z0-9]{1,3}\-\d{5}"),
-    SIG(name="ZLOTA", comment_names=["ZLOTA"], description="New Zealand on the Air", ref_regex=r"ZL[A-Z]/[A-Z]{2}\-\d{3,4}"),
-    SIG(name="WOTA", comment_names=["WOTA"], description="Wainwrights on the Air", ref_regex=r"[A-Z]{3}-[0-9]{2}"),
-    SIG(name="BOTA", comment_names=[], description="Beaches on the Air"),
-    SIG(name="KRMNPA", comment_names=["KRMNPA"], description="Keith Roget Memorial National Parks Award", ref_regex=r"VKFF\-\d{4}"),
-    SIG(name="SANPCPA", comment_names=["SANPCPA"], description="South Australian National Parks and Conservation Parks Award", ref_regex=r"VKFF\-\d{4}"),
-    SIG(name="LLOTA", comment_names=["LLOTA"], description="Lagos y Lagunas on the Air", ref_regex=r"LL[A-Z]{2}\-\d{4}"),
-    SIG(name="Towers", comment_names=["TOTA"], description="Towers on the Air", ref_regex=r"[A-Z]{2,3}R\-\d{4}"),
-    SIG(name="Tiles", comment_names=[], description="Tiles on the Air", ref_regex=r"[A-Za-z]{2}[0-9]{2}[A-Za-z]{2}"),
-    SIG(name="WAB", comment_names=["WAB"], description="Worked All Britain", ref_regex=r"[A-Z]{1,2}[0-9]{2}"),
-    SIG(name="WAI", comment_names=["WAI"], description="Worked All Ireland", ref_regex=r"[A-Z][0-9]{2}"),
-    SIG(name="DME", comment_names=["DME"], description="Diplomas de Municipios Españoles", ref_regex=r"\d{4,5}"),
-    SIG(name="Toilets", comment_names=[], 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", "FUSION", "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"]
-SSB_SUB_MODES = ["USB", "LSB"]
-DV_SUB_MODES = ["DMR", "DSTAR", "C4FM", "FUSION", "M17"]
-
-# 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 = [
@@ -76,7 +23,7 @@ BANDS = [
    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, is_ham_hf=True),
-    Band(name="6m", start_freq=50000000, end_freq=54000000),
+    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),
@@ -88,12 +35,10 @@ 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 = {
@@ -106,5 +51,6 @@ PROPAGATION_MODES = {
    "MS": "Meteor scatter",
    "RS": "Rain scatter",
    "AS": "Aircraft scatter",
-    "SAT": "Satellite"
+    "ACS": "Aircraft scatter",
+    "SAT": "Satellite",
 }
@@ -1,8 +1,11 @@
 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."""
@@ -14,7 +17,7 @@ class DataProviders:
        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"]:
@@ -26,15 +29,15 @@ class DataProviders:
        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.sigrefdata", entry))
+            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, type):
+    def start_providers(providers, provider_type):
        """Helper method to activate enabled providers in the list."""

-        logging.info(f"Starting %s providers...", type)
+        logger.info(f"Starting {provider_type} providers...")
        for p in providers:
            if p.enabled:
                p.start()
@@ -42,32 +45,59 @@ class DataProviders:
    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.
-        threading.Timer(5.0, lambda: self.start_providers(self.static_data_providers, "static data")).start()
-        threading.Timer(10.0, lambda: self.start_providers(self.callsign_data_providers, "callsign data")).start()
-        threading.Timer(15.0, lambda: self.start_providers(self.spot_providers, "spot")).start()
-        threading.Timer(20.0, lambda: self.start_providers(self.alert_providers, "alert")).start()
-        threading.Timer(25.0, lambda: self.start_providers(self.solar_condition_providers, "solar condition")).start()
-        threading.Timer(30.0, lambda: self.start_providers(self.sig_ref_data_providers, "SIG ref data")).start()
+        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):
-        for sp in self.spot_providers:
-            if sp.enabled:
-                sp.stop()
-        for ap in self.alert_providers:
-            if ap.enabled:
-                ap.stop()
-        for scp in self.solar_condition_providers:
-            if scp.enabled:
-                scp.stop()
-        for srdp in self.sig_ref_data_providers:
-            if srdp.enabled:
-                srdp.stop()
-        for sdp in self.static_data_providers:
-            if sdp.enabled:
-                sdp.stop()
-        for cdp in self.callsign_data_providers:
-            if cdp.enabled:
-                cdp.stop()
+        # 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()
+DATA_PROVIDERS = DataProviders()
@@ -4,16 +4,19 @@ from pathlib import Path

 import diskcache

-from core.config import MAX_SPOT_AGE, MAX_ALERT_AGE
+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, SIG reference data, and callsign
-    lookup data using different caching strategies for each."""
+    """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
@@ -31,11 +34,9 @@ class DataStore:
        self.callsign_data_hamqth = None
        self.dxcc_data = None
        self.dxcc_lookup_by_call_regex = []
-        self.sigrefs = None
-        self.status_data = {}
-        self._status = None
-        self.solar_conditions = {}
-        self._solar = None
+        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
@@ -44,54 +45,60 @@ class DataStore:
    def setup(self):
        Path(CACHE_DIR).mkdir(parents=True, exist_ok=True)

-        # Standard disk cache for solar data and status data, but each cache contains only a single object which we
-        # expose to the wider application
-        self._solar = diskcache.Cache(CACHE_DIR + "solar")
-        if "solar_conditions" not in self._solar:
-            self._solar.add("solar_conditions", SolarConditions())
-        self.solar_conditions = self._solar.get("solar_conditions")
-        self._status = diskcache.Cache(CACHE_DIR + "status")
-        if "status_data" not in self._status:
-            self._status.add("status_data", {})
-        self.status_data = self._status.get("status_data")
+        # 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 SIG 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(CACHE_DIR + "dxcc_data")
+        # 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 SIG reference data specifically, we need to key on both SIG *and* reference, and trying to do two layers
-        # of dict in diskcache absolutely destroys performance with unpickling huge dicts, so we have an ugly "SIG:ref"
-        # syntax for keys to keep it a single level.
-        self.sigrefs = diskcache.Cache(CACHE_DIR + "sigrefs")
-        logging.info(f"Loaded data for %d SIG references.", len(self.sigrefs))
+        # 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(CACHE_DIR + "callsign_data_countryfiles")
-        self.callsign_data_clublogxml = diskcache.Cache(CACHE_DIR + "callsign_data_clublogxml")
-        self.callsign_data_clublogapi = diskcache.Cache(CACHE_DIR + "callsign_data_clublogapi")
-        self.callsign_data_qrz = diskcache.Cache(CACHE_DIR + "callsign_data_qrz")
-        self.callsign_data_hamqth = diskcache.Cache(CACHE_DIR + "callsign_data_hamqth")
+        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]:
+        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)
-        logging.info(f"Loaded data for %d callsigns.", len(unique_keys))
+        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 sigref 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=CACHE_DIR + "spots",
-                                   snapshot_interval_sec=self._SPOT_ALERT_SNAPSHOT_INTERVAL_SEC)
-        logging.info(f"Loaded %d spots from a previous run.", len(self.spots.keys()))
+        # 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=CACHE_DIR + "alerts",
-                                    snapshot_interval_sec=self._SPOT_ALERT_SNAPSHOT_INTERVAL_SEC)
-        logging.info(f"Loaded %d alerts from a previous run.", len(self.alerts.keys()))
+        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
@@ -99,21 +106,23 @@ class DataStore:
        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.close()
-        self._status.close()
+        self.solar_conditions.close()
+        self.status.close()
        self.dxcc_data.close()
-        self.sigrefs.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()
+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,12 +1,14 @@
 import logging
 import re
-from math import floor
+from math import floor, isnan

 from pyproj import Transformer
 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")
@@ -71,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:
@@ -113,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
@@ -154,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
@@ -172,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


@@ -5,6 +5,8 @@ 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
@@ -20,6 +22,8 @@ class LiveDataCache:
        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)

@@ -34,8 +38,7 @@ class LiveDataCache:
            try:
                callback(value)
            except Exception:
-                logging.error("Listener raised an exception for key %s", key, exc_info=True)
-
+                logger.exception(f"Listener raised an exception for key {key}")

    def get(self, key, default=None):
        with self._lock:
@@ -70,11 +73,16 @@ class LiveDataCache:
            data = [(k, v, time.time()) for k, v in self._cache.items()]
        try:
            self._disk_cache.set("snapshot", data)
-        except Exception as e:
-            logging.error("Failed to write snapshot to %s", self._snapshot_dir, e, exc_info=True)
+        except Exception:
+            logger.exception(f"Failed to write snapshot to {self._snapshot_dir}")

    def _load_snapshot(self):
-        data = self._disk_cache.get("snapshot")
+        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

@@ -84,17 +92,23 @@ class LiveDataCache:
                # Only restore entries that would still be within TTL
                if now - saved_at < self._ttl:
                    self._cache[key] = value
-        logging.info("Loaded snapshot from %s", self._snapshot_dir)
+        logger.info(f"Loaded snapshot from {self._snapshot_dir}")

    def _start_periodic_snapshot(self, interval):
        def loop():
-            while True:
-                time.sleep(interval)
+            while not self._stop_event.wait(timeout=interval):
                self.save_snapshot()

-        t = threading.Thread(target=loop, name=f"LiveDataCache-Snapshot-{self._snapshot_dir}")
-        t.start()
+        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,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,101 +0,0 @@
-import logging
-
-from pyhamtools.locator import locator_to_latlong, latlong_to_locator
-
-from core.data_store import DATA_STORE
-from core.geo_utils import wab_wai_square_to_lat_lon
-from data.sig_ref import SIGRef
-
-
-def get_sig_ref_info(sig, ref_id):
-    """Look up details of a SIG reference (e.g. POTA park) such as name, lat/lon, and grid. Takes in a sig name and
-    a reference ID (both strings) and returns a SigRef object populated with as much data as we can find. This makes
-    use of SIG ref data in the data store, live lookups from the web, or just automatic calculation depending on which
-    SIG we are getting data for."""
-
-    if sig is None or sig == "" or ref_id is None or ref_id == "":
-        logging.debug("Failed to look up sig_ref info, sig or ref were not set.")
-        return None
-
-    sig_ref = SIGRef(sig=sig, id=ref_id)
-
-    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.
-        if sig.upper() == "DME":
-            ref_id = ref_id.zfill(5)
-
-        # If the SIG is HEMA, we have no current lookup for this so just skip the lookup here.
-        if sig.upper() == "HEMA":
-            return sig_ref
-
-        ### PROGRAMMATIC DATA GENERATION INSTEAD OF LOOKUPS ###
-        #
-        # If the SIG 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 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(str(sig_ref.grid))
-                sig_ref.latitude = ll[0]
-                sig_ref.longitude = ll[1]
-            return sig_ref
-
-        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.warning("Invalid lat/lon received for WAB/WAI reference")
-            return sig_ref
-
-        elif sig.upper() == "BOTA":
-            # For BOTA all we can ever generate is the URL, there is no data file or lookup for lat/longs
-            if not sig_ref.name:
-                sig_ref.name = sig_ref.id
-            sig_ref.url = "https://www.beachesontheair.com/beaches/" + sig_ref.name.lower().replace(" ", "-")
-            return sig_ref
-
-        ### ACTUAL LOOKUP ###
-        #
-        # OK, this is something we have to look up. Now check to see if our data store contains reference data and use
-        # that.
-        key = sig + ":" + ref_id
-        lookup_data = DATA_STORE.sigrefs.get(key) if key in DATA_STORE.sigrefs else None
-        if lookup_data:
-            return lookup_data
-
-        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.
-            logging.debug("%s database did not contain data for ref %s", sig, ref_id)
-
-    except Exception:
-        logging.error("Exception when looking up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)
-    return sig_ref
-
-
-def populate_missing_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. 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_sig_ref_info(sig_ref.sig, sig_ref.id)
-
-    if lookup_data:
-        # Copy new sig ref data into existing object where data was previously missing
-        for key, value in lookup_data.__dict__.items():
-            if value is not None and sig_ref.__dict__.get(key) is None:
-                sig_ref.__dict__[key] = value
-
-    return sig_ref
@@ -1,24 +0,0 @@
-from core.constants import SIGS
-
-
-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 get_sig_name_from_comment_name(sig):
-    """Utility function to get the name of a SIG 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 s in SIGS:
-        if any(n.upper() == sig.upper() for n in s.comment_names):
-            return s.name
-    return None
-
-
-# Regex matching any SIG's "comment name", i.e. how it may be referred to in spot comments
-ANY_SIG_REGEX = r"(" + r"|".join(n for s in SIGS for n in s.comment_names) + r")"
@@ -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,16 +1,21 @@
+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.data_providers import DATA_PROVIDERS
 from core.data_store import DATA_STORE
-from core.prometheus_metrics_handler import memory_use_gauge, spots_gauge, alerts_gauge
-from server.webserver import WEB_SERVER
+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:
@@ -24,19 +29,24 @@ class StatusReporter:
        self._stop_event = Event()
        self._startup_time = datetime.now(pytz.UTC)

-        DATA_STORE.status_data["software_version"] = SOFTWARE_VERSION
-        DATA_STORE.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, name="StatusReporter")
+        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"""
@@ -49,57 +59,98 @@ class StatusReporter:
    def _report(self):
        """Write status information"""

-        DATA_STORE.status_data["uptime"] = (datetime.now(pytz.UTC) - self._startup_time).total_seconds()
-        DATA_STORE.status_data["mem_use_mb"] = round(psutil.Process(os.getpid()).memory_info().rss / (1024 * 1024), 3)
-        DATA_STORE.status_data["num_spots"] = len(DATA_STORE.spots.values())
-        DATA_STORE.status_data["num_alerts"] = len(DATA_STORE.alerts.values())
-        DATA_STORE.status_data["spot_providers"] = list(
-            map(lambda p: {"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},
-                DATA_PROVIDERS.spot_providers))
-        DATA_STORE.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},
-                DATA_PROVIDERS.alert_providers))
-        DATA_STORE.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},
-                DATA_PROVIDERS.solar_condition_providers))
-        DATA_STORE.status_data["static_data_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},
-                DATA_PROVIDERS.static_data_providers))
-        DATA_STORE.status_data["sig_ref_data_providers"] = list(
-            map(lambda p: {"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},
-                DATA_PROVIDERS.sig_ref_data_providers))
-        DATA_STORE.status_data["callsign_data_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,
-                           "lookup_count": p.lookup_count},
-                DATA_PROVIDERS.callsign_data_providers))
-        DATA_STORE.status_data["webserver"] = {"status": WEB_SERVER.web_server_metrics["status"],
-                                               "last_api_access": WEB_SERVER.web_server_metrics[
-                                                   "last_api_access_time"].replace(
-                                                   tzinfo=pytz.UTC).timestamp() if WEB_SERVER.web_server_metrics[
-                                                   "last_api_access_time"] else 0,
-                                               "api_access_count": WEB_SERVER.web_server_metrics["api_access_counter"],
-                                               "last_page_access": WEB_SERVER.web_server_metrics[
-                                                   "last_page_access_time"].replace(
-                                                   tzinfo=pytz.UTC).timestamp() if WEB_SERVER.web_server_metrics[
-                                                   "last_page_access_time"] else 0,
-                                               "page_access_count": 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)
@@ -14,12 +14,14 @@ class URLDataCache(CachedSession):
    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."""

-    _lock = threading.Lock()
-
    def __init__(self, name):
-        super().__init__(CACHE_DIR + "urls/" + name, expire_after=timedelta(days=1),
-                         allowable_codes=(200, 400, 401, 403, 404))
+        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)
+            return super().get(*args, **kwargs)
@@ -1,12 +1,16 @@
 import logging
+import re

 import simplejson
 from pyhamtools.frequency import freq_to_band
 from pyhamtools.locator import latlong_to_locator

-from core.constants import UNKNOWN_BAND, BANDS, CW_MODES, PHONE_MODES, DATA_MODES, MODE_ALIASES, ALL_MODES
+from core.constants import BANDS, UNKNOWN_BAND
 from core.data_store import DATA_STORE
-from data.callsign import Callsign
+from core.enums import MODE_ALIASES, Continent, Mode, ModeType
+from data.callsign import Callsign, LocationSourceForCallsign
+
+logger = logging.getLogger(__name__)


 def safe_json_dumps(obj):
@@ -16,30 +20,42 @@ def safe_json_dumps(obj):
    return simplejson.dumps(obj, ensure_ascii=False, ignore_nan=True, default=lambda o: o.__dict__)


-def infer_mode_from_comment(comment):
+def infer_mode_from_comment(comment: str) -> Mode | None:
    """Infer a mode from the comment"""

-    for mode in ALL_MODES:
-        if mode in comment.upper():
+    if not comment:
+        return None
+
+    for mode in Mode:
+        if re.search(r"(^|\W)" + mode + r"($|\W)", comment, re.IGNORECASE):
            return mode
-    for mode in MODE_ALIASES.keys():
-        if mode in comment.upper():
-            return MODE_ALIASES[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):
-    """Infer a "mode family" from a mode."""
+def infer_mode_type_from_mode(mode: str) -> ModeType | None:
+    """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.")
+    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


@@ -60,16 +76,39 @@ def infer_mode_from_frequency(freq):
        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
+        # 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):
+        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):
+        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
+
+        if not mode:
+            return None
+
+        mode = mode.upper()
+        if mode in MODE_ALIASES:
+            mode = MODE_ALIASES[mode]
+
+        return Mode(mode)
+
    except KeyError:
        return None

@@ -77,7 +116,7 @@ def infer_mode_from_frequency(freq):
 def get_flag_for_dxcc(dxcc):
    """Get an emoji flag for a given DXCC entity ID"""

-    dxcc_data = DATA_STORE.dxcc_data[dxcc] if dxcc in DATA_STORE.dxcc_data else None
+    dxcc_data = DATA_STORE.dxcc_data.get(dxcc, None)
    return dxcc_data["flag"] if dxcc_data else None


@@ -89,28 +128,30 @@ def get_callsign_object_from_pyhamtools_callinfo(callsign, callinfo):
        home_call = callinfo.get_homecall(callsign)
        data = callinfo.get_all(callsign)

-        country = data["country"] if "country" in data else None
-        dxcc_id = data["adif"] if "adif" in data else None
-        continent = data["continent"] if "continent" in data else None
-        cq_zone = data["cqz"] if "cqz" in data else None
-        itu_zone = data["ituz"] if "ituz" in data else None
+        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="DXCC")
+        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
@@ -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,16 +1,19 @@
-import copy
 import hashlib
 import json
 import logging
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from datetime import datetime, timedelta

 import pytz

+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.sig_lookup_helper import populate_missing_sig_ref_info
+from core.enums import Continent
 from core.utils import get_flag_for_dxcc

+logger = logging.getLogger(__name__)
+

@dataclass
 class Alert:
@@ -18,6 +21,9 @@ class Alert:

    # Unique identifier for the alert
    id: str | None = None
+
+    # DX (alerting) operator info
+
    # Callsigns of the operators that has been alerted
    dx_calls: list | None = None
    # Names of the operators that has been alerted
@@ -27,13 +33,16 @@ class Alert:
    # Country flag of the DX operator
    dx_flag: str | None = None
    # Continent of the DX operator
-    dx_continent: str | None = None
+    dx_continent: Continent | None = None
    # DXCC ID of the DX operator
    dx_dxcc_id: int | None = None
    # CQ zone of the DX operator
    dx_cq_zone: int | None = None
    # ITU zone of the DX operator
    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 = None
    # Start time of the activation, UTC seconds since UNIX epoch
@@ -44,25 +53,40 @@ class Alert:
    end_time: float | None = None
    # End time of the activation of the alert, ISO 8601
    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 = None
    # Time that this software received the alert, ISO 8601
    received_time_iso: str | None = None
-    # Comment made by the alerter, if any
-    comment: str | None = None
-    # Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-    sig: str | None = None
-    # SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
-    sig_refs: list | None = None
-    # Whether this alert is for a DXpedition, as opposed to e.g. an xOTA programme.
-    is_dxpedition: bool = False
+
+    # Source info
+
    # Where we got the alert from, e.g. "POTA", "SOTA"...
    source: str | None = None
    # The ID the source gave it, if any.
    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"""

@@ -90,8 +114,8 @@ class Alert:
                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 not self.dx_continent:
-                    self.dx_continent = call_info.continent
+                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:
@@ -101,38 +125,40 @@ class Alert:
                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_missing_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:
+            # 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.
+            # 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:
-                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()
+                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 name lookup, using QRZ.com/HamQTH.
            if self.dx_calls and not self.dx_names:
-                self.dx_names = list(
-                    map(lambda c: get_call_info(c, credentials).name, self.dx_calls))
+                self.dx_names = [get_call_info(c, credentials).name for c in self.dx_calls]

-        except Exception as e:
-            logging.error("Exception while inferring missing data from spot", e, exc_info=True)
+            # 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"""
@@ -145,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())
+        )
@@ -1,47 +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 a SIG (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."""
+    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
+    name: str | None = None
    # QTH (location), free text
-    qth : str | None = None
+    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
+    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
+    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
+    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: str | None = None
+    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. This can be "HOME QTH" or "DXCC" depending on which provider gave us a location
-    location_source: str | 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
+        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,6 +4,7 @@ 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
@@ -1,21 +0,0 @@
-from dataclasses import dataclass, field
-
-
-@dataclass
-class SIG:
-    """Data class that defines a Special Interest Group. 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."""
-
-    # SIG name as used in the UI and API, e.g. "Towers"
-    name: str
-    # Description, e.g. "Towers on the Air"
-    description: str
-    # SIG names as they might appear in cluster spot comments, e.g. ["TOTA"]
-    comment_names: list[str] = field(default_factory=list)
-    # Regex matcher for references, e.g. for POTA r"[A-Z]{2}\-\d+".
-    ref_regex: str | None = 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 = None
-    # URL to look up more information about the reference, if known.
-    url: str | None = None
-    # Latitude of the reference, if known.
-    latitude: float | None = None
-    # Longitude of the reference, if known.
-    longitude: float | None = None
-    # Maidenhead grid reference of the reference, if known.
-    grid: str | None = None
-    # Activation score. SOTA only
-    activation_score: int | None = 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:
@@ -1,23 +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.config import MAX_SPOT_AGE
-from core.constants import MODE_ALIASES, PROPAGATION_MODES
-from core.geo_utils import lat_lon_to_cq_zone, lat_lon_to_itu_zone
+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.sig_utils import ANY_SIG_REGEX, get_ref_regex_for_sig, get_sig_name_from_comment_name
-from core.sig_lookup_helper import populate_missing_sig_ref_info
-from core.utils import infer_band_from_freq, infer_mode_from_comment, \
-    infer_mode_from_frequency, infer_mode_type_from_mode, get_flag_for_dxcc
-from data.sig_ref import SIGRef
+from core.config import MAX_SPOT_AGE
+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.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
@@ -33,15 +49,15 @@ class Spot:
    dx_call: str | None = None
    # Name of the operator that has been spotted
    dx_name: str | None = 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.
+    # 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 = None
    # Country flag of the DX operator
    dx_flag: str | None = None
    # Continent of the DX operator
-    dx_continent: str | None = None
+    dx_continent: Continent | None = None
    # DXCC ID of the DX operator
    dx_dxcc_id: int | None = None
    # CQ zone of the DX operator
@@ -57,12 +73,11 @@ class Spot:
    # lookup
    dx_latitude: float | None = None
    dx_longitude: float | None = None
-    # DX Location source. Indicates how accurate the location might be. Values: "SPOT", "GRID", "SIG REF LOOKUP",
-    # "HOME QTH", "DXCC", "NONE"
-    dx_location_source: str = "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", "SIG REF LOOKUP" or "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
@@ -74,7 +89,7 @@ class Spot:
    # Country flag of the spotter
    de_flag: str | None = None
    # Continent of the spotter
-    de_continent: str | None = None
+    de_continent: Continent | None = None
    # DXCC ID of the spotter
    de_dxcc_id: int | None = None
    # If this is an APRS/Packet/etc spot, what SSID was the spotter/receiver using?
@@ -92,11 +107,11 @@ class Spot:
    # General QSO info

    # Reported mode, such as SSB, PHONE, CW, FT8...
-    mode: str | None = None
-    # Inferred mode "family". One of "CW", "PHONE" or "DIGI".
-    mode_type: str | None = 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 = None
    # Band, defined by the frequency, e.g. "40m" or "70cm"
@@ -108,12 +123,13 @@ class Spot:
    # 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
+    # Activity (e.g. outdoor activity programme such as POTA). Still named "sig" for API backwards compatibility.
    sig: str | None = None
-    # SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
-    sig_refs: list | 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

@@ -135,6 +151,11 @@ class Spot:
    # The ID the source gave it, if any.
    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
@@ -142,8 +163,8 @@ class Spot:

        if self.sig_refs:
            self.sig_refs = [
-                sig_ref if isinstance(sig_ref, SIGRef) else SIGRef(**sig_ref)
-                for sig_ref in self.sig_refs
+                activity_ref if isinstance(activity_ref, ActivityRef) else ActivityRef(**activity_ref)
+                for activity_ref in self.sig_refs
            ]

    def infer_missing(self, credentials=None):
@@ -176,8 +197,8 @@ class Spot:
            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 not self.dx_continent:
-                self.dx_continent = dx_call_info.continent
+            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:
@@ -207,19 +228,22 @@ class Spot:
            # 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 (
+                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 not self.de_continent:
-                    self.de_continent = de_call_info.continent
+                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"):
+            if self.freq and isnan(self.freq):
                self.freq = None

            # Band from frequency
@@ -229,17 +253,13 @@ class Spot:

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

            # Mode type from mode
            if self.mode and not self.mode_type:
@@ -247,63 +267,92 @@ class 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"
+                self.dx_location_source = LocationSourceForSpot.SPOT

-            # Set the top-level "SIG" if it is missing but we have at least one SIG ref.
-            if not self.sig and self.sig_refs and len(self.sig_refs) > 0:
+            # 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()

-            # 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)
+            # 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)
+                    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))
+                        self._append_activity_ref_if_missing(ActivityRef(id=ref_match.group(2).upper(), sig=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".
+            # 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:
-                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 = get_sig_name_from_comment_name(sig_match.group(2))
+                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_sig
+                        self.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"([ -])(" + ref_regex + r")($|\W)", self.comment,
-                                                  re.IGNORECASE)
+                    # 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_sig_ref_if_missing(SIGRef(id=ref_match.group(3).upper(), sig=found_sig))
+                            self._append_activity_ref_if_missing(
+                                ActivityRef(id=ref_match.group(3).upper(), sig=found_activity)
+                            )

-            # 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_missing_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" or self.sig == "Tiles":
-                            self.dx_location_source = "GRID"
+            # 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 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 = "SIG REF LOOKUP"
+                            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:
+            # 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

            # Parse "de_grid<prop_mode>dx_grid" structures from the comment, e.g. "JN61ES(ES)JM56XT" or "JO02GQ<>KN17LG".
@@ -311,15 +360,16 @@ class Spot:
            # 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)
+                    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 = "GRID"
+                        self.dx_location_source = LocationSourceForSpot.GRID

                    # 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()
@@ -328,122 +378,171 @@ class Spot:
                            self.propagation_mode = PROPAGATION_MODES[mode_tag]
                        else:
                            self.propagation_mode = mode_tag
-                            logging.info("Seen a new propagation mode tag not yet in the system: %s", mode_tag)
+                            logger.info(f"Seen a new propagation mode tag not yet in the system: {mode_tag}")
+
+            # 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
+
+            # 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
+
+            # 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

            # 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)
+                    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 = "GRID"
+                        self.dx_location_source = LocationSourceForSpot.GRID
                    if not self.de_grid:
                        self.de_grid = grid_mode_grid_match.group(2).upper()

            # DX Grid to lat/lon and vice versa in case one is missing
-            if self.dx_grid and not self.dx_latitude:
+            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:
-                    logging.debug("Invalid grid received for spot")
+                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:
-                    logging.debug("Invalid lat/lon received for spot")
+                except Exception:
+                    logger.debug("Invalid lat/lon received for spot", exc_info=True)

            # QRT comment detection
            if self.comment and not self.qrt:
                self.qrt = "QRT" in self.comment.upper()

-            # 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.
+            # 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:
-                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()
+                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()

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

-            # 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:
+            # 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 += " " + 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:
+                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:
+                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 == "SPOT" or self.dx_location_source == "SIG REF LOOKUP"
-                    or self.dx_location_source == "GRID"
-                    or (self.dx_location_source == "HOME QTH" and "/" not in (self.dx_call or ""))))
+            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 self.de_call) and not (
-                    self.de_call.startswith("T2") and self.source == "APRS-IS"):
+            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
-                if not self.de_latitude:
-                    self.de_latitude = de_call_info.latitude
-                    self.de_longitude = de_call_info.longitude
-                    self.de_grid = de_call_info.grid
+                self.de_latitude = de_call_info.latitude
+                self.de_longitude = de_call_info.longitude
+                self.de_grid = de_call_info.grid

-        except Exception as e:
-            logging.error("Exception while inferring missing data from spot", e, exc_info=True)
+            # 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."""

-        sig_refs = self.sig_refs or []
-        self.sig_refs = 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 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
-        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,12 +1,9 @@
 AA343,"Almaty, Kazakhstan"
 AL945,"Alpena, United States"
 AT138,"Athens, Greece"
-AU930,"Austin, United States"
-BR52P,"Brisbane, Australia"
 BVJ03,"Boa Vista, Brazil"
 CAJ2M,"Cachoeira Paulista, Brazil"
 CB53N,"Canberra, Australia"
-CGK21,"Campo Grande, Brazil"
 DB049,"Dourbes, Belgium"
 DW41K,"Darwin, Australia"
 EA036,"El Arenosillo, Spain"
@@ -18,24 +15,18 @@ GM037,"Gibilmanna, Italy"
 GR13L,"Grahamstown, South Africa"
 HE13N,"Hermanus, South Africa"
 HO54K,"Hobart, Australia"
-IC437,"I-Cheon, South Korea"
 IF843,"Idaho National Laboratory, United States"
 JI91J,"Jicamarca, Peru"
 JR055,"Juliusruh, Germany"
 LAA38,"Lajes Terceira Island, Portugal"
 LL721,"Lualualei, United States"
-LM42B,"Learmonth, Australia"
-LV12P,"Louisvale, South Africa"
 MHJ45,"Millstone Hill, United States"
-ML10L,"Malindi, Kenya"
 NI135,"Nicosia, Cyprus"
 NI63_,"Norfolk, Australia"
-PA836,"Portt Arguello, United States"
+PA836,"Port Arguello, United States"
 PE43K,"Perth, Australia"
-PF765,"Poker Flat, United States"
 PQ052,"Pruhonice, Czechia"
 RO041,"Rome, Italy"
-SAA0K,"Saoluis, Brazil"
 SO148,"Sopron, Hungary"
 TR169,"Tromso, Norway"
 TV51R,"Townsville, Australia"
@@ -27,4 +27,9 @@ 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
+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
@@ -13,6 +13,7 @@ services:
    restart: unless-stopped
    ports:
      - "8080:8080"
+      - "7373:7373" # For telnet if required
    volumes:
      - ./config.yml:/app/config.yml
      - ./cache:/app/cache
@@ -23,15 +24,16 @@ You can replace `#main` with any other branch or tag reference, for example `#1.

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

@@ -60,8 +62,8 @@ networks:
 ```

 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:
+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 {
@@ -146,13 +148,13 @@ server {
 ```

 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.
+`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:
+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:
@@ -183,8 +185,8 @@ networks:
    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:
+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
@@ -5,7 +5,7 @@ You can embed Spothole's web interface in another website, e.g. for use as part
 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
+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
@@ -29,7 +29,7 @@ a mapping exists.
 | `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.          |
+| `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.        |
@@ -16,9 +16,12 @@ To navigate your way around the source code, this list may help.
 * `/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/sigrefdata` - Classes providing SIG reference lookup data by accessing bundled data files or the APIs of
-  other services
-* `/server` - Classes for running Spothole's own web server
+* `/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*
@@ -48,8 +51,8 @@ To navigate your way around the source code, this list may help.
 ### Extending the server

 Spothole is designed to be easily extensible. If you want to write your own 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.)
+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.
@@ -2,8 +2,8 @@

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

@@ -89,19 +89,14 @@ server {
 ```

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

@@ -3,7 +3,7 @@
 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
+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
@@ -1,50 +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 SIGRefDataProvider:
-    """Generic SIG reference data provider class. Subclasses of this query the individual URLs or files for data."""
+
+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"""
+        """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 = False
-
+        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 = True
+        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
-        with DATA_STORE.sigrefs.transact():
+        # 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.sigrefs.set(self.sig_name + ":" + d.id, d)
+                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:
+                if self._stop_event.is_set():
                    break

        self.reference_count = len(new_data)
-        logging.info(f"Loaded %d references for %s into the data store.", self.reference_count, self.sig_name)
+        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
@@ -1,39 +1,42 @@
 import logging
 from datetime import datetime
-from threading import Thread, Event
+from threading import Thread

 import pytz
-from requests import ReadTimeout
-from requests.exceptions import ConnectionError, ConnectTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout

 from core.constants import HTTP_HEADERS
 from core.url_data_cache import URLDataCache
-from providers.sigrefdata.sig_ref_data_provider import SIGRefDataProvider
+from providers.activityrefdata.activity_ref_data_provider import ActivityRefDataProvider
+
+logger = logging.getLogger(__name__)


-class FileDownloadSIGRefDataProvider(SIGRefDataProvider):
-    """Generic SIG ref data provider class for providers that fetch their data from the web by downloading a file."""
+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*."""
+        """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._stop_event = Event()
-        self._url_data_cache = URLDataCache("sigrefdata_" + sig_name)
+        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.
-        logging.info(
-            "Set up query of " + self.sig_name + " SIG ref data every " + str(self._poll_interval) + " days.")
-        self._thread = Thread(target=self._run, name=f"FileDownloadSIGRefDataProvider-{self.sig_name}")
+        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()
-        self._stop_event.set()
+        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:
@@ -45,37 +48,37 @@ class FileDownloadSIGRefDataProvider(SIGRefDataProvider):
        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.
-            logging.debug("Downloading " + self.sig_name + " SIG ref data...")
+            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 SIG Ref data store
+                # 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)
-                logging.debug("Received SIG ref data for " + self.sig_name)
+                logger.debug(f"Received activity ref data for {self.sig_name}")
            else:
                self.status = "Error"
-                logging.warning(f"HTTP {http_response.status_code} when downloading SIG ref data for {self.sig_name}.")
+                logger.warning(f"HTTP {http_response.status_code} when downloading activity ref data for {self.sig_name}.")

        except ConnectionError:
            self.status = "Error"
-            logging.warning(f"Connection error when downloading SIG ref data for {self.sig_name}.")
+            logger.warning(f"Connection error when downloading activity ref data for {self.sig_name}.")
        except (ConnectTimeout, ReadTimeout):
            self.status = "Error"
-            logging.warning(f"Timeout when downloading SIG ref data for {self.sig_name}.")
+            logger.warning(f"Timeout when downloading activity ref data for {self.sig_name}.")
        except Exception:
            self.status = "Error"
-            logging.exception("Exception in HTTP SIG Ref Data Provider (" + self.sig_name + ")")
+            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 SIG 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."""
+        """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
@@ -4,18 +4,21 @@ from time import sleep
 from fastkml import kml
 from pyhamtools.locator import latlong_to_locator

-from data.sig_ref import SIGRef
-from providers.sigrefdata.file_download_sig_ref_data_provider import FileDownloadSIGRefDataProvider
+from core.enums import ActivityRefType
+from data.activity_ref import ActivityRef
+from providers.activityrefdata.file_download_activity_ref_data_provider import (
+    FileDownloadActivityRefDataProvider,
+)


-class ParksNPeaksKMLSIGRefDataProvider(FileDownloadSIGRefDataProvider):
-    """Base class for SIG 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)."""
+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*."""
+        """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):
@@ -24,7 +27,9 @@ class ParksNPeaksKMLSIGRefDataProvider(FileDownloadSIGRefDataProvider):
        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)
@@ -35,10 +40,15 @@ class ParksNPeaksKMLSIGRefDataProvider(FileDownloadSIGRefDataProvider):

                    longitude, latitude = placemark.geometry.x, placemark.geometry.y

-                    ref = SIGRef(sig=self.sig_name, id=ref_id, name=placemark.name,
-                                              url="https://parksnpeaks.org/getPark.php?actPark=" + ref_id,
-                                              latitude=latitude,
-                                              longitude=longitude)
+                    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)
@@ -48,7 +58,7 @@ class ParksNPeaksKMLSIGRefDataProvider(FileDownloadSIGRefDataProvider):
                    if self._stop_event.is_set():
                        return new_data

-                    # Very short pause. This will extend the time to handle sig refs by a few seconds but will ensure some time
+                    # 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)

@@ -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
@@ -3,19 +3,22 @@ from time import sleep

 from pyhamtools.locator import latlong_to_locator

-from data.sig_ref import SIGRef
-from providers.sigrefdata.file_download_sig_ref_data_provider import FileDownloadSIGRefDataProvider
+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(FileDownloadSIGRefDataProvider):
-    """SIG ref data provider for Summits on the Air"""
+class SOTA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for Summits on the Air"""

    POLL_INTERVAL_DAYS = 30
-    SIG = "SOTA"
+    ACTIVITY = ActivityName.SOTA
    DATA_URL = "https://storage.sota.org.uk/summitslist.csv"

    def __init__(self, provider_config):
-        super().__init__(self.SIG, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)

    def _http_response_to_data(self, http_response):
        new_data = []
@@ -23,11 +26,18 @@ class SOTA(FileDownloadSIGRefDataProvider):
            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
-            ref = SIGRef(sig=self.SIG, id=ref_id, name=row["SummitName"] if "SummitName" in row else None,
-                                      url="https://www.sotadata.org.uk/en/summit/" + ref_id,
-                                      latitude=latitude,
-                                      longitude=longitude,
-                                      activation_score=int(row["Points"]) if "Points" in row 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)
@@ -37,7 +47,7 @@ class SOTA(FileDownloadSIGRefDataProvider):
            if self._stop_event.is_set():
                break

-            # Very short pause. This will extend the time to handle sig refs by a few seconds but will ensure some time
+            # 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)

@@ -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
@@ -4,19 +4,24 @@ from time import sleep

 from pyhamtools.locator import latlong_to_locator

-from data.sig_ref import SIGRef
-from providers.sigrefdata.file_download_sig_ref_data_provider import FileDownloadSIGRefDataProvider
+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(FileDownloadSIGRefDataProvider):
-    """SIG ref data provider for World Castles Award"""
+class WCA(FileDownloadActivityRefDataProvider):
+    """Activity ref data provider for World Castles Award"""

    POLL_INTERVAL_DAYS = 30
-    SIG = "WCA"
+    ACTIVITY = ActivityName.WCA
    DATA_URL = "https://polo.ham2k.com/data/activities/wca/all-castles.csv"

    def __init__(self, provider_config):
-        super().__init__(self.SIG, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)
+        super().__init__(self.ACTIVITY, provider_config, self.DATA_URL, self.POLL_INTERVAL_DAYS)

    def _http_response_to_data(self, http_response):
        new_data = []
@@ -34,20 +39,27 @@ class WCA(FileDownloadSIGRefDataProvider):
                    longitude = float(split[1])
                    grid = latlong_to_locator(latitude, longitude)
            except ValueError:
-                logging.debug(f"Encountered dodgy formatting in WCA CSV, skipping location data for %s", ref_id)
+                logger.debug(f"Encountered dodgy formatting in WCA CSV, skipping location data for {ref_id}")

-            new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["CLEAN NAME"] if "CLEAN NAME" in row else None,
-                                      url="https://www.cqgma.org/zinfo.php?ref=" + ref_id,
-                                      latitude=latitude,
-                                      longitude=longitude,
-                                      grid=grid))
+            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 sig refs by a few seconds but will ensure some time
+            # 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)

@@ -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
@@ -29,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()
@@ -3,9 +3,10 @@ from datetime import datetime, timedelta
 import pytz
 from bs4 import BeautifulSoup

-from providers.alert.http_alert_provider import HTTPAlertProvider
+from core.enums import ActivityName
+from data.activity_ref import ActivityRef
 from data.alert import Alert
-from data.sig_ref import SIGRef
+from providers.alert.http_alert_provider import HTTPAlertProvider


 class BOTA(HTTPAlertProvider):
@@ -23,17 +24,17 @@ class BOTA(HTTPAlertProvider):
        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'})
+        div = bs.body.find("div", attrs={"class": "view-activations-public"})
        if div:
-            table = div.find('table', attrs={'class': 'views-table'})
+            table = div.find("table", attrs={"class": "views-table"})
            if table:
-                tbody = table.find('tbody')
+                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
+                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()
@@ -41,7 +42,7 @@ class BOTA(HTTPAlertProvider):
                    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
+                    date_span = cells[2].find("span") if len(cells) > 2 else None
                    if not date_span:
                        continue
                    date_text = date_span.get_text().strip()
@@ -52,11 +53,13 @@ class BOTA(HTTPAlertProvider):
                        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)
+                    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
@@ -1,13 +1,15 @@
 import logging
 from datetime import datetime
-from threading import Thread, Event
+from threading import Event, Thread

 import pytz
 import requests
-from requests.exceptions import ConnectionError, ReadTimeout, ConnectTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, JSONDecodeError, ReadTimeout

-from providers.alert.alert_provider import AlertProvider
 from core.constants import HTTP_HEADERS
+from providers.alert.alert_provider import AlertProvider
+
+logger = logging.getLogger(__name__)


 class HTTPAlertProvider(AlertProvider):
@@ -24,12 +26,16 @@ class HTTPAlertProvider(AlertProvider):
    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, name=f"HTTPAlertProvider-{self.name}")
+        logger.info(f"Set up query of {self.name} alert API every {self._poll_interval!s} seconds.")
+        self._thread = Thread(target=self._run, name=f"HTTPAlertProvider-{self.name}", daemon=True)
        self._thread.start()

    def stop(self):
        self._stop_event.set()
+        if self._thread:
+            self._thread.join(timeout=12)
+            if self._thread.is_alive():
+                logger.warning(f"{self.name} alert worker thread did not exit on time and will be killed.")

    def _run(self):
        while True:
@@ -40,7 +46,7 @@ class HTTPAlertProvider(AlertProvider):
    def _poll(self):
        try:
            # Request data from API
-            logging.debug("Polling " + self.name + " alert API...")
+            logger.debug(f"Polling {self.name} alert API...")
            http_response = requests.get(self._url, headers=HTTP_HEADERS, timeout=(5, 30))
            # Check response code was good
            if http_response.ok:
@@ -52,18 +58,23 @@ class HTTPAlertProvider(AlertProvider):

                self.status = "OK"
                self.last_update_time = datetime.now(pytz.UTC)
-                logging.debug("Received data from " + self.name + " alert API.")
+                logger.debug(f"Received data from {self.name} alert API.")
            else:
                self.status = "Error"
-                logging.warning(f"HTTP {http_response.status_code} when calling {self.name} alerts API.")
+                logger.warning(f"HTTP {http_response.status_code} when calling {self.name} alerts API.")

        except ConnectionError:
-            logging.warning(f"Connection error when accessing {self.name} alerts API.")
+            self.status = "Error"
+            logger.warning(f"Connection error when accessing {self.name} alerts API.")
        except (ConnectTimeout, ReadTimeout):
-            logging.warning(f"Timeout when accessing {self.name} alerts API.")
+            self.status = "Error"
+            logger.warning(f"Timeout when accessing {self.name} alerts API.")
+        except JSONDecodeError:
+            self.status = "Error"
+            logger.warning(f"Invalid or empty JSON response from {self.name} alert API.")
        except Exception:
            self.status = "Error"
-            logging.exception("Exception in HTTP JSON Alert Provider (" + self.name + ")")
+            logger.exception(f"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)

@@ -0,0 +1,47 @@
+from datetime import datetime, time
+from typing import cast
+
+import pytz
+from icalendar import Calendar, Event
+
+from data.alert import Alert
+from providers.alert.http_alert_provider import HTTPAlertProvider
+
+
+class ICALAlertProvider(HTTPAlertProvider):
+    """Generic alert provider for iCal calendars. Defines an abstract method event_to_alert(event) that subclasses must
+    implement, and use it to convert an iCal event to an Alert object based on whatever format their iCal events use."""
+
+    def __init__(self, name, provider_config, url, poll_interval):
+        super().__init__(name, provider_config, url, poll_interval)
+
+    def _http_response_to_alerts(self, http_response):
+        new_alerts = []
+        cal = Calendar.from_ical(http_response.content)
+
+        # Iterate through events, passing each one in turn to the subclass' event_to_alert method to turn it into
+        # a Spothole alert object
+        for component in cal.walk():
+            if component.name != "VEVENT":
+                continue
+
+            event = cast(Event, component)
+            alert = self.event_to_alert(event)
+            new_alerts.append(alert)
+        return new_alerts
+
+    def event_to_alert(self, event: Event) -> Alert:
+        """Convert an ICal event to an Alert object. Subclasses must implement this method."""
+
+    @staticmethod
+    def _to_utc_timestamp(value):
+        """Convert a date or datetime value from an iCal field into a UTC UNIX timestamp."""
+
+        # Datetime object so we can treat it as-is, check if it has a non-UTC tz and convert it if necessary
+        if isinstance(value, datetime):
+            if value.tzinfo is None:
+                value = pytz.UTC.localize(value)
+            return value.astimezone(pytz.UTC).timestamp()
+
+        # Date object so this is an all day event
+        return pytz.UTC.localize(datetime.combine(value, time.min)).timestamp()
@@ -6,19 +6,20 @@ import pytz
 from rss_parser import Parser
 from rss_parser.models.rss import RSS

-from providers.alert.http_alert_provider import HTTPAlertProvider
+from core.enums import ActivityName
 from data.alert import Alert
+from providers.alert.http_alert_provider import HTTPAlertProvider


 class NG3K(HTTPAlertProvider):
-    """Alert provider NG3K DXpedition list"""
+    """Alert provider for NG3K DXpedition list"""

-    POLL_INTERVAL_SEC = 1800
+    POLL_INTERVAL_DAYS = 1
    ALERTS_URL = "https://www.ng3k.com/adxo.xml"
    AS_CALL_PATTERN = re.compile("as ([a-z0-9/]+)", re.IGNORECASE)

    def __init__(self, provider_config):
-        super().__init__("NG3K", provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)
+        super().__init__("NG3K", provider_config, self.ALERTS_URL, self.POLL_INTERVAL_DAYS * 24 * 60 * 60)

    def _http_response_to_alerts(self, http_response):
        new_alerts = []
@@ -49,11 +50,16 @@ class NG3K(HTTPAlertProvider):
                end_day = end_string.split(", ")[0].strip()
                end_mon = start_mon

-            start_timestamp = datetime.strptime(start_year + " " + start_mon + " " + start_day, "%Y %b %d").replace(
-                tzinfo=pytz.UTC).timestamp()
-            end_timestamp = datetime.strptime(end_year + " " + end_mon + " " + end_day + " 23:59",
-                                              "%Y %b %d %H:%M").replace(
-                tzinfo=pytz.UTC).timestamp()
+            start_timestamp = (
+                datetime.strptime(f"{start_year} {start_mon} {start_day}", "%Y %b %d")
+                .replace(tzinfo=pytz.UTC)
+                .timestamp()
+            )
+            end_timestamp = (
+                datetime.strptime(f"{end_year} {end_mon} {end_day} 23:59", "%Y %b %d %H:%M")
+                .replace(tzinfo=pytz.UTC)
+                .timestamp()
+            )

            # Sometimes the DX callsign is "real", sometimes you just get a prefix with the real working callsigns being
            # provided in the "by" field. e.g. call="JW", by="By LA7XK as JW7XK, LA6VM as JW6VM, LA9DL as JW9DL". So
@@ -75,14 +81,16 @@ class NG3K(HTTPAlertProvider):
            comment = extra_parts[3] if len(extra_parts) > 3 else ""

            # Convert to our alert format
-            alert = Alert(source=self.name,
-                          dx_calls=dx_calls,
-                          dx_country=dx_country,
-                          freqs_modes=bands + (("; " + modes) if modes != "" else ""),
-                          comment=by + "; " + comment + "; " + qsl_info,
-                          start_time=start_timestamp,
-                          end_time=end_timestamp,
-                          is_dxpedition=True)
+            alert = Alert(
+                source=self.name,
+                dx_calls=dx_calls,
+                dx_country=dx_country,
+                freqs_modes=bands + (f"; {modes}" if modes != "" else ""),
+                comment=f"{by}; {comment}; {qsl_info}",
+                start_time=start_timestamp,
+                end_time=end_timestamp,
+                sig=ActivityName.DXPEDITION,
+            )

            # Add to our list.
            new_alerts.append(alert)
@@ -3,9 +3,12 @@ from datetime import datetime

 import pytz

-from providers.alert.http_alert_provider import HTTPAlertProvider
+from core.enums import ActivityName
+from data.activity_ref import ActivityRef
 from data.alert import Alert
-from data.sig_ref import SIGRef
+from providers.alert.http_alert_provider import HTTPAlertProvider
+
+logger = logging.getLogger(__name__)


 class ParksNPeaks(HTTPAlertProvider):
@@ -22,40 +25,50 @@ class ParksNPeaks(HTTPAlertProvider):
        # Iterate through source data
        for source_alert in http_response.json():
            # Calculate some things
-            sig = source_alert["Class"].upper()
+            activity = source_alert["Class"].upper()
            if " - " in source_alert["Location"]:
                split = source_alert["Location"].split(" - ")
-                sig_ref = split[0]
-                sig_ref_name = split[1]
+                ref_id = split[0]
+                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()
+                ref_id = source_alert["WWFFID"]
+                ref_name = source_alert["Location"]
+            start_time = (
+                datetime.strptime(source_alert["alTime"], "%Y-%m-%d %H:%M:%S").replace(tzinfo=pytz.UTC).timestamp()
+            )

-            sigrefs = []
-            # PnP can give us an alert of class "QRP" which is the only one that's not a real SIG in Spothole's list,
-            # so mask this out if we got it.
-            if sig != "QRP":
-                sigrefs = [SIGRef(id=sig_ref, sig=sig, name=sig_ref_name)]
+            activity_refs = [ActivityRef(id=ref_id, sig=activity, name=ref_name)]

            # 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=sigrefs,
-                          start_time=start_time,
-                          is_dxpedition=False)
+            alert = Alert(
+                source=self.name,
+                source_id=source_alert["alID"],
+                dx_calls=[source_alert["CallSign"].upper()],
+                freqs_modes=f"{source_alert['Freq']} {source_alert['MODE']}",
+                comment=source_alert["Comments"],
+                sig=activity,
+                sig_refs=activity_refs,
+                start_time=start_time,
+            )

            # 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", "SANPCPA", "LLOTA", "QRP"]:
-                logging.warning("PNP alert found with sig " + sig + ", developer needs to add support for this!")
+            if activity and activity not in [
+                ActivityName.POTA,
+                ActivityName.SOTA,
+                ActivityName.WWFF,
+                ActivityName.HEMA,
+                ActivityName.SIOTA,
+                ActivityName.ZLOTA,
+                ActivityName.KRMNPA,
+                ActivityName.SANPCPA,
+                ActivityName.LLOTA,
+                ActivityName.QRP,
+            ]:
+                logger.warning(f"PNP alert found with activity {activity}, 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"]:
+            if activity not in [ActivityName.POTA, ActivityName.SOTA, ActivityName.WWFF]:
                new_alerts.append(alert)
        return new_alerts
@@ -2,9 +2,10 @@ from datetime import datetime

 import pytz

-from providers.alert.http_alert_provider import HTTPAlertProvider
+from core.enums import ActivityName
+from data.activity_ref import ActivityRef
 from data.alert import Alert
-from data.sig_ref import SIGRef
+from providers.alert.http_alert_provider import HTTPAlertProvider


 class POTA(HTTPAlertProvider):
@@ -21,18 +22,31 @@ class POTA(HTTPAlertProvider):
        # 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)
+            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=ActivityName.POTA,
+                sig_refs=[
+                    ActivityRef(
+                        id=source_alert["reference"],
+                        sig=ActivityName.POTA,
+                        name=source_alert["name"],
+                        url=f"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(),
+            )

            # 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
@@ -0,0 +1,75 @@
+import re
+
+from icalendar import Event
+
+from core.enums import ActivityName, Continent
+from data.alert import Alert
+from providers.alert.ical_alert_provider import ICALAlertProvider
+
+
+class RSGBICALAlertProvider(ICALAlertProvider):
+    """Generic alert provider for RSGB contest iCal calendars. Builds on the generic iCal alert provider by adding
+    handling specific to how RSGB's iCal events are formatted. This is still effectively an abstract class itself;
+    RSGB has two contest calendars (HF & VHF) that each subclass this."""
+
+    def __init__(self, name, provider_config, url, poll_interval):
+        super().__init__(name, provider_config, url, poll_interval)
+
+    FREQ_PATTERN = re.compile(r"([\d.]+(?:MHz|GHz))|SHF")
+
+    def event_to_alert(self, event: Event) -> Alert:
+        """Convert an iCal event in RSGB's format to an Alert object."""
+
+        summary = str(event.get("summary", "")).strip()
+
+        # Ensure summaries start with "RSGB" to avoid any confusion
+        if not summary.startswith("RSGB "):
+            summary = "RSGB " + summary
+
+        # Extract freq from summary. HF contests don't give frequencies, all VHF ones do
+        match = self.FREQ_PATTERN.search(summary)
+        if match:
+            freqs_modes = match.group()
+        else:
+            freqs_modes = "HF bands"
+        freqs_modes = freqs_modes + ", "
+
+        # Extract mode from summary
+        if "FMAC" in summary:
+            freqs_modes = freqs_modes + "FM"
+        elif "CW" in summary:
+            freqs_modes = freqs_modes + "CW"
+        elif "SSB" in summary:
+            freqs_modes = freqs_modes + "SSB"
+        elif "FT8" in summary:
+            freqs_modes = freqs_modes + "FT8"
+        elif "FT4" in summary:
+            freqs_modes = freqs_modes + "FT4"
+        elif "DATA" in summary:
+            freqs_modes = freqs_modes + "Data modes"
+        else:
+            freqs_modes = freqs_modes + "All modes"
+
+        dtstart = event.get("dtstart")
+        dtend = event.get("dtend")
+        start_timestamp = self._to_utc_timestamp(dtstart.dt)
+        end_timestamp = self._to_utc_timestamp(dtend.dt) - 1 if dtend is not None else start_timestamp
+
+        # Convert to our alert format
+        alert = Alert(
+            source=self.name,
+            dx_calls=[],
+            dx_country="United Kingdom",
+            dx_dxcc_id=235,
+            dx_continent=Continent.EU,
+            dx_cq_zone=14,
+            dx_itu_zone=27,
+            dx_flag="🇬🇧",
+            freqs_modes=freqs_modes,
+            comment=summary,
+            start_time=start_timestamp,
+            end_time=end_timestamp,
+            sig=ActivityName.CONTEST,
+        )
+
+        return alert
@@ -0,0 +1,11 @@
+from providers.alert.rsgb_ical_alert_provider import RSGBICALAlertProvider
+
+
+class RSGBHFContests(RSGBICALAlertProvider):
+    """Alert provider for RSGB HF Contest calendar"""
+
+    POLL_INTERVAL_DAYS = 30
+    ALERTS_URL = "https://calendar.google.com/calendar/ical/a5ff31ebb1b4834dc7fff4c5415ae8251c6a9aa11f98c6af6e472b6c552b1915%40group.calendar.google.com/public/basic.ics"
+
+    def __init__(self, provider_config):
+        super().__init__("RSGB HF Contests", provider_config, self.ALERTS_URL, self.POLL_INTERVAL_DAYS * 24 * 60 * 60)
@@ -0,0 +1,11 @@
+from providers.alert.rsgb_ical_alert_provider import RSGBICALAlertProvider
+
+
+class RSGBVHFContests(RSGBICALAlertProvider):
+    """Alert provider for RSGB VHF Contest calendar"""
+
+    POLL_INTERVAL_DAYS = 30
+    ALERTS_URL = "https://calendar.google.com/calendar/ical/40f3552bff39a016f1cdca205864177070dcad68d55be17eb061cb021f39f96c%40group.calendar.google.com/public/basic.ics"
+
+    def __init__(self, provider_config):
+        super().__init__("RSGB VHF Contests", provider_config, self.ALERTS_URL, self.POLL_INTERVAL_DAYS * 24 * 60 * 60)
@@ -2,9 +2,10 @@ from datetime import datetime

 import pytz

-from providers.alert.http_alert_provider import HTTPAlertProvider
+from core.enums import ActivityName
+from data.activity_ref import ActivityRef
 from data.alert import Alert
-from data.sig_ref import SIGRef
+from providers.alert.http_alert_provider import HTTPAlertProvider


 class SOTA(HTTPAlertProvider):
@@ -26,18 +27,26 @@ class SOTA(HTTPAlertProvider):
            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)
+            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=ActivityName.SOTA,
+                sig_refs=[
+                    ActivityRef(
+                        id=f"{source_alert['associationCode']}/{source_alert['summitCode']}",
+                        sig=ActivityName.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(),
+            )

            # Add to our list
            new_alerts.append(alert)
@@ -0,0 +1,41 @@
+from icalendar import Event
+
+from core.enums import ActivityName
+from data.alert import Alert
+from providers.alert.ical_alert_provider import ICALAlertProvider
+
+
+class WA7BNM(ICALAlertProvider):
+    """Alert provider for the WA7BNM contest calendar."""
+
+    POLL_INTERVAL_DAYS = 1
+    ALERTS_URL = "https://contestcalendar.com/weeklycontcustom.php"
+
+    def __init__(self, provider_config):
+        super().__init__(
+            "WA7BNM Contest Calendar", provider_config, self.ALERTS_URL, self.POLL_INTERVAL_DAYS * 24 * 60 * 60
+        )
+
+    def event_to_alert(self, event: Event) -> Alert:
+        """Convert an iCal event in WA7BNM's format to an Alert object."""
+
+        summary = str(event.get("summary", ""))
+        url = str(event.get("url", ""))
+
+        dtstart = event.get("dtstart")
+        dtend = event.get("dtend")
+        start_timestamp = self._to_utc_timestamp(dtstart.dt)
+        end_timestamp = self._to_utc_timestamp(dtend.dt) - 1 if dtend is not None else start_timestamp
+
+        # Convert to our alert format
+        alert = Alert(
+            source=self.name,
+            dx_calls=[],
+            comment=summary,
+            url=url,
+            start_time=start_timestamp,
+            end_time=end_timestamp,
+            sig=ActivityName.CONTEST,
+        )
+
+        return alert
@@ -1,13 +1,18 @@
+import logging
 from datetime import datetime
 from typing import cast
+from xml.parsers.expat import ExpatError

 import pytz
 from rss_parser import Parser as RSSParser
 from rss_parser.models.rss import RSS

-from providers.alert.http_alert_provider import HTTPAlertProvider
+from core.enums import ActivityName
+from data.activity_ref import ActivityRef
 from data.alert import Alert
-from data.sig_ref import SIGRef
+from providers.alert.http_alert_provider import HTTPAlertProvider
+
+logger = logging.getLogger(__name__)


 class WOTA(HTTPAlertProvider):
@@ -22,43 +27,62 @@ class WOTA(HTTPAlertProvider):

    def _http_response_to_alerts(self, http_response):
        new_alerts = []
-        rss = cast(RSS, RSSParser.parse(http_response.content.decode("utf-8-sig")))
-        # 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
+        try:
+            rss = cast(RSS, RSSParser.parse(http_response.content.decode("utf-8-sig")))
+            # 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 = str(ref_split[0])
-                if len(ref_split) > 1:
-                    ref_name = str(ref_split[1])
+                # Pick apart the title
+                dx_call = None
+                ref = None
+                ref_name = None
+                try:
+                    title_split = source_alert.title.split(" on ")
+                    dx_call = title_split[0]
+                    if len(title_split) > 1:
+                        ref_split = title_split[1].split(" - ")
+                        ref = str(ref_split[0])
+                        if len(ref_split) > 1:
+                            ref_name = str(ref_split[1])
+                except Exception:
+                    logger.warning(f"Could not parse WOTA alert title: {source_alert.description}", exc_info=True)

-            # 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()
+                # Pick apart the description
+                comment = None
+                freqs_modes = None
+                try:
+                    desc_split = source_alert.description.split(". ")
+                    freqs_modes = desc_split[0].replace("Frequencies/modes:", "").strip()
+                    if len(desc_split) > 1:
+                        comment = desc_split[1].strip()
+                except Exception:
+                    logger.warning(f"Could not parse WOTA alert description: {source_alert.description}", exc_info=True)

-            time = datetime.strptime(source_alert.pub_date.content, self.RSS_DATE_TIME_FORMAT).astimezone(pytz.UTC)
+                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())
+                # 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=[ActivityRef(id=ref, sig=ActivityName.WOTA, name=ref_name)] if ref else [],
+                    start_time=time.timestamp(),
+                )
+
+                # Add to our list.
+                new_alerts.append(alert)
+
+        except ExpatError:
+            logger.warning("WOTA alert RSS feed was fetched but was invalid")

-            # Add to our list.
-            new_alerts.append(alert)
        return new_alerts
@@ -2,9 +2,10 @@ from datetime import datetime

 import pytz

-from providers.alert.http_alert_provider import HTTPAlertProvider
+from core.enums import ActivityName
+from data.activity_ref import ActivityRef
 from data.alert import Alert
-from data.sig_ref import SIGRef
+from providers.alert.http_alert_provider import HTTPAlertProvider


 class WWFF(HTTPAlertProvider):
@@ -21,17 +22,21 @@ class WWFF(HTTPAlertProvider):
        # 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)
+            alert = Alert(
+                source=self.name,
+                source_id=source_alert["id"],
+                dx_calls=[source_alert["activator_call"].upper()],
+                freqs_modes=f"{source_alert['band']} {source_alert['mode']}",
+                comment=source_alert["remarks"],
+                sig=ActivityName.WWFF,
+                sig_refs=[ActivityRef(id=source_alert["reference"], sig=ActivityName.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(),
+            )

            # Add to our list
            new_alerts.append(alert)
@@ -1,13 +1,3 @@
-import logging
-from datetime import datetime
-from threading import Thread, Event
-
-import pytz
-from requests import ReadTimeout
-from requests.exceptions import ConnectionError, ConnectTimeout
-
-from core.constants import HTTP_HEADERS
-from core.url_data_cache import URLDataCache
 from providers.callsigndata.callsign_data_provider import CallsignDataProvider


@@ -15,7 +5,7 @@ class APIQueryCallsignDataProvider(CallsignDataProvider):
    """Generic callsign data provider class for providers that fetch their data from the web on-demand using an API."""

    def __init__(self, name, provider_config, storage):
-        """ Set up the provider."""
+        """Set up the provider."""
        super().__init__(name, provider_config, storage)

        if self.enabled:
@@ -1,4 +1,3 @@
-import logging
 from datetime import datetime

 import pytz
@@ -43,7 +42,13 @@ class CallsignDataProvider:

        if self.enabled:
            if callsign in self._storage:
-                return self._storage[callsign]
+                try:
+                    return self._storage[callsign]
+                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 self._storage[callsign]
+                    return None
            else:
                c = self._perform_new_lookup(callsign, lookup_credentials)
                if c:
@@ -52,7 +57,6 @@ class CallsignDataProvider:
        else:
            return None

-
    def _perform_new_lookup(self, callsign, lookup_credentials):
        """Makes a new request to the data source for callsign data."""

@@ -2,12 +2,16 @@ import logging
 from datetime import datetime

 import pytz
-from pyhamtools import LookupLib, Callinfo
+from pyhamtools import Callinfo, LookupLib

 from core.data_store import DATA_STORE
 from core.utils import get_callsign_object_from_pyhamtools_callinfo
 from data.callsign import Callsign
-from providers.callsigndata.api_query_callsign_data_provider import APIQueryCallsignDataProvider
+from providers.callsigndata.api_query_callsign_data_provider import (
+    APIQueryCallsignDataProvider,
+)
+
+logger = logging.getLogger(__name__)


 class ClublogAPI(APIQueryCallsignDataProvider):
@@ -23,12 +27,12 @@ class ClublogAPI(APIQueryCallsignDataProvider):
            self._callinfo = Callinfo(lookuplib)
        else:
            provider_config["enabled"] = False
-            logging.warning(
-                "Clublog XML callsign data provider configured but no api key was provided, this has been disabled.")
+            logger.warning(
+                "Clublog XML callsign data provider configured but no api key was provided, this has been disabled."
+            )

        super().__init__("Clublog API", provider_config, DATA_STORE.callsign_data_clublogapi)

-
    def _perform_new_lookup(self, callsign, lookup_credentials):
        callsign_data = Callsign(call=callsign)

@@ -41,8 +45,8 @@ class ClublogAPI(APIQueryCallsignDataProvider):
            else:
                return None

-        except Exception as e:
+        except Exception:
            self.status = "Error"
-            logging.error("Exception when looking up data from Clublog API", e, exc_info=True)
+            logger.exception("Exception when looking up data from Clublog API")

        return callsign_data
@@ -1,14 +1,16 @@
 import gzip
 import logging
-from datetime import datetime

-import pytz
-from pyhamtools import LookupLib, Callinfo
+from pyhamtools import Callinfo, LookupLib

 from core.data_store import DATA_STORE
 from core.utils import get_callsign_object_from_pyhamtools_callinfo
 from data.callsign import Callsign
-from providers.callsigndata.file_download_callsign_data_provider import FileDownloadCallsignDataProvider
+from providers.callsigndata.file_download_callsign_data_provider import (
+    FileDownloadCallsignDataProvider,
+)
+
+logger = logging.getLogger(__name__)


 class ClublogXML(FileDownloadCallsignDataProvider):
@@ -25,11 +27,18 @@ class ClublogXML(FileDownloadCallsignDataProvider):
        self._api_key = provider_config.get("api_key", "")
        if self._api_key == "":
            provider_config["enabled"] = False
-            logging.warning(
-                "Clublog XML callsign data provider configured but no api key was provided, this has been disabled.")
+            logger.warning(
+                "Clublog XML callsign data provider configured but no api key was provided, this has been disabled."
+            )

-        super().__init__("Clublog XML", provider_config, self.DATA_URL + "?api=" + self._api_key,
-                         self.CACHE_PATH_ZIPPED, self.POLL_INTERVAL_DAYS, DATA_STORE.callsign_data_clublogxml)
+        super().__init__(
+            "Clublog XML",
+            provider_config,
+            f"{self.DATA_URL}?api={self._api_key}",
+            self.CACHE_PATH_ZIPPED,
+            self.POLL_INTERVAL_DAYS,
+            DATA_STORE.callsign_data_clublogxml,
+        )

    def _handle_file(self, path):
        try:
@@ -47,8 +56,8 @@ class ClublogXML(FileDownloadCallsignDataProvider):
            self._callinfo = Callinfo(lookuplib)
            return True

-        except Exception as e:
-            logging.error("Exception when loading Clublog XML.", e, exc_info=True)
+        except Exception:
+            logger.exception("Exception when loading Clublog XML.")
            return False

    def _perform_new_lookup(self, callsign, lookup_credentials):
@@ -62,8 +71,8 @@ class ClublogXML(FileDownloadCallsignDataProvider):
            else:
                return None

-        except Exception as e:
+        except Exception:
            self.status = "Error"
-            logging.error("Exception when looking up data from Clublog XML data", e, exc_info=True)
+            logger.exception("Exception when looking up data from Clublog XML data")

        return callsign_data
@@ -1,11 +1,15 @@
 import logging

-from pyhamtools import LookupLib, Callinfo
+from pyhamtools import Callinfo, LookupLib

 from core.data_store import DATA_STORE
 from core.utils import get_callsign_object_from_pyhamtools_callinfo
 from data.callsign import Callsign
-from providers.callsigndata.file_download_callsign_data_provider import FileDownloadCallsignDataProvider
+from providers.callsigndata.file_download_callsign_data_provider import (
+    FileDownloadCallsignDataProvider,
+)
+
+logger = logging.getLogger(__name__)


 class CountryFiles(FileDownloadCallsignDataProvider):
@@ -17,8 +21,14 @@ class CountryFiles(FileDownloadCallsignDataProvider):
    _callinfo = None

    def __init__(self, provider_config):
-        super().__init__("CountryFiles.com", provider_config, self.DATA_URL, self.CACHE_PATH, self.POLL_INTERVAL_DAYS,
-                         DATA_STORE.callsign_data_countryfiles)
+        super().__init__(
+            "CountryFiles.com",
+            provider_config,
+            self.DATA_URL,
+            self.CACHE_PATH,
+            self.POLL_INTERVAL_DAYS,
+            DATA_STORE.callsign_data_countryfiles,
+        )

    def _handle_file(self, path):
        try:
@@ -26,8 +36,8 @@ class CountryFiles(FileDownloadCallsignDataProvider):
            self._callinfo = Callinfo(lookuplib)
            return True

-        except Exception as e:
-            logging.error("Exception when loading Country Files cty.plist.", e, exc_info=True)
+        except Exception:
+            logger.exception("Exception when loading Country Files cty.plist.")
            return False

    def _perform_new_lookup(self, callsign, lookup_credentials):
@@ -41,8 +51,8 @@ class CountryFiles(FileDownloadCallsignDataProvider):
            else:
                return None

-        except Exception as e:
+        except Exception:
            self.status = "Error"
-            logging.error("Exception when looking up data from Country file", e, exc_info=True)
+            logger.exception("Exception when looking up data from Country file")

        return callsign_data
@@ -1,28 +1,29 @@
 import logging
 from datetime import datetime
-from threading import Thread, Event
+from threading import Event, Thread

 import pytz
-from requests import ReadTimeout
-from requests.exceptions import ConnectionError, ConnectTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout

 from core.constants import HTTP_HEADERS
 from core.url_data_cache import URLDataCache
 from providers.callsigndata.callsign_data_provider import CallsignDataProvider

+logger = logging.getLogger(__name__)
+

 class FileDownloadCallsignDataProvider(CallsignDataProvider):
    """Generic callsign data provider class for providers that fetch their data from the web by downloading a file."""

    def __init__(self, name, provider_config, url, cache_file_path, poll_interval, storage):
-        """ Set up the provider, note poll_interval is in *days*."""
+        """Set up the provider, note poll_interval is in *days*."""
        super().__init__(name, provider_config, storage)
        self._url = url
        self._cache_file_path = cache_file_path
        self._poll_interval = poll_interval
        self._thread = None
        self._stop_event = Event()
-        self._url_data_cache = URLDataCache("callsigndata_" + name)
+        self._url_data_cache = URLDataCache(f"callsigndata_{name}")

        if self.enabled:
            self.status = "Ready"
@@ -30,13 +31,16 @@ class FileDownloadCallsignDataProvider(CallsignDataProvider):
    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 + " callsign reference data every " + str(self._poll_interval) + " days.")
-        self._thread = Thread(target=self._run, name=f"FileDownloadCallsignDataProvider-{self.name}")
+        logger.info(f"Set up query of {self.name} callsign reference data every {self._poll_interval!s} days.")
+        self._thread = Thread(target=self._run, name=f"FileDownloadCallsignDataProvider-{self.name}", daemon=True)
        self._thread.start()

    def stop(self):
        self._stop_event.set()
+        if self._thread:
+            self._thread.join(timeout=12)
+            if self._thread.is_alive():
+                logger.warning(f"{self.name} callsign data worker thread did not exit on time and will be killed.")

    def _run(self):
        while True:
@@ -48,7 +52,7 @@ class FileDownloadCallsignDataProvider(CallsignDataProvider):
        try:
            # Request the file. 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.
-            logging.debug("Downloading " + self.name + " callsign reference data...")
+            logger.debug(f"Downloading {self.name} callsign reference data...")
            http_response = self._url_data_cache.get(self._url, headers=HTTP_HEADERS)
            # Check response code was good
            if http_response.ok:
@@ -61,24 +65,26 @@ class FileDownloadCallsignDataProvider(CallsignDataProvider):
                    if ok:
                        self.status = "OK"
                        self.last_update_time = datetime.now(pytz.UTC)
-                        logging.info("Updated callsign reference data from " + self.name)
+                        logger.info(f"Updated callsign reference data from {self.name}")
                    else:
                        self.status = "Error"
-                        logging.warning(f"Error updating callsign reference data from {self.name}.")
+                        logger.warning(f"Error updating callsign reference data from {self.name}.")

            else:
                self.status = "Error"
-                logging.warning(f"HTTP {http_response.status_code} when downloading callsign reference data from {self.name}.")
+                logger.warning(
+                    f"HTTP {http_response.status_code} when downloading callsign reference data from {self.name}."
+                )

        except ConnectionError:
            self.status = "Error"
-            logging.warning(f"Connection error when downloading callsign reference data from {self.name}.")
+            logger.warning(f"Connection error when downloading callsign reference data from {self.name}.")
        except (ConnectTimeout, ReadTimeout):
            self.status = "Error"
-            logging.warning(f"Timeout when downloading callsign reference data from {self.name}.")
+            logger.warning(f"Timeout when downloading callsign reference data from {self.name}.")
        except Exception:
            self.status = "Error"
-            logging.exception("Exception in callsign reference data provider (" + self.name + ")")
+            logger.exception(f"Exception in callsign reference data provider ({self.name})")
            self._stop_event.wait(timeout=1)

    def _handle_file(self, path):
@@ -1,19 +1,24 @@
 import logging
 import urllib.parse
-from datetime import timedelta, datetime
+from datetime import datetime, timedelta

 import pytz
 import xmltodict
 from pyhamtools import callinfo
-from requests import ConnectTimeout, ReadTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
 from requests_cache import CachedSession

 from core.config import SERVER_OWNER_CALLSIGN
 from core.constants import HTTP_HEADERS, SOFTWARE_VERSION
-from core.data_store import DATA_STORE, CACHE_DIR
+from core.data_store import CACHE_DIR, DATA_STORE
+from core.enums import Continent
 from core.url_data_cache import URLDataCache
-from data.callsign import Callsign
-from providers.callsigndata.api_query_callsign_data_provider import APIQueryCallsignDataProvider
+from data.callsign import Callsign, LocationSourceForCallsign
+from providers.callsigndata.api_query_callsign_data_provider import (
+    APIQueryCallsignDataProvider,
+)
+
+logger = logging.getLogger(__name__)


 class HamQTH(APIQueryCallsignDataProvider):
@@ -22,18 +27,19 @@ class HamQTH(APIQueryCallsignDataProvider):
    def __init__(self, provider_config):
        super().__init__("HamQTH", provider_config, DATA_STORE.callsign_data_hamqth)
        self._HAMQTH_BASE_URL = "https://www.hamqth.com/xml.php"
-        self._PRG = ("Spothole v" + SOFTWARE_VERSION + " operated by " + SERVER_OWNER_CALLSIGN).replace(" ", "_")
+        self._PRG = f"Spothole v{SOFTWARE_VERSION} operated by {SERVER_OWNER_CALLSIGN}".replace(" ", "_")
        self._URL_DATA_CACHE = URLDataCache("hamqth")
        # Separate URL cache for session key lookups. Once a session key is returned from logging in with a username
        # and password, this is valid for an hour, so our cache stores this specifically for 55 minutes.
-        self._CREDENTIALS_CACHE = CachedSession(CACHE_DIR + "/urls/hamqth-creds",
-                                                expire_after=timedelta(minutes=55))
+        self._CREDENTIALS_CACHE = CachedSession(f"{CACHE_DIR}/urls/hamqth-creds", expire_after=timedelta(minutes=55))

    def _perform_new_lookup(self, callsign, lookup_credentials):
        # If we don't have HamQTH credentials, skip this lookup Return None so we don't *cache* the lack of data, because
        #         # someone might provide credentials next time around.
-        if not lookup_credentials or not ((lookup_credentials.hamqth_username and lookup_credentials.hamqth_password)
-                or lookup_credentials.hamqth_session_id):
+        if not lookup_credentials or not (
+            (lookup_credentials.hamqth_username and lookup_credentials.hamqth_password)
+            or lookup_credentials.hamqth_session_id
+        ):
            return None

        try:
@@ -44,18 +50,18 @@ class HamQTH(APIQueryCallsignDataProvider):
            elif lookup_credentials.hamqth_username and lookup_credentials.hamqth_password:
                try:
                    session_data = self._CREDENTIALS_CACHE.get(
-                        self._HAMQTH_BASE_URL + "?u=" + urllib.parse.quote_plus(lookup_credentials.hamqth_username) +
-                        "&p=" + urllib.parse.quote_plus(lookup_credentials.hamqth_password),
-                        headers=HTTP_HEADERS).content
+                        f"{self._HAMQTH_BASE_URL}?u={urllib.parse.quote_plus(lookup_credentials.hamqth_username)}&p={urllib.parse.quote_plus(lookup_credentials.hamqth_password)}",
+                        headers=HTTP_HEADERS,
+                    ).content
                    dict_data = xmltodict.parse(session_data)
                    if "session_id" in dict_data["HamQTH"]["session"]:
                        session_id = str(dict_data["HamQTH"]["session"]["session_id"])
                    else:
                        # Log this failure at debug level only, not our problem if user entered the wrong password.
-                        logging.debug("HamQTH login details incorrect, failed to look up with HamQTH.")
+                        logger.debug("HamQTH login details incorrect, failed to look up with HamQTH.")
                        return None
                except Exception:
-                    logging.error("Exception when getting HamQTH session key")
+                    logger.exception("Exception when getting HamQTH session key")
                    return None

            if not session_id:
@@ -68,14 +74,16 @@ class HamQTH(APIQueryCallsignDataProvider):
                if home_call != callsign:
                    calls_to_try.append(home_call)
            except ValueError:
-                logging.debug("Could not look up home call for callsign %s", callsign)
+                logger.debug(f"Could not look up home call for callsign {callsign}")

            # Try looking up each call using the API
            for lookup_call in calls_to_try:
                try:
                    response = self._URL_DATA_CACHE.get(
-                        self._HAMQTH_BASE_URL + "?id=" + session_id + "&callsign=" + urllib.parse.quote_plus(
-                            lookup_call) + "&prg=" + self._PRG, headers=HTTP_HEADERS, timeout=10)
+                        f"{self._HAMQTH_BASE_URL}?id={session_id}&callsign={urllib.parse.quote_plus(lookup_call)}&prg={self._PRG}",
+                        headers=HTTP_HEADERS,
+                        timeout=10,
+                    )
                    if response.ok:
                        # Found data, convert it to our object and return it
                        data = xmltodict.parse(response.content)["HamQTH"]["search"]
@@ -85,27 +93,26 @@ class HamQTH(APIQueryCallsignDataProvider):
                        return self.hamqth_response_to_callsign(callsign, data)

                    elif not response.from_cache:
-                        logging.warning("HTTP %d looking up callsign %s using HamQTH", response.status_code,
-                                        lookup_call)
+                        logger.warning(f"HTTP {response.status_code} looking up callsign {lookup_call} using HamQTH")

                except (KeyError, ValueError):
                    continue
                except ConnectionError:
-                    logging.warning(f"Connection error when looking up callsign %s using HamQTH", lookup_call)
+                    logger.warning(f"Connection error when looking up callsign {lookup_call} using HamQTH")
                    continue
                except (ConnectTimeout, ReadTimeout):
-                    logging.warning(f"Timeout when looking up callsign %s using HamQTH", lookup_call)
+                    logger.warning(f"Timeout when looking up callsign {lookup_call} using HamQTH")
                    continue
                except Exception:
-                    logging.error("Exception when looking up callsign %s using HamQTH", lookup_call, exc_info=True)
+                    logger.exception(f"Exception when looking up callsign {lookup_call} using HamQTH")
                    continue

            # Not found in HamQTH; return a Callsign object with no data so we cache that and don't keep retrying
            return Callsign(call=callsign)

-        except Exception as e:
+        except Exception:
            self.status = "Error"
-            logging.error("Exception when looking up data from HamQTH", e, exc_info=True)
+            logger.exception("Exception when looking up data from HamQTH")
            # Return None, this won't be cached so we will be asked to query data again for this call next time.
            return None

@@ -116,27 +123,32 @@ class HamQTH(APIQueryCallsignDataProvider):
        # Check for sensible latitudes
        lat = None
        lon = None
-        if "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:
+        if (
+            data.get("latitude") is not None
+            and data.get("longitude") is not None
+            and (float(data["latitude"]) != 0 or float(data["longitude"]) != 0)
+            and -89.9 < float(data["latitude"]) < 89.9
+        ):
            lat = float(data["latitude"])
            lon = float(data["longitude"])

        # Check for sensible grids
        grid = None
-        if "grid" in data and not data["grid"].startswith("AA00"):
+        if data.get("grid") and not data["grid"].startswith("AA00"):
            grid = data["grid"]

-        return Callsign(call=callsign,
-                        home_call=callinfo.Callinfo.get_homecall(callsign),
-                        name=data["nick"] if "nick" in data else None,
-                        qth=data["qth"] if "qth" in data else None,
-                        country=data["country"] if "country" in data else None,
-                        continent=data["continent"] if "continent" in data else None,
-                        latitude=lat,
-                        longitude=lon,
-                        grid=grid,
-                        dxcc_id=int(data["adif"]) if "adif" in data else None,
-                        cq_zone=int(data["cq"]) if "cq" in data else None,
-                        itu_zone=int(data["itu"]) if "itu" in data else None,
-                        location_source="HOME QTH")
+        return Callsign(
+            call=callsign,
+            home_call=callinfo.Callinfo.get_homecall(callsign),
+            name=data.get("nick", None),
+            qth=data.get("qth", None),
+            country=data.get("country", None),
+            continent=Continent(data["continent"]) if "continent" in data else None,
+            latitude=lat,
+            longitude=lon,
+            grid=grid,
+            dxcc_id=int(data["adif"]) if data.get("adif") is not None else None,
+            cq_zone=int(data["cq"]) if data.get("cq") is not None else None,
+            itu_zone=int(data["itu"]) if data.get("itu") is not None else None,
+            location_source=LocationSourceForCallsign.HOME_QTH,
+        )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ian Renton	2df7ecf4b5	Prevent ruff running on a couple of lines where catching and not logging an exception is a deliberate choice.	2026-09-20 09:55:22 +01:00
Ian Renton	1b41520f7c	Merge branch 'main' into 147-sig-activity-changes # Conflicts: # core/constants.py # pyproject.toml	2026-09-20 09:51:29 +01:00
Ian Renton	ed172a0063	Release 2.1.3	2026-09-20 09:48:10 +01:00
Ian Renton	f45b7d51b0	Give threads less time to shut down gracefully. Attempt shutdown() rather than stop() on the telnet connections to see if that improves things	2026-09-19 15:07:31 +01:00
Ian Renton	0eb4553406	Merge remote-tracking branch 'origin/main' # Conflicts: # templates/add_spot.html # templates/alerts.html # templates/bands.html # templates/base.html # templates/conditions.html # templates/map.html # templates/spots.html # templates/status.html	2026-09-19 10:49:36 +01:00
Ian Renton	682e2c267c	Improve handling of empty JSON repsonses from ParksNPeaks (and potentially others)	2026-09-19 10:49:09 +01:00
Ian Renton	f39215ecdd	Attempt at fixing slight hscroll on mobile	2026-09-19 08:33:15 +01:00
Ian Renton	c9c8ffc1f7	If cache load fails because objects are from a different version and throw an exception, clear the cache.	2026-09-19 08:04:50 +01:00
Ian Renton	59d5f61d90	Potential fix for an issue where the telnet client was reconnecting right at the same time we try to shut down spothole, causing the stop() method to close one telnet object but then a new one is created and read from anyway.	2026-09-19 07:55:12 +01:00
Ian Renton	ab81c136cc	Release 2.1.1	2026-09-18 21:37:05 +01:00
Ian Renton	c1c9bcd5ae	Merge branch 'main' into 147-sig-activity-changes	2026-09-18 21:35:56 +01:00
Ian Renton	f0df4f38ca	Turns out "if x in list" returns true if list[x] = None, so guard against that by checking list.get(x) instead	2026-09-18 21:33:26 +01:00
Ian Renton	a24e03028b	Restrict the activities that we display on the alerts page's filters to just ones that can actually be in alerts #147	2026-09-18 21:20:42 +01:00
Ian Renton	54d779f036	Allow QRP spots from PnP APIs #147	2026-09-18 20:56:46 +01:00
Ian Renton	7bdc26c926	Activity filter on upcoming page #147	2026-09-18 20:49:24 +01:00
Ian Renton	eea045e4b8	Merge branch 'main' into 147-sig-activity-changes # Conflicts: # providers/activityrefdata/activity_ref_data_provider.py	2026-09-18 18:58:22 +01:00
Ian Renton	4b51dd9ba5	(Hopefully) fix a bug where several sig ref data providers try to write to the data store simultaneously on startup.	2026-09-18 18:57:18 +01:00
Ian Renton	c2c3981cda	If a spot has no other activity but its DX call does match a call from an ongoing DXpedition, assign that activity to it. Closes #147	2026-09-18 18:45:06 +01:00
Ian Renton	1a1743d11c	ruff fixes	2026-09-18 18:38:35 +01:00
Ian Renton	40033d122e	Add a has_refs field to activities #147	2026-09-18 18:28:30 +01:00
Ian Renton	e5caf7353d	Refactor activity names to use an enum instead of a string to avoid typos #147	2026-09-18 18:09:41 +01:00
Ian Renton	ab79e7e01c	More About page tweaks. #147	2026-09-18 17:31:31 +01:00
Ian Renton	75905c5ef7	Add /AM and /MM activities, fix up activities list in OpenAPI spec, few more About page tweaks. #147	2026-09-18 17:29:21 +01:00
Ian Renton	0ad0d25c70	Add QRP and RaDAR Rally activities	2026-09-18 17:14:24 +01:00
Ian Renton	51798fbc81	Doc updates	2026-09-18 17:10:30 +01:00
Ian Renton	cea90695ba	Now that SIGs are rebranded as Activities, we can merge DXpedition and Contest into that without it being too weird, and get rid of AlertType #147	2026-09-18 16:50:00 +01:00
Ian Renton	bf9b4ac68c	In the JS UI, turn each category of Activity into a collapsible section to save space #147	2026-09-18 15:45:23 +01:00
Ian Renton	81cd686a00	Giant refactor to rebrand "SIG" as "Activity" anywhere that doesn't touch API or config file (which is to be addressed in a future breaking change). #147	2026-09-18 14:54:11 +01:00
Ian Renton	556ea56378	v2.1 release	2026-09-18 12:44:09 +01:00
Ian Renton	a367888e14	Missed a couple of _stop_events	2026-09-18 09:27:15 +01:00
Ian Renton	29d8654234	Use _stop_event consistently across all threads as the way to signal that it should stop. Add thread joins with timeouts to allow the program to exit cleanly	2026-09-18 09:21:38 +01:00
Ian Renton	d79c8f72c8	Add missing SIGs to OpenAPI spec	2026-09-18 07:58:55 +01:00
Ian Renton	a03e1336c8	Code review fixes	2026-09-18 07:56:08 +01:00
Ian Renton	0fa8cd763d	Add support for Diplôme des Moulins de France	2026-09-18 07:38:30 +01:00
Ian Renton	4261c60d74	Improve protection against old unsupported objects (e.g. LocationSourceForCallsign.NONE) coming back from the cache and throwing exceptions	2026-09-18 07:28:29 +01:00
Ian Renton	29eea1edc0	Telnet fixes and banner	2026-09-12 08:40:50 +01:00
Ian Renton	7c458a8c5b	Extract webserver metrics into a separate class to avoid passing it into every API call. Change the display to requests per hour rather than just last request time. Add SSE and telnet client connected count.	2026-09-11 22:32:04 +01:00
Ian Renton	4a09e46fe0	Improve asyncio usage in telnet server	2026-09-11 21:38:22 +01:00
Ian Renton	e3df512b9e	Add telnet server	2026-09-11 16:23:10 +01:00
Ian Renton	ee45a15b4e	Add telnet server	2026-09-11 16:18:09 +01:00
Ian Renton	5e56cd3b19	Add telnet server	2026-09-11 15:55:57 +01:00
Ian Renton	04f5df5260	Alerts now displays a "Type" in the table not just the source. Closes #142	2026-09-11 14:43:33 +01:00
Ian Renton	8f8ff46426	country-files.com seems more reliable than Clublog at locating some calls, trying it out as higher priority	2026-09-11 09:47:53 +01:00
Ian Renton	2e51d5fdb2	Doc updates	2026-09-11 08:36:49 +01:00
Ian Renton	3bab3cb784	Add EME SIG and do some refactoring	2026-09-11 08:33:00 +01:00
Ian Renton	a4245ed5ce	Support Hamsat alerts and use an AMSAT SIG for satellite spots	2026-09-11 08:18:34 +01:00
Ian Renton	64bb8ef3eb	Fix a potential NPE and a case where callsign location source could be reported as None instead of DXCC.	2026-09-11 07:32:15 +01:00
Ian Renton	3b575de36a	Fix SSE timeout	2026-09-10 17:58:02 +01:00
Ian Renton	94dc9044c4	Add support for WA7BNM Contest Calendar. Closes #106	2026-09-10 16:45:40 +01:00
Ian Renton	be625c40a4	Add "fields" query parameter to spots and alerts API calls. Closes #140	2026-09-10 07:54:34 +01:00
Ian Renton	0fcc459cc4	Fix some dodgy handling of DME references	2026-09-05 10:24:18 +01:00
Ian Renton	e52790f07d	Alerts page layout fixes	2026-09-05 10:19:53 +01:00
Ian Renton	237cdaa091	Fix icon and ref_type disappearing from SIG Ref lookups	2026-09-05 10:14:37 +01:00
Ian Renton	df724409a5	Fix some dodgy handling of DME references	2026-09-05 09:57:05 +01:00
Ian Renton	3e4327ec0c	Add icons back to spots & alerts	2026-09-05 09:48:56 +01:00
Ian Renton	d6e53c14e9	Support RSGB contests	2026-09-05 09:00:32 +01:00
Ian Renton	d3d1d20821	Support DMVE, DMUE, DCE, DEFE. Closes #137	2026-09-04 19:35:48 +01:00
Ian Renton	ab86bdc4d6	Improve error handling and PWA manifest	2026-09-04 17:50:35 +01:00
Ian Renton	d7202f208c	Allow ACS as well as AS for aircraft scatter	2026-09-04 17:38:46 +01:00
Ian Renton	9d117a6069	Split out event type SIGs, and do other enum conversions. Closes #138	2026-09-02 09:38:05 +01:00
Ian Renton	606cf1be68	Start converting some enum-like strings to proper enums, plus global reformat	2026-09-02 08:37:13 +01:00
Ian Renton	5a6fc19ab5	dxstats.py now uses is_ham_hf flag on bands list instead of providing its own. Closes #139	2026-09-02 07:46:02 +01:00
Ian Renton	9258d680fc	Overnight bug fixes	2026-09-02 07:40:57 +01:00
ian	8189be699e	Consider 6m a de facto HF band	2026-09-02 06:33:13 +00:00
Ian Renton	fa2e4b929a	Start converting some enum-like strings to proper enums	2026-09-02 07:26:02 +01:00
Ian Renton	55eaa871e9	Remove accidentally committed debug code	2026-08-31 21:54:43 +01:00
Ian Renton	1b62d4742b	Support PGA. Closes #135	2026-08-31 21:54:13 +01:00
Ian Renton	b0caf697ae	Support COTA. Closes #131	2026-08-31 21:17:55 +01:00
Ian Renton	a33f02491d	Avoid polling GIRO stations that don't return any data	2026-08-31 20:54:21 +01:00
Ian Renton	892827f1f8	Allow some SIG refs to be picked up from comments without separate SIG name. Closes #134	2026-08-31 20:49:15 +01:00
Ian Renton	e4738b2c7d	Split SIGs list into Worldwide, Regional and Other. Closes #133	2026-08-31 18:38:19 +01:00
Ian Renton	f42fd237b1	Move icons back into SIG data	2026-08-31 17:57:04 +01:00
Ian Renton	d83a979e46	Move icons back into SIG data	2026-08-31 17:31:13 +01:00
Ian Renton	12e9b6a4ca	Remove distinction between DV modes and LSB/USB	2026-08-31 11:17:05 +01:00
Ian Renton	8345238d76	Tweak FEA reference handling, add understanding of BIWOTA, remove some unused junk from ui-ham.js	2026-08-31 11:05:53 +01:00
Ian Renton	bc326388ac	Add support for FEA	2026-08-31 09:39:05 +01:00
Ian Renton	df684a601d	Fix an exception on shutdown	2026-08-31 09:00:23 +01:00
Ian Renton	9083470482	Add support for DTMBA	2026-08-31 08:59:49 +01:00
Ian Renton	ba56acd7ac	Fix a bug where solar conditions and status data were not properly persisted to disk between restarts. Release v2.0.5	2026-08-29 09:17:24 +01:00
Ian Renton	8451ca2727	Release v2.0.4	2026-08-29 08:40:11 +01:00
Ian Renton	7ae77e9fb2	Encourage cluster spot sources to simply be named "Cluster" as the specific node shouldn't matter	2026-08-29 08:37:21 +01:00
Ian Renton	c3a360e691	Consistency about whether "GMA Islands" is plural or not; widen columns on SIG list so it doesn't wrap	2026-08-29 08:34:04 +01:00
Ian Renton	2a4190ec4a	Fix GIRO data source. Release v2.0.3	2026-08-28 21:47:25 +01:00
Ian Renton	c71c0e9d75	Release v2.0.2	2026-08-28 16:10:02 +01:00
Ian Renton	f2ef6e93fa	Merge remote-tracking branch 'origin/main' # Conflicts: # core/constants.py # pyproject.toml # templates/add_spot.html # templates/alerts.html # templates/bands.html # templates/base.html # templates/conditions.html # templates/map.html # templates/spots.html # templates/status.html	2026-08-28 15:46:24 +01:00
Ian Renton	d63897f8ad	Provide CartoDB API key	2026-08-28 15:43:52 +01:00
Ian Renton	02e2730e47	v2.0.1 release	2026-08-28 07:59:10 +01:00
Ian Renton	b2719d2cd6	Fix a bug where the default maximum spot age was not being applied on first access of the web UI	2026-08-28 07:52:15 +01:00
ian	b9268dd4ca	Update pyproject.toml	2026-08-25 20:42:07 +00:00
ian	0cce38b0ab	Update core/constants.py	2026-08-25 20:41:53 +00:00
ian	5a77248dbc	Fix a bug in calling the V1 add spot endpoint	2026-08-25 20:41:12 +00:00
Ian Renton	14e4886c1b	v2.0 release	2026-08-22 08:11:03 +01:00
Ian Renton	f346444ec3	Defensive coding improvements	2026-08-22 08:08:27 +01:00
Ian Renton	6f21ac83b7	Add timestamp to log output	2026-08-22 08:07:34 +01:00
Ian Renton	a20c29cdd1	GMA Islands support	2026-08-22 08:04:24 +01:00
Ian Renton	1fd6611ac2	GMA Islands support	2026-08-22 08:02:57 +01:00
ian	a27a04b65d	Update templates/about.html	2026-08-20 22:36:18 +00:00
Ian Renton	c5d6a65786	Bug fixes and minor doc clarifications	2026-08-20 07:30:21 +01:00
Ian Renton	85f63a1258	Add zoom controls	2026-08-18 17:59:54 +01:00
Ian Renton	7f1a5ae3be	Overnight bug fixes	2026-08-18 17:56:31 +01:00
Ian Renton	38bc03a603	Improve checking callsign validity by regex, and fix passing v1 type credentials into v2 APIs	2026-08-17 16:30:24 +01:00
Ian Renton	03164d747f	More defensive coding	2026-08-17 13:43:40 +01:00
Ian Renton	7623ae667e	Overnight bug fixes	2026-08-17 06:47:20 +01:00
Ian Renton	1db0c2787a	Overnight bug fixes	2026-08-17 06:41:31 +01:00
ian	e7cdfb0080	Update core/constants.py	2026-08-16 20:28:33 +00:00
Ian Renton	842e91b34a	Re-add translation of QRZ/HamQTH query params to header params, since it turns out someone was using that	2026-08-16 15:23:05 +01:00
Ian Renton	7220a0f58d	ruff format && ruff check --fix	2026-08-16 14:11:45 +01:00
Ian Renton	8e48287edf	Bug fixes	2026-08-16 14:02:22 +01:00
ian	36ce350079	Update static/css/style.css	2026-08-16 08:55:39 +00:00
Ian Renton	f8032973ca	Error handling improvements	2026-08-16 09:26:05 +01:00
Ian Renton	0291be3338	Screenshots	2026-08-16 07:59:25 +01:00
Ian Renton	1bda204863	Fix trivial thing where "Your Data" button brought up a panel just called "Data"	2026-08-16 07:51:50 +01:00
Ian Renton	00c1bc7ba3	Fix potential NPE	2026-08-15 17:04:52 +01:00
Ian Renton	325d445f30	how does i math	2026-08-15 17:04:45 +01:00
Ian Renton	ae1f752516	Fix bugs in GMA and WWBOTA providers	2026-08-15 13:59:52 +01:00
Ian Renton	fe4826b729	Bell sound on wanted calls. Closes #117	2026-08-15 12:02:40 +01:00
Ian Renton	3006ee38cb	Highlight wanted calls. Closes #117	2026-08-15 11:43:44 +01:00
Ian Renton	2ffa4780e8	More ruff linter fixes	2026-08-15 08:52:26 +01:00
Ian Renton	d0d6c777da	More ruff linter fixes	2026-08-15 08:51:50 +01:00
Ian Renton	335d15bfa0	More ruff linter fixes	2026-08-15 08:50:03 +01:00
Ian Renton	a6e54f524d	More ruff linter fixes	2026-08-15 08:43:19 +01:00
Ian Renton	dd89ff4af7	Replace root logger calls with module-specific loggers	2026-08-15 08:35:06 +01:00
Ian Renton	74bcd9cded	Use ruff linter to fix issues and provide consistent formatting	2026-08-15 08:31:38 +01:00
Ian Renton	af3f82c14d	Use ruff linter to fix issues and provide consistent formatting	2026-08-15 08:25:54 +01:00
Ian Renton	7391c28cd0	flynt pass to provide consistency to string formatters and concatenation	2026-08-15 07:55:32 +01:00
Ian Renton	bff5b79f8f	Logging tidy-up, IDE inspection fixes	2026-08-15 07:42:38 +01:00
Ian Renton	9cd6d9c177	Better logging on telnet disconnect	2026-08-15 07:11:45 +01:00
Ian Renton	0dee8d827a	Defensive coding	2026-08-15 07:11:36 +01:00
Ian Renton	ef2c23c8b6	Fix missing headers in SSE queries	2026-08-14 23:47:22 +01:00
Ian Renton	efec8e220e	Oops, "type" was a bad choice of field name	2026-08-14 17:59:15 +01:00
Ian Renton	12c2e66c64	HOPE26 TOTA refs	2026-08-14 17:47:23 +01:00
Ian Renton	e94d4bd927	Add types and altitudes to SIG Ref lookups	2026-08-14 14:57:48 +01:00
Ian Renton	605b629d43	Fix ZLOTA location lookup	2026-08-14 14:32:42 +01:00
Ian Renton	186f03a233	Add distance column for spots	2026-08-13 14:49:15 +01:00
Ian Renton	d1a9af9932	Bring back cleanup thread	2026-08-13 07:13:05 +01:00
Ian Renton	c913d0bac8	Bring back cleanup thread	2026-08-13 07:09:27 +01:00
Ian Renton	bab14bd7ac	Bring back cleanup thread	2026-08-13 07:07:15 +01:00
Ian Renton	6a4b0bed95	Fix extra duplicates showing for spots and alerts	2026-08-13 06:45:27 +01:00
Ian Renton	c285b86131	Transparent redirect handler instead of returning HTTP 308 to clients	2026-08-12 18:49:06 +01:00