Global autoformat

2026-06-23 21:25:12 +00:00 · 2026-06-19 21:36:11 +01:00
parent edb2641f76
commit 07d0d98f3d
65 changed files with 1250 additions and 844 deletions
--- a/README.md
+++ b/README.md
@@ -1,16 +1,23 @@
 # ![Spothole](/webassets/img/logo.png)
-Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an open JSON API as well as a website to browse the data.
+Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an open
 JSON API as well as a website to browse the data.
 ![Screenshot](/images/screenshot.png)
-While there are several other web-based interfaces to DX clusters, and sites that aggregate spots from various outdoor activity programmes for amateur radio, Spothole differentiates itself by supporting a large number of data sources, and by being "API first" rather than just providing a web front-end. This allows other software to be built on top of it.
+While there are several other web-based interfaces to DX clusters, and sites that aggregate spots from various outdoor
 activity programmes for amateur radio, Spothole differentiates itself by supporting a large number of data sources, and
 by being "API first" rather than just providing a web front-end. This allows other software to be built on top of it.
-The API is deliberately well-defined with an OpenAPI specification and auto-generated API documentation. The API delivers spots in a consistent format regardless of the data source, freeing developers from needing to know how each individual data source presents its data.
+The API is deliberately well-defined with an OpenAPI specification and auto-generated API documentation. The API
 delivers spots in a consistent format regardless of the data source, freeing developers from needing to know how each
 individual data source presents its data.
 Spothole itself is also open source, Public Domain licenced code that anyone can take and modify.
-Supported data sources include DX Clusters, the Reverse Beacon Network (RBN), the APRS Internet Service (APRS-IS), POTA, SOTA, WWFF, GMA, WWBOTA, HEMA, Parks 'n' Peaks, ZLOTA, WOTA, BOTA, LLOTA, WWTOTA, Tiles on the Air, the UK Packet Repeater Network, NG3K, and any site based on the xOTA software by nischu.
+Supported data sources include DX Clusters, the Reverse Beacon Network (RBN), the APRS Internet Service (APRS-IS), POTA,
 SOTA, WWFF, GMA, WWBOTA, HEMA, Parks 'n' Peaks, ZLOTA, WOTA, BOTA, LLOTA, WWTOTA, Tiles on the Air, the UK Packet
 Repeater Network, NG3K, and any site based on the xOTA software by nischu.
 ![Screenshot](/images/screenshot2.png)
@@ -18,65 +25,88 @@ Supported data sources include DX Clusters, the Reverse Beacon Network (RBN), th
 ## Accessing the public version
-You can access the public version's web interface at [https://spothole.app](https://spothole.app), and see [https://spothole.app/apidocs](https://spothole.app/apidocs) for the API details.
+You can access the public version's web interface at [https://spothole.app](https://spothole.app), and
 see [https://spothole.app/apidocs](https://spothole.app/apidocs) for the API details.
-This is a Progressive Web App, so you can also "install" it to your Android or iOS device by accessing it in Chrome or Safari respectively, and following the menu-driven process for installing PWAs.
+This is a Progressive Web App, so you can also "install" it to your Android or iOS device by accessing it in Chrome or
 Safari respectively, and following the menu-driven process for installing PWAs.
-You are more than welcome to use the data and the API that Spothole provides to power your own software. There are many ways to do this; see below. 
+You are more than welcome to use the data and the API that Spothole provides to power your own software. There are many
 ways to do this; see below.
 ## Embedding Spothole in another website
 You can embed Spothole's web interface in another website, e.g. for use as part of a ham radio custom dashboard.
-URL parameters can be used to trigger an "embedded" mode which hides the headers, footers and settings. In this mode, you provide configuration for the various filter and display options via additional URL parameters. Any settings that the user has set for Spothole are ignored. This is so that the embedding site can select, for example, their choice of dark mode or SIG filters, which will not impact how Spothole appears when the user accesses it directly. Effectively, it becomes separate to their normal Spothole settings.
+URL parameters can be used to trigger an "embedded" mode which hides the headers, footers and settings. In this mode,
 you provide configuration for the various filter and display options via additional URL parameters. Any settings that
 the user has set for Spothole are ignored. This is so that the embedding site can select, for example, their choice of
 dark mode or SIG filters, which will not impact how Spothole appears when the user accesses it directly. Effectively, it
 becomes separate to their normal Spothole settings.
-Setting `embedded` to true is important for the rest of the settings to be applied; otherwise, the user's defaults will be used in preference to the URL params.
+Setting `embedded` to true is important for the rest of the settings to be applied; otherwise, the user's defaults will
 be used in preference to the URL params.
-These are supplied with the URL to the page you want to embed, for example for an embedded version of the band map in dark mode, use `https://spothole.app/bands?embedded=true&dark-mode=true`. For an embedded version of the main spots/home page in the system light/dark mode, use `https://spothole.app/?embedded=true`. For dark mode showing 70cm TOTA spots only, use `https://spothole.app/?embedded=true&dark-mode=true&sig=TOTA&band=70cm`. Providing no URL params causes the page to be loaded in the normal way it would when accessed directly in the user's browser.
+These are supplied with the URL to the page you want to embed, for example for an embedded version of the band map in
 dark mode, use `https://spothole.app/bands?embedded=true&dark-mode=true`. For an embedded version of the main spots/home
 page in the system light/dark mode, use `https://spothole.app/?embedded=true`. For dark mode showing 70cm TOTA spots
 only, use `https://spothole.app/?embedded=true&dark-mode=true&sig=TOTA&band=70cm`. Providing no URL params causes the
 page to be loaded in the normal way it would when accessed directly in the user's browser.
-The supported parameters are as follows. Generally these match the equivalent parameters in the real Spothole API, where a mapping exists.
+The supported parameters are as follows. Generally these match the equivalent parameters in the real Spothole API, where
 a mapping exists.
-| Name              | Allowed Values          | Default | Example                        | Description                                                                                                                                                           |
+| Name             | Allowed Values          | Default | Example                 | Description                                                                                                                                                           |
-|-------------------|-------------------------|---------|--------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|------------------|-------------------------|---------|-------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `embedded`        | `true`, `false`         | `false` | `?embedded=true`               | Enables embedded mode.                                                                                                                                                |
+| `embedded`       | `true`, `false`         | `false` | `?embedded=true`        | Enables embedded mode.                                                                                                                                                |
-| `color-scheme`    | `light`, `dark`, `auto` | `auto`  | `?color-scheme=dark`           | Forces light or dark mode in preference to the operating system default.                                                                                              |
+| `color-scheme`   | `light`, `dark`, `auto` | `auto`  | `?color-scheme=dark`    | Forces light or dark mode in preference to the operating system default.                                                                                              |
-| `time-zone`       | `UTC`, `local`          | `UTC`   | `?time-zone=local`             | Sets times to be in UTC or local time.                                                                                                                                |
+| `time-zone`      | `UTC`, `local`          | `UTC`   | `?time-zone=local`      | Sets times to be in UTC or local time.                                                                                                                                |
-| `limit`           | 10, 25, 50, 100         | 50      | `?limit=50`                    | Sets the number of spots that will be displayed on the main spots page                                                                                                |
+| `limit`          | 10, 25, 50, 100         | 50      | `?limit=50`             | Sets the number of spots that will be displayed on the main spots page                                                                                                |
-| `limit`           | 25, 50, 100, 200, 500   | 100     | `?limit=100`                   | Sets the number of alerts that will be displayed on the alerts page                                                                                                   |
+| `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.                                                                                       |
+| `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.         |
+| `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 SIGs that will be shown on the spots, bands and map pages. Available options match the labels of the buttons in the standard web interface.          |
-| `source`          | Comma-separated list    | (all)   | `?source=Cluster`              | Sets the list of sources that will be shown on any spot or alert pages. Available options match the labels of the buttons in the standard web interface.              |
+| `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.    |
+| `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.        |
+| `dx_continent`   | Comma-separated list    | (all)   | `?dx_continent=NA,SA`   | Sets the list of DX Continents that will be shown on any spot or alert pages. Available options match the labels of the buttons in the standard web interface.        |
-| `de_continent`    | Comma-separated list    | (all)   | `?de_continent=EU`             | Sets the list of DE Continents that will be shown on the spots, bands and map pages. Available options match the labels of the buttons in the standard web interface. |
+| `de_continent`   | Comma-separated list    | (all)   | `?de_continent=EU`      | Sets the list of DE Continents that will be shown on the spots, bands and map pages. Available options match the labels of the buttons in the standard web interface. |
-| `map-center-lat`  | Numeric (decimal)       | (auto)  | `?map-center-lat=51.5`         | Sets the initial latitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                       |
+| `map-center-lat` | Numeric (decimal)       | (auto)  | `?map-center-lat=51.5`  | Sets the initial latitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                       |
-| `map-center-lon`  | Numeric (decimal)       | (auto)  | `?map-center-lon=-0.1`         | Sets the initial longitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                      |
+| `map-center-lon` | Numeric (decimal)       | (auto)  | `?map-center-lon=-0.1`  | Sets the initial longitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                      |
-| `map-zoom`        | Numeric (integer)       | (auto)  | `?map-zoom=6`                  | Sets the initial zoom level of the map on the map page. If omitted, the map auto-fits to the loaded spots.                                                            |
+| `map-zoom`       | Numeric (integer)       | (auto)  | `?map-zoom=6`           | Sets the initial zoom level of the map on the map page. If omitted, the map auto-fits to the loaded spots.                                                            |
 More will be added soon to allow customisation of filters and other display properties.
 ## Writing your own client
-One of the key strengths of Spothole is that the API is well-defined and open to anyone to use. This means you can build your own software that uses data from Spothole.
+One of the key strengths of Spothole is that the API is well-defined and open to anyone to use. This means you can build
 your own software that uses data from Spothole.
-As well as the main API endpoints to fetch spots and alerts, with various possible query parameters, there are also Server-Sent Events (SSE) API endpoints to receive a live feed, plus various utility lookup endpoints for things like callsign and park data.
+As well as the main API endpoints to fetch spots and alerts, with various possible query parameters, there are also
 Server-Sent Events (SSE) API endpoints to receive a live feed, plus various utility lookup endpoints for things like
 callsign and park data.
 Various approaches exist to writing your own client, but in general:
-* Refer to the API docs. These are built on an OpenAPI definition file (`/webassets/apidocs/openapi.yml`), which you can automatically use to generate a client skeleton using various software.
+* Refer to the API docs. These are built on an OpenAPI definition file (`/webassets/apidocs/openapi.yml`), which you can
  automatically use to generate a client skeleton using various software.
 * Call the main "spots" or "alerts" API endpoints to get the data you want. Apply filters if necessary.
-* Call the "options" API to get an idea of which bands, modes etc. the server knows about. You might want to do that first before calling the spots/alerts APIs, to allow you to populate your filters correctly.
+* Call the "options" API to get an idea of which bands, modes etc. the server knows about. You might want to do that
-* Refer to the provided HTML/JS interface for a reference on different approaches. For example, the "map" and "bands" pages simply query the main spot API on a timer, whereas the main/spots page combines this approach with using the Server-Sent Events (SSE) endpoint to update live.
+  first before calling the spots/alerts APIs, to allow you to populate your filters correctly.
 * Refer to the provided HTML/JS interface for a reference on different approaches. For example, the "map" and "bands"
  pages simply query the main spot API on a timer, whereas the main/spots page combines this approach with using the
  Server-Sent Events (SSE) endpoint to update live.
 * Let me know if you get stuck, I'm happy to help!
 ## Running your own copy
-If you want to run a copy of Spothole with different configuration settings than the main instance, you can download it and run it on your own local machine or server.
+If you want to run a copy of Spothole with different configuration settings than the main instance, you can download it
 and run it on your own local machine or server.
-You will require Python version 3.8 or later. If you encounter an error about `gdal-config` during the following process, you will also need `libgdal-dev` installed.
+You will require Python version 3.8 or later. If you encounter an error about `gdal-config` during the following
 process, you will also need `libgdal-dev` installed.
-To download and set up Spothole on a Debian server, run the following commands. Other operating systems will likely be similar.
+To download and set up Spothole on a Debian server, run the following commands. Other operating systems will likely be
 similar.
 ```bash
 git clone ssh://git@git.ianrenton.com/ian/spothole.git
@@ -88,13 +118,23 @@ deactivate
 cp config-example.yml config.yml
 ```
-Then edit `config.yml` in your text editor of choice to set up the software as you like it. Mostly, this will involve enabling or disabling the various providers of spot and alert data.
+Then edit `config.yml` in your text editor of choice to set up the software as you like it. Mostly, this will involve
 enabling or disabling the various providers of spot and alert data.
-By default, all outdoor programme providers are enabled, as is one cluster node and the NG3K DXpedition data. The RBN spot providers are turned off by default due to the volume of traffic from CW/RTTY/FT8 skimmers, and the APRS and Packet spot providers are off by default on the assumption that Spothole users want a spot with a human at the other end of it, but all can be easily re-enabled.
+By default, all outdoor programme providers are enabled, as is one cluster node and the NG3K DXpedition data. The RBN
 spot providers are turned off by default due to the volume of traffic from CW/RTTY/FT8 skimmers, and the APRS and Packet
 spot providers are off by default on the assumption that Spothole users want a spot with a human at the other end of it,
 but all can be easily re-enabled.
-Other parameters you will want to update include the base URL to your instance, and whether you want to serve a full web-based DX cluster interface or just the API endpoints for client software to use.
+Other parameters you will want to update include the base URL to your instance, and whether you want to serve a full
 web-based DX cluster interface or just the API endpoints for client software to use.
-`config.yml` has an entry for a Clublog API key. If provided, this will allow Spothole to retrieve some more information about DX spots. The software will work just fine without it, but you may find a few country flags etc. are less accurate or missing. Clublog API keys are free, but you'll need to get your own by submitting a helpdesk ticket and explaining what you'll use it for. The admin team are happy with the rate of requests made by my Spothole server, so unless you change the source code of yours to radically increase the rate of querying Clublog, I'm sure they will be fine with your server too.
+`config.yml` has an entry for a Clublog API key. If provided, this will allow Spothole to retrieve some more information
 about DX spots. The software will work just fine without it, but you may find a few country flags etc. are less accurate
 or missing. Clublog API keys are free, but you'll need to get your own by submitting a helpdesk ticket and explaining
 what you'll use it for. The admin team are happy with the rate of requests made by my Spothole server, so unless you
 change the source code of yours to radically increase the rate of querying Clublog, I'm sure they will be fine with your
 server too.
 Once you're happy with the content of `config.yml`, you can proceed to running the software.
@@ -105,13 +145,16 @@ source .venv/bin/activate
 python3 spothole.py
 ```
-The software can take a few seconds to start up, mostly because it is downloading an updated file to match callsigns to countries. This is normal, don't panic!
+The software can take a few seconds to start up, mostly because it is downloading an updated file to match callsigns to
 countries. This is normal, don't panic!
-If you see some errors on startup, check your configuration, e.g. in case you have specified a port for the web server that is already in use by something else.
+If you see some errors on startup, check your configuration, e.g. in case you have specified a port for the web server
 that is already in use by something else.
 ### Multiple cluster nodes with different settings
-Dan, S50U has written in with his Spothole cluster settings. He is using a cluster node which provides RBN spots, and uses different SSIDs on his callsign to get different settings when logged into the same cluster node. For example:
+Dan, S50U has written in with his Spothole cluster settings. He is using a cluster node which provides RBN spots, and
 uses different SSIDs on his callsign to get different settings when logged into the same cluster node. For example:
 ```
  -
@@ -207,9 +250,12 @@ For each callsign-SSID, we also specify our basic information with commands:
 ### systemd configuration
-If you want Spothole to run automatically on startup on a Linux distribution that uses `systemd`, follow the instructions here. For distros that don't use `systemd`, or Windows/OSX/etc., you can find generic instructions for your OS online.
+If you want Spothole to run automatically on startup on a Linux distribution that uses `systemd`, follow the
 instructions here. For distros that don't use `systemd`, or Windows/OSX/etc., you can find generic instructions for your
 OS online.
-Create a file at `/etc/systemd/system/spothole.service`. Give it the following content, adjusting for the user you want to run it as and the directory in which you have installed it:
+Create a file at `/etc/systemd/system/spothole.service`. Give it the following content, adjusting for the user you want
 to run it as and the directory in which you have installed it:
 ```
 [Unit]
@@ -239,11 +285,19 @@ Check the service has started up correctly with `sudo journalctl -u spothole -f`
 ### nginx Reverse Proxy configuration
-Web servers generally serve their pages from port 80. However, it's best not to serve Spothole's web interface directly on port 80, as that requires root privileges on a Linux system. It also and prevents us using HTTPS to serve a secure site, since Spothole itself doesn't directly support acting as an HTTPS server. The normal solution to this is to use a "reverse proxy" setup, where a general web server handles HTTP and HTTP requests (to port 80 & 443 respectively), then passes on the request to the back-end application (in this case Spothole). nginx is a common choice for this general web server.
+Web servers generally serve their pages from port 80. However, it's best not to serve Spothole's web interface directly
 on port 80, as that requires root privileges on a Linux system. It also and prevents us using HTTPS to serve a secure
 site, since Spothole itself doesn't directly support acting as an HTTPS server. The normal solution to this is to use
 a "reverse proxy" setup, where a general web server handles HTTP and HTTP requests (to port 80 & 443 respectively), then
 passes on the request to the back-end application (in this case Spothole). nginx is a common choice for this general web
 server.
-To set up nginx as a reverse proxy that sits in front of Spothole, first ensure it's installed e.g. `sudo apt install nginx`, and enabled e.g. `sudo systemd enable nginx`.
+To set up nginx as a reverse proxy that sits in front of Spothole, first ensure it's installed e.g.
 `sudo apt install nginx`, and enabled e.g. `sudo systemd enable nginx`.
-Create a file at `/etc/nginx/sites-available/` called `spothole`. Give it the following contents, replacing `spothole.app` with the domain name on which you want to run Spothole. If you changed the port on which Spothole runs, update that on the "proxy_pass" line too.
+Create a file at `/etc/nginx/sites-available/` called `spothole`. Give it the following contents, replacing
 `spothole.app` with the domain name on which you want to run Spothole. If you changed the port on which Spothole runs,
 update that on the "proxy_pass" line too.
 ```nginx
 server {
@@ -298,13 +352,19 @@ 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
+One further change you might want to make to the file above is the `add_header Access-Control-Allow-Origin` statements.
-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
+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,
+leave this intact. But if you want your Spothole instance to only be usable by scripts running on the web server you
-you can remove these lines. (Note that this doesn't stop other people writing *non-web-based* software that accesses your
+write,
-Spothole API&mdash;the enforcement of cross-origin headers only happens within the user's browser. If you need to lock your
+you can remove these lines. (Note that this doesn't stop other people writing *non-web-based* software that accesses
-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
+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:
@@ -314,17 +374,22 @@ cd /etc/nginx/sites-enabled
 sudo ln -sf ../sites-available/spothole
 ```
-Test that your nginx config isn't broken using `nginx -t`. If it works, restart nginx with `sudo systemctl restart nginx`.
+Test that your nginx config isn't broken using `nginx -t`. If it works, restart nginx with
 `sudo systemctl restart nginx`.
-If you haven't already done so, set up a DNS entry to make sure requests for your domain name end up at the server that's running Spothole.
+If you haven't already done so, set up a DNS entry to make sure requests for your domain name end up at the server
 that's running Spothole.
 You should now be able to access the web interface by going to the domain from your browser.
-Once that's working, [install certbot](https://certbot.eff.org/instructions?ws=nginx&os=snap) onto your server. Run it as root, and when prompted pick your domain name from the list. After a few seconds, it should successfully provision a certificate and modify your nginx config files automatically. You should then be able to access the site via HTTPS.
+Once that's working, [install certbot](https://certbot.eff.org/instructions?ws=nginx&os=snap) onto your server. Run it
 as root, and when prompted pick your domain name from the list. After a few seconds, it should successfully provision a
 certificate and modify your nginx config files automatically. You should then be able to access the site via HTTPS.
 ## Modifying the source code
-Spothole is Public Domain licenced, so you can grab the source code and start modifying it for your own needs. Contributions of code back to the main repository are encouraged, but completely optional.
+Spothole is Public Domain licenced, so you can grab the source code and start modifying it for your own needs.
 Contributions of code back to the main repository are encouraged, but completely optional.
 ### Code structure
@@ -356,24 +421,37 @@ To navigate your way around the source code, this list may help.
 * `/` - Main script (`spothole.py`), pip `requirements.txt`, config, README, etc.
 * `/images` - Image sources
-* `/datafiles` - Local data sources (differentiated from the majority of data files which are loaded from URLs and cached in `/cache`)
+* `/datafiles` - Local data sources (differentiated from the majority of data files which are loaded from URLs and
-* `/cache` - Directory where static-ish data downloaded from the internet is cached to avoid rapid re-requests, and where spot/alert data is cached so that it survives a software restart. Created on first run.
+  cached in `/cache`)
 * `/cache` - Directory where static-ish data downloaded from the internet is cached to avoid rapid re-requests, and
  where spot/alert data is cached so that it survives a software restart. Created on first run.
 ### Extending the server
-Spothole is designed to be easily extensible. If you want to write your own spot provider, for example, simply add a module to the `spotproviders` package containing your class. (Currently, in order to be loaded correctly, the module (file) name should be the same as the class name, but lower case.)
+Spothole is designed to be easily extensible. If you want to write your own spot provider, for example, simply add a
 module to the `spotproviders` package containing your class. (Currently, in order to be loaded correctly, the module (
 file) name should be the same as the class name, but lower case.)
-Your class should extend "SpotProvider"; if it operates by polling an HTTP Server on a timer, it can instead extend "HTTPSpotProvider" where some of the work is done for you.
+Your class should extend "SpotProvider"; if it operates by polling an HTTP Server on a timer, it can instead extend "
 HTTPSpotProvider" where some of the work is done for you.
-The class will need to implement a constructor that takes in the `provider_config` and provides it to the superclass constructor, while also taking any other config parameters it needs.
+The class will need to implement a constructor that takes in the `provider_config` and provides it to the superclass
 constructor, while also taking any other config parameters it needs.
-If you're extending the base `SpotProvider` class, you will need to implement `start()` and `stop()` methods that start and stop a separate thread which handles the provider's processing needs. The thread should call `submit()` or `submit_batch()` when it has one or more spots to report.
+If you're extending the base `SpotProvider` class, you will need to implement `start()` and `stop()` methods that start
 and stop a separate thread which handles the provider's processing needs. The thread should call `submit()` or
 `submit_batch()` when it has one or more spots to report.
-If you're extending the `HTTPSpotProvider` class, you will need to provide a URI to query and an interval to the superclass constructor. You'll then need to implement the `http_response_to_spots()` method which is called when new data is retrieved. Your implementation should then call `submit()` or `submit_batch()` when it has one or more spots to report.
+If you're extending the `HTTPSpotProvider` class, you will need to provide a URI to query and an interval to the
 superclass constructor. You'll then need to implement the `http_response_to_spots()` method which is called when new
 data is retrieved. Your implementation should then call `submit()` or `submit_batch()` when it has one or more spots to
 report.
-When constructing spots, use the comments in the Spot class and the existing implementations as an example. All parameters are optional, but you will at least want to provide a `time` (which must be timezone-aware) and a `dx_call`.
+When constructing spots, use the comments in the Spot class and the existing implementations as an example. All
 parameters are optional, but you will at least want to provide a `time` (which must be timezone-aware) and a `dx_call`.
-Finally, simply add the appropriate config to the `spot_providers` section of `config.yml`, and your provider should be instantiated on startup.
+Finally, simply add the appropriate config to the `spot_providers` section of `config.yml`, and your provider should be
 instantiated on startup.
 The same approach as above is also used for alert providers.
@@ -381,18 +459,27 @@ The same approach as above is also used for alert providers.
 As well as being my work, I have also gratefully received feature patches from Steven, M1SDH.
-The project contains GeoJSON files for CQ and ITU zones, in the `/datafiles/` directory. These are MIT-licenced and, to my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet.
+The project contains GeoJSON files for CQ and ITU zones, in the `/datafiles/` directory. These are MIT-licenced and, to
 my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet.
-The project contains a set of flag icons generated using the "Noto Color Emoji" font on a Debian system, in the `/webassets/img/flags/` directory.
+The project contains a set of flag icons generated using the "Noto Color Emoji" font on a Debian system, in the
 `/webassets/img/flags/` directory.
-The software uses a number of Python libraries as listed in `requirements.txt`, and a number of JavaScript libraries. This project would not have been possible without these libraries, so many thanks to their developers.
+The software uses a number of Python libraries as listed in `requirements.txt`, and a number of JavaScript libraries.
 This project would not have been possible without these libraries, so many thanks to their developers.
 ### Third Party Libraries
-A number of third-party libraries are self-hosted in the `/webassets/vendor/` directory. These files are subject to their own licences and are not covered by the overall licence declared in the `LICENSE` file.
+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.
+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.
+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!
--- a/config-example.yml
+++ b/config-example.yml
@@ -24,60 +24,46 @@ base-url: "http://localhost:8080"
 # for CW/RTTY and 7001 for FT8, so if you want both, you need two entries, as shown below.
 # Feel free to write your own provider classes! There are details in the README.
 spot-providers:
-  -
+  - class: "POTA"
    class: "POTA"
    name: "POTA"
    enabled: true
-  -
+  - class: "SOTA"
    class: "SOTA"
    name: "SOTA"
    enabled: true
-  -
+  - class: "WWFF"
    class: "WWFF"
    name: "WWFF"
    enabled: true
-  -
+  - class: "WWBOTA"
    class: "WWBOTA"
    name: "WWBOTA"
    enabled: true
-  -
+  - class: "GMA"
    class: "GMA"
    name: "GMA"
    enabled: true
-  -
+  - class: "HEMA"
    class: "HEMA"
    name: "HEMA"
    enabled: true
-  -
+  - class: "ParksNPeaks"
    class: "ParksNPeaks"
    name: "ParksNPeaks"
    enabled: true
-  -
+  - class: "ZLOTA"
    class: "ZLOTA"
    name: "ZLOTA"
    enabled: true
-  -
+  - class: "WOTA"
    class: "WOTA"
    name: "WOTA"
    enabled: true
-  -
+  - class: "LLOTA"
    class: "LLOTA"
    name: "LLOTA"
    enabled: true
-  -
+  - class: "WWTOTA"
    class: "WWTOTA"
    name: "WWTOTA"
    enabled: true
-  -
+  - class: "Tiles"
    class: "Tiles"
    name: "Tiles"
    enabled: true
-  -
+  - class: "APRSIS"
    class: "APRSIS"
    name: "APRS-IS"
    enabled: false
-  -
+  - class: "DXCluster"
    class: "DXCluster"
    name: "HRD Cluster"
    enabled: true
    host: "hrd.wa9pie.net"
@@ -92,8 +78,7 @@ spot-providers:
    # sure you aren't also separately connecting to RBN directly, otherwise you may get duplicate spots.) Note that not
    # all clusters sent RBN spots anyway.
    allow_rbn_spots: false
-  -
+  - class: "DXCluster"
    class: "DXCluster"
    name: "W3LPL Cluster"
    enabled: false
    host: "w3lpl.net"
@@ -108,8 +93,7 @@ spot-providers:
    # sure you aren't also separately connecting to RBN directly, otherwise you may get duplicate spots.) Note that not
    # all clusters sent RBN spots anyway.
    allow_rbn_spots: false
-  -
+  - class: "RBN"
    class: "RBN"
    name: "RBN CW/RTTY"
    enabled: false
    port: 7000
@@ -118,19 +102,16 @@ spot-providers:
    # received by Spothole but not shown on the web UI unless the user explicitly turns it on. For that behaviour,
    # set enabled to true, but enabled-by-default-in-web-ui to false.
    enabled-by-default-in-web-ui: false
-  -
+  - class: "RBN"
    class: "RBN"
    name: "RBN FT8"
    enabled: false
    port: 7001
    enabled-by-default-in-web-ui: false
-  -
+  - class: "UKPacketNet"
    class: "UKPacketNet"
    name: "UK Packet Radio Net"
    enabled: false
    enabled-by-default-in-web-ui: false
-  -
+  - class: "XOTA"
    class: "XOTA"
    name: "39C3 TOTA"
    enabled: false
    url: "wss://39c3.totawatch.de/api/spot/live"
@@ -139,8 +120,7 @@ spot-providers:
    # programmes and so different URLs provide different programmes.
    sig: "TOTA"
    locations-csv: "datafiles/39c3-tota.csv"
-  -
+  - class: "XOTA"
    class: "XOTA"
    name: "EH23 TOTA"
    enabled: true
    url: "wss://eh23.totawatch.de/api/spot/live"
@@ -150,32 +130,25 @@ spot-providers:
 # Alert providers to use. Same setup as the spot providers list above.
 alert-providers:
-  -
+  - class: "POTA"
    class: "POTA"
    name: "POTA"
    enabled: true
-  -
+  - class: "SOTA"
    class: "SOTA"
    name: "SOTA"
    enabled: true
-  -
+  - class: "WWFF"
    class: "WWFF"
    name: "WWFF"
    enabled: true
-  -
+  - class: "ParksNPeaks"
    class: "ParksNPeaks"
    name: "ParksNPeaks"
    enabled: true
-  -
+  - class: "WOTA"
    class: "WOTA"
    name: "WOTA"
    enabled: true
-  -
+  - class: "BOTA"
    class: "BOTA"
    name: "BOTA"
    enabled: true
-  -
+  - class: "NG3K"
    class: "NG3K"
    name: "NG3K"
    enabled: true
@@ -183,20 +156,16 @@ alert-providers:
 # Solar condition providers to use. These poll external APIs for solar propagation data (SFI, A/K indices, band
 # conditions, etc.) and make it available via the /api/v1/solar endpoint.
 solar-condition-providers:
-  -
+  - class: "HamQSL"
    class: "HamQSL"
    name: "HamQSL"
    enabled: true
-  -
+  - class: "NOAA3dayForecast"
    class: "NOAA3dayForecast"
    name: "NOAA 3-day Forecast"
    enabled: true
-  -
+  - class: "GIROIonosonde"
    class: "GIROIonosonde"
    name: "GIRO Ionosonde Data"
    enabled: true
-  -
+  - class: "KC2GProp"
    class: "KC2GProp"
    name: "KC2G Propagation Data"
    enabled: true
@@ -214,11 +183,11 @@ allow-spotting: true
 # Options for the web UI.
 web-ui-options:
-  spot-count: [10, 25, 50, 100]
+  spot-count: [ 10, 25, 50, 100 ]
  spot-count-default: 50
-  max-spot-age: [5, 10, 30, 60]
+  max-spot-age: [ 5, 10, 30, 60 ]
  max-spot-age-default: 30
-  alert-count: [25, 50, 100, 200, 500]
+  alert-count: [ 25, 50, 100, 200, 500 ]
  alert-count-default: 100
  # Default UI colour scheme. Supported values are "light", "dark" and "auto" (i.e. use the browser/OS colour scheme).
  # Users can still override this in the UI to their own preference.
--- a/core/lookup_helper.py
+++ b/core/lookup_helper.py
@@ -385,12 +385,12 @@ class LookupHelper:
        data = self._get_qrz_data_for_callsign(call, credentials)
        if data and "latitude" in data and "longitude" in data and (
                float(data["latitude"]) != 0 or float(data["longitude"]) != 0) and -89.9 < float(
-                data["latitude"]) < 89.9:
+            data["latitude"]) < 89.9:
            return [float(data["latitude"]), float(data["longitude"])]
        data = self._get_hamqth_data_for_callsign(call, credentials)
        if data and "latitude" in data and "longitude" in data and (
                float(data["latitude"]) != 0 or float(data["longitude"]) != 0) and -89.9 < float(
-                data["latitude"]) < 89.9:
+            data["latitude"]) < 89.9:
            return [float(data["latitude"]), float(data["longitude"])]
        else:
            return None
@@ -629,6 +629,7 @@ class LookupHelper:
 # Singleton object
 lookup_helper = LookupHelper()
 def infer_mode_from_comment(comment):
    """Infer a mode from the comment"""
--- a/core/sig_utils.py
+++ b/core/sig_utils.py
@@ -81,7 +81,8 @@ def populate_sig_ref_info(sig_ref):
        elif sig.upper() == "SIOTA":
            siota_csv_data = SEMI_STATIC_URL_DATA_CACHE.get("https://www.silosontheair.com/data/silos.csv",
                                                            headers=HTTP_HEADERS)
-            siota_index = {row["SILO_CODE"]: row for row in csv.DictReader(siota_csv_data.content.decode().splitlines())}
+            siota_index = {row["SILO_CODE"]: row for row in
                           csv.DictReader(siota_csv_data.content.decode().splitlines())}
            row = siota_index.get(ref_id)
            if row:
                sig_ref.name = row["NAME"] if "NAME" in row else None
--- a/core/status_reporter.py
+++ b/core/status_reporter.py
@@ -89,7 +89,8 @@ class StatusReporter:
                                              "last_page_access_time"].replace(
                                              tzinfo=pytz.UTC).timestamp() if self._web_server.web_server_metrics[
                                              "last_page_access_time"] else 0,
-                                          "page_access_count": self._web_server.web_server_metrics["page_access_counter"]}
+                                          "page_access_count": self._web_server.web_server_metrics[
                                              "page_access_counter"]}
        # Update Prometheus metrics
        memory_use_gauge.set(psutil.Process(os.getpid()).memory_info().rss)
--- a/data/lookup_credentials.py
+++ b/data/lookup_credentials.py
@@ -6,10 +6,10 @@ class LookupCredentials:
    """Per-request credentials for QRZ.com and HamQTH online callsign lookups."""
    qrz_username: str = ""
    qrz_password: str = ""
-    qrz_session_key: str = ""      # alternative to username/password
+    qrz_session_key: str = ""  # alternative to username/password
    hamqth_username: str = ""
    hamqth_password: str = ""
-    hamqth_session_id: str = ""    # alternative to username/password
+    hamqth_session_id: str = ""  # alternative to username/password
 def extract_credentials(query_params):
--- a/data/spot.py
+++ b/data/spot.py
@@ -357,7 +357,8 @@ class Spot:
                self.dx_latitude = float(str(self.dx_latitude))
                self.dx_longitude = float(str(self.dx_longitude))
            except (TypeError, ValueError):
-                logging.warning("Received non-numeric strings in lat/lon (" + str(self.dx_latitude) + ", " + str(self.dx_longitude) + ") for call " + str(self.dx_call) + ", rejecting it")
+                logging.warning("Received non-numeric strings in lat/lon (" + str(self.dx_latitude) + ", " + str(
                    self.dx_longitude) + ") for call " + str(self.dx_call) + ", rejecting it")
                self.dx_latitude = None
                self.dx_longitude = None
--- a/server/handlers/api/lookups.py
+++ b/server/handlers/api/lookups.py
@@ -118,8 +118,9 @@ class APILookupSIGRefHandler(tornado.web.RequestHandler):
                    else:
                        self.write(
-                            json.dumps("Error - '" + ref_id + "' does not look like a valid reference ID for " + sig + ".",
+                            json.dumps(
-                                       default=serialize_everything))
+                                "Error - '" + ref_id + "' does not look like a valid reference ID for " + sig + ".",
                                default=serialize_everything))
                        self.set_status(422)
                else:
                    self.write(json.dumps("Error - sig '" + sig + "' is not known.", default=serialize_everything))
--- a/server/handlers/pagetemplate.py
+++ b/server/handlers/pagetemplate.py
@@ -33,4 +33,4 @@ class PageTemplateHandler(tornado.web.RequestHandler):
        # Load named template, and provide variables used in templates
        self.render(self._template_name + ".html", software_version=SOFTWARE_VERSION,
                    server_owner_callsign=SERVER_OWNER_CALLSIGN, allow_spotting=ALLOW_SPOTTING,
-                    web_ui_options=WEB_UI_OPTIONS, baseurl=BASE_URL, current_path=self.request.path)
+                    web_ui_options=WEB_UI_OPTIONS, baseurl=BASE_URL, current_path=self.request.path)
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -18,7 +18,6 @@ from server.handlers.api.status import APIStatusHandler
 from server.handlers.metrics import PrometheusMetricsHandler
 from server.handlers.pagetemplate import PageTemplateHandler
 _HERE = os.path.dirname(__file__ or "")
--- a/solarconditionsproviders/hamqsl.py
+++ b/solarconditionsproviders/hamqsl.py
@@ -4,7 +4,6 @@ from xml.etree import ElementTree
 import pytz
 from dateutil import parser as dateutil_parser, tz as dateutil_tz
 from solarconditionsproviders.http_solar_conditions_provider import HTTPSolarConditionsProvider
 POLL_INTERVAL = 3600  # 1 hour
@@ -98,16 +97,17 @@ class HamQSL(HTTPSolarConditionsProvider):
            "solar_wind": float_val("solarwind"),
            "magnetic_field": float_val("magneticfield"),
            "geomag_field": text("geomagfield").title()
-                            .replace("Vr Quiet", "Very Quiet")
+            .replace("Vr Quiet", "Very Quiet")
-                            .replace("Unsettld", "Unsettled")
+            .replace("Unsettld", "Unsettled")
-                            .replace("Min Strm", "Minor Storm")
+            .replace("Min Strm", "Minor Storm")
-                            .replace("Maj Strm", "Major Storm")
+            .replace("Maj Strm", "Major Storm")
-                            .replace("Sev Strm", "Severe Storm")
+            .replace("Sev Strm", "Severe Storm")
-                            .replace("Ext Strm", "Extreme Storm"),
+            .replace("Ext Strm", "Extreme Storm"),
            "geomag_noise": text("signalnoise"),
            "hf_conditions": hf_conditions,
            "vhf_conditions": {
-                "vhf_aurora_northern_hemi": (vhf_map.get(("vhf-aurora", "northern_hemi")) or "").title().replace("Lat Aur", "Latitude") or None,
+                "vhf_aurora_northern_hemi": (vhf_map.get(("vhf-aurora", "northern_hemi")) or "").title().replace(
                    "Lat Aur", "Latitude") or None,
                "es_2m_europe": vhf_map.get(("E-Skip", "europe")),
                "es_4m_europe": vhf_map.get(("E-Skip", "europe_4m")),
                "es_6m_europe": vhf_map.get(("E-Skip", "europe_6m")),
--- a/solarconditionsproviders/noaa3dayforecast.py
+++ b/solarconditionsproviders/noaa3dayforecast.py
@@ -4,7 +4,7 @@ from datetime import datetime, timezone
 from solarconditionsproviders.http_solar_conditions_provider import HTTPSolarConditionsProvider
-POLL_INTERVAL = 10800 # Every 3 hours
+POLL_INTERVAL = 10800  # Every 3 hours
 URL = "https://services.swpc.noaa.gov/text/3-day-forecast.txt"
--- a/spothole.py
+++ b/spothole.py
@@ -8,11 +8,11 @@ import sys
 from diskcache import Cache
 from core.cleanup import CleanupTimer
 from data.solar_conditions import SolarConditions
 from core.config import config, SERVER_OWNER_CALLSIGN
 from core.constants import SOFTWARE_VERSION
 from core.lookup_helper import lookup_helper
 from core.status_reporter import StatusReporter
 from data.solar_conditions import SolarConditions
 from server.webserver import WebServer
 # Globals
--- a/spotproviders/dxcluster.py
+++ b/spotproviders/dxcluster.py
@@ -72,7 +72,8 @@ class DXCluster(SpotProvider):
                    match = self._spot_line_pattern.match(telnet_output.decode("latin-1"))
                    if match:
                        spot_time = datetime.strptime(match.group(5), "%H%MZ")
-                        spot_datetime = datetime.combine(datetime.now(pytz.UTC).date(), spot_time.time(), tzinfo=pytz.UTC)
+                        spot_datetime = datetime.combine(datetime.now(pytz.UTC).date(), spot_time.time(),
                                                         tzinfo=pytz.UTC)
                        spot = Spot(source=self.name,
                                    dx_call=match.group(3),
                                    de_call=match.group(1),
--- a/spotproviders/gma.py
+++ b/spotproviders/gma.py
@@ -38,10 +38,10 @@ class GMA(HTTPSpotProvider):
                        time=datetime.strptime(source_spot["DATE"] + source_spot["TIME"], "%Y%m%d%H%M").replace(
                            tzinfo=pytz.UTC).timestamp(),
                        dx_latitude=float(source_spot["LAT"]) if (
-                                    source_spot["LAT"] and source_spot["LAT"] != "") else None,
+                                source_spot["LAT"] and source_spot["LAT"] != "") else None,
                        # Seen GMA spots with no (or empty) lat/lon
                        dx_longitude=float(source_spot["LON"]) if (
-                                    source_spot["LON"] and source_spot["LON"] != "") else None)
+                                source_spot["LON"] and source_spot["LON"] != "") else None)
            # GMA doesn't give what programme (SIG) the reference is for until we separately look it up.
            if "REF" in source_spot:
--- a/spotproviders/rbn.py
+++ b/spotproviders/rbn.py
@@ -63,7 +63,8 @@ class RBN(SpotProvider):
                    match = self._LINE_PATTERN.match(telnet_output.decode("latin-1"))
                    if match:
                        spot_time = datetime.strptime(match.group(5), "%H%MZ")
-                        spot_datetime = datetime.combine(datetime.now(pytz.UTC).date(), spot_time.time(), tzinfo=pytz.UTC)
+                        spot_datetime = datetime.combine(datetime.now(pytz.UTC).date(), spot_time.time(),
                                                         tzinfo=pytz.UTC)
                        spot = Spot(source=self.name,
                                    dx_call=match.group(3),
                                    de_call=match.group(1),
--- a/spotproviders/sota.py
+++ b/spotproviders/sota.py
@@ -43,7 +43,7 @@ class SOTA(HTTPSpotProvider):
                            dx_name=source_spot["activatorName"],
                            de_call=source_spot["callsign"].upper(),
                            freq=(float(source_spot["frequency"]) * 1000000) if (
-                                        source_spot["frequency"] is not None) else None,
+                                    source_spot["frequency"] is not None) else None,
                            # Seen SOTA spots with no frequency!
                            mode=source_spot["mode"].upper(),
                            comment=source_spot["comments"],
--- a/spotproviders/tiles.py
+++ b/spotproviders/tiles.py
@@ -30,7 +30,8 @@ class Tiles(HTTPSpotProvider):
                        sig="Tiles",
                        # Tiles spots can include POTA & SOTA references, but ignore those on the basis that we will get them separately from the POTA/SOTA providers anyway.
                        # Just take the grid reference itself as the single Tiles SIG reference.
-                        sig_refs=[SIGRef(id=source_spot["maidenhead_grid"], sig="Tiles", name=source_spot["maidenhead_grid"])],
+                        sig_refs=[SIGRef(id=source_spot["maidenhead_grid"], sig="Tiles",
                                         name=source_spot["maidenhead_grid"])],
                        time=datetime.fromisoformat(source_spot["created_at"].replace("Z", "+00:00")).timestamp(),
                        dx_grid=source_spot["maidenhead_grid"],
                        dx_latitude=source_spot["latitude"],
@@ -41,10 +42,11 @@ class Tiles(HTTPSpotProvider):
            new_spots.append(spot)
        return new_spots
 # Utility function to keep the first decimal point in a given string but remove any others. Used to parse Tiles'
 # strange frequency format where we can sometimes have e.g. "14.123.5".
 def strip_extra_decimal_points(s):
    parts = s.split('.', 1)
    if len(parts) == 1:
        return s
-    return parts[0] + '.' + parts[1].replace('.', '')
+    return parts[0] + '.' + parts[1].replace('.', '')
--- a/spotproviders/wota.py
+++ b/spotproviders/wota.py
@@ -49,7 +49,7 @@ class WOTA(HTTPSpotProvider):
                desc_split = source_spot.description.split(". ")
                freq_mode = desc_split[0].replace("Frequencies/modes:", "").strip()
                freq_mode_split = re.split(r'[\-\s]+', freq_mode)
-                freq_hz = float(freq_mode_split[0].replace("'",".")) * 1000000
+                freq_hz = float(freq_mode_split[0].replace("'", ".")) * 1000000
                mode = None
                if len(freq_mode_split) > 1:
                    mode = freq_mode_split[1].upper()
--- a/spotproviders/wwtota.py
+++ b/spotproviders/wwtota.py
@@ -1,6 +1,5 @@
 from datetime import datetime
 import json
 from datetime import datetime
 from data.sig_ref import SIGRef
 from data.spot import Spot
--- a/spotproviders/xota.py
+++ b/spotproviders/xota.py
@@ -48,8 +48,9 @@ class XOTA(WebsocketSpotProvider):
                    freq=float(source_spot["freq"]) * 1000,
                    mode=source_spot["mode"].upper(),
                    sig=self.SIG,
-                    sig_refs=[SIGRef(id=ref_id, sig=self.SIG or "", url=source_spot["reference"]["website"], latitude=lat,
+                    sig_refs=[
-                                     longitude=lon)],
+                        SIGRef(id=ref_id, sig=self.SIG or "", url=source_spot["reference"]["website"], latitude=lat,
                               longitude=lon)],
                    time=datetime.now(pytz.UTC).timestamp(),
                    dx_latitude=lat,
                    dx_longitude=lon,
--- a/templates/about.html
+++ b/templates/about.html
@@ -3,72 +3,204 @@
 <div id="info-container" class="mt-4">
    <h2 class="mt-4 mb-4">About Spothole</h2>
-    <p>Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an open JSON API as well as a website to browse the data.</p>
+    <p>Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an
-    <p>While there are several other web-based interfaces to DX clusters, and sites that aggregate spots from various outdoor activity programmes for amateur radio, Spothole differentiates itself by supporting a larger number of data sources, and by being "API first" rather than just providing a web front-end. This allows other software to be built on top of it.</p>
+        open JSON API as well as a website to browse the data.</p>
-    <p>The API is deliberately well-defined with an <a href="/apidocs/openapi.yml">OpenAPI specification</a> and <a href="/apidocs">API documentation</a>. The API delivers spots in a consistent format regardless of the data source, freeing developers from needing to know how each individual data source presents its data.</p>
+    <p>While there are several other web-based interfaces to DX clusters, and sites that aggregate spots from various
-    <p>Spothole itself is also open source, Public Domain licenced code that anyone can take and modify. <a href="https://git.ianrenton.com/ian/metaspot/">The source code is here</a>.</p>
+        outdoor activity programmes for amateur radio, Spothole differentiates itself by supporting a larger number of
-    <p>The software was written by <a href="https://ianrenton.com">Ian Renton, MØTRT</a> and other contributors. Full details are available in the <a href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README file</a>.</p>
+        data sources, and by being "API first" rather than just providing a web front-end. This allows other software to
        be built on top of it.</p>
    <p>The API is deliberately well-defined with an <a href="/apidocs/openapi.yml">OpenAPI specification</a> and <a
            href="/apidocs">API documentation</a>. The API delivers spots in a consistent format regardless of the data
        source, freeing developers from needing to know how each individual data source presents its data.</p>
    <p>Spothole itself is also open source, Public Domain licenced code that anyone can take and modify. <a
            href="https://git.ianrenton.com/ian/metaspot/">The source code is here</a>.</p>
    <p>The software was written by <a href="https://ianrenton.com">Ian Renton, MØTRT</a> and other contributors. Full
        details are available in the <a href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README
            file</a>.</p>
    <p>This server is running Spothole version {{software_version}}.</p>
    <h2 class="mt-4 mb-4">Using Spothole</h2>
-    <p>There are a number of different ways to use Spothole, depending on what you want to do with it and your level of technical skill:</p>
+    <p>There are a number of different ways to use Spothole, depending on what you want to do with it and your level of
-    <ol><li>You can <b>use it on the web</b>, like you are (probably) doing right now. This is how most people use it, to look up spots and alerts, and make interesting QSOs.</li>
+        technical skill:</p>
-    <li>If you are using an Android or iOS device, you can <b>"install" it on your device</b>. Spothole is a Progressive Web App, meaning it's not delivered through app stores, but if you open the page on Chrome (Android) or Safari (iOS) there will be an option in the menu to install it. It will then appear in your main app menu.</li>
+    <ol>
-    <li>You can <b>embed the web interface in another website</b> to show its spots in a custom dashboard or the like. The usage is explained in more detail in the <a href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README file</a>.</li>
+        <li>You can <b>use it on the web</b>, like you are (probably) doing right now. This is how most people use it,
-    <li>You can <b>write your own client using the Spothole API</b>, using the main Spothole instance to provide data, and do whatever you like with it. The README contains guidance on how to do this, and the full API docs are linked above. You can also find reference implementations in the form of Spothole's own web-based front end, plus my other two tools built on Spothole: <a href="https://fieldspotter.radio">Field Spotter</a> and the <a href="https://qsomap.m0trt.radio">QSO Map Tool</a>.</li>
+            to look up spots and alerts, and make interesting QSOs.
-    <li>If you want to <b>run your own version of Spothole</b> so you can customise the configuration, such as enabling sources that I disable on the main instance, you can do that too. The README contains not only advice on how to set up Spothole but how to get it auto-starting with systemd, using an nginx reverse proxy, and setting up HTTPS support with certbot.</li>
+        </li>
-    <li>Finally, you can of course download the source code and <b>develop Spothole to meet your needs</b>. Whether you contribute your changes back to the main repository is up to you. As usual, the README file contains some advice on the structure of the repository, and how to get started writing your own spot provider.</li></ol>
+        <li>If you are using an Android or iOS device, you can <b>"install" it on your device</b>. Spothole is a
            Progressive Web App, meaning it's not delivered through app stores, but if you open the page on Chrome
            (Android) or Safari (iOS) there will be an option in the menu to install it. It will then appear in your
            main app menu.
        </li>
        <li>You can <b>embed the web interface in another website</b> to show its spots in a custom dashboard or the
            like. The usage is explained in more detail in the <a
                    href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README file</a>.
        </li>
        <li>You can <b>write your own client using the Spothole API</b>, using the main Spothole instance to provide
            data, and do whatever you like with it. The README contains guidance on how to do this, and the full API
            docs are linked above. You can also find reference implementations in the form of Spothole's own web-based
            front end, plus my other two tools built on Spothole: <a href="https://fieldspotter.radio">Field Spotter</a>
            and the <a href="https://qsomap.m0trt.radio">QSO Map Tool</a>.
        </li>
        <li>If you want to <b>run your own version of Spothole</b> so you can customise the configuration, such as
            enabling sources that I disable on the main instance, you can do that too. The README contains not only
            advice on how to set up Spothole but how to get it auto-starting with systemd, using an nginx reverse proxy,
            and setting up HTTPS support with certbot.
        </li>
        <li>Finally, you can of course download the source code and <b>develop Spothole to meet your needs</b>. Whether
            you contribute your changes back to the main repository is up to you. As usual, the README file contains
            some advice on the structure of the repository, and how to get started writing your own spot provider.
        </li>
    </ol>
    <h2 id="faq" class="mt-4">FAQ</h2>
    <h4 class="mt-4">"Spots"? "DX Clusters"? What does any of this mean?</h4>
-    <p>This is a tool for amateur ("ham") radio users. Many amateur radio operators like to make contacts with others who are doing something more interesting than sitting in their home "shack", such as people in rarely-seen countries, remote islands, or on mountaintops. Such operators are often "spotted", i.e. when someone speaks to them, they will put the details such as their operating frequency into an online system, to let others know where to find them. A DX Cluster is one type of those systems. Most outdoor radio awards programmes, such as "Parks on the Air" (POTA) have their own websites for posting spots.</p>
+    <p>This is a tool for amateur ("ham") radio users. Many amateur radio operators like to make contacts with others
-    <p>Spothole is an "aggregator" for those spots, so it checks lots of different services for data, and brings it all together in one place. So no matter what kinds of interesting spots you are looking for, you can find them here.</p>
+        who are doing something more interesting than sitting in their home "shack", such as people in rarely-seen
-    <p>As well as spots, it also provides a similar feed of "alerts". This is where amateur radio users who are going to interesting places soon will announce their intentions.</p>
+        countries, remote islands, or on mountaintops. Such operators are often "spotted", i.e. when someone speaks to
        them, they will put the details such as their operating frequency into an online system, to let others know
        where to find them. A DX Cluster is one type of those systems. Most outdoor radio awards programmes, such as
        "Parks on the Air" (POTA) have their own websites for posting spots.</p>
    <p>Spothole is an "aggregator" for those spots, so it checks lots of different services for data, and brings it all
        together in one place. So no matter what kinds of interesting spots you are looking for, you can find them
        here.</p>
    <p>As well as spots, it also provides a similar feed of "alerts". This is where amateur radio users who are going to
        interesting places soon will announce their intentions.</p>
    <h4 class="mt-4">What are "DX", "DE" and modes?</h4>
-    <p>In amateur radio terminology, the "DX" contact is the "interesting" one that is using the frequency shown and looking for callers. They might be on a remote island or just in a local park, but either way it's interesting enough that someone has "spotted" them. The callsign listed under "DE" is the person who entered the spot of the "DX" operator. "Modes" are the type of communication they are using. For example you might see "CW" which is Morse Code, or voice "modes" like SSB or FM, or more exotic "data" modes which are used for computer-to-computer communication.</p>
+    <p>In amateur radio terminology, the "DX" contact is the "interesting" one that is using the frequency shown and
        looking for callers. They might be on a remote island or just in a local park, but either way it's interesting
        enough that someone has "spotted" them. The callsign listed under "DE" is the person who entered the spot of the
        "DX" operator. "Modes" are the type of communication they are using. For example you might see "CW" which is
        Morse Code, or voice "modes" like SSB or FM, or more exotic "data" modes which are used for computer-to-computer
        communication.</p>
    <h4 class="mt-4">What data sources are supported?</h4>
-    <p>Spothole can retrieve spots from: <a href="https://www.dxcluster.info/telnet/">Telnet-based DX clusters</a>, the <a href="https://www.reversebeacon.net/">Reverse Beacon Network (RBN)</a>, the <a href="https://www.aprs-is.net/">APRS Internet Service (APRS-IS)</a>, <a href="https://pota.app">POTA</a>, <a href="https://www.sota.org.uk/">SOTA</a>, <a href="https://wwff.co/">WWFF</a>, <a href="https://www.cqgma.org/">GMA</a>, <a href="https://wwbota.net/">WWBOTA</a>, <a href="http://www.hema.org.uk/">HEMA</a>, <a href="https://www.parksnpeaks.org/">Parks 'n' Peaks</a>, <a href="https://ontheair.nz">ZLOTA</a>, <a href="https://www.wota.org.uk/">WOTA</a>, <a href="https://llota.app">LLOTA</a>, <a href="https://wwtota.com">WWTOTA</a>, <a href="https://tilesontheair.com/">Tiles on the Air</a>, the <a href="https://ukpacketradio.network/">UK Packet Repeater Network</a>, and any site based on the <a href="https://github.com/nischu/xOTA">xOTA software by nischu</a>.</p>
+    <p>Spothole can retrieve spots from: <a href="https://www.dxcluster.info/telnet/">Telnet-based DX clusters</a>, the
-    <p>Spothole can retrieve alerts from: <a href="https://www.ng3k.com/">NG3K</a>, <a href="https://pota.app">POTA</a>, <a href="https://www.sota.org.uk/">SOTA</a>, <a href="https://wwff.co/">WWFF</a>, <a href="https://www.parksnpeaks.org/">Parks 'n' Peaks</a>, <a href="https://www.wota.org.uk/">WOTA</a> and <a href="https://www.beachesontheair.com/">BOTA</a>.</p>
+        <a href="https://www.reversebeacon.net/">Reverse Beacon Network (RBN)</a>, the <a
-    <p>Spothole can retrieve solar and propagation condition data from <a href="https://www.hamqsl.com">HamQSL</a>, the <a href="https://www.swpc.noaa.gov/">NOAA Space Weather Prediction Center</a>, the <a href="https://giro.uml.edu/">Lowell GIRO Data Center</a> and <a href="https://prop.kc2g.com/">prop.kc2g.com</a> by KC2G.</p>
+                href="https://www.aprs-is.net/">APRS Internet Service (APRS-IS)</a>, <a href="https://pota.app">POTA</a>,
-    <p>Spothole can also perform lookups for callsign data on behalf of the user from <a href="https://qrz.com">QRZ.com</a> and <a href="https://hamqth.com">HamQTH</a>.</p>
+        <a href="https://www.sota.org.uk/">SOTA</a>, <a href="https://wwff.co/">WWFF</a>, <a
-    <p>Note that the server owner has not necessarily enabled all these data sources. In particular it is common to disable RBN, to avoid the server being swamped with FT8 traffic, and to disable APRS-IS and UK Packet Net so that the server only displays stations where there is likely to be an operator physically present for a QSO.</p>
+                href="https://www.cqgma.org/">GMA</a>, <a href="https://wwbota.net/">WWBOTA</a>, <a
-    <p>Between the various data sources, the following Special Interest Groups (SIGs) are supported: Parks on the Air (POTA), Summits on the Air (SOTA), Worldwide Flora & Fauna (WWFF), Global Mountain Activity (GMA), Worldwide Bunkers on the Air (WWBOTA), HuMPs Excluding Marilyns Award (HEMA), Islands on the Air (IOTA), Mills on the Air (MOTA), the Amateur Radio Lighthouse Socirty (ARLHS), International Lighthouse Lightship Weekend (ILLW), Silos on the Air (SIOTA), World Castles Award (WCA), New Zealand on the Air (ZLOTA), Keith Roget Memorial National Parks Award (KRMNPA), Wainwrights on the Air (WOTA), Beaches on the Air (BOTA), Lagos y Lagunas On the Air (LLOTA), Towers on the Air (WWTOTA), Tiles on the Air, Worked All Britain (WAB), Worked All Ireland (WAI), and Toilets on the Air (TOTA).</p>
+                href="http://www.hema.org.uk/">HEMA</a>, <a href="https://www.parksnpeaks.org/">Parks 'n' Peaks</a>, <a
-    <p>As of the time of writing in November 2025, I think Spothole captures essentially all outdoor radio programmes that have a defined reference list, and almost certainly those that have a spotting/alerting API. If you know of one I've missed, please let me know!</p>
+                href="https://ontheair.nz">ZLOTA</a>, <a href="https://www.wota.org.uk/">WOTA</a>, <a
                href="https://llota.app">LLOTA</a>, <a href="https://wwtota.com">WWTOTA</a>, <a
                href="https://tilesontheair.com/">Tiles on the Air</a>, the <a href="https://ukpacketradio.network/">UK
            Packet Repeater Network</a>, and any site based on the <a href="https://github.com/nischu/xOTA">xOTA
            software by nischu</a>.</p>
    <p>Spothole can retrieve alerts from: <a href="https://www.ng3k.com/">NG3K</a>, <a href="https://pota.app">POTA</a>,
        <a href="https://www.sota.org.uk/">SOTA</a>, <a href="https://wwff.co/">WWFF</a>, <a
                href="https://www.parksnpeaks.org/">Parks 'n' Peaks</a>, <a href="https://www.wota.org.uk/">WOTA</a> and
        <a href="https://www.beachesontheair.com/">BOTA</a>.</p>
    <p>Spothole can retrieve solar and propagation condition data from <a href="https://www.hamqsl.com">HamQSL</a>, the
        <a href="https://www.swpc.noaa.gov/">NOAA Space Weather Prediction Center</a>, the <a
                href="https://giro.uml.edu/">Lowell GIRO Data Center</a> and <a href="https://prop.kc2g.com/">prop.kc2g.com</a>
        by KC2G.</p>
    <p>Spothole can also perform lookups for callsign data on behalf of the user from <a
            href="https://qrz.com">QRZ.com</a> and <a href="https://hamqth.com">HamQTH</a>.</p>
    <p>Note that the server owner has not necessarily enabled all these data sources. In particular it is common to
        disable RBN, to avoid the server being swamped with FT8 traffic, and to disable APRS-IS and UK Packet Net so
        that the server only displays stations where there is likely to be an operator physically present for a QSO.</p>
    <p>Between the various data sources, the following Special Interest Groups (SIGs) are supported: Parks on the Air
        (POTA), Summits on the Air (SOTA), Worldwide Flora & Fauna (WWFF), Global Mountain Activity (GMA), Worldwide
        Bunkers on the Air (WWBOTA), HuMPs Excluding Marilyns Award (HEMA), Islands on the Air (IOTA), Mills on the Air
        (MOTA), the Amateur Radio Lighthouse Socirty (ARLHS), International Lighthouse Lightship Weekend (ILLW), Silos
        on the Air (SIOTA), World Castles Award (WCA), New Zealand on the Air (ZLOTA), Keith Roget Memorial National
        Parks Award (KRMNPA), Wainwrights on the Air (WOTA), Beaches on the Air (BOTA), Lagos y Lagunas On the Air
        (LLOTA), Towers on the Air (WWTOTA), Tiles on the Air, Worked All Britain (WAB), Worked All Ireland (WAI), and
        Toilets on the Air (TOTA).</p>
    <p>As of the time of writing in November 2025, I think Spothole captures essentially all outdoor radio programmes
        that have a defined reference list, and almost certainly those that have a spotting/alerting API. If you know of
        one I've missed, please let me know!</p>
    <h4 class="mt-4">Why can I filter spots by both SIG and Source? Isn't that basically the same thing?</h4>
-    <p>Mostly, but not quite. While POTA spots generally come from the POTA source and so on, there are a few exceptions:</p>
+    <p>Mostly, but not quite. While POTA spots generally come from the POTA source and so on, there are a few
-    <ol><li>Sources like GMA and Parks 'n' Peaks provide spots for multiple different programmes (SIGs).</li>
+        exceptions:</p>
-    <li>Cluster spots may name SIGs in their comment, in which case the source remains the Cluster, but a SIG is assigned.</li>
+    <ol>
-    <li>Some SIGs, such as Worked all Britain (WAB), don't have their own spotting site and can <em>only</em> be identified through comments on spots retrieved from other sources.</li>
+        <li>Sources like GMA and Parks 'n' Peaks provide spots for multiple different programmes (SIGs).</li>
-    <li>SIGs have well-defined names, whereas the server owner may name the sources as they see fit.</li></ol>
+        <li>Cluster spots may name SIGs in their comment, in which case the source remains the Cluster, but a SIG is
-    <p>Spothole's web interface exists not just for the end user, but also as a reference implementation for the API, so I have chosen to demonstrate both methods of filtering.</p>
+            assigned.
        </li>
        <li>Some SIGs, such as Worked all Britain (WAB), don't have their own spotting site and can <em>only</em> be
            identified through comments on spots retrieved from other sources.
        </li>
        <li>SIGs have well-defined names, whereas the server owner may name the sources as they see fit.</li>
    </ol>
    <p>Spothole's web interface exists not just for the end user, but also as a reference implementation for the API, so
        I have chosen to demonstrate both methods of filtering.</p>
    <h4 class="mt-4">How is this better than DXheat, DXsummit, POTA's own website, etc?</h4>
    <p>It's probably not? But it's nice to have choice.</p>
    <p>I think it's got three key advantages over those sites:</p>
-    <ol><li>It provides a public, <a href="/apidocs">well-documented API</a> with an <a href="/apidocs/openapi.yml">OpenAPI specification</a>. Other sites don't have official APIs or don't bother documenting them publicly, because they want people to use their web page. I like Spothole's web page, but you don't have to use it&mdash;if you're a programmer, you can build your own software on Spothole's API. Spothole does the hard work of taking all the various data sources and providing a consistent, well-documented data set. You can then do the fun bit of writing your own application.</li>
+    <ol>
-    <li>It grabs data from a lot more sources. I've seen other sites that pull in DX Cluster and POTA spots together, but nothing on the scale of what Spothole supports.</li>
+        <li>It provides a public, <a href="/apidocs">well-documented API</a> with an <a href="/apidocs/openapi.yml">OpenAPI
-    <li>Spothole is open source, so anyone can contribute the code to support a new data source or add new features, and share them with the community.</li></ol>
+            specification</a>. Other sites don't have official APIs or don't bother documenting them publicly, because
            they want people to use their web page. I like Spothole's web page, but you don't have to use it&mdash;if
            you're a programmer, you can build your own software on Spothole's API. Spothole does the hard work of
            taking all the various data sources and providing a consistent, well-documented data set. You can then do
            the fun bit of writing your own application.
        </li>
        <li>It grabs data from a lot more sources. I've seen other sites that pull in DX Cluster and POTA spots
            together, but nothing on the scale of what Spothole supports.
        </li>
        <li>Spothole is open source, so anyone can contribute the code to support a new data source or add new features,
            and share them with the community.
        </li>
    </ol>
    <h4 class="mt-4">Why does this website ask me if I want to install it?</h4>
-    <p>Spothole is a Progressive Web App, which means you can install it on an Android or iOS device by opening the site in Chrome or Safari respectively, and clicking "Install" on the pop-up panel. It'll only prompt you once, so if you dismiss the prompt and change your mind, you'll find an Install / Add to Home Screen option on your browser's menu.</p>
+    <p>Spothole is a Progressive Web App, which means you can install it on an Android or iOS device by opening the site
-    <p>Installing Spothole on your phone is completely optional, the website works exactly the same way as the "app" does.</p>
+        in Chrome or Safari respectively, and clicking "Install" on the pop-up panel. It'll only prompt you once, so if
        you dismiss the prompt and change your mind, you'll find an Install / Add to Home Screen option on your
        browser's menu.</p>
    <p>Installing Spothole on your phone is completely optional, the website works exactly the same way as the "app"
        does.</p>
    <h4 class="mt-4">Why hasn't my spot/alert shown up yet?</h4>
-    <p>To avoid putting too much load on the various servers that Spothole connects to, the Spothole server only polls them once every two minutes for spots, and once every 30 minutes for alerts. (Some sources, such as DX clusters, RBN, APRS-IS and WWBOTA use a non-polling mechanism, and their updates will therefore arrive more quickly.) Then if you are using the web interface, that has its own rate at which it fetches the data from Spothole. This is instant for the main spots list, with new spots appearing immediately at the top of the list, while the map and bands displays update once a minute, and the alerts display updates once every 5 minutes. So you could be waiting around three minutes to see a newly added spot, or 40 minutes to see a newly added alert.</p>
+    <p>To avoid putting too much load on the various servers that Spothole connects to, the Spothole server only polls
        them once every two minutes for spots, and once every 30 minutes for alerts. (Some sources, such as DX clusters,
        RBN, APRS-IS and WWBOTA use a non-polling mechanism, and their updates will therefore arrive more quickly.) Then
        if you are using the web interface, that has its own rate at which it fetches the data from Spothole. This is
        instant for the main spots list, with new spots appearing immediately at the top of the list, while the map and
        bands displays update once a minute, and the alerts display updates once every 5 minutes. So you could be
        waiting around three minutes to see a newly added spot, or 40 minutes to see a newly added alert.</p>
    <h4 class="mt-4">What licence does Spothole use?</h4>
-    <p>Spothole's source code is licenced under the Public Domain. You can write a Spothole client, run your own server, modify it however you like, you can claim you wrote it and charge people £1000 for a copy, I don't really mind. (Please don't do the last one. But if you're using my code for something cool, it would be nice to hear from you!)</p>
+    <p>Spothole's source code is licenced under the Public Domain. You can write a Spothole client, run your own server,
        modify it however you like, you can claim you wrote it and charge people £1000 for a copy, I don't really mind.
        (Please don't do the last one. But if you're using my code for something cool, it would be nice to hear from
        you!)</p>
    <h2 class="mt-4">Data Accuracy</h2>
-    <p>Please note that the data coming out of Spothole is only as good as the data going in. People mis-hear and make typos when spotting callsigns all the time. There are also plenty of cases where Spothole's data, particularly location data, may be inaccurate. For example, there are POTA parks that span multiple US states, countries that span multiple CQ zones, portable operators with no requirement to sign /P, etc. If you are doing something where accuracy is important, such as contesting, you should not rely on Spothole's data to fill in any gaps in your log.</p>
+    <p>Please note that the data coming out of Spothole is only as good as the data going in. People mis-hear and make
        typos when spotting callsigns all the time. There are also plenty of cases where Spothole's data, particularly
        location data, may be inaccurate. For example, there are POTA parks that span multiple US states, countries that
        span multiple CQ zones, portable operators with no requirement to sign /P, etc. If you are doing something where
        accuracy is important, such as contesting, you should not rely on Spothole's data to fill in any gaps in your
        log.</p>
    <h2 id="privacy" class="mt-4">Privacy</h2>
-    <p>Spothole collects no data about you on a permanent basis. All spots and alerts are "timed out" and deleted from the system after a set interval, which by default is one hour for spots and one week for alerts.</p>
+    <p>Spothole collects no data about you on a permanent basis. All spots and alerts are "timed out" and deleted from
-    <p>Settings you select from Spothole's menus are sent to the server, in order to provide the data with the requested filters. They are also stored in your browser's local storage, so that your preferences are remembered between sessions.</p>
+        the system after a set interval, which by default is one hour for spots and one week for alerts.</p>
-    <p>The data you provide can optionally include your login credentials for QRZ.com and HamQTH. You can provide these in the "Data" menu of most pages. If you do, Spothole will augment the data it produces with lookups from these services, which can for example provide more accurate markers on the map tab, and operator names when you mouse over a DX callsign. Spothole will still work fine if you don't provide these. The values you enter are sent to Spothole via HTTPS so are protected in transit, though of course you do have to trust Spothole with this sensitive data in order to use this feature.</p>
+    <p>Settings you select from Spothole's menus are sent to the server, in order to provide the data with the requested
        filters. They are also stored in your browser's local storage, so that your preferences are remembered between
        sessions.</p>
    <p>The data you provide can optionally include your login credentials for QRZ.com and HamQTH. You can provide these
        in the "Data" menu of most pages. If you do, Spothole will augment the data it produces with lookups from these
        services, which can for example provide more accurate markers on the map tab, and operator names when you mouse
        over a DX callsign. Spothole will still work fine if you don't provide these. The values you enter are sent to
        Spothole via HTTPS so are protected in transit, though of course you do have to trust Spothole with this
        sensitive data in order to use this feature.</p>
    <p>Spothole uses no trackers, no ads, and no cookies.</p>
    {% if len(web_ui_options["support-button-html"]) > 0 %}
-        <p><strong>Caveat: </strong> The owner of this server has chosen to inject their own content into the "spots" page. This is designed for a "donate" or "support this server" button. The functionality of this injected content is the responsibility of the server owner, rather than the Spothole software.</p>
+    <p><strong>Caveat: </strong> The owner of this server has chosen to inject their own content into the "spots" page.
        This is designed for a "donate" or "support this server" button. The functionality of this injected content is
        the responsibility of the server owner, rather than the Spothole software.</p>
    {% end %}
-    <p>Spothole is open source, so you can audit <a href="https://git.ianrenton.com/ian/spothole">the code</a> if you like.</p>
+    <p>Spothole is open source, so you can audit <a href="https://git.ianrenton.com/ian/spothole">the code</a> if you
        like.</p>
    <h2 class="mt-4">Thanks</h2>
-    <p>This project would not have been possible without those volunteers who have taken it upon themselves to run DX clusters, xOTA programmes, DXpedition lists, callsign lookup databases, solar conditions and propagation modelling software, and other online tools on which Spothole's data is based. The vast majority of these are not profit-seeking and are made purely for the love of the hobby and to help others in the community. Spothole is standing on the shoulders of giants, who deserve a huge amount of thanks for all the work they put in.</p>
+    <p>This project would not have been possible without those volunteers who have taken it upon themselves to run DX
-    <p>Spothole is also dependent on a number of Python libraries, in particular pyhamtools, and many JavaScript libraries, as well as the Font Awesome icon set and flag icons from the Noto Color Emoji set, and MIT-licenced GeoJSON files for CQ and ITU zones from HA8TKS.</p>
+        clusters, xOTA programmes, DXpedition lists, callsign lookup databases, solar conditions and propagation
-    <p>This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.</p>
+        modelling software, and other online tools on which Spothole's data is based. The vast majority of these are not
        profit-seeking and are made purely for the love of the hobby and to help others in the community. Spothole is
        standing on the shoulders of giants, who deserve a huge amount of thanks for all the work they put in.</p>
    <p>Spothole is also dependent on a number of Python libraries, in particular pyhamtools, and many JavaScript
        libraries, as well as the Font Awesome icon set and flag icons from the Noto Color Emoji set, and MIT-licenced
        GeoJSON files for CQ and ITU zones from HA8TKS.</p>
    <p>This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around
        the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.</p>
 </div>
-<script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script>$(document).ready(function () {
    $("#nav-link-about").addClass("active");
 }); <!-- highlight active page in nav --></script>
 {% end %}
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -2,10 +2,16 @@
 {% block content %}
 <div id="add-spot-intro-box" class="permanently-dismissible-box mt-3">
-<div class="alert alert-primary alert-dismissible fade show" role="alert">
+    <div class="alert alert-primary alert-dismissible fade show" role="alert">
-  <i class="fa-solid fa-circle-info"></i> <strong>Adding spots to Spothole</strong><br/>This page is implemented as a proof of concept for adding spots to the Spothole system. Currently, spots added in this way are only visible within Spothole and are not sent "upstream" to DX clusters or xOTA spotting sites. The functionality might be extended to include this in future if there is demand for it. If you'd like this to be added, please give a thumbs-up on <a href="https://git.ianrenton.com/ian/spothole/issues/39" target="_new" class="alert-link">issue #39</a> or get in touch via email.
+        <i class="fa-solid fa-circle-info"></i> <strong>Adding spots to Spothole</strong><br/>This page is implemented
-  <button type="button" id="add-spot-intro-box-dismiss" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        as a proof of concept for adding spots to the Spothole system. Currently, spots added in this way are only
-</div>
+        visible within Spothole and are not sent "upstream" to DX clusters or xOTA spotting sites. The functionality
        might be extended to include this in future if there is demand for it. If you'd like this to be added, please
        give a thumbs-up on <a href="https://git.ianrenton.com/ian/spothole/issues/39" target="_new" class="alert-link">issue
        #39</a> or get in touch via email.
        <button type="button" id="add-spot-intro-box-dismiss" class="btn-close" data-bs-dismiss="alert"
                aria-label="Close"></button>
    </div>
 </div>
 <div class="mt-3">
@@ -53,7 +59,8 @@
                </div>
                <div class="col-auto">
                    <label for="de-call" class="form-label">Your Call *</label>
-                    <input type="text" class="form-control storeable-text input-narrow" id="de-call" placeholder="N0CALL">
+                    <input type="text" class="form-control storeable-text input-narrow" id="de-call"
                           placeholder="N0CALL">
                </div>
                <div class="col-auto">
                    <button type="button" class="btn btn-primary mt-2em" onclick="addSpot();">Spot</button>
@@ -69,7 +76,9 @@
 </div>
-<script src="/js/add-spot.js?v=1781901226"></script>
+<script src="/js/add-spot.js?v=1781901371"></script>
-<script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script>$(document).ready(function () {
    $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
 {% end %}
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -65,12 +65,19 @@
    </div>
    <div id="table-container">
-        <table id="table" class="table"><thead><tr></tr></thead><tbody></tbody></table>
+        <table id="table" class="table">
            <thead>
            <tr></tr>
            </thead>
            <tbody></tbody>
        </table>
    </div>
 </div>
-<script src="/js/alerts.js?v=1781901227"></script>
+<script src="/js/alerts.js?v=1781901371"></script>
-<script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script>$(document).ready(function () {
    $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
 {% end %}
--- a/templates/api_only_home.html
+++ b/templates/api_only_home.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-    <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
+<link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 {% end %}
 {% block body %}
 <div class="container mt-5">
@@ -11,9 +11,15 @@
            </div>
            <div class="card">
                <div class="card-body">
-                    <p class="card-text">This server is running <strong>Spothole v{{software_version}}</strong>, and is operated by <strong>{{server_owner_callsign}}</strong>.</p>
+                    <p class="card-text">This server is running <strong>Spothole v{{software_version}}</strong>, and is
-                    <p class="card-text">The web UI is not available on this instance because the server is running in API-only mode, intended for use by client software rather than visitors to the website. See the <a href="/apidocs">API documentation</a> for details of how client software can interact with the server.</p>
+                        operated by <strong>{{server_owner_callsign}}</strong>.</p>
-                    <p class="card-text">Please see the <a href="https://git.ianrenton.com/ian/spothole#readme">README</a> for details of what Spothole is and how you can run it for yourself.</p>
+                    <p class="card-text">The web UI is not available on this instance because the server is running in
                        API-only mode, intended for use by client software rather than visitors to the website. See the
                        <a href="/apidocs">API documentation</a> for details of how client software can interact with
                        the server.</p>
                    <p class="card-text">Please see the <a
                            href="https://git.ianrenton.com/ian/spothole#readme">README</a> for details of what Spothole
                        is and how you can run it for yourself.</p>
                </div>
            </div>
        </div>
--- a/templates/apidocs.html
+++ b/templates/apidocs.html
@@ -1,5 +1,5 @@
 {% extends "skeleton.html" %}
 {% block body %}
 <redoc spec-url="/apidocs/openapi.yml"></redoc>
-<script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"> </script>
+<script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"></script>
 {% end %}
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -49,7 +49,8 @@
                    {% module Template("cards/spot-age.html", web_ui_options=web_ui_options) %}
                </div>
                <div class="col">
-                    {% module Template("cards/color-scheme-and-band-color-scheme.html", web_ui_options=web_ui_options) %}
+                    {% module Template("cards/color-scheme-and-band-color-scheme.html", web_ui_options=web_ui_options)
                    %}
                </div>
            </div>
        </div>
@@ -74,10 +75,15 @@
 </div>
 <script>
-    let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
+    let spotProvidersEnabledByDefault = { % raw
    json_encode(web_ui_options["spot-providers-enabled-by-default"]) %
    }
    ;
 </script>
-<script src="/js/spotsbandsandmap.js?v=1781901226"></script>
+<script src="/js/spotsbandsandmap.js?v=1781901371"></script>
-<script src="/js/bands.js?v=1781901226"></script>
+<script src="/js/bands.js?v=1781901371"></script>
-<script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script>$(document).ready(function () {
    $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
 {% end %}
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,19 +1,19 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-    <link rel="stylesheet" href="/css/style.css?v=1781901226" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1781901371" type="text/css">
-    <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
+<link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
-    <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
+<link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
-    <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
+<link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
-    <script src="/vendor/js/jquery-3.7.1.min.js"></script>
+<script src="/vendor/js/jquery-3.7.1.min.js"></script>
-    <script src="/vendor/js/moment-2.29.4.min.js"></script>
+<script src="/vendor/js/moment-2.29.4.min.js"></script>
-    <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
+<script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
-    <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
+<script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
-    <script src="/js/utils.js?v=1781901226"></script>
+<script src="/js/utils.js?v=1781901371"></script>
-    <script src="/js/ui-ham.js?v=1781901226"></script>
+<script src="/js/ui-ham.js?v=1781901371"></script>
-    <script src="/js/geo.js?v=1781901226"></script>
+<script src="/js/geo.js?v=1781901371"></script>
-    <script src="/js/common.js?v=1781901226"></script>
+<script src="/js/common.js?v=1781901371"></script>
 {% end %}
 {% block body %}
 <div class="container">
@@ -22,22 +22,33 @@
            <a class="navbar-brand" href="/">
                <img src="/img/logo.png" class="logo" width="192" height="60" alt="Spothole">
            </a>
-            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-toggler-content" aria-controls="navbar-toggler-content" aria-expanded="false" aria-label="Toggle navigation">
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
-              <span class="navbar-toggler-icon"></span>
+                    data-bs-target="#navbar-toggler-content" aria-controls="navbar-toggler-content"
                    aria-expanded="false" aria-label="Toggle navigation">
                <span class="navbar-toggler-icon"></span>
            </button>
            <div class="collapse navbar-collapse" id="navbar-toggler-content">
                <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                    <li class="nav-item ms-4"><a href="/" class="nav-link" id="nav-link-spots"><i class="fa-solid fa-tower-cell"></i> Spots</a></li>
+                    <li class="nav-item ms-4"><a href="/" class="nav-link" id="nav-link-spots"><i
-                    <li class="nav-item ms-4"><a href="/map" class="nav-link" id="nav-link-map"><i class="fa-solid fa-map"></i> Map</a></li>
+                            class="fa-solid fa-tower-cell"></i> Spots</a></li>
-                    <li class="nav-item ms-4"><a href="/bands" class="nav-link" id="nav-link-bands"><i class="fa-solid fa-ruler-vertical"></i> Bands</a></li>
+                    <li class="nav-item ms-4"><a href="/map" class="nav-link" id="nav-link-map"><i
-                    <li class="nav-item ms-4"><a href="/alerts" class="nav-link" id="nav-link-alerts"><i class="fa-solid fa-clock"></i> Upcoming</a></li>
+                            class="fa-solid fa-map"></i> Map</a></li>
-                  {% if allow_spotting %}
+                    <li class="nav-item ms-4"><a href="/bands" class="nav-link" id="nav-link-bands"><i
-                    <li class="nav-item ms-4"><a href="/add-spot" class="nav-link" id="nav-link-add-spot"><i class="fa-solid fa-comment"></i> Add&nbsp;Spot</a></li>
+                            class="fa-solid fa-ruler-vertical"></i> Bands</a></li>
-                  {% end %}
+                    <li class="nav-item ms-4"><a href="/alerts" class="nav-link" id="nav-link-alerts"><i
-                    <li class="nav-item ms-4"><a href="/conditions" class="nav-link" id="nav-link-conditions"><i class="fa-solid fa-sun"></i> Conditions</a></li>
+                            class="fa-solid fa-clock"></i> Upcoming</a></li>
-                    <li class="nav-item ms-4"><a href="/status" class="nav-link" id="nav-link-status"><i class="fa-solid fa-chart-simple"></i> Status</a></li>
+                    {% if allow_spotting %}
-                    <li class="nav-item ms-4"><a href="/about" class="nav-link" id="nav-link-about"><i class="fa-solid fa-circle-info"></i> About</a></li>
+                    <li class="nav-item ms-4"><a href="/add-spot" class="nav-link" id="nav-link-add-spot"><i
-                    <li class="nav-item ms-4"><a href="/apidocs" class="nav-link" id="nav-link-api"><i class="fa-solid fa-gear"></i> API</a></li>
+                            class="fa-solid fa-comment"></i> Add&nbsp;Spot</a></li>
                    {% end %}
                    <li class="nav-item ms-4"><a href="/conditions" class="nav-link" id="nav-link-conditions"><i
                            class="fa-solid fa-sun"></i> Conditions</a></li>
                    <li class="nav-item ms-4"><a href="/status" class="nav-link" id="nav-link-status"><i
                            class="fa-solid fa-chart-simple"></i> Status</a></li>
                    <li class="nav-item ms-4"><a href="/about" class="nav-link" id="nav-link-about"><i
                            class="fa-solid fa-circle-info"></i> About</a></li>
                    <li class="nav-item ms-4"><a href="/apidocs" class="nav-link" id="nav-link-api"><i
                            class="fa-solid fa-gear"></i> API</a></li>
                </ul>
            </div>
        </div>
@@ -45,14 +56,17 @@
    <main>
-{% block content %}{% end %}
+        {% block content %}{% end %}
    </main>
    <div id="footer" class="hideonmobile hideonmap">
        <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
-            <p class="col-md-4 mb-0 text-body-secondary">Made with love by <a href="https://ianrenton.com" class="text-body-secondary">Ian, MØTRT</a> and other contributors.</p>
+            <p class="col-md-4 mb-0 text-body-secondary">Made with love by <a href="https://ianrenton.com"
-            <p class="col-md-4 mb-0 justify-content-center text-body-secondary text-center">Spothole v{{software_version}}</p>
+                                                                              class="text-body-secondary">Ian, MØTRT</a>
                and other contributors.</p>
            <p class="col-md-4 mb-0 justify-content-center text-body-secondary text-center">Spothole
                v{{software_version}}</p>
            <ul class="nav col-md-4 justify-content-end">
                <li class="nav-item">
                    <a href="/about#faq" class="nav-link px-3 text-body-secondary">FAQ</a>
@@ -61,16 +75,20 @@
                    <a href="/about#privacy" class="nav-link px-3 text-body-secondary">Privacy</a>
                </li>
                <li class="nav-item">
-                    <a href="https://git.ianrenton.com/ian/spothole" class="nav-link px-3 text-body-secondary">Source Code</a>
+                    <a href="https://git.ianrenton.com/ian/spothole" class="nav-link px-3 text-body-secondary">Source
                        Code</a>
                </li>
                <li class="nav-item">
-                    <a href="https://git.ianrenton.com/ian/spothole/issues" class="nav-link px-3 text-body-secondary">Issue Tracker</a>
+                    <a href="https://git.ianrenton.com/ian/spothole/issues" class="nav-link px-3 text-body-secondary">Issue
                        Tracker</a>
                </li>
            </ul>
        </footer>
    </div>
 </div>
-<div id="embeddedModeFooter" class="text-body-secondary pt-2 px-3 pb-1">Powered by <img src="/img/logo.png" class="logo" width="96" height="30" alt="Spothole"></div>
+<div id="embeddedModeFooter" class="text-body-secondary pt-2 px-3 pb-1">Powered by <img src="/img/logo.png" class="logo"
                                                                                        width="96" height="30"
                                                                                        alt="Spothole"></div>
 {% end %}
--- a/templates/cards/audio.html
+++ b/templates/cards/audio.html
@@ -3,8 +3,9 @@
        <h5 class="card-title mb-3">Audio</h5>
        <div class="form-group">
            <div class="form-check form-check-inline">
-              <input class="form-check-input storeable-checkbox" type="checkbox" id="pingOnNewSpots" value="pingOnNewSpots" oninput="saveSettings();">
+                <input class="form-check-input storeable-checkbox" type="checkbox" id="pingOnNewSpots"
-              <label class="form-check-label" for="pingOnNewSpots">Ping on new spots</label>
+                       value="pingOnNewSpots" oninput="saveSettings();">
                <label class="form-check-label" for="pingOnNewSpots">Ping on new spots</label>
            </div>
        </div>
    </div>
--- a/templates/cards/duration-limit-alerts.html
+++ b/templates/cards/duration-limit-alerts.html
@@ -1,9 +1,12 @@
 <div class="card">
    <div class="card-body">
-        <h5 class="card-title">Duration Limit <i class='fa-solid fa-circle-question' title='Some users create long-duration alerts for the period they will be generally in and around xOTA references, when they are not indending to be on the air most of the time. Use this control to restrict the maximum duration of spots that the software will display, and exclude any with a long duration, to avoid these filling up the list. By default, we allow DXpeditions to be displayed even if they are longer than this limit, because on a DXpedition the operators typically ARE on the air most of the time.'></i></h5>
+        <h5 class="card-title">Duration Limit <i class='fa-solid fa-circle-question'
                                                 title='Some users create long-duration alerts for the period they will be generally in and around xOTA references, when they are not indending to be on the air most of the time. Use this control to restrict the maximum duration of spots that the software will display, and exclude any with a long duration, to avoid these filling up the list. By default, we allow DXpeditions to be displayed even if they are longer than this limit, because on a DXpedition the operators typically ARE on the air most of the time.'></i>
        </h5>
        <p class="card-text spothole-card-text">
            <label for="max-duration" class="form-label">Hide any alerts lasting more than</label>
-            <select id="max-duration" class="storeable-select form-select" onclick="filtersUpdated();" style="width: 8em; display: inline-block;">
+            <select id="max-duration" class="storeable-select form-select" onclick="filtersUpdated();"
                    style="width: 8em; display: inline-block;">
                <option value="10800">3 hours</option>
                <option value="43200">12 hours</option>
                <option value="86400" selected>24 hours</option>
@@ -13,7 +16,10 @@
            </select>
        </p>
        <p class='card-text spothole-card-text' style='line-height: 1.5em !important;'>
-            <input class="form-check-input storeable-checkbox" type="checkbox" value="" onclick="filtersUpdated();" id="dxpeditions_skip_max_duration_check" checked><label class="form-check-label ms-2" for="dxpeditions_skip_max_duration_check">Allow DXpeditions that are longer</label>
+            <input class="form-check-input storeable-checkbox" type="checkbox" value="" onclick="filtersUpdated();"
                   id="dxpeditions_skip_max_duration_check" checked><label class="form-check-label ms-2"
                                                                           for="dxpeditions_skip_max_duration_check">Allow
            DXpeditions that are longer</label>
        </p>
    </div>
 </div>
--- a/templates/cards/hamqth.html
+++ b/templates/cards/hamqth.html
@@ -3,21 +3,28 @@
        <h5 class="card-title">HamQTH</h5>
        <div class="card-text spothole-card-text">
            <div class="form-check mb-2">
-                <input type="checkbox" class="storeable-checkbox form-check-input" id="hamqth-enabled" onchange="saveSettings();">
+                <input type="checkbox" class="storeable-checkbox form-check-input" id="hamqth-enabled"
                       onchange="saveSettings();">
                <label for="hamqth-enabled" class="form-check-label">Use data from HamQTH</label>
            </div>
            <div class="mb-2">
-                <input type="text" class="storeable-text form-control" id="hamqth-username" placeholder="Username (Callsign)" onchange="saveSettings();" autocomplete="username">
+                <input type="text" class="storeable-text form-control" id="hamqth-username"
                       placeholder="Username (Callsign)" onchange="saveSettings();" autocomplete="username">
            </div>
            <div class="mb-2">
-                <input type="password" class="password-field form-control" id="hamqth-password" placeholder="Password" data-remember-checkbox="hamqth-remember-password" onchange="saveSettings();" autocomplete="current-password">
+                <input type="password" class="password-field form-control" id="hamqth-password" placeholder="Password"
                       data-remember-checkbox="hamqth-remember-password" onchange="saveSettings();"
                       autocomplete="current-password">
            </div>
            <div class="form-check">
-                <input type="checkbox" class="storeable-checkbox form-check-input" id="hamqth-remember-password" onchange="saveSettings();">
+                <input type="checkbox" class="storeable-checkbox form-check-input" id="hamqth-remember-password"
                       onchange="saveSettings();">
                <label for="hamqth-remember-password" class="form-check-label">Remember password</label>
            </div>
            <div class="mt-3">
-                <button type="button" class="btn btn-outline-secondary btn-sm" onclick="location.reload();">Reload with this data</button>
+                <button type="button" class="btn btn-outline-secondary btn-sm" onclick="location.reload();">Reload with
                    this data
                </button>
            </div>
            <div class="mt-1">
                <small>See <a href="/about#privacy">Privacy</a> for more information.</small>
--- a/templates/cards/location.html
+++ b/templates/cards/location.html
@@ -1,9 +1,10 @@
 <div class="card">
    <div class="card-body">
        <h5 class="card-title">Location</h5>
-            <div class="form-group spothole-card-text">
+        <div class="form-group spothole-card-text">
-                <label for="userGrid">Your grid:</label>
+            <label for="userGrid">Your grid:</label>
-                <input type="text" class="storeable-text form-control" id="userGrid" placeholder="AA00aa" oninput="userGridUpdated();" style="width: 10em; display: inline-block;">
+            <input type="text" class="storeable-text form-control" id="userGrid" placeholder="AA00aa"
-            </div>
+                   oninput="userGridUpdated();" style="width: 10em; display: inline-block;">
        </div>
    </div>
 </div>
--- a/templates/cards/map-features.html
+++ b/templates/cards/map-features.html
@@ -3,37 +3,43 @@
        <h5 class="card-title mb-3">Map Features</h5>
        <div class="form-group">
            <div class="form-check form-check-inline">
-              <input class="form-check-input storeable-checkbox" type="checkbox" id="mapShowGeodesics" value="mapShowGeodesics" oninput="displayUpdated();">
+                <input class="form-check-input storeable-checkbox" type="checkbox" id="mapShowGeodesics"
-              <label class="form-check-label" for="mapShowGeodesics">Geodesic Lines</label>
+                       value="mapShowGeodesics" oninput="displayUpdated();">
                <label class="form-check-label" for="mapShowGeodesics">Geodesic Lines</label>
            </div>
        </div>
        <div class="form-group">
            <div class="form-check form-check-inline">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="showTerminator" oninput="displayUpdated();" checked>
+                <input class="form-check-input storeable-checkbox" type="checkbox" id="showTerminator"
                       oninput="displayUpdated();" checked>
                <label class="form-check-label" for="showTerminator">Terminator / Greyline</label>
            </div>
        </div>
        <div class="form-group">
            <div class="form-check form-check-inline">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="showMaidenheadGrid" oninput="displayUpdated();">
+                <input class="form-check-input storeable-checkbox" type="checkbox" id="showMaidenheadGrid"
                       oninput="displayUpdated();">
                <label class="form-check-label" for="showMaidenheadGrid">Maidenhead Grid</label>
            </div>
        </div>
        <div class="form-group">
            <div class="form-check form-check-inline">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="showCQZones" oninput="displayUpdated();">
+                <input class="form-check-input storeable-checkbox" type="checkbox" id="showCQZones"
                       oninput="displayUpdated();">
                <label class="form-check-label" for="showCQZones">CQ Zones</label>
            </div>
        </div>
        <div class="form-group">
            <div class="form-check form-check-inline">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="showITUZones" oninput="displayUpdated();">
+                <input class="form-check-input storeable-checkbox" type="checkbox" id="showITUZones"
                       oninput="displayUpdated();">
                <label class="form-check-label" for="showITUZones">ITU Zones</label>
            </div>
        </div>
        <div class="form-group">
            <div class="form-check form-check-inline">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="showWABWAIGrid" oninput="displayUpdated();">
+                <input class="form-check-input storeable-checkbox" type="checkbox" id="showWABWAIGrid"
                       oninput="displayUpdated();">
                <label class="form-check-label" for="showWABWAIGrid">WAB/WAI Grid</label>
            </div>
        </div>
--- a/templates/cards/number-of-alerts.html
+++ b/templates/cards/number-of-alerts.html
@@ -2,10 +2,12 @@
    <div class="card-body">
        <h5 class="card-title">Number of Alerts</h5>
        <p class="card-text spothole-card-text">Show up to
-            <select id="alerts-to-fetch" class="storeable-select form-select ms-2 me-2" oninput="filtersUpdated();"  style="width: 5em;display: inline-block;">
+            <select id="alerts-to-fetch" class="storeable-select form-select ms-2 me-2" oninput="filtersUpdated();"
-            {% for c in web_ui_options["alert-count"] %}
+                    style="width: 5em;display: inline-block;">
-                <option value="{{c}}" {% if web_ui_options["alert-count-default"] == c %}selected{% end %}>{{c}}</option>
+                {% for c in web_ui_options["alert-count"] %}
-            {% end %}
+                <option value="{{c}}" {% if web_ui_options[
                "alert-count-default"] == c %}selected{% end %}>{{c}}</option>
                {% end %}
            </select>
            alerts
        </p>
--- a/templates/cards/number-of-spots.html
+++ b/templates/cards/number-of-spots.html
@@ -2,10 +2,12 @@
    <div class="card-body">
        <h5 class="card-title">Number of Spots</h5>
        <p class="card-text spothole-card-text">Show up to
-            <select id="spots-to-fetch" class="storeable-select form-select ms-2 me-2 d-inline-block" oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
+            <select id="spots-to-fetch" class="storeable-select form-select ms-2 me-2 d-inline-block"
-            {% for c in web_ui_options["spot-count"] %}
+                    oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
-                <option value="{{c}}" {% if web_ui_options["spot-count-default"] == c %}selected{% end %}>{{c}}</option>
+                {% for c in web_ui_options["spot-count"] %}
-            {% end %}
+                <option value="{{c}}" {% if web_ui_options[
                "spot-count-default"] == c %}selected{% end %}>{{c}}</option>
                {% end %}
            </select>
            spots
        </p>
--- a/templates/cards/qrz.html
+++ b/templates/cards/qrz.html
@@ -3,21 +3,28 @@
        <h5 class="card-title">QRZ.com</h5>
        <div class="card-text spothole-card-text">
            <div class="form-check mb-2">
-                <input type="checkbox" class="storeable-checkbox form-check-input" id="qrz-enabled" onchange="saveSettings();">
+                <input type="checkbox" class="storeable-checkbox form-check-input" id="qrz-enabled"
                       onchange="saveSettings();">
                <label for="qrz-enabled" class="form-check-label">Use data from QRZ.com</label>
            </div>
            <div class="mb-2">
-                <input type="text" class="storeable-text form-control" id="qrz-username" placeholder="Username (Callsign)" onchange="saveSettings();" autocomplete="username">
+                <input type="text" class="storeable-text form-control" id="qrz-username"
                       placeholder="Username (Callsign)" onchange="saveSettings();" autocomplete="username">
            </div>
            <div class="mb-2">
-                <input type="password" class="password-field form-control" id="qrz-password" placeholder="Password" data-remember-checkbox="qrz-remember-password" onchange="saveSettings();" autocomplete="current-password">
+                <input type="password" class="password-field form-control" id="qrz-password" placeholder="Password"
                       data-remember-checkbox="qrz-remember-password" onchange="saveSettings();"
                       autocomplete="current-password">
            </div>
            <div class="form-check">
-                <input type="checkbox" class="storeable-checkbox form-check-input" id="qrz-remember-password" onchange="saveSettings();">
+                <input type="checkbox" class="storeable-checkbox form-check-input" id="qrz-remember-password"
                       onchange="saveSettings();">
                <label for="qrz-remember-password" class="form-check-label">Remember password</label>
            </div>
            <div class="mt-3">
-                <button type="button" class="btn btn-outline-secondary btn-sm" onclick="location.reload();">Reload with this data</button>
+                <button type="button" class="btn btn-outline-secondary btn-sm" onclick="location.reload();">Reload with
                    this data
                </button>
            </div>
            <div class="mt-1">
                <small>See <a href="/about#privacy">Privacy</a> for more information.</small>
--- a/templates/cards/spot-age.html
+++ b/templates/cards/spot-age.html
@@ -2,9 +2,11 @@
    <div class="card-body">
        <h5 class="card-title">Spot Age</h5>
        <p class="card-text spothole-card-text">Last
-            <select id="max-spot-age" class="storeable-select form-select ms-2 me-2 d-inline-block" oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
+            <select id="max-spot-age" class="storeable-select form-select ms-2 me-2 d-inline-block"
                    oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
                {% for a in web_ui_options["max-spot-age"] %}
-                    <option value="{{a*60}}" {% if web_ui_options["max-spot-age-default"] == a*60 %}selected{% end %}>{{a}}</option>
+                <option value="{{a*60}}" {% if web_ui_options[
                "max-spot-age-default"] == a*60 %}selected{% end %}>{{a}}</option>
                {% end %}
            </select>
            minutes
--- a/templates/cards/table-columns-alerts.html
+++ b/templates/cards/table-columns-alerts.html
@@ -2,34 +2,55 @@
    <div class="card-body">
        <h5 class="card-title">Table Columns</h5>
        <div class="row row-cols-2 g-1">
-            <div class="col"><div class="form-check">
+            <div class="col">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowStartTime" value="tableShowStartTime" oninput="columnsUpdated();" checked>
+                <div class="form-check">
-                <label class="form-check-label" for="tableShowStartTime">Start Time</label>
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowStartTime"
-            </div></div>
+                           value="tableShowStartTime" oninput="columnsUpdated();" checked>
-            <div class="col"><div class="form-check">
+                    <label class="form-check-label" for="tableShowStartTime">Start Time</label>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowEndTime" value="tableShowEndTime" oninput="columnsUpdated();" checked>
+                </div>
-                <label class="form-check-label" for="tableShowEndTime">End Time</label>
+            </div>
-            </div></div>
+            <div class="col">
-            <div class="col"><div class="form-check">
+                <div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDX" value="tableShowDX" oninput="columnsUpdated();" checked>
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowEndTime"
-                <label class="form-check-label" for="tableShowDX">DX</label>
+                           value="tableShowEndTime" oninput="columnsUpdated();" checked>
-            </div></div>
+                    <label class="form-check-label" for="tableShowEndTime">End Time</label>
-            <div class="col"><div class="form-check">
+                </div>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowFreqsModes" value="tableShowFreqsModes" oninput="columnsUpdated();" checked>
+            </div>
-                <label class="form-check-label" for="tableShowFreqsModes">Freq &amp; Mode</label>
+            <div class="col">
-            </div></div>
+                <div class="form-check">
-            <div class="col"><div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDX"
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowComment" value="tableShowComment" oninput="columnsUpdated();" checked>
+                           value="tableShowDX" oninput="columnsUpdated();" checked>
-                <label class="form-check-label" for="tableShowComment">Comment</label>
+                    <label class="form-check-label" for="tableShowDX">DX</label>
-            </div></div>
+                </div>
-            <div class="col"><div class="form-check">
+            </div>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowSource" value="tableShowSource" oninput="columnsUpdated();" checked>
+            <div class="col">
-                <label class="form-check-label" for="tableShowSource">Source</label>
+                <div class="form-check">
-            </div></div>
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowFreqsModes"
-            <div class="col"><div class="form-check">
+                           value="tableShowFreqsModes" oninput="columnsUpdated();" checked>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowRef" value="tableShowRef" oninput="columnsUpdated();" checked>
+                    <label class="form-check-label" for="tableShowFreqsModes">Freq &amp; Mode</label>
-                <label class="form-check-label" for="tableShowRef">Ref.</label>
+                </div>
-            </div></div>
+            </div>
            <div class="col">
                <div class="form-check">
                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowComment"
                           value="tableShowComment" oninput="columnsUpdated();" checked>
                    <label class="form-check-label" for="tableShowComment">Comment</label>
                </div>
            </div>
            <div class="col">
                <div class="form-check">
                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowSource"
                           value="tableShowSource" oninput="columnsUpdated();" checked>
                    <label class="form-check-label" for="tableShowSource">Source</label>
                </div>
            </div>
            <div class="col">
                <div class="form-check">
                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowRef"
                           value="tableShowRef" oninput="columnsUpdated();" checked>
                    <label class="form-check-label" for="tableShowRef">Ref.</label>
                </div>
            </div>
        </div>
    </div>
 </div>
--- a/templates/cards/table-columns-spots.html
+++ b/templates/cards/table-columns-spots.html
@@ -2,46 +2,76 @@
    <div class="card-body">
        <h5 class="card-title">Table Columns</h5>
        <div class="row row-cols-2 g-1">
-            <div class="col"><div class="form-check">
+            <div class="col">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowTime" value="tableShowTime" oninput="columnsUpdated();" checked>
+                <div class="form-check">
-                <label class="form-check-label" for="tableShowTime">Time</label>
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowTime"
-            </div></div>
+                           value="tableShowTime" oninput="columnsUpdated();" checked>
-            <div class="col"><div class="form-check">
+                    <label class="form-check-label" for="tableShowTime">Time</label>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDX" value="tableShowDX" oninput="columnsUpdated();" checked>
+                </div>
-                <label class="form-check-label" for="tableShowDX">DX</label>
+            </div>
-            </div></div>
+            <div class="col">
-            <div class="col"><div class="form-check">
+                <div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowFreq" value="tableShowFreq" oninput="columnsUpdated();" checked>
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDX"
-                <label class="form-check-label" for="tableShowFreq">Frequency</label>
+                           value="tableShowDX" oninput="columnsUpdated();" checked>
-            </div></div>
+                    <label class="form-check-label" for="tableShowDX">DX</label>
-            <div class="col"><div class="form-check">
+                </div>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowMode" value="tableShowMode" oninput="columnsUpdated();" checked>
+            </div>
-                <label class="form-check-label" for="tableShowMode">Mode</label>
+            <div class="col">
-            </div></div>
+                <div class="form-check">
-            <div class="col"><div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowFreq"
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowComment" value="tableShowComment" oninput="columnsUpdated();" checked>
+                           value="tableShowFreq" oninput="columnsUpdated();" checked>
-                <label class="form-check-label" for="tableShowComment">Comment</label>
+                    <label class="form-check-label" for="tableShowFreq">Frequency</label>
-            </div></div>
+                </div>
-            <div class="col"><div class="form-check">
+            </div>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowBearing" value="tableShowBearing" oninput="columnsUpdated();">
+            <div class="col">
-                <label class="form-check-label" for="tableShowBearing">Bearing</label>
+                <div class="form-check">
-            </div></div>
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowMode"
-            <div class="col"><div class="form-check">
+                           value="tableShowMode" oninput="columnsUpdated();" checked>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowType" value="tableShowType" oninput="columnsUpdated();" checked>
+                    <label class="form-check-label" for="tableShowMode">Mode</label>
-                <label class="form-check-label" for="tableShowType">Type</label>
+                </div>
-            </div></div>
+            </div>
-            <div class="col"><div class="form-check">
+            <div class="col">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowRef" value="tableShowRef" oninput="columnsUpdated();" checked>
+                <div class="form-check">
-                <label class="form-check-label" for="tableShowRef">Ref.</label>
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowComment"
-            </div></div>
+                           value="tableShowComment" oninput="columnsUpdated();" checked>
-            <div class="col"><div class="form-check">
+                    <label class="form-check-label" for="tableShowComment">Comment</label>
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDE" value="tableShowDE" oninput="columnsUpdated();" checked>
+                </div>
-                <label class="form-check-label" for="tableShowDE">DE</label>
+            </div>
-            </div></div>
+            <div class="col">
-            <div class="col"><div class="form-check">
+                <div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowWorkedCheckbox" value="tableShowWorkedCheckbox" oninput="columnsUpdated();" checked>
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowBearing"
-                <label class="form-check-label" for="tableShowWorkedCheckbox">Worked?</label>
+                           value="tableShowBearing" oninput="columnsUpdated();">
-            </div></div>
+                    <label class="form-check-label" for="tableShowBearing">Bearing</label>
                </div>
            </div>
            <div class="col">
                <div class="form-check">
                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowType"
                           value="tableShowType" oninput="columnsUpdated();" checked>
                    <label class="form-check-label" for="tableShowType">Type</label>
                </div>
            </div>
            <div class="col">
                <div class="form-check">
                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowRef"
                           value="tableShowRef" oninput="columnsUpdated();" checked>
                    <label class="form-check-label" for="tableShowRef">Ref.</label>
                </div>
            </div>
            <div class="col">
                <div class="form-check">
                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDE"
                           value="tableShowDE" oninput="columnsUpdated();" checked>
                    <label class="form-check-label" for="tableShowDE">DE</label>
                </div>
            </div>
            <div class="col">
                <div class="form-check">
                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowWorkedCheckbox"
                           value="tableShowWorkedCheckbox" oninput="columnsUpdated();" checked>
                    <label class="form-check-label" for="tableShowWorkedCheckbox">Worked?</label>
                </div>
            </div>
        </div>
    </div>
 </div>
--- a/templates/cards/time-zone.html
+++ b/templates/cards/time-zone.html
@@ -2,7 +2,8 @@
    <div class="card-body">
        <h5 class="card-title">Time Zone</h5>
        <p class="card-text spothole-card-text"> Use
-            <select id="timeZone" class="storeable-select form-select ms-2 me-2 d-inline-block" oninput="timeZoneUpdated();" style="width: 8em; display: inline-block;">
+            <select id="timeZone" class="storeable-select form-select ms-2 me-2 d-inline-block"
                    oninput="timeZoneUpdated();" style="width: 8em; display: inline-block;">
                <option value="UTC" selected>UTC</option>
                <option value="local">Local time</option>
            </select>
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1781901226"></script>
+<script src="/js/conditions.js?v=1781901371"></script>
 <script>$(document).ready(function () {
    $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
--- a/templates/map.html
+++ b/templates/map.html
@@ -13,7 +13,7 @@
        </div>
        <div id="filters-area" class="appearing-panel card mb-3">
-        {% module Template("widgets/filters-area-header.html", web_ui_options=web_ui_options) %}
+            {% module Template("widgets/filters-area-header.html", web_ui_options=web_ui_options) %}
            <div class="card-body">
                <div class="row row-cols-1 g-4 mb-4 row-cols-md-3">
                    <div class="col">
@@ -54,7 +54,8 @@
                        {% module Template("cards/map-features.html", web_ui_options=web_ui_options) %}
                    </div>
                    <div class="col">
-                        {% module Template("cards/color-scheme-and-band-color-scheme.html", web_ui_options=web_ui_options) %}
+                        {% module Template("cards/color-scheme-and-band-color-scheme.html",
                        web_ui_options=web_ui_options) %}
                    </div>
                </div>
            </div>
@@ -92,10 +93,15 @@
 <script src="/vendor/js/leaflet-workedallbritainireland.js"></script>
 <script>
-    let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
+    let spotProvidersEnabledByDefault = { % raw
    json_encode(web_ui_options["spot-providers-enabled-by-default"]) %
    }
    ;
 </script>
-<script src="/js/spotsbandsandmap.js?v=1781901227"></script>
+<script src="/js/spotsbandsandmap.js?v=1781901371"></script>
-<script src="/js/map.js?v=1781901227"></script>
+<script src="/js/map.js?v=1781901371"></script>
-<script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script>$(document).ready(function () {
    $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
 {% end %}
--- a/templates/skeleton.html
+++ b/templates/skeleton.html
@@ -11,8 +11,10 @@
    <meta property="og:title" content="Spothole"/>
    <meta property="twitter:title" content="Spothole"/>
-    <meta name="description" content="An Amateur Radio spotting tool bringing together DX clusters and outdoor programmes, providing a universal JSON API and web interface."/>
+    <meta name="description"
-    <meta property="og:description" content="An Amateur Radio spotting tool bringing together DX clusters and outdoor programmes, providing a universal JSON API and web interface."/>
+          content="An Amateur Radio spotting tool bringing together DX clusters and outdoor programmes, providing a universal JSON API and web interface."/>
    <meta property="og:description"
          content="An Amateur Radio spotting tool bringing together DX clusters and outdoor programmes, providing a universal JSON API and web interface."/>
    <link rel="canonical" href="https://spothole.app/"/>
    <meta property="og:url" content="https://spothole.app/"/>
    <meta property="og:image" content="https://spothole.app/img/banner.png"/>
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -2,10 +2,16 @@
 {% block content %}
 <div id="intro-box" class="permanently-dismissible-box mt-3">
-<div class="alert alert-primary alert-dismissible fade show" role="alert">
+    <div class="alert alert-primary alert-dismissible fade show" role="alert">
-  <i class="fa-solid fa-circle-info"></i> <strong>What is Spothole?</strong><br/>Spothole is an aggregator of amateur radio spots from DX clusters and outdoor activity programmes. It's free for anyone to use and includes an API that developers can build other applications on. For more information, check out the <a href="/about" class="alert-link">"About" page</a>. If that sounds like nonsense to you, you can visit <a href="/about#faq" class="alert-link">the FAQ section</a> to learn more.
+        <i class="fa-solid fa-circle-info"></i> <strong>What is Spothole?</strong><br/>Spothole is an aggregator of
-  <button type="button" id="intro-box-dismiss" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        amateur radio spots from DX clusters and outdoor activity programmes. It's free for anyone to use and includes
-</div>
+        an API that developers can build other applications on. For more information, check out the <a href="/about"
                                                                                                       class="alert-link">"About"
        page</a>. If that sounds like nonsense to you, you can visit <a href="/about#faq" class="alert-link">the FAQ
        section</a> to learn more.
        <button type="button" id="intro-box-dismiss" class="btn-close" data-bs-dismiss="alert"
                aria-label="Close"></button>
    </div>
 </div>
 <div class="mt-3">
@@ -63,7 +69,8 @@
                    {% module Template("cards/number-of-spots.html", web_ui_options=web_ui_options) %}
                </div>
                <div class="col">
-                    {% module Template("cards/color-scheme-and-band-color-scheme.html", web_ui_options=web_ui_options) %}
+                    {% module Template("cards/color-scheme-and-band-color-scheme.html", web_ui_options=web_ui_options)
                    %}
                </div>
                <div class="col">
                    {% module Template("cards/table-columns-spots.html", web_ui_options=web_ui_options) %}
@@ -96,16 +103,26 @@
    </div>
    <div id="table-container">
-        <table id="table" class="table"><thead><tr></tr></thead><tbody></tbody></table>
+        <table id="table" class="table">
            <thead>
            <tr></tr>
            </thead>
            <tbody></tbody>
        </table>
    </div>
 </div>
 <script>
-    let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
+    let spotProvidersEnabledByDefault = { % raw
    json_encode(web_ui_options["spot-providers-enabled-by-default"]) %
    }
    ;
 </script>
-<script src="/js/spotsbandsandmap.js?v=1781901226"></script>
+<script src="/js/spotsbandsandmap.js?v=1781901371"></script>
-<script src="/js/spots.js?v=1781901226"></script>
+<script src="/js/spots.js?v=1781901371"></script>
-<script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script>$(document).ready(function () {
    $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
 {% end %}
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,9 +59,11 @@
    </div>
 </div>
-<script src="/js/status.js?v=1781901226"></script>
+<script src="/js/status.js?v=1781901371"></script>
 <script>
-    $(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav -->
+    $(document).ready(function () {
        $("#nav-link-status").addClass("active");
    }); <!-- highlight active page in nav -->
 </script>
 {% end %}
--- a/templates/widgets/band-color-scheme.html
+++ b/templates/widgets/band-color-scheme.html
@@ -1,13 +1,24 @@
 <label class="form-check-label form-label" for="band-color-scheme">Band color scheme</label><br/>
-<select id="band-color-scheme" class="storeable-select form-select d-inline-block" oninput="setBandColorSchemeFromUI();" style="display: inline-block;">
+<select id="band-color-scheme" class="storeable-select form-select d-inline-block" oninput="setBandColorSchemeFromUI();"
-    <option value="PSK Reporter" {% if web_ui_options["band-color-scheme-default"] == "PSK Reporter" %}selected{% end %}>PSK Reporter</option>
+        style="display: inline-block;">
-    <option value="PSK Reporter (Adjusted)" {% if web_ui_options["band-color-scheme-default"] == "PSK Reporter (Adjusted)" %}selected{% end %}>PSK Reporter (Adjusted)</option>
+    <option value="PSK Reporter" {% if web_ui_options[
-    <option value="RBN" {% if web_ui_options["band-color-scheme-default"] == "RBN" %}selected{% end %}>RBN</option>
+    "band-color-scheme-default"] == "PSK Reporter" %}selected{% end %}>PSK Reporter</option>
-    <option value="Ham Rainbow" {% if web_ui_options["band-color-scheme-default"] == "Ham Rainbow" %}selected{% end %}>Ham Rainbow</option>
+    <option value="PSK Reporter (Adjusted)" {% if web_ui_options[
-    <option value="Ham Rainbow (Reverse)" {% if web_ui_options["band-color-scheme-default"] == "Ham Rainbow (Reverse)" %}selected{% end %}>Ham Rainbow (Reverse)</option>
+    "band-color-scheme-default"] == "PSK Reporter (Adjusted)" %}selected{% end %}>PSK Reporter (Adjusted)</option>
-    <option value="Kate Morley" {% if web_ui_options["band-color-scheme-default"] == "Kate Morley" %}selected{% end %}>Kate Morley</option>
+    <option value="RBN" {% if web_ui_options[
-    <option value="ColorBrewer" {% if web_ui_options["band-color-scheme-default"] == "ColorBrewer" %}selected{% end %}>ColorBrewer</option>
+    "band-color-scheme-default"] == "RBN" %}selected{% end %}>RBN</option>
-    <option value="IWantHue" {% if web_ui_options["band-color-scheme-default"] == "IWantHue" %}selected{% end %}>IWantHue</option>
+    <option value="Ham Rainbow" {% if web_ui_options[
-    <option value="IWantHue (Color Blind)" {% if web_ui_options["band-color-scheme-default"] == "IWantHue (Color Blind)" %}selected{% end %}>IWantHue (Color Blind)</option>
+    "band-color-scheme-default"] == "Ham Rainbow" %}selected{% end %}>Ham Rainbow</option>
-    <option value="Mokole" {% if web_ui_options["band-color-scheme-default"] == "Mokole" %}selected{% end %}>Mokole</option>
+    <option value="Ham Rainbow (Reverse)" {% if web_ui_options[
    "band-color-scheme-default"] == "Ham Rainbow (Reverse)" %}selected{% end %}>Ham Rainbow (Reverse)</option>
    <option value="Kate Morley" {% if web_ui_options[
    "band-color-scheme-default"] == "Kate Morley" %}selected{% end %}>Kate Morley</option>
    <option value="ColorBrewer" {% if web_ui_options[
    "band-color-scheme-default"] == "ColorBrewer" %}selected{% end %}>ColorBrewer</option>
    <option value="IWantHue" {% if web_ui_options[
    "band-color-scheme-default"] == "IWantHue" %}selected{% end %}>IWantHue</option>
    <option value="IWantHue (Color Blind)" {% if web_ui_options[
    "band-color-scheme-default"] == "IWantHue (Color Blind)" %}selected{% end %}>IWantHue (Color Blind)</option>
    <option value="Mokole" {% if web_ui_options[
    "band-color-scheme-default"] == "Mokole" %}selected{% end %}>Mokole</option>
 </select>
--- a/templates/widgets/color-scheme.html
+++ b/templates/widgets/color-scheme.html
@@ -1,6 +1,10 @@
 <label class="form-check-label form-label" for="color-scheme">UI color scheme</label>
-<select id="color-scheme" class="storeable-select form-select d-inline-block" oninput="setColorSchemeFromUI();" style="display: inline-block;">
+<select id="color-scheme" class="storeable-select form-select d-inline-block" oninput="setColorSchemeFromUI();"
-    <option value="auto" {% if web_ui_options["color-scheme-default"] == "auto" %}selected{% end %}>Automatic</option>
+        style="display: inline-block;">
-    <option value="light" {% if web_ui_options["color-scheme-default"] == "light" %}selected{% end %}>Light</option>
+    <option value="auto" {% if web_ui_options[
-    <option value="dark" {% if web_ui_options["color-scheme-default"] == "dark" %}selected{% end %}>Dark</option>
+    "color-scheme-default"] == "auto" %}selected{% end %}>Automatic</option>
    <option value="light" {% if web_ui_options[
    "color-scheme-default"] == "light" %}selected{% end %}>Light</option>
    <option value="dark" {% if web_ui_options[
    "color-scheme-default"] == "dark" %}selected{% end %}>Dark</option>
 </select>
--- a/templates/widgets/data-area-header.html
+++ b/templates/widgets/data-area-header.html
@@ -4,7 +4,8 @@
            Data
        </div>
        <div class="col-auto d-inline-flex">
-            <button id="close-data-button" type="button" class="btn-close btn-close" aria-label="Close" onclick="closeDataPanel();"></button>
+            <button id="close-data-button" type="button" class="btn-close btn-close" aria-label="Close"
                    onclick="closeDataPanel();"></button>
        </div>
    </div>
 </div>
--- a/templates/widgets/display-area-header.html
+++ b/templates/widgets/display-area-header.html
@@ -4,7 +4,8 @@
            Display
        </div>
        <div class="col-auto d-inline-flex">
-            <button id="close-display-button" type="button" class="btn-close btn-close" aria-label="Close" onclick="closeDisplayPanel();"></button>
+            <button id="close-display-button" type="button" class="btn-close btn-close" aria-label="Close"
                    onclick="closeDisplayPanel();"></button>
        </div>
    </div>
 </div>
--- a/templates/widgets/filters-area-header.html
+++ b/templates/widgets/filters-area-header.html
@@ -4,7 +4,8 @@
            Filters
        </div>
        <div class="col-auto d-inline-flex">
-            <button id="close-filters-button" type="button" class="btn-close btn-close" aria-label="Close" onclick="closeFiltersPanel();"></button>
+            <button id="close-filters-button" type="button" class="btn-close btn-close" aria-label="Close"
                    onclick="closeFiltersPanel();"></button>
        </div>
    </div>
 </div>
--- a/templates/widgets/filters-display-data-buttons.html
+++ b/templates/widgets/filters-display-data-buttons.html
@@ -1,5 +1,11 @@
 <div class="d-inline-flex gap-1">
-    <button id="filters-button" type="button" class="btn btn-outline-secondary" data-bs-toggle="button" onclick="toggleFiltersPanel();"><i class="fa-solid fa-filter"></i><span class="hideonmobile">&nbsp;Filters</span></button>
+    <button id="filters-button" type="button" class="btn btn-outline-secondary" data-bs-toggle="button"
-    <button id="display-button" type="button" class="btn btn-outline-secondary" data-bs-toggle="button" onclick="toggleDisplayPanel();"><i class="fa-solid fa-desktop"></i><span class="hideonmobile">&nbsp;Display</span></button>
+            onclick="toggleFiltersPanel();"><i class="fa-solid fa-filter"></i><span
-    <button id="data-button" type="button" class="btn btn-outline-secondary" data-bs-toggle="button" onclick="toggleDataPanel();"><i class="fa-solid fa-database"></i><span class="hideonmobile">&nbsp;Your data</span></button>
+            class="hideonmobile">&nbsp;Filters</span></button>
    <button id="display-button" type="button" class="btn btn-outline-secondary" data-bs-toggle="button"
            onclick="toggleDisplayPanel();"><i class="fa-solid fa-desktop"></i><span
            class="hideonmobile">&nbsp;Display</span></button>
    <button id="data-button" type="button" class="btn btn-outline-secondary" data-bs-toggle="button"
            onclick="toggleDataPanel();"><i class="fa-solid fa-database"></i><span
            class="hideonmobile">&nbsp;Your data</span></button>
 </div>
--- a/webassets/apidocs/openapi.yml
+++ b/webassets/apidocs/openapi.yml
@@ -678,7 +678,7 @@ components:
      oneOf:
        - $ref: "#/components/schemas/SIGName"
        - type: string
-          enum: [NO_SIG]
+          enum: [ NO_SIG ]
      example: POTA
    Continent:
@@ -1455,7 +1455,7 @@ components:
            for DX). Null if foF2 or MUF data is not yet available.
          additionalProperties:
            type: string
-            enum: [Closed, Short, Long]
+            enum: [ Closed, Short, Long ]
          example:
            "160m": "Closed"
            "80m": "Short"
--- a/webassets/css/style.css
+++ b/webassets/css/style.css
@@ -1,10 +1,11 @@
 /* NAVIGATION */
 .navbar-nav .nav-link.active {
-  font-weight: bold;
+    font-weight: bold;
 }
 .navbar-nav .nav-link i {
-  margin-right: 0.2em;
+    margin-right: 0.2em;
 }
 /* In embedded mode, hide header/footer/settings. "#header div" is kind of janky but for some reason if we hide the
@@ -26,9 +27,11 @@ whole of #header, the map vertical sizing breaks. */
    border-top: 1px solid grey;
    border-left: 1px solid grey;
 }
 [embedded-mode=true] #embeddedModeFooter {
    display: block;
 }
 #embeddedModeFooter img.logo {
    position: relative;
    top: -2px;
@@ -50,15 +53,15 @@ whole of #header, the map vertical sizing breaks. */
 /* GENERAL PAGE LAYOUT */
 div.container {
-   display:grid;
+    display: grid;
-   grid-template-rows:auto 1fr auto;
+    grid-template-rows:auto 1fr auto;
-   grid-template-columns:100%;
+    grid-template-columns:100%;
-   /* fallback height */
+    /* fallback height */
-   min-height:100vh;
+    min-height: 100vh;
-   /* new small viewport height for modern browsers */
+    /* new small viewport height for modern browsers */
-   min-height:100svh;
+    min-height: 100svh;
 }
 [embedded-mode=true] div.container {
@@ -69,15 +72,15 @@ div.container {
 /* ABOUT PAGE */
-#info-container{
+#info-container {
    width: 100%;
 }
@media (min-width: 768px) {
-  #info-container{
+    #info-container {
-    max-width: 60em;
+        max-width: 60em;
-    margin: 0 auto;
+        margin: 0 auto;
-  }
+    }
 }
@@ -161,6 +164,7 @@ a.dx-link {
    text-decoration: none;
    font-weight: bold;
 }
 a.sig-ref-link {
    color: var(--bs-emphasis-color);
    text-decoration: none;
@@ -171,21 +175,23 @@ tr.table-faded td {
    filter: grayscale(100%) opacity(30%) !important;
    text-decoration: line-through !important;
 }
 tr.table-faded td span {
    text-decoration: line-through !important;
 }
 /* New spot styles */
 tr.new td {
-  animation: 2s linear newspotanim;
+    animation: 2s linear newspotanim;
 }
@keyframes newspotanim {
-  0% {
+    0% {
-    background-color: var(--bs-success-border-subtle);
+        background-color: var(--bs-success-border-subtle);
-  }
+    }
-  100% {
+    100% {
-    background-color: initial;
+        background-color: initial;
-  }
+    }
 }
@@ -196,7 +202,7 @@ tr.new td {
    overflow: hidden;
 }
-#table-container table{
+#table-container table {
    margin-bottom: 0;
 }
@@ -219,6 +225,7 @@ div#map {
 .leaflet-container {
    font-family: var(--bs-body-font-family) sans-serif !important;
 }
 .leaflet-control-attribution {
    background: none;
 }
@@ -343,6 +350,7 @@ div.band-spot:hover span.band-spot-info {
 .input-narrow {
    max-width: 8em;
 }
 .input-medium {
    max-width: 12em;
 }
@@ -360,22 +368,27 @@ div.band-spot:hover span.band-spot-info {
    .hideonmobile {
        display: none !important;
    }
    /* Make map stretch to horizontal screen edges */
    div#map, div#table-container, div#bands-container {
        margin-left: -1em;
        margin-right: -1em;
    }
    /* Avoid map page filters panel being larger than the map itself */
    #settingsButtonRowMap .appearing-panel {
        max-height: 30em;
    }
    #settingsButtonRowMap .appearing-panel .card-body {
        max-height: 26em;
        overflow: scroll;
    }
    input#search {
        max-width: 7em;
    }
    .table-fixed-on-desktop {
        table-layout: auto !important;
    }
--- a/webassets/js/add-spot.js
+++ b/webassets/js/add-spot.js
@@ -1,7 +1,7 @@
 // Load server options. Once a successful callback is made from this, we can populate the choice boxes in the form and load
 // any saved values from local storage.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function(jsonData) {
+    $.getJSON('/api/v1/options', function (jsonData) {
        // Store options
        options = jsonData;
@@ -9,7 +9,7 @@ function loadOptions() {
        $.each(options["modes"], function (i, m) {
            $('#mode').append($('<option>', {
                value: m,
-                text : m
+                text: m
            }));
        });
@@ -17,7 +17,7 @@ function loadOptions() {
        $.each(options["sigs"], function (i, sig) {
            $('#sig').append($('<option>', {
                value: sig.name,
-                text : sig.name
+                text: sig.name
            }));
        });
@@ -79,11 +79,11 @@ function addSpot() {
        spot["time"] = moment.utc().valueOf() / 1000.0;
        $.ajax("/api/v1/spot", {
-            data : JSON.stringify(spot),
+            data: JSON.stringify(spot),
-            contentType : 'application/json',
+            contentType: 'application/json',
-            type : 'POST',
+            type: 'POST',
            timeout: 10000,
-            success: async function() {
+            success: async function () {
                $("#result-good").html("<div class='alert alert-success fade show mb-0 mt-4' role='alert'><i class='fa-solid fa-check'></i> Spot submitted. Returning you to the spots list...</div>");
                $("#result-bad").html("");
                setTimeout(() => {
@@ -92,7 +92,7 @@ function addSpot() {
                }, 1000);
            },
            error: function (result) {
-                showAddSpotError(result.responseText.slice(1,-1));
+                showAddSpotError(result.responseText.slice(1, -1));
            }
        });
    } catch (error) {
@@ -126,13 +126,13 @@ function displayIntroBox() {
    if (localStorage.getItem("add-spot-intro-box-dismissed") == null) {
        $("#add-spot-intro-box").show();
    }
-    $("#add-spot-intro-box-dismiss").click(function() {
+    $("#add-spot-intro-box-dismiss").click(function () {
        localStorage.setItem("add-spot-intro-box-dismissed", true);
    });
 }
 // Startup
-$(document).ready(function() {
+$(document).ready(function () {
    // Load options
    loadOptions();
    // Display intro box
--- a/webassets/js/alerts.js
+++ b/webassets/js/alerts.js
@@ -6,7 +6,7 @@ let alerts = [];
 // Load alerts and populate the table.
 function loadAlerts() {
-    $.getJSON('/api/v1/alerts' + buildQueryString(false), function(jsonData) {
+    $.getJSON('/api/v1/alerts' + buildQueryString(false), function (jsonData) {
        // Store last updated time
        lastUpdateTime = moment.utc();
        updateRefreshDisplay();
@@ -280,7 +280,7 @@ function addAlertRowsToTable(tbody, alerts) {
 // Load server options. Once a successful callback is made from this, we then query alerts.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function(jsonData) {
+    $.getJSON('/api/v1/options', function (jsonData) {
        // Store options
        options = jsonData;
@@ -310,7 +310,7 @@ function filtersUpdated() {
 }
 // Startup
-$(document).ready(function() {
+$(document).ready(function () {
    // Call loadOptions(), this will then trigger loading alerts and setting up timers.
    loadOptions();
    // Update the refresh timing display every second
--- a/webassets/js/bands.js
+++ b/webassets/js/bands.js
@@ -12,7 +12,7 @@ BAND_COLUMN_SPOT_DIV_HEIGHT_PX = BAND_COLUMN_FONT_SIZE * 1.6;
 // Load spots and populate the bands display.
 function loadSpots() {
-    $.getJSON('/api/v1/spots' + buildQueryString(false), function(jsonData) {
+    $.getJSON('/api/v1/spots' + buildQueryString(false), function (jsonData) {
        // Store last updated time
        lastUpdateTime = moment.utc();
        updateRefreshDisplay();
@@ -86,7 +86,7 @@ function updateBands() {
        const freqStep = (band.end_freq - band.start_freq) / 40.0;
        for (let i = 0; i <= 40; i++) {
            if (i % 4 === 0) {
-                bandMarkersDiv.append("&mdash;" + ((band.start_freq + i * freqStep)/1000000).toFixed(3) + "<br/>");
+                bandMarkersDiv.append("&mdash;" + ((band.start_freq + i * freqStep) / 1000000).toFixed(3) + "<br/>");
            } else if (i % 4 === 2) {
                bandMarkersDiv.append("&ndash;<br/>");
            } else {
@@ -98,7 +98,9 @@ function updateBands() {
        const bandSpotsDiv = $("<div class='band-spots'>");
        let lastSpotPxDownBand = -999;
        // Sort by frequency so have a consistent order in which to plan where they will appear on the band div.
-        spotList.sort(function(a, b) { return a.freq - b.freq; });
+        spotList.sort(function (a, b) {
            return a.freq - b.freq;
        });
        // First calculate how we should be displaying the spots. There are three "modes" to try to place them in a
        // visually appealing way:
        // 1) Spaced normally, not going over the end of the band, so we populate them forwards.
@@ -149,7 +151,7 @@ function updateBands() {
        // Now each spot is tagged with how far down the div it should go, add them to the DOM.
        spotList.forEach(s => {
            let worked = alreadyWorked(s["dx_call"], s["band"], s["mode"]);
-            bandSpotsDiv.append(`<div class="band-spot" style="top: ${s['pxDownBandLabel']}px; border-top: 1px solid ${bandToColor(s['band'])}; border-left: 5px solid ${bandToColor(s['band'])}; border-bottom: 1px solid ${bandToColor(s['band'])}; border-right: 1px solid ${bandToColor(s['band'])}; text-decoration: ${worked ? 'line-through' : 'none'};"><span class="band-spot-call">${s.dx_call}${s.dx_ssid != null ? "-" + s.dx_ssid : ""}</span><span class="band-spot-info">${s.dx_call}${s.dx_ssid != null ? "-" + s.dx_ssid : ""} ${(s.freq/1000000).toFixed(3)} ${s.mode}</span></div>`);
+            bandSpotsDiv.append(`<div class="band-spot" style="top: ${s['pxDownBandLabel']}px; border-top: 1px solid ${bandToColor(s['band'])}; border-left: 5px solid ${bandToColor(s['band'])}; border-bottom: 1px solid ${bandToColor(s['band'])}; border-right: 1px solid ${bandToColor(s['band'])}; text-decoration: ${worked ? 'line-through' : 'none'};"><span class="band-spot-call">${s.dx_call}${s.dx_ssid != null ? "-" + s.dx_ssid : ""}</span><span class="band-spot-info">${s.dx_call}${s.dx_ssid != null ? "-" + s.dx_ssid : ""} ${(s.freq / 1000000).toFixed(3)} ${s.mode}</span></div>`);
        });
        // Work out how tall the canvas should be. Normally this is matching the normal band column height, but if some
@@ -227,7 +229,7 @@ function removeDuplicatesForBandPanel(spotList) {
 // Load server options. Once a successful callback is made from this, we then query spots and set up the timer to query
 // spots repeatedly.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function(jsonData) {
+    $.getJSON('/api/v1/options', function (jsonData) {
        // Store options
        options = jsonData;
@@ -268,7 +270,7 @@ function displayUpdated() {
 }
 // Startup
-$(document).ready(function() {
+$(document).ready(function () {
    // Call loadOptions(), this will then trigger loading spots and setting up timers.
    loadOptions();
    // Update the refresh timing display every second
--- a/webassets/js/conditions.js
+++ b/webassets/js/conditions.js
@@ -420,7 +420,10 @@ function renderIonosondeData() {
        $('#ionosonde-data-rows').hide();
        $('#ionosonde-band-state').hide();
        $('#ionosonde-chart').hide();
-        if (ionosondeChart) { ionosondeChart.destroy(); ionosondeChart = null; }
+        if (ionosondeChart) {
            ionosondeChart.destroy();
            ionosondeChart = null;
        }
        return;
    }
    $('#ionosonde-no-data').hide();
--- a/webassets/js/geo.js
+++ b/webassets/js/geo.js
@@ -14,7 +14,9 @@ function calcBearing(lat1, lon1, lat2, lon2) {
    const x = Math.cos(lat1) * Math.sin(lat2) - Math.sin(lat1) * Math.cos(lat2) * Math.cos(lonDelta);
    let bearing = Math.atan2(y, x);
    bearing = bearing * (180 / Math.PI);
-    if ( bearing < 0 ) { bearing += 360; }
+    if (bearing < 0) {
        bearing += 360;
    }
    return bearing;
 }
@@ -96,7 +98,7 @@ function latLonForGridSWCornerPlusSize(grid) {
    lat -= 90.0;
    // Return nulls on maths errors
-    if (isNaN(lat) || isNaN(lon) || isNaN(latCellSize) ||  isNaN(lonCellSize)) {
+    if (isNaN(lat) || isNaN(lon) || isNaN(latCellSize) || isNaN(lonCellSize)) {
        return [null, null, null, null];
    }
--- a/webassets/js/map.js
+++ b/webassets/js/map.js
@@ -28,7 +28,7 @@ let firstLoad = true;
 // Load spots and populate the map.
 function loadSpots() {
-    $.getJSON('/api/v1/spots' + buildQueryString(true), function(jsonData) {
+    $.getJSON('/api/v1/spots' + buildQueryString(true), function (jsonData) {
        // Store data
        spots = jsonData;
        // Update map
@@ -194,7 +194,7 @@ function getTooltipText(s) {
 // Load server options. Once a successful callback is made from this, we then query spots and set up the timer to query
 // spots repeatedly.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function(jsonData) {
+    $.getJSON('/api/v1/options', function (jsonData) {
        // Store options
        options = jsonData;
@@ -423,7 +423,7 @@ function setUpMap() {
    // Set up spiderfy for overlapping markers
    oms = new OverlappingMarkerSpiderfier(map, {keepSpiderfied: true});
-    oms.addListener('click', function(marker) {
+    oms.addListener('click', function (marker) {
        marker.openPopup();
    });
@@ -442,7 +442,7 @@ function setUpMap() {
    // Add Maidenhead grid (toggleable)
    maidenheadGrid = L.maidenhead({
-        color : MAIDENHEAD_GRID_COLOR_LIGHT
+        color: MAIDENHEAD_GRID_COLOR_LIGHT
    });
    if ($("#showMaidenheadGrid")[0].checked) {
        maidenheadGrid.addTo(map);
@@ -451,7 +451,7 @@ function setUpMap() {
    // Add CQ zone layer (toggleable)
    cqZones = L.cqzones({
-        color : CQ_ZONES_COLOR_LIGHT
+        color: CQ_ZONES_COLOR_LIGHT
    });
    if ($("#showCQZones")[0].checked) {
        cqZones.addTo(map);
@@ -460,7 +460,7 @@ function setUpMap() {
    // Add ITU zone layer (toggleable)
    ituZones = L.ituzones({
-        color : ITU_ZONES_COLOR_LIGHT
+        color: ITU_ZONES_COLOR_LIGHT
    });
    if ($("#showITUZones")[0].checked) {
        ituZones.addTo(map);
@@ -469,7 +469,7 @@ function setUpMap() {
    // Add WAB/WAI grid layer (toggleable)
    wabwaiGrid = L.workedAllBritainIreland({
-        color : WAB_WAI_GRID_COLOR_LIGHT
+        color: WAB_WAI_GRID_COLOR_LIGHT
    });
    if ($("#showWABWAIGrid")[0].checked) {
        wabwaiGrid.addTo(map);
@@ -482,7 +482,7 @@ function setUpMap() {
 }
 // Startup
-$(document).ready(function() {
+$(document).ready(function () {
    // Hide the extra things that need to be hidden on this page
    $(".hideonmap").hide();
    // Set up map
--- a/webassets/js/spots.js
+++ b/webassets/js/spots.js
@@ -6,7 +6,7 @@ let rowCount = 0;
 // Set up a listener to close the SSE connection nicely when we navigate away from the page, to prevent console errors
 // and keep things nice and tidy for the server.
-window.addEventListener('beforeunload', function() {
+window.addEventListener('beforeunload', function () {
    if (evtSource != null) {
        evtSource.close();
    }
@@ -20,7 +20,7 @@ function loadSpots() {
    }
    // Make the new query
-    $.getJSON('/api/v1/spots' + buildQueryString(false), function(jsonData) {
+    $.getJSON('/api/v1/spots' + buildQueryString(false), function (jsonData) {
        // Store data
        spots = jsonData;
        // Update table
@@ -41,7 +41,7 @@ function startSSEConnection() {
    }
    evtSource = new EventSource('/api/v1/spots/stream' + buildQueryString(true));
-    evtSource.onmessage = function(event) {
+    evtSource.onmessage = function (event) {
        // Get the new spot
        const newSpot = JSON.parse(event.data);
        // Awful fudge to ensure new incoming spots at the top of the list don't have timestamps that make them look
@@ -76,7 +76,7 @@ function startSSEConnection() {
        }
    };
-    evtSource.onerror = function() {
+    evtSource.onerror = function () {
        if (evtSource != null) {
            evtSource.close();
        }
@@ -418,7 +418,7 @@ function createNewTableRowsForSpot(s, highlightNew) {
 // Load server options. Once a successful callback is made from this, we then query spots and set up the timer to query
 // spots repeatedly.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function(jsonData) {
+    $.getJSON('/api/v1/options', function (jsonData) {
        // Store options
        options = jsonData;
@@ -485,7 +485,7 @@ function displayIntroBox() {
    if (localStorage.getItem("intro-box-dismissed") == null) {
        $("#intro-box").show();
    }
-    $("#intro-box-dismiss").click(function() {
+    $("#intro-box-dismiss").click(function () {
        localStorage.setItem("intro-box-dismissed", true);
    });
 }
@@ -512,19 +512,19 @@ function clearWorked() {
 }
 // Startup
-$(document).ready(function() {
+$(document).ready(function () {
    // Call loadOptions(), this will then trigger loading spots and setting up timers.
    loadOptions();
    // Display intro box
    displayIntroBox();
    // Set up run/pause toggles
-    $("#runButton").change(function() {
+    $("#runButton").change(function () {
        // Need to start the SSE connection but also do a full re-query to catch up anything that we missed, so we
        // might as well just call loadSpots again which will trigger it all
        loadSpots();
    });
-    $("#pauseButton").change(function() {
+    $("#pauseButton").change(function () {
        // If we are pausing and have an open SSE connection, stop it
        if (evtSource != null) {
            evtSource.close();
--- a/webassets/js/spotsbandsandmap.js
+++ b/webassets/js/spotsbandsandmap.js
@@ -32,7 +32,7 @@ function generateBandsMultiToggleFilterCard(band_options) {
 // widely expected by hams to be included. Special case of toggleFilterButtons().
 function setHamHFBandToggles() {
    const hamHFBands = ["160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "10m", "6m"];
-    $(".filter-button-band").each(function() {
+    $(".filter-button-band").each(function () {
        $(this).prop('checked', hamHFBands.includes($(this).val().replace("filter-button-band-", "")));
    });
    filtersUpdated();
@@ -65,7 +65,7 @@ function generateModesMultiToggleFilterCard(mode_options) {
 // Set the mode toggles that relate to Analog Voice.
 function setVoiceModeToggles() {
    const modes = ["PHONE", "SSB", "LSB", "USB", "AM", "FM", "DV", "DMR", "DSTAR", "C4FM", "M17"];
-    $(".filter-button-mode").each(function() {
+    $(".filter-button-mode").each(function () {
        $(this).prop('checked', modes.includes($(this).val().replace("filter-button-mode-", "")));
    });
    filtersUpdated();
@@ -74,7 +74,7 @@ function setVoiceModeToggles() {
 // Set the mode toggles that relate to Digimodes.
 function setDigiModeToggles() {
    const modes = ["DATA", "FT8", "FT4", "RTTY", "SSTV", "JS8", "HELL", "PSK", "OLIVIA", "PKT", "MSK144"];
-    $(".filter-button-mode").each(function() {
+    $(".filter-button-mode").each(function () {
        $(this).prop('checked', modes.includes($(this).val().replace("filter-button-mode-", "")));
    });
    filtersUpdated();
@@ -122,7 +122,7 @@ addEventListener("visibilitychange", () => {
 });
 // Startup
-$(document).ready(function() {
+$(document).ready(function () {
    // Load worked list
    const tmpWorked = JSON.parse(localStorage.getItem("worked"));
    if (tmpWorked) {
--- a/webassets/js/status.js
+++ b/webassets/js/status.js
@@ -1,6 +1,6 @@
 // Load server status
 function loadStatus() {
-    $.getJSON('/api/v1/status', function(jsonData) {
+    $.getJSON('/api/v1/status', function (jsonData) {
        $("#software-version").text(jsonData["software-version"]);
        $("#server-owner-callsign").text(jsonData["server-owner-callsign"]);
        $("#up-since").text(moment().subtract(jsonData["uptime"], 'seconds').fromNow());
@@ -46,6 +46,6 @@ function loadStatus() {
 }
 // Startup
-$(document).ready(function() {
+$(document).ready(function () {
    loadStatus();
 });
--- a/webassets/js/ui-ham.js
+++ b/webassets/js/ui-ham.js
@@ -4,286 +4,286 @@
 //
 const BAND_COLOR_SCHEMES = {
-	"PSK Reporter": {
+    "PSK Reporter": {
-		"2200m": "#ff4500",
+        "2200m": "#ff4500",
-		"600m": "#1e90ff",
+        "600m": "#1e90ff",
-		"160m": "#7cfc00",
+        "160m": "#7cfc00",
-		"80m": "#e550e5",
+        "80m": "#e550e5",
-		"60m": "#00008b",
+        "60m": "#00008b",
-		"40m": "#5959ff",
+        "40m": "#5959ff",
-		"30m": "#62d962",
+        "30m": "#62d962",
-		"20m": "#f2c40c",
+        "20m": "#f2c40c",
-		"17m": "#f2f261",
+        "17m": "#f2f261",
-		"15m": "#cca166",
+        "15m": "#cca166",
-		"12m": "#b22222",
+        "12m": "#b22222",
-		"11m": "#00ff00",
+        "11m": "#00ff00",
-		"10m": "#ff69b4",
+        "10m": "#ff69b4",
-		"6m": "#FF0000",
+        "6m": "#FF0000",
-		"5m": "#e0e0e0",
+        "5m": "#e0e0e0",
-		"4m": "#cc0044",
+        "4m": "#cc0044",
-		"2m": "#FF1493",
+        "2m": "#FF1493",
-		"1.25m": "#CCFF00",
+        "1.25m": "#CCFF00",
-		"70cm": "#999900",
+        "70cm": "#999900",
-		"23cm": "#5AB8C7",
+        "23cm": "#5AB8C7",
-		"13cm": "#FF7F50",
+        "13cm": "#FF7F50",
-		"5.8GHz": "#cc0099",
+        "5.8GHz": "#cc0099",
-		"10GHz": "#696969",
+        "10GHz": "#696969",
-		"24GHz": "#f3edc6",
+        "24GHz": "#f3edc6",
-		"47GHz": "#ffe786",
+        "47GHz": "#ffe786",
-		"76GHz": "#baf9d8"
+        "76GHz": "#baf9d8"
-	},
+    },
-	"PSK Reporter (Adjusted)": {
+    "PSK Reporter (Adjusted)": {
-		"2200m": "#ff4500",
+        "2200m": "#ff4500",
-		"600m": "#1e90ff",
+        "600m": "#1e90ff",
-		"160m": "#7cfc00",
+        "160m": "#7cfc00",
-		"80m": "#b33fb3",
+        "80m": "#b33fb3",
-		"60m": "#00008b",
+        "60m": "#00008b",
-		"40m": "#5959ff",
+        "40m": "#5959ff",
-		"30m": "#62d962",
+        "30m": "#62d962",
-		"20m": "#f2c40c",
+        "20m": "#f2c40c",
-		"17m": "#f2f261",
+        "17m": "#f2f261",
-		"15m": "#cca166",
+        "15m": "#cca166",
-		"12m": "#b22222",
+        "12m": "#b22222",
-		"11m": "#00ff00",
+        "11m": "#00ff00",
-		"10m": "#ff7eb4",
+        "10m": "#ff7eb4",
-		"6m": "#FF0000",
+        "6m": "#FF0000",
-		"5m": "#e0e0e0",
+        "5m": "#e0e0e0",
-		"4m": "#cc0044",
+        "4m": "#cc0044",
-		"2m": "#FF1493",
+        "2m": "#FF1493",
-		"1.25m": "#CCFF00",
+        "1.25m": "#CCFF00",
-		"70cm": "#999900",
+        "70cm": "#999900",
-		"23cm": "#5AB8C7",
+        "23cm": "#5AB8C7",
-		"13cm": "#FF7F50",
+        "13cm": "#FF7F50",
-		"5.8GHz": "#cc0099",
+        "5.8GHz": "#cc0099",
-		"10GHz": "#696969",
+        "10GHz": "#696969",
-		"24GHz": "#f3edc6",
+        "24GHz": "#f3edc6",
-		"47GHz": "#ffe786",
+        "47GHz": "#ffe786",
-		"76GHz": "#baf9d8"
+        "76GHz": "#baf9d8"
-	},
+    },
-	"RBN": {
+    "RBN": {
-		"2200m": "#000000",
+        "2200m": "#000000",
-		"600m": "#aaaaaa",
+        "600m": "#aaaaaa",
-		"160m": "#ffe000",
+        "160m": "#ffe000",
-		"80m": "#093F00",
+        "80m": "#093F00",
-		"60m": "#777777",
+        "60m": "#777777",
-		"40m": "#ffa500",
+        "40m": "#ffa500",
-		"30m": "#ff0000",
+        "30m": "#ff0000",
-		"20m": "#800080",
+        "20m": "#800080",
-		"17m": "#0000ff",
+        "17m": "#0000ff",
-		"15m": "#444444",
+        "15m": "#444444",
-		"12m": "#00ffff",
+        "12m": "#00ffff",
-		"11m": "#000000",
+        "11m": "#000000",
-		"10m": "#ff00ff",
+        "10m": "#ff00ff",
-		"6m": "#ffc0cb",
+        "6m": "#ffc0cb",
-		"5m": "#000000",
+        "5m": "#000000",
-		"4m": "#a276ff",
+        "4m": "#a276ff",
-		"2m": "#92FF7F",
+        "2m": "#92FF7F",
-		"1.25m": "#000000",
+        "1.25m": "#000000",
-		"70cm": "#000000",
+        "70cm": "#000000",
-		"23cm": "#000000",
+        "23cm": "#000000",
-		"13cm": "#000000",
+        "13cm": "#000000",
-		"5.8GHz": "#000000",
+        "5.8GHz": "#000000",
-		"10GHz": "#000000",
+        "10GHz": "#000000",
-		"24GHz": "#000000",
+        "24GHz": "#000000",
-		"47GHz": "#000000",
+        "47GHz": "#000000",
-		"76GHz": "#000000"
+        "76GHz": "#000000"
-	},
+    },
-	"Ham Rainbow": {
+    "Ham Rainbow": {
-		"2200m": "#8e4f37",
+        "2200m": "#8e4f37",
-		"600m": "#8e4f37",
+        "600m": "#8e4f37",
-		"160m": "#8e3737",
+        "160m": "#8e3737",
-		"80m": "#da2f93",
+        "80m": "#da2f93",
-		"60m": "#792fda",
+        "60m": "#792fda",
-		"40m": "#2f4bda",
+        "40m": "#2f4bda",
-		"30m": "#2fdad2",
+        "30m": "#2fdad2",
-		"20m": "#68da2f",
+        "20m": "#68da2f",
-		"17m": "#dad52f",
+        "17m": "#dad52f",
-		"15m": "#da832f",
+        "15m": "#da832f",
-		"12m": "#da5c2f",
+        "12m": "#da5c2f",
-		"11m": "#8e8e8e",
+        "11m": "#8e8e8e",
-		"10m": "#da2f2f",
+        "10m": "#da2f2f",
-		"6m": "#8e377a",
+        "6m": "#8e377a",
-		"5m": "#8e8e8e",
+        "5m": "#8e8e8e",
-		"4m": "#42378e",
+        "4m": "#42378e",
-		"2m": "#37748e",
+        "2m": "#37748e",
-		"1.25m": "#8e8e8e",
+        "1.25m": "#8e8e8e",
-		"70cm": "#378e65",
+        "70cm": "#378e65",
-		"23cm": "#8e8e37",
+        "23cm": "#8e8e37",
-		"13cm": "#8e6037",
+        "13cm": "#8e6037",
-		"5.8GHz": "#8e6037",
+        "5.8GHz": "#8e6037",
-		"10GHz": "#8e6037",
+        "10GHz": "#8e6037",
-		"24GHz": "#8e6037",
+        "24GHz": "#8e6037",
-		"47GHz": "#8e6037",
+        "47GHz": "#8e6037",
-		"76GHz": "#8e6037"
+        "76GHz": "#8e6037"
-	},
+    },
-	"Ham Rainbow (Reverse)": {
+    "Ham Rainbow (Reverse)": {
-		"2200m": "#42378e",
+        "2200m": "#42378e",
-		"600m": "#42378e",
+        "600m": "#42378e",
-		"160m": "#8e377a",
+        "160m": "#8e377a",
-		"80m": "#da2f2f",
+        "80m": "#da2f2f",
-		"60m": "#da5c2f",
+        "60m": "#da5c2f",
-		"40m": "#da832f",
+        "40m": "#da832f",
-		"30m": "#dad52f",
+        "30m": "#dad52f",
-		"20m": "#68da2f",
+        "20m": "#68da2f",
-		"17m": "#2fdad2",
+        "17m": "#2fdad2",
-		"15m": "#2f4bda",
+        "15m": "#2f4bda",
-		"12m": "#792fda",
+        "12m": "#792fda",
-		"11m": "#8e8e8e",
+        "11m": "#8e8e8e",
-		"10m": "#da2f93",
+        "10m": "#da2f93",
-		"6m": "#8e3737",
+        "6m": "#8e3737",
-		"5m": "#8e8e8e",
+        "5m": "#8e8e8e",
-		"4m": "#8e4f37",
+        "4m": "#8e4f37",
-		"2m": "#8e6037",
+        "2m": "#8e6037",
-		"1.25m": "#8e8e8e",
+        "1.25m": "#8e8e8e",
-		"70cm": "#8e8e37",
+        "70cm": "#8e8e37",
-		"23cm": "#378e65",
+        "23cm": "#378e65",
-		"13cm": "#37748e",
+        "13cm": "#37748e",
-		"5.8GHz": "#37748e",
+        "5.8GHz": "#37748e",
-		"10GHz": "#37748e",
+        "10GHz": "#37748e",
-		"24GHz": "#37748e",
+        "24GHz": "#37748e",
-		"47GHz": "#37748e",
+        "47GHz": "#37748e",
-		"76GHz": "#37748e",
+        "76GHz": "#37748e",
-	},
+    },
-	"Kate Morley": {
+    "Kate Morley": {
-		"2200m": "#817",
+        "2200m": "#817",
-		"600m": "#817",
+        "600m": "#817",
-		"160m": "#817",
+        "160m": "#817",
-		"80m": "#a35",
+        "80m": "#a35",
-		"60m": "#c66",
+        "60m": "#c66",
-		"40m": "#e94",
+        "40m": "#e94",
-		"30m": "#ed0",
+        "30m": "#ed0",
-		"20m": "#9d5",
+        "20m": "#9d5",
-		"17m": "#4d8",
+        "17m": "#4d8",
-		"15m": "#2cb",
+        "15m": "#2cb",
-		"12m": "#0bc",
+        "12m": "#0bc",
-		"11m": "#09c",
+        "11m": "#09c",
-		"10m": "#09c",
+        "10m": "#09c",
-		"6m": "#36b",
+        "6m": "#36b",
-		"5m": "#36b",
+        "5m": "#36b",
-		"4m": "#36b",
+        "4m": "#36b",
-		"2m": "#36b",
+        "2m": "#36b",
-		"1.25m": "#36b",
+        "1.25m": "#36b",
-		"70cm": "#639",
+        "70cm": "#639",
-		"23cm": "#639",
+        "23cm": "#639",
-		"13cm": "#639",
+        "13cm": "#639",
-		"5.8GHz": "#639",
+        "5.8GHz": "#639",
-		"10GHz": "#639",
+        "10GHz": "#639",
-		"24GHz": "#639",
+        "24GHz": "#639",
-		"47GHz": "#639",
+        "47GHz": "#639",
-		"76GHz": "#639",
+        "76GHz": "#639",
-	},
+    },
-	"ColorBrewer": {
+    "ColorBrewer": {
-		"2200m": "#54278f",
+        "2200m": "#54278f",
-		"600m": "#756bb1",
+        "600m": "#756bb1",
-		"160m": "#9e9ac8",
+        "160m": "#9e9ac8",
-		"80m": "#cbc9e2",
+        "80m": "#cbc9e2",
-		"60m": "#08519c",
+        "60m": "#08519c",
-		"40m": "#3182bd",
+        "40m": "#3182bd",
-		"30m": "#6baed6",
+        "30m": "#6baed6",
-		"20m": "#bdd7e7",
+        "20m": "#bdd7e7",
-		"17m": "#006d2c",
+        "17m": "#006d2c",
-		"15m": "#31a354",
+        "15m": "#31a354",
-		"12m": "#74c476",
+        "12m": "#74c476",
-		"11m": "#bae4b3",
+        "11m": "#bae4b3",
-		"10m": "#a63603",
+        "10m": "#a63603",
-		"6m": "#e6550d",
+        "6m": "#e6550d",
-		"5m": "#fd8d3c",
+        "5m": "#fd8d3c",
-		"4m": "#fdbe85",
+        "4m": "#fdbe85",
-		"2m": "#a50f15",
+        "2m": "#a50f15",
-		"1.25m": "#de2d26",
+        "1.25m": "#de2d26",
-		"70cm": "#fb6a4a",
+        "70cm": "#fb6a4a",
-		"23cm": "#fcae91",
+        "23cm": "#fcae91",
-		"13cm": "#636363",
+        "13cm": "#636363",
-		"5.8GHz": "#636363",
+        "5.8GHz": "#636363",
-		"10GHz": "#969696",
+        "10GHz": "#969696",
-		"24GHz": "#969696",
+        "24GHz": "#969696",
-		"47GHz": "#cccccc",
+        "47GHz": "#cccccc",
-		"76GHz": "#cccccc",
+        "76GHz": "#cccccc",
-	},
+    },
-	"IWantHue": {
+    "IWantHue": {
-		"2200m": "#409271",
+        "2200m": "#409271",
-		"600m": "#b03ce1",
+        "600m": "#b03ce1",
-		"160m": "#50c640",
+        "160m": "#50c640",
-		"80m": "#d545b7",
+        "80m": "#d545b7",
-		"60m": "#99b936",
+        "60m": "#99b936",
-		"40m": "#7260db",
+        "40m": "#7260db",
-		"30m": "#60af57",
+        "30m": "#60af57",
-		"20m": "#d54788",
+        "20m": "#d54788",
-		"17m": "#58c79f",
+        "17m": "#58c79f",
-		"15m": "#e2462a",
+        "15m": "#e2462a",
-		"12m": "#49b1d3",
+        "12m": "#49b1d3",
-		"11m": "#df872f",
+        "11m": "#df872f",
-		"10m": "#506bb0",
+        "10m": "#506bb0",
-		"6m": "#c6a639",
+        "6m": "#c6a639",
-		"5m": "#9554a3",
+        "5m": "#9554a3",
-		"4m": "#36783c",
+        "4m": "#36783c",
-		"2m": "#da405b",
+        "2m": "#da405b",
-		"1.25m": "#657527",
+        "1.25m": "#657527",
-		"70cm": "#8c97e2",
+        "70cm": "#8c97e2",
-		"23cm": "#b44f2f",
+        "23cm": "#b44f2f",
-		"13cm": "#d386c8",
+        "13cm": "#d386c8",
-		"5.8GHz": "#aaac66",
+        "5.8GHz": "#aaac66",
-		"10GHz": "#9d4760",
+        "10GHz": "#9d4760",
-		"24GHz": "#90672c",
+        "24GHz": "#90672c",
-		"47GHz": "#e08086",
+        "47GHz": "#e08086",
-		"76GHz": "#dc9769",
+        "76GHz": "#dc9769",
-	},
+    },
-	"IWantHue (Color Blind)": {
+    "IWantHue (Color Blind)": {
-		"2200m": "#bf9e3d",
+        "2200m": "#bf9e3d",
-		"600m": "#9d2fec",
+        "600m": "#9d2fec",
-		"160m": "#79df39",
+        "160m": "#79df39",
-		"80m": "#d445db",
+        "80m": "#d445db",
-		"60m": "#5dd175",
+        "60m": "#5dd175",
-		"40m": "#814dd8",
+        "40m": "#814dd8",
-		"30m": "#d7ce2f",
+        "30m": "#d7ce2f",
-		"20m": "#657af1",
+        "20m": "#657af1",
-		"17m": "#8cc34a",
+        "17m": "#8cc34a",
-		"15m": "#d635aa",
+        "15m": "#d635aa",
-		"12m": "#6cbd80",
+        "12m": "#6cbd80",
-		"11m": "#b860c1",
+        "11m": "#b860c1",
-		"10m": "#e48721",
+        "10m": "#e48721",
-		"6m": "#686ccc",
+        "6m": "#686ccc",
-		"5m": "#d44e2b",
+        "5m": "#d44e2b",
-		"4m": "#51b3db",
+        "4m": "#51b3db",
-		"2m": "#d74058",
+        "2m": "#d74058",
-		"1.25m": "#56c5ad",
+        "1.25m": "#56c5ad",
-		"70cm": "#d0478d",
+        "70cm": "#d0478d",
-		"23cm": "#708940",
+        "23cm": "#708940",
-		"13cm": "#c380c2",
+        "13cm": "#c380c2",
-		"5.8GHz": "#cab775",
+        "5.8GHz": "#cab775",
-		"10GHz": "#7a7fc2",
+        "10GHz": "#7a7fc2",
-		"24GHz": "#b87148",
+        "24GHz": "#b87148",
-		"47GHz": "#bd678c",
+        "47GHz": "#bd678c",
-		"76GHz": "#c3666b",
+        "76GHz": "#c3666b",
-	},
+    },
-	"Mokole": {
+    "Mokole": {
-		"2200m": "#8b4513",
+        "2200m": "#8b4513",
-		"600m": "#006400",
+        "600m": "#006400",
-		"160m": "#808000",
+        "160m": "#808000",
-		"80m": "#483d8b",
+        "80m": "#483d8b",
-		"60m": "#5f9ea0",
+        "60m": "#5f9ea0",
-		"40m": "#000080",
+        "40m": "#000080",
-		"30m": "#9acd32",
+        "30m": "#9acd32",
-		"20m": "#8b008b",
+        "20m": "#8b008b",
-		"17m": "#ff0000",
+        "17m": "#ff0000",
-		"15m": "#ff8c00",
+        "15m": "#ff8c00",
-		"12m": "#ffd700",
+        "12m": "#ffd700",
-		"11m": "#7fff00",
+        "11m": "#7fff00",
-		"10m": "#8a2be2",
+        "10m": "#8a2be2",
-		"6m": "#00ff7f",
+        "6m": "#00ff7f",
-		"5m": "#dc143c",
+        "5m": "#dc143c",
-		"4m": "#00bfff",
+        "4m": "#00bfff",
-		"2m": "#0000ff",
+        "2m": "#0000ff",
-		"1.25m": "#d8bfd8",
+        "1.25m": "#d8bfd8",
-		"70cm": "#ff00ff",
+        "70cm": "#ff00ff",
-		"23cm": "#1e90ff",
+        "23cm": "#1e90ff",
-		"13cm": "#db7093",
+        "13cm": "#db7093",
-		"5.8GHz": "#f0e68c",
+        "5.8GHz": "#f0e68c",
-		"10GHz": "#ff1493",
+        "10GHz": "#ff1493",
-		"24GHz": "#ffa07a",
+        "24GHz": "#ffa07a",
-		"47GHz": "#ee82ee",
+        "47GHz": "#ee82ee",
-		"76GHz": "#7fffd4",
+        "76GHz": "#7fffd4",
-	}
+    }
 };
 let bandColorScheme = "PSK Reporter (Adjusted)";
@@ -310,33 +310,33 @@ function bandToColor(band) {
 // possible with the band colour. If the band is unknown, white will be returned.
 function bandToContrastColor(band) {
    const rgb = hexToRGB(bandToColor(band));
-    const lum = 0.2126*rgb[0] + 0.7152*rgb[1] + 0.0722*rgb[2];
+    const lum = 0.2126 * rgb[0] + 0.7152 * rgb[1] + 0.0722 * rgb[2];
    return (lum > 128) ? "#000000" : "#ffffff";
 }
 const SIG_ICONS = {
-	"POTA": "fa-tree",
+    "POTA": "fa-tree",
-	"SOTA": "fa-mountain-sun",
+    "SOTA": "fa-mountain-sun",
-	"WWFF": "fa-seedling",
+    "WWFF": "fa-seedling",
-	"GMA": "fa-person-hiking",
+    "GMA": "fa-person-hiking",
-	"WWBOTA": "fa-radiation",
+    "WWBOTA": "fa-radiation",
-	"HEMA": "fa-mound",
+    "HEMA": "fa-mound",
-	"IOTA": "fa-book-atlas",
+    "IOTA": "fa-book-atlas",
-	"MOTA": "fa-fan",
+    "MOTA": "fa-fan",
-	"ARLHS": "fa-house-flood-water",
+    "ARLHS": "fa-house-flood-water",
-	"ILLW": "fa-house-flood-water",
+    "ILLW": "fa-house-flood-water",
-	"SIOTA": "fa-wheat-awn",
+    "SIOTA": "fa-wheat-awn",
-	"WCA": "fa-chess-rook",
+    "WCA": "fa-chess-rook",
-	"ZLOTA": "fa-kiwi-bird",
+    "ZLOTA": "fa-kiwi-bird",
-	"WOTA": "fa-w",
+    "WOTA": "fa-w",
-	"BOTA": "fa-umbrella-beach",
+    "BOTA": "fa-umbrella-beach",
-	"KRMNPA": "fa-earth-oceania",
+    "KRMNPA": "fa-earth-oceania",
-	"LLOTA": "fa-water",
+    "LLOTA": "fa-water",
-	"WWTOTA": "fa-tower-observation",
+    "WWTOTA": "fa-tower-observation",
-	"WAB": "fa-table-cells-large",
+    "WAB": "fa-table-cells-large",
-	"WAI": "fa-table-cells-large",
+    "WAI": "fa-table-cells-large",
-	"Tiles": "fa-square",
+    "Tiles": "fa-square",
-	"TOTA": "fa-toilet"
+    "TOTA": "fa-toilet"
 }
 // Get the Font Awesome icon for a given SIG. If the SIG is unknown, the provided default symbol will be returned
@@ -345,11 +345,11 @@ function sigToIcon(sig, defaultIcon) {
    if (col) {
        return col;
    } else {
-		let col = (sig != null) ? SIG_ICONS[sig.toUpperCase()] : null;
+        let col = (sig != null) ? SIG_ICONS[sig.toUpperCase()] : null;
-		if (col) {
+        if (col) {
-			return col;
+            return col;
-		} else {
+        } else {
-			return defaultIcon;
+            return defaultIcon;
-		}
+        }
    }
 }
--- a/webassets/js/utils.js
+++ b/webassets/js/utils.js
@@ -11,13 +11,20 @@ function escapeHtml(str) {
    const escapeCharacter = (match) => {
        switch (match) {
-            case '&': return '&amp;';
+            case '&':
-            case '<': return '&lt;';
+                return '&amp;';
-            case '>': return '&gt;';
+            case '<':
-            case '"': return '&quot;';
+                return '&lt;';
-            case '\'': return '&#039;';
+            case '>':
-            case '`': return '&#096;';
+                return '&gt;';
-            default: return match;
+            case '"':
                return '&quot;';
            case '\'':
                return '&#039;';
            case '`':
                return '&#096;';
            default:
                return match;
        }
    };
@@ -27,7 +34,7 @@ function escapeHtml(str) {
 // Converts an HTML hex colour to an array of [R, G, B] where each is 0-255.
 function hexToRGB(hex) {
    return hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i
-             ,(m, r, g, b) => '#' + r + r + g + g + b + b)
+        , (m, r, g, b) => '#' + r + r + g + g + b + b)
-    .substring(1).match(/.{2}/g)
+        .substring(1).match(/.{2}/g)
-    .map(x => parseInt(x, 16));
+        .map(x => parseInt(x, 16));
 }
--- a/webassets/service-worker.js
+++ b/webassets/service-worker.js
@@ -1,49 +1,49 @@
 const CACHE_NAME = 'Spothole';
 const CACHE_URLS = [
-  'index.html',
+    'index.html',
-  './',
+    './',
-  'apidocs',
+    'apidocs',
-  'apidocs/openapi.yml',
+    'apidocs/openapi.yml',
-  'about',
+    'about',
-  'css/style.css',
+    'css/style.css',
-  'js/add-spot.js',
+    'js/add-spot.js',
-  'js/alerts.js',
+    'js/alerts.js',
-  'js/bands.js',
+    'js/bands.js',
-  'js/common.js',
+    'js/common.js',
-  'js/map.js',
+    'js/map.js',
-  'js/spots.js',
+    'js/spots.js',
-  'js/spotsbandsandmap.js',
+    'js/spotsbandsandmap.js',
-  'js/status.js',
+    'js/status.js',
-  'img/logo.png',
+    'img/logo.png',
-  'img/favicon.ico',
+    'img/favicon.ico',
-  'img/icon-32.png',
+    'img/icon-32.png',
-  'img/icon-192.png',
+    'img/icon-192.png',
-  'img/icon-512.png',
+    'img/icon-512.png',
-  'fa/css/fontawesome.min.css',
+    'fa/css/fontawesome.min.css',
-  'fa/css/solid.min.css',
+    'fa/css/solid.min.css',
-  'fa/webfonts/fa-solid-900.ttf',
+    'fa/webfonts/fa-solid-900.ttf',
-  'fa/webfonts/fa-solid-900.woff2'
+    'fa/webfonts/fa-solid-900.woff2'
 ];
 self.addEventListener('fetch', (event) => {
-  // Is this an asset we can cache?
+    // Is this an asset we can cache?
-  const url = new URL(event.request.url);
+    const url = new URL(event.request.url);
-  const isCacheableRequest = CACHE_URLS.includes(url.pathname);
+    const isCacheableRequest = CACHE_URLS.includes(url.pathname);
-  if (isCacheableRequest) {
+    if (isCacheableRequest) {
-    // Open the cache
+        // Open the cache
-    event.respondWith(caches.open(CACHE_NAME).then((cache) => {
+        event.respondWith(caches.open(CACHE_NAME).then((cache) => {
-      // Go to the network first, cacheing the response
+            // Go to the network first, cacheing the response
-      return fetch(event.request.url).then((fetchedResponse) => {
+            return fetch(event.request.url).then((fetchedResponse) => {
-        cache.put(event.request, fetchedResponse.clone());
+                cache.put(event.request, fetchedResponse.clone());
-        return fetchedResponse;
+                return fetchedResponse;
-      }).catch(() => {
+            }).catch(() => {
-        // If the network is unavailable, get from cache.
+                // If the network is unavailable, get from cache.
-        return cache.match(event.request.url);
+                return cache.match(event.request.url);
-      });
+            });
-    }));
+        }));
-  } else {
+    } else {
-    // Not a cacheable request, must be a call to the API, so no cache involved just go to the network
+        // Not a cacheable request, must be a call to the API, so no cache involved just go to the network
-  }
+    }
 });