Global autoformat

.idea/inspectionProfiles/Project_Default.xml

@@ -8,6 +8,7 @@
     <inspection_tool class="CssUnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="GrazieInspection" enabled="false" level="GRAMMAR_ERROR" enabled_by_default="false" />
     <inspection_tool class="GrazieStyle" enabled="false" level="STYLE_SUGGESTION" enabled_by_default="false" />
+    <inspection_tool class="HtmlFormInputWithoutLabel" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" />
     <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="myValues">
         <value>
@@ -38,8 +39,10 @@
     <inspection_tool class="JSJQueryEfficiency" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="JSUnresolvedReference" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnusedGlobalSymbols" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" />
     <inspection_tool class="LanguageDetectionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="OutdatedRequirementInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyBroadExceptionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />

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,26 +25,39 @@ 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                                                                                                                                                           |
-|-------------------|-------------------------|---------|--------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|------------------|-------------------------|---------|-------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `embedded`       | `true`, `false`         | `false` | `?embedded=true`        | Enables embedded mode.                                                                                                                                                |
 | `color-scheme`   | `light`, `dark`, `auto` | `auto`  | `?color-scheme=dark`    | Forces light or dark mode in preference to the operating system default.                                                                                              |
 | `time-zone`      | `UTC`, `local`          | `UTC`   | `?time-zone=local`      | Sets times to be in UTC or local time.                                                                                                                                |
@@ -58,25 +78,35 @@ More will be added soon to allow customisation of filters and other display prop
 
 ## 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.
-* 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.
+* Call the "options" API to get an idea of which bands, modes etc. the server knows about. You might want to do that
+  first before calling the spots/alerts APIs, to allow you to populate your filters correctly.
+* Refer to the provided HTML/JS interface for a reference on different approaches. For example, the "map" and "bands"
+  pages simply query the main spot API on a timer, whereas the main/spots page combines this approach with using the
+  Server-Sent Events (SSE) endpoint to update live.
 * Let me know if you get stuck, I'm happy to help!
 
 ## Running your own copy
 
-If you want to run a copy of Spothole with different configuration settings than the main instance, you can download it and run it on your own local machine or server.
+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
-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
+One further change you might want to make to the file above is the `add_header Access-Control-Allow-Origin` statements.
+These are what's used on
+my own Spothole server to make sure that other third-party web-based software can get the data from my instance, and
+applies to any endpoint underneath `/api`. If you want
 *your* Spothole instance to be set up the same way, so that others can write software in JavaScript that can access it,
-leave this intact. But if you want your Spothole instance to only be usable by scripts running on the web server you write,
-you can remove these lines. (Note that this doesn't stop other people writing *non-web-based* software that accesses your
-Spothole API—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
+leave this intact. But if you want your Spothole instance to only be usable by scripts running on the web server you
+write,
+you can remove these lines. (Note that this doesn't stop other people writing *non-web-based* software that accesses
+your
+Spothole API—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`)
-* `/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.
+* `/datafiles` - Local data sources (differentiated from the majority of data files which are loaded from URLs and
+  cached in `/cache`)
+* `/cache` - Directory where static-ish data downloaded from the internet is cached to avoid rapid re-requests, and
+  where spot/alert data is cached so that it survives a software restart. Created on first run.
 
 ### Extending the server
 
-Spothole is designed to be easily extensible. If you want to write your own spot provider, for example, simply add a module to the `spotproviders` package containing your class. (Currently, in order to be loaded correctly, the module (file) name should be the same as the class name, but lower case.)
+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!

alertproviders/bota.py

@@ -21,19 +21,30 @@ class BOTA(HTTPAlertProvider):
         new_alerts = []
         # Find the table of upcoming alerts
         bs = BeautifulSoup(http_response.content.decode(), features="lxml")
+        if not bs.body:
+            return new_alerts
         div = bs.body.find('div', attrs={'class': 'view-activations-public'})
         if div:
             table = div.find('table', attrs={'class': 'views-table'})
             if table:
                 tbody = table.find('tbody')
+                if not tbody:
+                    return new_alerts
                 for row in tbody.find_all('tr'):
                     cells = row.find_all('td')
-                    first_cell_text = str(cells[0].find('a').contents[0]).strip()
+                    first_cell_anchor = cells[0].find('a') if len(cells) > 0 else None
+                    second_cell_anchor = cells[1].find('a') if len(cells) > 1 else None
+                    if not first_cell_anchor or not second_cell_anchor:
+                        continue
+                    first_cell_text = first_cell_anchor.get_text().strip()
                     ref_name = first_cell_text.split(" by ")[0]
-                    dx_call = str(cells[1].find('a').contents[0]).strip().upper()
+                    dx_call = second_cell_anchor.get_text().strip().upper()
 
                     # Get the date, dealing with the fact we get no year so have to figure out if it's last year or next year
-                    date_text = str(cells[2].find('span').contents[0]).strip()
+                    date_span = cells[2].find('span') if len(cells) > 2 else None
+                    if not date_span:
+                        continue
+                    date_text = date_span.get_text().strip()
                     date_time = datetime.strptime(date_text, "%d %b - %H:%M UTC").replace(tzinfo=pytz.UTC)
                     date_time = date_time.replace(year=datetime.now(pytz.UTC).year)
                     # If this was more than a day ago, activation is actually next year

alertproviders/ng3k.py

@@ -1,8 +1,10 @@
 import re
 from datetime import datetime
+from typing import cast
 
 import pytz
 from rss_parser import Parser
+from rss_parser.models.rss import RSS
 
 from alertproviders.http_alert_provider import HTTPAlertProvider
 from data.alert import Alert
@@ -20,7 +22,7 @@ class NG3K(HTTPAlertProvider):
 
     def _http_response_to_alerts(self, http_response):
         new_alerts = []
-        rss = Parser.parse(http_response.content.decode())
+        rss = cast(RSS, Parser.parse(http_response.content.decode()))
         # Iterate through source data
         for source_alert in rss.channel.items:
             # Deal with "the format"...

alertproviders/pota.py

@@ -37,6 +37,6 @@ class POTA(HTTPAlertProvider):
             # Add to our list, but exclude any old spots that POTA can sometimes give us where even the end time is
             # in the past. Don't worry about de-duping, removing old alerts etc. at this point; other code will do
             # that for us.
-            if alert.end_time > datetime.now(pytz.UTC).timestamp():
+            if alert.end_time and alert.end_time > datetime.now(pytz.UTC).timestamp():
                 new_alerts.append(alert)
         return new_alerts

alertproviders/wota.py

@@ -1,7 +1,9 @@
 from datetime import datetime
+from typing import cast
 
 import pytz
 from rss_parser import Parser as RSSParser
+from rss_parser.models.rss import RSS
 
 from alertproviders.http_alert_provider import HTTPAlertProvider
 from data.alert import Alert
@@ -20,7 +22,7 @@ class WOTA(HTTPAlertProvider):
 
     def _http_response_to_alerts(self, http_response):
         new_alerts = []
-        rss = RSSParser.parse(http_response.content.decode())
+        rss = cast(RSS, RSSParser.parse(http_response.content.decode()))
         # Iterate through source data
         for source_alert in rss.channel.items:
 
@@ -35,9 +37,9 @@ class WOTA(HTTPAlertProvider):
             ref_name = None
             if len(title_split) > 1:
                 ref_split = title_split[1].split(" - ")
-                ref = ref_split[0]
+                ref = str(ref_split[0])
                 if len(ref_split) > 1:
-                    ref_name = ref_split[1]
+                    ref_name = str(ref_split[1])
 
             # Pick apart the description
             desc_split = source_alert.description.split(". ")

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
 

core/lookup_helper.py

@@ -104,7 +104,7 @@ class LookupHelper:
 
         self._hamqth_callsign_data_cache = Cache('cache/hamqth_callsign_lookup_cache')
 
-        self._clublog_api_key = config["clublog-api-key"]
+        self._clublog_api_key = str(config["clublog-api-key"])
         self._clublog_cty_xml_cache = CachedSession("cache/clublog_cty_xml_cache", expire_after=timedelta(days=10))
         self._clublog_api_available = self._clublog_api_key != ""
         self._clublog_xml_download_location = "cache/cty.xml"
@@ -184,6 +184,7 @@ class LookupHelper:
             open(self._clublog_xml_download_location + ".gz", 'wb').write(response.content)
             with gzip.open(self._clublog_xml_download_location + ".gz", "rb") as uncompressed:
                 file_content = uncompressed.read()
+            assert isinstance(file_content, bytes)
             logging.info("Caching Clublog cty.xml...")
             with open(self._clublog_xml_download_location, "wb") as f:
                 f.write(file_content)
@@ -446,15 +447,16 @@ class LookupHelper:
     def infer_grid_from_callsign_dxcc(self, call):
         """Infer a grid locator from a callsign (using DXCC, probably very inaccurate)"""
 
-        latlon = self.infer_latlon_from_callsign_dxcc(call)
+        latlon = self.infer_latlon_from_callsign_dxcc(call) or []
         grid = None
+        if latlon:
             try:
                 grid = latlong_to_locator(latlon[0], latlon[1], 8)
             except:
                 logging.debug("Invalid lat/lon received for DXCC")
         return grid
 
-    def _get_qrz_data_for_callsign(self, call, credentials):
+    def _get_qrz_data_for_callsign(self, call, credentials) -> dict | None:
         """Utility method to get QRZ.com data from cache if possible, if not get it from the API and cache it.
         Returns None immediately if no credentials are provided."""
 
@@ -475,7 +477,7 @@ class LookupHelper:
                 login_data = xmltodict.parse(login_response)
                 session = login_data.get("QRZDatabase", {}).get("Session", {})
                 if "Key" in session:
-                    session_key = session["Key"]
+                    session_key = str(session["Key"])
                 else:
                     logging.warning("QRZ.com login details incorrect, failed to look up with QRZ.")
                     return None
@@ -512,7 +514,7 @@ class LookupHelper:
         self._qrz_callsign_data_cache.add(call, None, expire=604800)  # 1 week in seconds
         return None
 
-    def _get_hamqth_data_for_callsign(self, call, credentials):
+    def _get_hamqth_data_for_callsign(self, call, credentials) -> dict | None:
         """Utility method to get HamQTH data from cache if possible, if not get it from the API and cache it.
         Returns None immediately if no credentials are provided."""
 
@@ -531,7 +533,7 @@ class LookupHelper:
                     "&p=" + urllib.parse.quote_plus(credentials.hamqth_password), headers=HTTP_HEADERS).content
                 dict_data = xmltodict.parse(session_data)
                 if "session_id" in dict_data["HamQTH"]["session"]:
-                    session_id = dict_data["HamQTH"]["session"]["session_id"]
+                    session_id = str(dict_data["HamQTH"]["session"]["session_id"])
                 else:
                     logging.warning("HamQTH login details incorrect, failed to look up with HamQTH.")
                     return None
@@ -566,7 +568,7 @@ class LookupHelper:
         self._hamqth_callsign_data_cache.add(call, None, expire=604800)  # 1 week in seconds
         return None
 
-    def _get_clublog_api_data_for_callsign(self, call):
+    def _get_clublog_api_data_for_callsign(self, call) -> dict | None:
         """Utility method to get Clublog API data from cache if possible, if not get it from the API and cache it"""
 
         # Fetch from cache if we can, otherwise fetch from the API and cache it
@@ -594,7 +596,7 @@ class LookupHelper:
         else:
             return None
 
-    def _get_clublog_xml_data_for_callsign(self, call):
+    def _get_clublog_xml_data_for_callsign(self, call) -> dict | None:
         """Utility method to get Clublog XML data from file"""
 
         if self._clublog_xml_available:
@@ -608,7 +610,7 @@ class LookupHelper:
         else:
             return None
 
-    def _get_dxcc_data_for_callsign(self, call):
+    def _get_dxcc_data_for_callsign(self, call) -> dict | None:
         """Utility method to get generic DXCC data from our lookup table, if we can find it"""
 
         for entry in self._dxcc_data.values():
@@ -627,6 +629,7 @@ class LookupHelper:
 # Singleton object
 lookup_helper = LookupHelper()
 
+
 def infer_mode_from_comment(comment):
     """Infer a mode from the comment"""
 

core/sig_utils.py

@@ -25,13 +25,13 @@ def populate_sig_ref_info(sig_ref):
     if sig_ref.sig is None or sig_ref.id is None:
         logging.warning("Failed to look up sig_ref info, sig or id were not set.")
 
-    sig = sig_ref.sig
+    sig = sig_ref.sig or ""
     ref_id = sig_ref.id
     try:
         if sig.upper() == "POTA":
             data = SEMI_STATIC_URL_DATA_CACHE.get("https://api.pota.app/park/" + ref_id, headers=HTTP_HEADERS).json()
             if data:
-                fullname = data["name"] if "name" in data else None
+                fullname = str(data["name"]) if "name" in data else None
                 if fullname and "parktypeDesc" in data and data["parktypeDesc"] != "":
                     fullname = fullname + " " + data["parktypeDesc"]
                 sig_ref.name = fullname
@@ -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
@@ -129,9 +130,9 @@ def populate_sig_ref_info(sig_ref):
             if data:
                 for ref in data:
                     if ref["reference_code"] == ref_id:
-                        sig_ref.name = ref["name"]
+                        sig_ref.name = str(ref["name"])
                         sig_ref.url = "https://llota.app/list/ref/" + ref_id
-                        sig_ref.grid = ref["grid_locator"]
+                        sig_ref.grid = str(ref["grid_locator"])
                         ll = locator_to_latlong(sig_ref.grid)
                         sig_ref.latitude = ll[0]
                         sig_ref.longitude = ll[1]
@@ -139,7 +140,7 @@ def populate_sig_ref_info(sig_ref):
         elif sig.upper() == "WWTOTA":
             if not sig_ref.name:
                 sig_ref.name = sig_ref.id
-            sig_ref.url = "https://wwtota.com/seznam/karta_rozhledny.php?ref=" + sig_ref.name
+            sig_ref.url = "https://wwtota.com/seznam/karta_rozhledny.php?ref=" + str(sig_ref.name)
         elif sig.upper() == "TILES":
             # Tiles on the Air just uses Maidenhead 6-digit squares, so ID, Name and Grid are all the same
             if not sig_ref.name:
@@ -147,7 +148,7 @@ def populate_sig_ref_info(sig_ref):
             if not sig_ref.grid:
                 sig_ref.grid = sig_ref.id
             if sig_ref.grid and not sig_ref.latitude:
-                ll = locator_to_latlong(sig_ref.grid)
+                ll = locator_to_latlong(str(sig_ref.grid))
                 sig_ref.latitude = ll[0]
                 sig_ref.longitude = ll[1]
         elif sig.upper() == "WAB" or sig.upper() == "WAI":

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)

data/alert.py

@@ -15,51 +15,51 @@ class Alert:
     """Data class that defines an alert."""
 
     # Unique identifier for the alert
-    id: str = None
+    id: str | None = None
     # Callsigns of the operators that has been alerted
-    dx_calls: list = None
+    dx_calls: list | None = None
     # Names of the operators that has been alerted
-    dx_names: list = None
+    dx_names: list | None = None
     # Country of the DX operator
-    dx_country: str = None
+    dx_country: str | None = None
     # Country flag of the DX operator
-    dx_flag: str = None
+    dx_flag: str | None = None
     # Continent of the DX operator
-    dx_continent: str = None
+    dx_continent: str | None = None
     # DXCC ID of the DX operator
-    dx_dxcc_id: int = None
+    dx_dxcc_id: int | None = None
     # CQ zone of the DX operator
-    dx_cq_zone: int = None
+    dx_cq_zone: int | None = None
     # ITU zone of the DX operator
-    dx_itu_zone: int = None
+    dx_itu_zone: int | None = None
     # Intended frequencies & modes of operation. Essentially just a different kind of comment field.
-    freqs_modes: str = None
+    freqs_modes: str | None = None
     # Start time of the activation, UTC seconds since UNIX epoch
-    start_time: float = None
+    start_time: float | None = None
     # Start time of the activation of the alert, ISO 8601
-    start_time_iso: str = None
+    start_time_iso: str | None = None
     # End time of the activation, UTC seconds since UNIX epoch. Optional
-    end_time: float = None
+    end_time: float | None = None
     # End time of the activation of the alert, ISO 8601
-    end_time_iso: str = None
+    end_time_iso: str | None = None
     # Time that this software received the alert, UTC seconds since UNIX epoch. This is used with the "since_received"
     # call to our API to receive all data that is new to us, even if by a quirk of the API it might be older than the
     # list time the client polled the API.
-    received_time: float = None
+    received_time: float | None = None
     # Time that this software received the alert, ISO 8601
-    received_time_iso: str = None
+    received_time_iso: str | None = None
     # Comment made by the alerter, if any
-    comment: str = None
+    comment: str | None = None
     # Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-    sig: str = None
+    sig: str | None = None
     # SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
-    sig_refs: list = None
+    sig_refs: list | None = None
     # Whether this alert is for a DXpedition, as opposed to e.g. an xOTA programme.
     is_dxpedition: bool = False
     # Where we got the alert from, e.g. "POTA", "SOTA"...
-    source: str = None
+    source: str | None = None
     # The ID the source gave it, if any.
-    source_id: str = None
+    source_id: str | None = None
 
     def infer_missing(self, credentials=None):
         """Infer missing parameters where possible"""

data/sig_ref.py

@@ -11,14 +11,14 @@ class SIGRef:
     # SIG that this reference is in, e.g. "POTA".
     sig: str
     # Name of the reference, e.g. "Null Country Park", if known.
-    name: str = None
+    name: str | None = None
     # URL to look up more information about the reference, if known.
-    url: str = None
+    url: str | None = None
     # Latitude of the reference, if known.
-    latitude: float = None
+    latitude: float | None = None
     # Longitude of the reference, if known.
-    longitude: float = None
+    longitude: float | None = None
     # Maidenhead grid reference of the reference, if known.
-    grid: str = None
+    grid: str | None = None
     # Activation score. SOTA only
-    activation_score: int = None
+    activation_score: int | None = None

data/solar_conditions.py

@@ -110,11 +110,11 @@ class HFBandCondition:
     """Data class representing HF propagation conditions for certain bands and time of day."""
 
     # Band name, e.g. "80m-40m", "20m-17m", "10m-6m"
-    band: str = None
+    band: str | None = None
     # Time of day: "day" or "night"
-    time: str = None
+    time: str | None = None
     # Propagation condition: "Good", "Fair", or "Poor"
-    condition: str = None
+    condition: str | None = None
 
 
 @dataclass
@@ -122,66 +122,66 @@ class SolarConditions:
     """Data class representing current solar and propagation conditions."""
 
     # Time the data was last updated at the source, UTC seconds since UNIX epoch
-    updated: float = None
+    updated: float | None = None
     # Solar Flux Index (SFI)
-    sfi: int = None
+    sfi: int | None = None
     # A-index (daily geomagnetic activity)
-    a_index: int = None
+    a_index: int | None = None
     # K-index (3-hour geomagnetic activity)
-    k_index: int = None
+    k_index: int | None = None
     # X-ray flux class, e.g. "B2.3", "C1.0"
-    xray: str = None
+    xray: str | None = None
     # Proton flux
-    proton_flux: int = None
+    proton_flux: int | None = None
     # Electron flux
-    electron_flux: int = None
+    electron_flux: int | None = None
     # Aurora activity level
-    aurora: int = None
+    aurora: int | None = None
     # Latitude in degrees of the aurora boundary
-    aurora_latitude: float = None
+    aurora_latitude: float | None = None
     # Sunspot count
-    sunspots: int = None
+    sunspots: int | None = None
     # Solar wind speed in km/s
-    solar_wind: float = None
+    solar_wind: float | None = None
     # Interplanetary magnetic field strength in nT
-    magnetic_field: float = None
+    magnetic_field: float | None = None
     # Geomagnetic field condition, e.g. "Quiet", "Unsettled", "Active", "Storm"
-    geomag_field: str = None
+    geomag_field: str | None = None
     # Geomagnetic background noise level, e.g. "S0", "S1", "S2"
-    geomag_noise: str = None
+    geomag_noise: str | None = None
     # HF band propagation conditions, keyed by "{band}-{time}" e.g. "80m-40m-day"
-    hf_conditions: dict = None
+    hf_conditions: dict | None = None
     # VHF propagation conditions, keyed by condition name
-    vhf_conditions: dict = None
+    vhf_conditions: dict | None = None
     # NOAA Kp index 3-day forecast, keyed by UNIX timestamp of the start of each 3-hour UTC period
-    k_index_forecast: dict = None
+    k_index_forecast: dict | None = None
     # NOAA Solar Radiation Storm (S1 or greater) probability forecast, keyed by UNIX timestamp of start of day UTC
-    solar_storm_forecast: dict = None
+    solar_storm_forecast: dict | None = None
     # NOAA Radio Blackout (R1-R2) probability forecast, keyed by UNIX timestamp of start of day UTC
-    blackout_forecast_r1r2: dict = None
+    blackout_forecast_r1r2: dict | None = None
     # NOAA Radio Blackout (R3 or greater) probability forecast, keyed by UNIX timestamp of start of day UTC
-    blackout_forecast_r3_or_greater: dict = None
+    blackout_forecast_r3_or_greater: dict | None = None
     # Ionosonde measurements, dict keyed by URSI code, values are dicts with keys: ursi, name, fof2, muf, luf,
     # band_states. Populated by GIROIonosonde or KC2GProp providers.
-    ionosonde_data: dict = None
+    ionosonde_data: dict | None = None
 
     # Derived values (populated by infer_descriptions())
     # HF radio blackout risk description, derived from xray
-    xray_desc: str = None
+    xray_desc: str | None = None
     # HF radio blackout scale number (R0-R5), derived from xray
-    radio_blackout_scale: int = None
+    radio_blackout_scale: int | None = None
     # Solar radiation storm level description, derived from proton_flux
-    proton_flux_desc: str = None
+    proton_flux_desc: str | None = None
     # Solar radiation storm scale number (S0-S5), derived from proton_flux
-    solar_storm_scale: int = None
+    solar_storm_scale: int | None = None
     # Geomagnetic storm level description, derived from k_index
-    geomag_storm_desc: str = None
+    geomag_storm_desc: str | None = None
     # Geomagnetic storm scale number (G0-G5), derived from k_index
-    geomag_storm_scale: int = None
+    geomag_storm_scale: int | None = None
     # Overall HF band conditions summary, derived from sfi
-    band_conditions_desc: str = None
+    band_conditions_desc: str | None = None
     # Electron flux description, derived from electron_flux
-    electron_flux_desc: str = None
+    electron_flux_desc: str | None = None
 
     def infer_descriptions(self):
         """Populate derived text description fields from the current numeric/raw field values."""

data/spot.py

@@ -23,38 +23,38 @@ class Spot:
     """Data class that defines a spot."""
 
     # Unique identifier for the spot
-    id: str = None
+    id: str | None = None
 
     # DX (spotted) operator info
 
     # Callsign of the operator that has been spotted
-    dx_call: str = None
+    dx_call: str | None = None
     # Name of the operator that has been spotted
-    dx_name: str = None
+    dx_name: str | None = None
     # QTH of the operator that has been spotted. This could be from any SIG refs or could be from online lookup of their
     # home QTH.
-    dx_qth: str = None
+    dx_qth: str | None = None
     # Country of the DX operator
-    dx_country: str = None
+    dx_country: str | None = None
     # Country flag of the DX operator
-    dx_flag: str = None
+    dx_flag: str | None = None
     # Continent of the DX operator
-    dx_continent: str = None
+    dx_continent: str | None = None
     # DXCC ID of the DX operator
-    dx_dxcc_id: int = None
+    dx_dxcc_id: int | None = None
     # CQ zone of the DX operator
-    dx_cq_zone: int = None
+    dx_cq_zone: int | None = None
     # ITU zone of the DX operator
-    dx_itu_zone: int = None
+    dx_itu_zone: int | None = None
     # If this is an APRS/Packet/etc spot, what SSID was the DX operator using?
-    dx_ssid: str = None
+    dx_ssid: str | None = None
     # Maidenhead grid locator for the DX.  This could be from a geographical reference e.g. POTA, or just from the
     # country
-    dx_grid: str = None
+    dx_grid: str | None = None
     # Latitude & longitude of the DX, in degrees. This could be from a geographical reference e.g. POTA, or from a QRZ
     # lookup
-    dx_latitude: float = None
-    dx_longitude: float = None
+    dx_latitude: float | None = None
+    dx_longitude: float | None = None
     # DX Location source. Indicates how accurate the location might be. Values: "SPOT", "WAB/WAI GRID", "HOME QTH",
     # "DXCC", "NONE"
     dx_location_source: str = "NONE"
@@ -66,70 +66,70 @@ class Spot:
     # DE (Spotter) info
 
     # Callsign of the spotter
-    de_call: str = None
+    de_call: str | None = None
     # Country of the spotter
-    de_country: str = None
+    de_country: str | None = None
     # Country flag of the spotter
-    de_flag: str = None
+    de_flag: str | None = None
     # Continent of the spotter
-    de_continent: str = None
+    de_continent: str | None = None
     # DXCC ID of the spotter
-    de_dxcc_id: int = None
+    de_dxcc_id: int | None = None
     # If this is an APRS/Packet/etc spot, what SSID was the spotter/receiver using?
-    de_ssid: str = None
+    de_ssid: str | None = None
     # Maidenhead grid locator for the spotter. This is not going to be from a xOTA reference so it will likely just be
     # a QRZ or DXCC lookup. If the spotter is also portable, this is probably wrong, but it's good enough for some
     # simple mapping.
-    de_grid: str = None
+    de_grid: str | None = None
     # Latitude & longitude of the DX, in degrees. This is not going to be from a xOTA reference so it will likely just
     # be a QRZ or DXCC lookup. If the spotter is also portable, this is probably wrong, but it's good enough for some
     # simple mapping.
-    de_latitude: float = None
-    de_longitude: float = None
+    de_latitude: float | None = None
+    de_longitude: float | None = None
 
     # General QSO info
 
     # Reported mode, such as SSB, PHONE, CW, FT8...
-    mode: str = None
+    mode: str | None = None
     # Inferred mode "family". One of "CW", "PHONE" or "DIGI".
-    mode_type: str = None
+    mode_type: str | None = None
     # Source of the mode information. "SPOT", "COMMENT", "BANDPLAN" or "NONE"
     mode_source: str = "NONE"
     # Frequency, in Hz
-    freq: float = None
+    freq: float | None = None
     # Band, defined by the frequency, e.g. "40m" or "70cm"
-    band: str = None
+    band: str | None = None
     # Comment left by the spotter, if any
-    comment: str = None
+    comment: str | None = None
     # QRT state. Some APIs return spots marked as QRT. Otherwise we can check the comments.
     qrt: bool = False
 
     # Special Interest Group info
 
     # Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-    sig: str = None
+    sig: str | None = None
     # SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
-    sig_refs: list = None
+    sig_refs: list | None = None
 
     # Timing info
 
     # Time of the spot, UTC seconds since UNIX epoch
-    time: float = None
+    time: float | None = None
     # Time of the spot, ISO 8601
-    time_iso: str = None
+    time_iso: str | None = None
     # Time that this software received the spot, UTC seconds since UNIX epoch. This is used with the "since_received"
     # call to our API to receive all data that is new to us, even if by a quirk of the API it might be older than the
     # list time the client polled the API.
-    received_time: float = None
+    received_time: float | None = None
     # Time that this software received the spot, ISO 8601
-    received_time_iso: str = None
+    received_time_iso: str | None = None
 
     # Source info
 
     # Where we got the spot from, e.g. "POTA", "Cluster"...
-    source: str = None
+    source: str | None = None
     # The ID the source gave it, if any.
-    source_id: str = None
+    source_id: str | None = None
 
     def infer_missing(self, credentials=None):
         """Infer missing parameters where possible"""
@@ -335,9 +335,10 @@ class Spot:
         # Determine a "QTH" string. If we have a SIG ref, pick the first one and turn it into a suitable string,
         # otherwise see what they have set on an online lookup service.
         if self.sig_refs and len(self.sig_refs) > 0:
-            self.dx_qth = self.sig_refs[0].id
+            qth = self.sig_refs[0].id
             if self.sig_refs[0].name:
-                self.dx_qth = self.dx_qth + " " + self.sig_refs[0].name
+                qth += " " + self.sig_refs[0].name
+            self.dx_qth = qth
         else:
             self.dx_qth = lookup_helper.infer_qth_from_callsign_online_lookup(self.dx_call, credentials)
 
@@ -353,10 +354,11 @@ class Spot:
         # It looks like we can sometimes get a string into lat/lon, so try to parse as float, reject if not valid
         if isinstance(self.dx_latitude, str) or isinstance(self.dx_longitude, str):
             try:
-                self.dx_latitude = float(self.dx_latitude)
-                self.dx_longitude = float(self.dx_longitude)
+                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 " + 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
 
@@ -374,10 +376,10 @@ class Spot:
 
         # DX Location is "good" if it is from a spot, or from QRZ if the callsign doesn't contain a slash, so the operator
         # is likely at home.
-        self.dx_location_good = self.dx_latitude and self.dx_longitude and (
+        self.dx_location_good = bool(self.dx_latitude and self.dx_longitude and (
                 self.dx_location_source == "SPOT" or self.dx_location_source == "SIG REF LOOKUP"
                 or self.dx_location_source == "WAB/WAI GRID"
-                or (self.dx_location_source == "HOME QTH" and not "/" in self.dx_call))
+                or (self.dx_location_source == "HOME QTH" and "/" not in (self.dx_call or ""))))
 
         # DE with no digits and APRS servers starting "T2" are not things we can look up location for
         if self.de_call and any(char.isdigit() for char in self.de_call) and not (
@@ -406,16 +408,16 @@ class Spot:
     def _append_sig_ref_if_missing(self, new_sig_ref):
         """Append a sig_ref to the list, so long as it's not already there."""
 
-        if not self.sig_refs:
-            self.sig_refs = []
+        sig_refs = self.sig_refs or []
+        self.sig_refs = sig_refs
         new_sig_ref.id = new_sig_ref.id.strip().upper()
         new_sig_ref.sig = new_sig_ref.sig.strip().upper()
         if new_sig_ref.id == "":
             return
-        for sig_ref in self.sig_refs:
+        for sig_ref in sig_refs:
             if sig_ref.id == new_sig_ref.id and sig_ref.sig == new_sig_ref.sig:
                 return
-        self.sig_refs.append(new_sig_ref)
+        sig_refs.append(new_sig_ref)
 
     def expired(self):
         """Decide if this spot has expired (in which case it should not be added to the system in the first place, and not

server/handlers/api/addspot.py

@@ -2,9 +2,12 @@ import json
 import logging
 import re
 from datetime import datetime
+from typing import Any
 
 import pytz
 import tornado
+from tornado import httputil
+from tornado.web import Application
 
 from core.config import ALLOW_SPOTTING, MAX_SPOT_AGE
 from core.constants import UNKNOWN_BAND
@@ -19,6 +22,11 @@ from data.spot import Spot
 class APISpotHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/spot (POST)"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._spots = None
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, spots, web_server_metrics):
         self._spots = spots
         self._web_server_metrics = web_server_metrics

server/handlers/api/alerts.py

@@ -3,16 +3,18 @@ import json
 import logging
 from datetime import datetime
 from queue import Queue
+from typing import Any
 
 import pytz
 import tornado
 import tornado_eventsource.handler
+from tornado import httputil
+from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
 from core.utils import serialize_everything, empty_queue
 from data.lookup_credentials import extract_credentials
 
-
 SSE_HANDLER_MAX_QUEUE_SIZE = 100
 SSE_HANDLER_QUEUE_CHECK_INTERVAL = 5000
 
@@ -20,6 +22,11 @@ SSE_HANDLER_QUEUE_CHECK_INTERVAL = 5000
 class APIAlertsHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/alerts"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._alerts = None
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, alerts, web_server_metrics):
         self._alerts = alerts
         self._web_server_metrics = web_server_metrics
@@ -67,6 +74,15 @@ class APIAlertsHandler(tornado.web.RequestHandler):
 class APIAlertsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
     """API request handler for /api/v1/alerts/stream"""
 
+    def __init__(self, application, request, **kwargs: Any):
+        self._sse_alert_queues = None
+        self._web_server_metrics = None
+        self._query_params = None
+        self._credentials = None
+        self._alert_queue = None
+        self._heartbeat = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, sse_alert_queues, web_server_metrics):
         self._sse_alert_queues = sse_alert_queues
         self._web_server_metrics = web_server_metrics

server/handlers/api/dxstats.py

@@ -1,9 +1,12 @@
 import json
 from collections import Counter
 from datetime import datetime, timedelta
+from typing import Any
 
 import pytz
 import tornado
+from tornado import httputil
+from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
 
@@ -16,6 +19,11 @@ BANDS_SET = frozenset(BANDS)
 class APIDxStatsHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/dxstats"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._spots = None
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, spots, web_server_metrics):
         self._spots = spots
         self._web_server_metrics = web_server_metrics

server/handlers/api/lookups.py

@@ -2,9 +2,12 @@ import json
 import logging
 import re
 from datetime import datetime
+from typing import Any
 
 import pytz
 import tornado
+from tornado import httputil
+from tornado.web import Application
 
 from core.constants import SIGS
 from core.geo_utils import lat_lon_for_grid_sw_corner_plus_size, lat_lon_to_cq_zone, lat_lon_to_itu_zone
@@ -19,6 +22,10 @@ from data.spot import Spot
 class APILookupCallHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/lookup/call"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, web_server_metrics):
         self._web_server_metrics = web_server_metrics
 
@@ -36,7 +43,7 @@ class APILookupCallHandler(tornado.web.RequestHandler):
 
             # The "call" query param must exist and look like a callsign
             if "call" in query_params.keys():
-                call = query_params.get("call").upper()
+                call = str(query_params.get("call")).upper()
                 if re.match(r"^[A-Z0-9/\-]*$", call):
                     # Take the callsign, make a "fake spot" so we can run infer_missing() on it, then repack the
                     # resulting data in the correct way for the API response.
@@ -80,6 +87,10 @@ class APILookupCallHandler(tornado.web.RequestHandler):
 class APILookupSIGRefHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/lookup/sigref"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, web_server_metrics):
         self._web_server_metrics = web_server_metrics
 
@@ -98,8 +109,8 @@ class APILookupSIGRefHandler(tornado.web.RequestHandler):
             # "sig" and "id" query params must exist, SIG must be known, and if we have a reference regex for that SIG,
             # the provided id must match it.
             if "sig" in query_params.keys() and "id" in query_params.keys():
-                sig = query_params.get("sig").upper()
-                ref_id = query_params.get("id").upper()
+                sig = str(query_params.get("sig")).upper()
+                ref_id = str(query_params.get("id")).upper()
                 if sig in list(map(lambda p: p.name, SIGS)):
                     if not get_ref_regex_for_sig(sig) or re.match(get_ref_regex_for_sig(sig), ref_id):
                         data = populate_sig_ref_info(SIGRef(id=ref_id, sig=sig))
@@ -107,7 +118,8 @@ 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(
+                                "Error - '" + ref_id + "' does not look like a valid reference ID for " + sig + ".",
                                 default=serialize_everything))
                         self.set_status(422)
                 else:
@@ -129,6 +141,10 @@ class APILookupSIGRefHandler(tornado.web.RequestHandler):
 class APILookupGridHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/lookup/grid"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, web_server_metrics):
         self._web_server_metrics = web_server_metrics
 
@@ -146,7 +162,7 @@ class APILookupGridHandler(tornado.web.RequestHandler):
 
             # "grid" query param must exist.
             if "grid" in query_params.keys():
-                grid = query_params.get("grid").upper()
+                grid = str(query_params.get("grid")).upper()
                 lat, lon, lat_cell_size, lon_cell_size = lat_lon_for_grid_sw_corner_plus_size(grid)
                 if lat is not None and lon is not None and lat_cell_size is not None and lon_cell_size is not None:
                     center_lat = lat + lat_cell_size / 2.0

server/handlers/api/options.py

@@ -1,8 +1,11 @@
 import json
 from datetime import datetime
+from typing import Any
 
 import pytz
 import tornado
+from tornado import httputil
+from tornado.web import Application
 
 from core.config import MAX_SPOT_AGE, ALLOW_SPOTTING
 from core.constants import BANDS, ALL_MODES, MODE_TYPES, SIGS, CONTINENTS
@@ -13,6 +16,11 @@ from core.utils import serialize_everything
 class APIOptionsHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/options"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._status_data = None
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, status_data, web_server_metrics):
         self._status_data = status_data
         self._web_server_metrics = web_server_metrics

server/handlers/api/solar_conditions.py

@@ -1,7 +1,10 @@
 from datetime import datetime
+from typing import Any
 
 import pytz
 import tornado
+from tornado import httputil
+from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
 
@@ -9,6 +12,11 @@ from core.prometheus_metrics_handler import api_requests_counter
 class APISolarConditionsHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/solar"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._solar_conditions = None
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, solar_conditions, web_server_metrics):
         self._solar_conditions = solar_conditions
         self._web_server_metrics = web_server_metrics

server/handlers/api/spots.py

@@ -3,16 +3,18 @@ import json
 import logging
 from datetime import datetime, timedelta
 from queue import Queue
+from typing import Any
 
 import pytz
 import tornado
 import tornado_eventsource.handler
+from tornado import httputil
+from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
 from core.utils import serialize_everything, empty_queue
 from data.lookup_credentials import extract_credentials
 
-
 SSE_HANDLER_MAX_QUEUE_SIZE = 1000
 SSE_HANDLER_QUEUE_CHECK_INTERVAL = 5000
 
@@ -20,6 +22,11 @@ SSE_HANDLER_QUEUE_CHECK_INTERVAL = 5000
 class APISpotsHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/spots"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._spots = None
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, spots, web_server_metrics):
         self._spots = spots
         self._web_server_metrics = web_server_metrics
@@ -67,6 +74,15 @@ class APISpotsHandler(tornado.web.RequestHandler):
 class APISpotsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
     """API request handler for /api/v1/spots/stream"""
 
+    def __init__(self, application, request, **kwargs: Any):
+        self._sse_spot_queues = None
+        self._web_server_metrics = None
+        self._query_params = None
+        self._credentials = None
+        self._spot_queue = None
+        self._heartbeat = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, sse_spot_queues, web_server_metrics):
         self._sse_spot_queues = sse_spot_queues
         self._web_server_metrics = web_server_metrics

server/handlers/api/status.py

@@ -1,8 +1,11 @@
 import json
 from datetime import datetime
+from typing import Any
 
 import pytz
 import tornado
+from tornado import httputil
+from tornado.web import Application
 
 from core.prometheus_metrics_handler import api_requests_counter
 from core.utils import serialize_everything
@@ -11,6 +14,11 @@ from core.utils import serialize_everything
 class APIStatusHandler(tornado.web.RequestHandler):
     """API request handler for /api/v1/status"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._status_data = None
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, status_data, web_server_metrics):
         self._status_data = status_data
         self._web_server_metrics = web_server_metrics

server/handlers/pagetemplate.py

@@ -1,7 +1,10 @@
 from datetime import datetime
+from typing import Any
 
 import pytz
 import tornado
+from tornado import httputil
+from tornado.web import Application
 
 from core.config import ALLOW_SPOTTING, WEB_UI_OPTIONS, BASE_URL, SERVER_OWNER_CALLSIGN
 from core.constants import SOFTWARE_VERSION
@@ -11,6 +14,11 @@ from core.prometheus_metrics_handler import page_requests_counter
 class PageTemplateHandler(tornado.web.RequestHandler):
     """Handler for all HTML pages generated from templates"""
 
+    def __init__(self, application: "Application", request: httputil.HTTPServerRequest, **kwargs: Any):
+        self._template_name = None
+        self._web_server_metrics = None
+        super().__init__(application, request, **kwargs)
+
     def initialize(self, template_name, web_server_metrics):
         self._template_name = template_name
         self._web_server_metrics = web_server_metrics

server/webserver.py

@@ -18,6 +18,8 @@ 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 "")
+
 
 class WebServer:
     """Provides the public-facing web server."""
@@ -101,11 +103,11 @@ class WebServer:
         misc_routes = [
             (r"/apidocs", PageTemplateHandler, {"template_name": "apidocs", **handler_opts}),
             (r"/metrics", PrometheusMetricsHandler),
-            (r"/(.*)", StaticFileHandler, {"path": os.path.join(os.path.dirname(__file__), "../webassets")})
+            (r"/(.*)", StaticFileHandler, {"path": os.path.join(_HERE, "../webassets")})
         ]
 
         app = tornado.web.Application(api_routes + ui_routes + misc_routes,
-                                      template_path=os.path.join(os.path.dirname(__file__), "../templates"),
+                                      template_path=os.path.join(_HERE, "../templates"),
                                       debug=False)
         app.listen(self._port)
         logging.info("Web server running on port " + str(WEB_SERVER_PORT))

solarconditionsproviders/giroionosonde.py

@@ -28,7 +28,8 @@ class GIROIonosonde(SolarConditionsProvider):
         self._thread = None
         self._stop_event = Event()
 
-    def _load_stations(self):
+    @staticmethod
+    def _load_stations():
         stations = []
         with open(STATIONS_INDEX, newline='') as f:
             for row in csv.reader(f):

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
@@ -32,6 +31,9 @@ class HamQSL(HTTPSolarConditionsProvider):
         # Some error checking functions in case the data is janky.
 
         def text(tag, default=None):
+            if sd is None:
+                logging.warning("HamQSL solar conditions API returned unexpected XML structure")
+                return default
             el = sd.find(tag)
             return el.text.strip() if el is not None and el.text else default
 
@@ -104,7 +106,8 @@ class HamQSL(HTTPSolarConditionsProvider):
             "geomag_noise": text("signalnoise"),
             "hf_conditions": hf_conditions,
             "vhf_conditions": {
-                "vhf_aurora_northern_hemi": vhf_map.get(("vhf-aurora", "northern_hemi")).title().replace("Lat Aur", "Latitude"),
+                "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")),

solarconditionsproviders/ionosonde_utils.py

@@ -3,8 +3,8 @@ from core.constants import BANDS
 HF_BANDS = [b for b in BANDS if b.is_ham_hf]
 
 
-def _latest(d):
-    return d[max(d.keys())] if d else None
+def _latest(d) -> float | None:
+    return float(d[max(d.keys())]) if d else None
 
 
 def compute_band_states(fof2_dict, muf_dict, luf_dict):

solarconditionsproviders/solar_conditions_provider.py

@@ -10,6 +10,7 @@ class SolarConditionsProvider:
     def __init__(self, provider_config):
         """Constructor"""
 
+        self._solar_conditions_cache = None
         self.name = provider_config["name"]
         self.enabled = provider_config["enabled"]
         self.last_update_time = datetime.min.replace(tzinfo=pytz.UTC)

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
@@ -29,12 +29,13 @@ cleanup_timer = None
 run = True
 
 
-def shutdown(sig, frame):
+def shutdown(_signum=None, _frame=None):
     """Shutdown function"""
 
     global run
 
     logging.info("Stopping program...")
+    if web_server:
         web_server.stop()
     for sp in spot_providers:
         if sp.enabled:
@@ -45,7 +46,9 @@ def shutdown(sig, frame):
     for scp in solar_condition_providers:
         if scp.enabled:
             scp.stop()
+    if cleanup_timer:
         cleanup_timer.stop()
+    if lookup_helper:
         lookup_helper.stop()
     spots.close()
     alerts.close()

spotproviders/aprsis.py

@@ -37,20 +37,20 @@ class APRSIS(SpotProvider):
 
     def _handle(self, data):
         # Split SSID in "from" call and store separately
-        from_parts = data["from"].split("-").upper()
-        dx_call = from_parts[0]
-        dx_ssid = from_parts[1] if len(from_parts) > 1 else None
-        via_parts = data["via"].split("-").upper()
-        de_call = via_parts[0]
-        de_ssid = via_parts[1] if len(via_parts) > 1 else None
+        from_parts = str(data["from"]).split("-")
+        dx_call = from_parts[0].upper()
+        dx_ssid = from_parts[1].upper() if len(from_parts) > 1 else None
+        via_parts = str(data["via"]).split("-")
+        de_call = via_parts[0].upper()
+        de_ssid = via_parts[1].upper() if len(via_parts) > 1 else None
         spot = Spot(source="APRS-IS",
                     dx_call=dx_call,
                     dx_ssid=dx_ssid,
                     de_call=de_call,
                     de_ssid=de_ssid,
-                    comment=data["comment"] if "comment" in data else None,
-                    dx_latitude=data["latitude"] if "latitude" in data else None,
-                    dx_longitude=data["longitude"] if "longitude" in data else None,
+                    comment=str(data["comment"]) if "comment" in data else None,
+                    dx_latitude=float(data["latitude"]) if "latitude" in data else None,
+                    dx_longitude=float(data["longitude"]) if "longitude" in data else None,
                     time=datetime.now(
                         pytz.UTC).timestamp())  # APRS-IS spots are live so we can assume spot time is "now"
 

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),

spotproviders/gma.py

@@ -55,7 +55,7 @@ class GMA(HTTPSpotProvider):
                         # spots come through with reftype=POTA or reftype=WWFF. SOTA is harder to figure out because both SOTA
                         # and GMA summits come through with reftype=Summit, so we must check for the presence of a "sota" entry
                         # to determine if it's a SOTA summit.
-                        if "reftype" in ref_info and ref_info["reftype"] not in ["POTA", "WWFF"] and (
+                        if spot.sig_refs and "reftype" in ref_info and ref_info["reftype"] not in ["POTA", "WWFF"] and (
                                 ref_info["reftype"] != "Summit" or "sota" not in ref_info or ref_info["sota"] == ""):
                             match ref_info["reftype"]:
                                 case "Summit":

spotproviders/hema.py

@@ -45,6 +45,8 @@ class HEMA(HTTPSpotProvider):
                     # Fiddle with some data to extract bits we need. Freq/mode and spotter/comment come in combined fields.
                     freq_mode_match = re.search(self.FREQ_MODE_PATTERN, spot_items[5])
                     spotter_comment_match = re.search(self.SPOTTER_COMMENT_PATTERN, spot_items[6])
+                    if not freq_mode_match or not spotter_comment_match:
+                        continue
 
                     # Convert to our spot format
                     spot = Spot(source=self.name,

spotproviders/llota.py

@@ -22,8 +22,8 @@ class LLOTA(HTTPSpotProvider):
             comment = None
             spotter = None
             if "history" in source_spot and len(source_spot["history"]) > 0:
-                comment = source_spot["history"][-1]["comment"]
-                spotter = source_spot["history"][-1]["spotter_callsign"]
+                comment = str(source_spot["history"][-1]["comment"])
+                spotter = str(source_spot["history"][-1]["spotter_callsign"])
             # Convert to our spot format
             spot = Spot(source=self.name,
                         source_id=source_spot["id"],

spotproviders/parksnpeaks.py

@@ -39,9 +39,9 @@ class ParksNPeaks(HTTPSpotProvider):
                                 tzinfo=pytz.UTC).timestamp())
 
                 # Extract a de_call if it's in the comment but not in the "actSpoter" field
-                m = re.search(r"\(de ([A-Za-z0-9]*)\)", spot.comment)
+                m = re.search(r"\(de ([A-Za-z0-9]*)\)", spot.comment or "")
                 if not spot.de_call and m:
-                    spot.de_call = m.group(1)
+                    spot.de_call = str(m.group(1))
 
                 # Record SIG information. Sometimes we get a "SIG" of "QRP", which we ignore as it's not a programme with a
                 # defined set of references
@@ -49,11 +49,12 @@ class ParksNPeaks(HTTPSpotProvider):
                 sig_ref = source_spot["actSiteID"]
                 if sig and sig != "" and sig != "QRP" and sig_ref and sig_ref != "":
                     spot.sig = sig
-                    spot.sig_refs = [SIGRef(id=source_spot["actSiteID"], sig=source_spot["actClass"].upper())]
+                    sig_refs = [SIGRef(id=source_spot["actSiteID"], sig=source_spot["actClass"].upper())]
+                    spot.sig_refs = sig_refs
 
                     # Free text location is not present in all spots, so only add it if it's set
                     if "actLocation" in source_spot and source_spot["actLocation"] != "":
-                        spot.sig_refs[0].name = source_spot["actLocation"]
+                        sig_refs[0].name = source_spot["actLocation"]
 
                     # Log a warning for the developer if PnP gives us an unknown programme we've never seen before
                     if sig not in ["POTA", "SOTA", "WWFF", "SIOTA", "ZLOTA", "KRMNPA"]:

spotproviders/rbn.py

@@ -46,7 +46,7 @@ class RBN(SpotProvider):
                     self.status = "Connecting"
                     logging.info("RBN port " + str(self._port) + " connecting...")
                     self._telnet = telnetlib3.Telnet("telnet.reversebeacon.net", self._port)
-                    telnet_output = self._telnet.read_until("Please enter your call: ".encode("latin-1"))
+                    self._telnet.read_until("Please enter your call: ".encode("latin-1"))
                     self._telnet.write((SERVER_OWNER_CALLSIGN + "\n").encode("latin-1"))
                     connected = True
                     logging.info("RBN port " + str(self._port) + " connected.")
@@ -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),

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

spotproviders/wota.py

@@ -1,9 +1,11 @@
 import logging
 import re
 from datetime import datetime
+from typing import cast
 
 import pytz
 from rss_parser import Parser
+from rss_parser.models.rss import RSS
 
 from data.sig_ref import SIGRef
 from data.spot import Spot
@@ -23,7 +25,7 @@ class WOTA(HTTPSpotProvider):
 
     def _http_response_to_spots(self, http_response):
         new_spots = []
-        rss = Parser.parse(http_response.content.decode())
+        rss = cast(RSS, Parser.parse(http_response.content.decode()))
         # Iterate through source data
         for source_spot in rss.channel.items:
 
@@ -39,9 +41,9 @@ class WOTA(HTTPSpotProvider):
                 ref_name = None
                 if len(title_split) > 1:
                     ref_split = title_split[1].split(" - ")
-                    ref = ref_split[0]
+                    ref = str(ref_split[0])
                     if len(ref_split) > 1:
-                        ref_name = ref_split[1]
+                        ref_name = str(ref_split[1])
 
                 # Pick apart the description
                 desc_split = source_spot.description.split(". ")

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

spotproviders/xota.py

@@ -22,8 +22,8 @@ class XOTA(WebsocketSpotProvider):
 
     def __init__(self, provider_config):
         super().__init__(provider_config, provider_config["url"])
-        locations_csv = provider_config["locations-csv"] if "locations-csv" in provider_config else None
-        self.SIG = provider_config["sig"] if "sig" in provider_config else None
+        locations_csv = str(provider_config["locations-csv"]) if "locations-csv" in provider_config else None
+        self.SIG = str(provider_config["sig"]) if "sig" in provider_config else None
 
         # Load location data
         if locations_csv:
@@ -48,7 +48,8 @@ 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, url=source_spot["reference"]["website"], latitude=lat,
+                    sig_refs=[
+                        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,

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>While there are several other web-based interfaces to DX clusters, and sites that aggregate spots from various outdoor activity programmes for amateur radio, Spothole differentiates itself by supporting a larger number of data sources, and by being "API first" rather than just providing a web front-end. This allows other software to be built on top of it.</p>
-    <p>The API is deliberately well-defined with an <a href="/apidocs/openapi.yml">OpenAPI specification</a> and <a href="/apidocs">API documentation</a>. The API delivers spots in a consistent format regardless of the data source, freeing developers from needing to know how each individual data source presents its data.</p>
-    <p>Spothole itself is also open source, Public Domain licenced code that anyone can take and modify. <a href="https://git.ianrenton.com/ian/metaspot/">The source code is here</a>.</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>Spothole is a utility to aggregate "spots" from amateur radio DX clusters and xOTA spotting sites, and provide an
+        open JSON API as well as a website to browse the data.</p>
+    <p>While there are several other web-based interfaces to DX clusters, and sites that aggregate spots from various
+        outdoor activity programmes for amateur radio, Spothole differentiates itself by supporting a larger number of
+        data sources, and by being "API first" rather than just providing a web front-end. This allows other software to
+        be built on top of it.</p>
+    <p>The API is deliberately well-defined with an <a href="/apidocs/openapi.yml">OpenAPI specification</a> and <a
+            href="/apidocs">API documentation</a>. The API delivers spots in a consistent format regardless of the data
+        source, freeing developers from needing to know how each individual data source presents its data.</p>
+    <p>Spothole itself is also open source, Public Domain licenced code that anyone can take and modify. <a
+            href="https://git.ianrenton.com/ian/metaspot/">The source code is here</a>.</p>
+    <p>The software was written by <a href="https://ianrenton.com">Ian Renton, MØTRT</a> and other contributors. Full
+        details are available in the <a href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README
+            file</a>.</p>
     <p>This server is running Spothole version {{software_version}}.</p>
     <h2 class="mt-4 mb-4">Using Spothole</h2>
-    <p>There are a number of different ways to use Spothole, depending on what you want to do with it and your level of technical skill:</p>
-    <ol><li>You can <b>use it on the web</b>, like you are (probably) doing right now. This is how most people use it, to look up spots and alerts, and make interesting QSOs.</li>
-    <li>If you are using an Android or iOS device, you can <b>"install" it on your device</b>. Spothole is a Progressive Web App, meaning it's not delivered through app stores, but if you open the page on Chrome (Android) or Safari (iOS) there will be an option in the menu to install it. It will then appear in your main app menu.</li>
-    <li>You can <b>embed the web interface in another website</b> to show its spots in a custom dashboard or the like. The usage is explained in more detail in the <a href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README file</a>.</li>
-    <li>You can <b>write your own client using the Spothole API</b>, using the main Spothole instance to provide data, and do whatever you like with it. The README contains guidance on how to do this, and the full API docs are linked above. You can also find reference implementations in the form of Spothole's own web-based front end, plus my other two tools built on Spothole: <a href="https://fieldspotter.radio">Field Spotter</a> and the <a href="https://qsomap.m0trt.radio">QSO Map Tool</a>.</li>
-    <li>If you want to <b>run your own version of Spothole</b> so you can customise the configuration, such as enabling sources that I disable on the main instance, you can do that too. The README contains not only advice on how to set up Spothole but how to get it auto-starting with systemd, using an nginx reverse proxy, and setting up HTTPS support with certbot.</li>
-    <li>Finally, you can of course download the source code and <b>develop Spothole to meet your needs</b>. Whether you contribute your changes back to the main repository is up to you. As usual, the README file contains some advice on the structure of the repository, and how to get started writing your own spot provider.</li></ol>
+    <p>There are a number of different ways to use Spothole, depending on what you want to do with it and your level of
+        technical skill:</p>
+    <ol>
+        <li>You can <b>use it on the web</b>, like you are (probably) doing right now. This is how most people use it,
+            to look up spots and alerts, and make interesting QSOs.
+        </li>
+        <li>If you are using an Android or iOS device, you can <b>"install" it on your device</b>. Spothole is a
+            Progressive Web App, meaning it's not delivered through app stores, but if you open the page on Chrome
+            (Android) or Safari (iOS) there will be an option in the menu to install it. It will then appear in your
+            main app menu.
+        </li>
+        <li>You can <b>embed the web interface in another website</b> to show its spots in a custom dashboard or the
+            like. The usage is explained in more detail in the <a
+                    href="https://git.ianrenton.com/ian/spothole/src/branch/main/README.md">README file</a>.
+        </li>
+        <li>You can <b>write your own client using the Spothole API</b>, using the main Spothole instance to provide
+            data, and do whatever you like with it. The README contains guidance on how to do this, and the full API
+            docs are linked above. You can also find reference implementations in the form of Spothole's own web-based
+            front end, plus my other two tools built on Spothole: <a href="https://fieldspotter.radio">Field Spotter</a>
+            and the <a href="https://qsomap.m0trt.radio">QSO Map Tool</a>.
+        </li>
+        <li>If you want to <b>run your own version of Spothole</b> so you can customise the configuration, such as
+            enabling sources that I disable on the main instance, you can do that too. The README contains not only
+            advice on how to set up Spothole but how to get it auto-starting with systemd, using an nginx reverse proxy,
+            and setting up HTTPS support with certbot.
+        </li>
+        <li>Finally, you can of course download the source code and <b>develop Spothole to meet your needs</b>. Whether
+            you contribute your changes back to the main repository is up to you. As usual, the README file contains
+            some advice on the structure of the repository, and how to get started writing your own spot provider.
+        </li>
+    </ol>
     <h2 id="faq" class="mt-4">FAQ</h2>
     <h4 class="mt-4">"Spots"? "DX Clusters"? What does any of this mean?</h4>
-    <p>This is a tool for amateur ("ham") radio users. Many amateur radio operators like to make contacts with others who are doing something more interesting than sitting in their home "shack", such as people in rarely-seen countries, remote islands, or on mountaintops. Such operators are often "spotted", i.e. when someone speaks to them, they will put the details such as their operating frequency into an online system, to let others know where to find them. A DX Cluster is one type of those systems. Most outdoor radio awards programmes, such as "Parks on the Air" (POTA) have their own websites for posting spots.</p>
-    <p>Spothole is an "aggregator" for those spots, so it checks lots of different services for data, and brings it all together in one place. So no matter what kinds of interesting spots you are looking for, you can find them here.</p>
-    <p>As well as spots, it also provides a similar feed of "alerts". This is where amateur radio users who are going to interesting places soon will announce their intentions.</p>
+    <p>This is a tool for amateur ("ham") radio users. Many amateur radio operators like to make contacts with others
+        who are doing something more interesting than sitting in their home "shack", such as people in rarely-seen
+        countries, remote islands, or on mountaintops. Such operators are often "spotted", i.e. when someone speaks to
+        them, they will put the details such as their operating frequency into an online system, to let others know
+        where to find them. A DX Cluster is one type of those systems. Most outdoor radio awards programmes, such as
+        "Parks on the Air" (POTA) have their own websites for posting spots.</p>
+    <p>Spothole is an "aggregator" for those spots, so it checks lots of different services for data, and brings it all
+        together in one place. So no matter what kinds of interesting spots you are looking for, you can find them
+        here.</p>
+    <p>As well as spots, it also provides a similar feed of "alerts". This is where amateur radio users who are going to
+        interesting places soon will announce their intentions.</p>
     <h4 class="mt-4">What are "DX", "DE" and modes?</h4>
-    <p>In amateur radio terminology, the "DX" contact is the "interesting" one that is using the frequency shown 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 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>
+    <p>Spothole can retrieve spots from: <a href="https://www.dxcluster.info/telnet/">Telnet-based DX clusters</a>, the
+        <a href="https://www.reversebeacon.net/">Reverse Beacon Network (RBN)</a>, the <a
+                href="https://www.aprs-is.net/">APRS Internet Service (APRS-IS)</a>, <a href="https://pota.app">POTA</a>,
+        <a href="https://www.sota.org.uk/">SOTA</a>, <a href="https://wwff.co/">WWFF</a>, <a
+                href="https://www.cqgma.org/">GMA</a>, <a href="https://wwbota.net/">WWBOTA</a>, <a
+                href="http://www.hema.org.uk/">HEMA</a>, <a href="https://www.parksnpeaks.org/">Parks 'n' Peaks</a>, <a
+                href="https://ontheair.nz">ZLOTA</a>, <a href="https://www.wota.org.uk/">WOTA</a>, <a
+                href="https://llota.app">LLOTA</a>, <a href="https://wwtota.com">WWTOTA</a>, <a
+                href="https://tilesontheair.com/">Tiles on the Air</a>, the <a href="https://ukpacketradio.network/">UK
+            Packet Repeater Network</a>, and any site based on the <a href="https://github.com/nischu/xOTA">xOTA
+            software by nischu</a>.</p>
+    <p>Spothole can retrieve alerts from: <a href="https://www.ng3k.com/">NG3K</a>, <a href="https://pota.app">POTA</a>,
+        <a href="https://www.sota.org.uk/">SOTA</a>, <a href="https://wwff.co/">WWFF</a>, <a
+                href="https://www.parksnpeaks.org/">Parks 'n' Peaks</a>, <a href="https://www.wota.org.uk/">WOTA</a> and
+        <a href="https://www.beachesontheair.com/">BOTA</a>.</p>
+    <p>Spothole can retrieve solar and propagation condition data from <a href="https://www.hamqsl.com">HamQSL</a>, 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>
-    <ol><li>Sources like GMA and Parks 'n' Peaks provide spots for multiple different programmes (SIGs).</li>
-    <li>Cluster spots may name SIGs in their comment, in which case the source remains the Cluster, but a SIG is assigned.</li>
-    <li>Some SIGs, such as Worked all Britain (WAB), don't have their own spotting site and can <em>only</em> be identified through comments on spots retrieved from other sources.</li>
-    <li>SIGs have well-defined names, whereas the server owner may name the sources as they see fit.</li></ol>
-    <p>Spothole's web interface exists not just for the end user, but also as a reference implementation for the API, so I have chosen to demonstrate both methods of filtering.</p>
+    <p>Mostly, but not quite. While POTA spots generally come from the POTA source and so on, there are a few
+        exceptions:</p>
+    <ol>
+        <li>Sources like GMA and Parks 'n' Peaks provide spots for multiple different programmes (SIGs).</li>
+        <li>Cluster spots may name SIGs in their comment, in which case the source remains the Cluster, but a SIG is
+            assigned.
+        </li>
+        <li>Some SIGs, such as Worked all Britain (WAB), don't have their own spotting site and can <em>only</em> be
+            identified through comments on spots retrieved from other sources.
+        </li>
+        <li>SIGs have well-defined names, whereas the server owner may name the sources as they see fit.</li>
+    </ol>
+    <p>Spothole's web interface exists not just for the end user, but also as a reference implementation for the API, so
+        I have chosen to demonstrate both methods of filtering.</p>
     <h4 class="mt-4">How is this better than DXheat, DXsummit, POTA's own website, etc?</h4>
     <p>It's probably not? But it's nice to have choice.</p>
     <p>I think it's got three key advantages over those sites:</p>
-    <ol><li>It provides a public, <a href="/apidocs">well-documented API</a> with an <a href="/apidocs/openapi.yml">OpenAPI specification</a>. Other sites don't have official APIs or don't bother documenting them publicly, because they want people to use their web page. I like Spothole's web page, but you don't have to use it&mdash;if you're a programmer, you can build your own software on Spothole's API. Spothole does the hard work of taking all the various data sources and providing a consistent, well-documented data set. You can then do the fun bit of writing your own application.</li>
-    <li>It grabs data from a lot more sources. 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>
+    <ol>
+        <li>It provides a public, <a href="/apidocs">well-documented API</a> with an <a href="/apidocs/openapi.yml">OpenAPI
+            specification</a>. Other sites don't have official APIs or don't bother documenting them publicly, because
+            they want people to use their web page. I like Spothole's web page, but you don't have to use it&mdash;if
+            you're a programmer, you can build your own software on Spothole's API. Spothole does the hard work of
+            taking all the various data sources and providing a consistent, well-documented data set. You can then do
+            the fun bit of writing your own application.
+        </li>
+        <li>It grabs data from a lot more sources. I've seen other sites that pull in DX Cluster and POTA spots
+            together, but nothing on the scale of what Spothole supports.
+        </li>
+        <li>Spothole is open source, so anyone can contribute the code to support a new data source or add new features,
+            and share them with the community.
+        </li>
+    </ol>
     <h4 class="mt-4">Why does this website ask me if I want to install it?</h4>
-    <p>Spothole is a Progressive Web App, which means you can install it on an Android or iOS device by opening the site in Chrome or Safari respectively, and clicking "Install" on the pop-up panel. It'll only prompt you once, so if you dismiss the prompt and change your mind, you'll find an Install / Add to Home Screen option on your browser's menu.</p>
-    <p>Installing Spothole on your phone is completely optional, the website works exactly the same way as the "app" does.</p>
+    <p>Spothole is a Progressive Web App, which means you can install it on an Android or iOS device by opening the site
+        in Chrome or Safari respectively, and clicking "Install" on the pop-up panel. It'll only prompt you once, so if
+        you dismiss the prompt and change your mind, you'll find an Install / Add to Home Screen option on your
+        browser's menu.</p>
+    <p>Installing Spothole on your phone is completely optional, the website works exactly the same way as the "app"
+        does.</p>
     <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>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 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>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>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>
+    <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>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 %}

templates/add_spot.html

@@ -3,8 +3,14 @@
 
 <div id="add-spot-intro-box" class="permanently-dismissible-box mt-3">
     <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.
-  <button type="button" id="add-spot-intro-box-dismiss" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        <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.
+        <button type="button" id="add-spot-intro-box-dismiss" class="btn-close" data-bs-dismiss="alert"
+                aria-label="Close"></button>
     </div>
 </div>
 
@@ -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=1781893916"></script>
-<script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></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>
 
 {% end %}

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=1781893916"></script>
-<script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script src="/js/alerts.js?v=1781901371"></script>
+<script>$(document).ready(function () {
+    $("#nav-link-alerts").addClass("active");
+}); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/api_only_home.html

@@ -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">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>
+                    <p class="card-text">This server is running <strong>Spothole v{{software_version}}</strong>, and is
+                        operated by <strong>{{server_owner_callsign}}</strong>.</p>
+                    <p class="card-text">The web UI is not available on this instance because the server is running in
+                        API-only mode, intended for use by client software rather than visitors to the website. See the
+                        <a href="/apidocs">API documentation</a> for details of how client software can interact with
+                        the server.</p>
+                    <p class="card-text">Please see the <a
+                            href="https://git.ianrenton.com/ian/spothole#readme">README</a> for details of what Spothole
+                        is and how you can run it for yourself.</p>
                 </div>
             </div>
         </div>

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=1781893916"></script>
-<script src="/js/bands.js?v=1781893916"></script>
-<script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script src="/js/spotsbandsandmap.js?v=1781901371"></script>
+<script src="/js/bands.js?v=1781901371"></script>
+<script>$(document).ready(function () {
+    $("#nav-link-bands").addClass("active");
+}); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/base.html

@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-    <link rel="stylesheet" href="/css/style.css?v=1781893916" 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/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <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="/js/utils.js?v=1781893916"></script>
-    <script src="/js/ui-ham.js?v=1781893916"></script>
-    <script src="/js/geo.js?v=1781893916"></script>
-    <script src="/js/common.js?v=1781893916"></script>
+<script src="/js/utils.js?v=1781901371"></script>
+<script src="/js/ui-ham.js?v=1781901371"></script>
+<script src="/js/geo.js?v=1781901371"></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"
+                    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="/map" class="nav-link" id="nav-link-map"><i class="fa-solid fa-map"></i> Map</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="/alerts" class="nav-link" id="nav-link-alerts"><i class="fa-solid fa-clock"></i> Upcoming</a></li>
+                    <li class="nav-item ms-4"><a href="/" class="nav-link" id="nav-link-spots"><i
+                            class="fa-solid fa-tower-cell"></i> Spots</a></li>
+                    <li class="nav-item ms-4"><a href="/map" class="nav-link" id="nav-link-map"><i
+                            class="fa-solid fa-map"></i> Map</a></li>
+                    <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="/alerts" class="nav-link" id="nav-link-alerts"><i
+                            class="fa-solid fa-clock"></i> Upcoming</a></li>
                     {% if allow_spotting %}
-                    <li class="nav-item ms-4"><a href="/add-spot" class="nav-link" id="nav-link-add-spot"><i class="fa-solid fa-comment"></i> Add&nbsp;Spot</a></li>
+                    <li class="nav-item ms-4"><a href="/add-spot" class="nav-link" id="nav-link-add-spot"><i
+                            class="fa-solid fa-comment"></i> Add&nbsp;Spot</a></li>
                     {% end %}
-                    <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>
+                    <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>
@@ -51,8 +62,11 @@
 
     <div id="footer" class="hideonmobile hideonmap">
         <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
-            <p class="col-md-4 mb-0 text-body-secondary">Made with love by <a href="https://ianrenton.com" class="text-body-secondary">Ian, MØTRT</a> and other contributors.</p>
-            <p class="col-md-4 mb-0 justify-content-center text-body-secondary text-center">Spothole v{{software_version}}</p>
+            <p class="col-md-4 mb-0 text-body-secondary">Made with love by <a href="https://ianrenton.com"
+                                                                              class="text-body-secondary">Ian, MØTRT</a>
+                and other contributors.</p>
+            <p class="col-md-4 mb-0 justify-content-center text-body-secondary 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 %}

templates/cards/audio.html

@@ -3,7 +3,8 @@
         <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"
+                       value="pingOnNewSpots" oninput="saveSettings();">
                 <label class="form-check-label" for="pingOnNewSpots">Ping on new spots</label>
             </div>
         </div>

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>

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>

templates/cards/location.html

@@ -3,7 +3,8 @@
         <h5 class="card-title">Location</h5>
         <div class="form-group spothole-card-text">
             <label for="userGrid">Your grid:</label>
-                <input type="text" class="storeable-text form-control" id="userGrid" placeholder="AA00aa" oninput="userGridUpdated();" style="width: 10em; display: inline-block;">
+            <input type="text" class="storeable-text form-control" id="userGrid" placeholder="AA00aa"
+                   oninput="userGridUpdated();" style="width: 10em; display: inline-block;">
         </div>
     </div>
 </div>

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

templates/cards/number-of-alerts.html

@@ -2,9 +2,11 @@
     <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();"
+                    style="width: 5em;display: inline-block;">
                 {% for c in web_ui_options["alert-count"] %}
-                <option value="{{c}}" {% if web_ui_options["alert-count-default"] == c %}selected{% end %}>{{c}}</option>
+                <option value="{{c}}" {% if web_ui_options[
+                "alert-count-default"] == c %}selected{% end %}>{{c}}</option>
                 {% end %}
             </select>
             alerts

templates/cards/number-of-spots.html

@@ -2,9 +2,11 @@
     <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"
+                    oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
                 {% for c in web_ui_options["spot-count"] %}
-                <option value="{{c}}" {% if web_ui_options["spot-count-default"] == c %}selected{% end %}>{{c}}</option>
+                <option value="{{c}}" {% if web_ui_options[
+                "spot-count-default"] == c %}selected{% end %}>{{c}}</option>
                 {% end %}
             </select>
             spots

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>

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

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">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowStartTime" value="tableShowStartTime" oninput="columnsUpdated();" checked>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowStartTime"
+                           value="tableShowStartTime" oninput="columnsUpdated();" checked>
                     <label class="form-check-label" for="tableShowStartTime">Start Time</label>
-            </div></div>
-            <div class="col"><div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowEndTime" value="tableShowEndTime" oninput="columnsUpdated();" checked>
+                </div>
+            </div>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowEndTime"
+                           value="tableShowEndTime" oninput="columnsUpdated();" checked>
                     <label class="form-check-label" for="tableShowEndTime">End Time</label>
-            </div></div>
-            <div class="col"><div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDX" value="tableShowDX" oninput="columnsUpdated();" checked>
+                </div>
+            </div>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDX"
+                           value="tableShowDX" oninput="columnsUpdated();" checked>
                     <label class="form-check-label" for="tableShowDX">DX</label>
-            </div></div>
-            <div class="col"><div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowFreqsModes" value="tableShowFreqsModes" oninput="columnsUpdated();" checked>
+                </div>
+            </div>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowFreqsModes"
+                           value="tableShowFreqsModes" oninput="columnsUpdated();" checked>
                     <label class="form-check-label" for="tableShowFreqsModes">Freq &amp; Mode</label>
-            </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>
+                </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>
+                </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>
+                </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>
     </div>
 </div>

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">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowTime" value="tableShowTime" oninput="columnsUpdated();" checked>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowTime"
+                           value="tableShowTime" oninput="columnsUpdated();" checked>
                     <label class="form-check-label" for="tableShowTime">Time</label>
-            </div></div>
-            <div class="col"><div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDX" value="tableShowDX" oninput="columnsUpdated();" checked>
+                </div>
+            </div>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowDX"
+                           value="tableShowDX" oninput="columnsUpdated();" checked>
                     <label class="form-check-label" for="tableShowDX">DX</label>
-            </div></div>
-            <div class="col"><div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowFreq" value="tableShowFreq" oninput="columnsUpdated();" checked>
+                </div>
+            </div>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowFreq"
+                           value="tableShowFreq" oninput="columnsUpdated();" checked>
                     <label class="form-check-label" for="tableShowFreq">Frequency</label>
-            </div></div>
-            <div class="col"><div class="form-check">
-                <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowMode" value="tableShowMode" oninput="columnsUpdated();" checked>
+                </div>
+            </div>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowMode"
+                           value="tableShowMode" oninput="columnsUpdated();" checked>
                     <label class="form-check-label" for="tableShowMode">Mode</label>
-            </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>
+                </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="tableShowBearing" value="tableShowBearing" oninput="columnsUpdated();">
+                </div>
+            </div>
+            <div class="col">
+                <div class="form-check">
+                    <input class="form-check-input storeable-checkbox" type="checkbox" id="tableShowBearing"
+                           value="tableShowBearing" oninput="columnsUpdated();">
                     <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>
+                </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>
+                </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>
+                </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>
+                </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>
     </div>
 </div>

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>

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=1781893916"></script>
+<script src="/js/conditions.js?v=1781901371"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/map.html

@@ -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=1781893916"></script>
-<script src="/js/map.js?v=1781893916"></script>
-<script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script src="/js/spotsbandsandmap.js?v=1781901371"></script>
+<script src="/js/map.js?v=1781901371"></script>
+<script>$(document).ready(function () {
+    $("#nav-link-map").addClass("active");
+}); <!-- highlight active page in nav --></script>
 
 {% end %}

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 property="og: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"
+          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"/>

templates/spots.html

@@ -3,8 +3,14 @@
 
 <div id="intro-box" class="permanently-dismissible-box mt-3">
     <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.
-  <button type="button" id="intro-box-dismiss" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        <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.
+        <button type="button" id="intro-box-dismiss" class="btn-close" data-bs-dismiss="alert"
+                aria-label="Close"></button>
     </div>
 </div>
 
@@ -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=1781893916"></script>
-<script src="/js/spots.js?v=1781893916"></script>
-<script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>
+<script src="/js/spotsbandsandmap.js?v=1781901371"></script>
+<script src="/js/spots.js?v=1781901371"></script>
+<script>$(document).ready(function () {
+    $("#nav-link-spots").addClass("active");
+}); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/status.html

@@ -59,9 +59,11 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1781893916"></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 %}

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;">
-    <option value="PSK Reporter" {% if web_ui_options["band-color-scheme-default"] == "PSK Reporter" %}selected{% end %}>PSK Reporter</option>
-    <option value="PSK Reporter (Adjusted)" {% if web_ui_options["band-color-scheme-default"] == "PSK Reporter (Adjusted)" %}selected{% end %}>PSK Reporter (Adjusted)</option>
-    <option value="RBN" {% if web_ui_options["band-color-scheme-default"] == "RBN" %}selected{% end %}>RBN</option>
-    <option value="Ham Rainbow" {% if web_ui_options["band-color-scheme-default"] == "Ham Rainbow" %}selected{% end %}>Ham Rainbow</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 id="band-color-scheme" class="storeable-select form-select d-inline-block" oninput="setBandColorSchemeFromUI();"
+        style="display: inline-block;">
+    <option value="PSK Reporter" {% if web_ui_options[
+    "band-color-scheme-default"] == "PSK Reporter" %}selected{% end %}>PSK Reporter</option>
+    <option value="PSK Reporter (Adjusted)" {% if web_ui_options[
+    "band-color-scheme-default"] == "PSK Reporter (Adjusted)" %}selected{% end %}>PSK Reporter (Adjusted)</option>
+    <option value="RBN" {% if web_ui_options[
+    "band-color-scheme-default"] == "RBN" %}selected{% end %}>RBN</option>
+    <option value="Ham Rainbow" {% if web_ui_options[
+    "band-color-scheme-default"] == "Ham Rainbow" %}selected{% end %}>Ham Rainbow</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>

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;">
-    <option value="auto" {% if web_ui_options["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 id="color-scheme" class="storeable-select form-select d-inline-block" oninput="setColorSchemeFromUI();"
+        style="display: inline-block;">
+    <option value="auto" {% if web_ui_options[
+    "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>

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>

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>

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>

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="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>
+    <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="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>

webassets/css/style.css

@@ -3,6 +3,7 @@
 .navbar-nav .nav-link.active {
     font-weight: bold;
 }
+
 .navbar-nav .nav-link i {
     margin-right: 0.2em;
 }
@@ -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;
@@ -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,6 +175,7 @@ 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;
 }
@@ -179,6 +184,7 @@ tr.table-faded td span {
 tr.new td {
     animation: 2s linear newspotanim;
 }
+
 @keyframes newspotanim {
     0% {
         background-color: var(--bs-success-border-subtle);
@@ -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;
     }

webassets/js/bands.js

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

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();

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;
 }
 

webassets/js/utils.js

@@ -11,13 +11,20 @@ function escapeHtml(str) {
 
     const escapeCharacter = (match) => {
         switch (match) {
-            case '&': return '&';
-            case '<': return '&lt;';
-            case '>': return '&gt;';
-            case '"': return '&quot;';
-            case '\'': return '&#039;';
-            case '`': return '&#096;';
-            default: return match;
+            case '&':
+                return '&amp;';
+            case '<':
+                return '&lt;';
+            case '>':
+                return '&gt;';
+            case '"':
+                return '&quot;';
+            case '\'':
+                return '&#039;';
+            case '`':
+                return '&#096;';
+            default:
+                return match;
         }
     };