Ensure "RTT" as a mode is understood as "RTTY" and similar.

alertproviders/sota.py

@@ -20,13 +20,18 @@ class SOTA(HTTPAlertProvider):
         # Iterate through source data
         for source_alert in http_response.json():
             # Convert to our alert format
+            details = source_alert["summitDetails"].split(", ")
+            summit_name = details[0]
+            summit_points = None
+            if len(details) > 2:
+                summit_points = int(details[-1].split(" ")[0])
             alert = Alert(source=self.name,
                           source_id=source_alert["id"],
                           dx_calls=[source_alert["activatingCallsign"].upper()],
                           dx_names=[source_alert["activatorName"].upper()],
                           freqs_modes=source_alert["frequency"],
                           comment=source_alert["comments"],
-                          sig_refs=[SIGRef(id=source_alert["associationCode"] + "/" + source_alert["summitCode"], sig="SOTA", name=source_alert["summitDetails"])],
+                          sig_refs=[SIGRef(id=source_alert["associationCode"] + "/" + source_alert["summitCode"], sig="SOTA", name=summit_name, activation_score=summit_points)],
                           start_time=datetime.strptime(source_alert["dateActivated"],
                                                        "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=pytz.UTC).timestamp(),
                           is_dxpedition=False)

config-example.yml

@@ -59,28 +59,53 @@ spot-providers:
     enabled: true
     host: "hrd.wa9pie.net"
     port: 8000
+    # Prompt the cluster node gives when asking for a callsign to log in. Varies between cluster node software.
     login_prompt: "login:"
+    # Callsign Spothole will use to log into this cluster. Ensure the SSID (e.g. -99) is different to any personal
+    # connection you might make to this cluster node.
+    login_callsign: "N0CALL-99"
+    # Whether to allow RBN spots that come via this cluster. If you don't want RBN spots or you are making a separate
+    # connection to RBN directly, leave this as False. If you want RBN spots from this cluster, set this to True. (Make
+    # sure you aren't also separately connecting to RBN directly, otherwise you may get duplicate spots.) Note that not
+    # all clusters sent RBN spots anyway.
+    allow_rbn_spots: false
   -
     class: "DXCluster"
     name: "W3LPL Cluster"
     enabled: false
     host: "w3lpl.net"
     port: 7373
+    # Prompt the cluster node gives when asking for a callsign to log in. Varies between cluster node software.
     login_prompt: "Please enter your call:"
+    # Callsign Spothole will use to log into this cluster. Ensure the SSID (e.g. -99) is different to any personal
+    # connection you might make to this cluster node.
+    login_callsign: "N0CALL-99"
+    # Whether to allow RBN spots that come via this cluster. If you don't want RBN spots or you are making a separate
+    # connection to RBN directly, leave this as False. If you want RBN spots from this cluster, set this to True. (Make
+    # sure you aren't also separately connecting to RBN directly, otherwise you may get duplicate spots.) Note that not
+    # all clusters sent RBN spots anyway.
+    allow_rbn_spots: false
   -
     class: "RBN"
     name: "RBN CW/RTTY"
     enabled: false
     port: 7000
+    # This setting doesn't affect the spot provider itself, or anything in the back-end of Spothole, just the web UI.
+    # By default spots from all enabled providers will be shown in the web UI. However, you might want RBN data to be
+    # received by Spothole but not shown on the web UI unless the user explicitly turns it on. For that behaviour,
+    # set enabled to true, but enabled-by-default-in-web-ui to false.
+    enabled-by-default-in-web-ui: false
   -
     class: "RBN"
     name: "RBN FT8"
     enabled: false
     port: 7001
+    enabled-by-default-in-web-ui: false
   -
     class: "UKPacketNet"
     name: "UK Packet Radio Net"
     enabled: false
+    enabled-by-default-in-web-ui: false
   -
     class: "XOTA"
     name: "39C3 TOTA"

core/config.py

@@ -5,7 +5,8 @@ import yaml
 
 # Check you have a config file
 if not os.path.isfile("config.yml"):
-    logging.error("Your config file is missing. Ensure you have copied config-example.yml to config.yml and updated it according to your needs.")
+    logging.error(
+        "Your config file is missing. Ensure you have copied config-example.yml to config.yml and updated it according to your needs.")
     exit()
 
 # Load config
@@ -18,3 +19,8 @@ SERVER_OWNER_CALLSIGN = config["server-owner-callsign"]
 WEB_SERVER_PORT = config["web-server-port"]
 ALLOW_SPOTTING = config["allow-spotting"]
 WEB_UI_OPTIONS = config["web-ui-options"]
+
+# For ease of config, each spot provider owns its own config about whether it should be enabled by default in the web UI
+# but for consistency we provide this to the front-end in web-ui-options because it has no impact outside of the web UI.
+WEB_UI_OPTIONS["spot-providers-enabled-by-default"] = [p["name"] for p in config["spot-providers"] if p["enabled"] and (
+            "enabled-by-default-in-web-ui" not in p or p["enabled-by-default-in-web-ui"] == True)]

core/constants.py

@@ -4,7 +4,7 @@ from data.sig import SIG
 
 # General software
 SOFTWARE_NAME = "Spothole by M0TRT"
-SOFTWARE_VERSION = "1.1-pre"
+SOFTWARE_VERSION = "1.1.1"
 
 # HTTP headers used for spot providers that use HTTP
 HTTP_HEADERS = {"User-Agent": SOFTWARE_NAME + ", v" + SOFTWARE_VERSION + " (operated by " + SERVER_OWNER_CALLSIGN + ")"}
@@ -36,10 +36,25 @@ SIGS = [
 # Modes. Note "DIGI" and "DIGITAL" are also supported but are normalised into "DATA".
 CW_MODES = ["CW"]
 PHONE_MODES = ["PHONE", "SSB", "USB", "LSB", "AM", "FM", "DV", "DMR", "DSTAR", "C4FM", "M17"]
-DATA_MODES = ["DATA", "FT8", "FT4", "RTTY", "SSTV", "JS8", "HELL", "BPSK", "PSK", "PSK31", "BPSK31", "OLIVIA", "MFSK", "MFSK32", "PKT", "MSK144"]
+DATA_MODES = ["DATA", "FT8", "FT4", "RTTY", "SSTV", "JS8", "HELL", "PSK", "OLIVIA", "PKT", "MSK144"]
 ALL_MODES = CW_MODES + PHONE_MODES + DATA_MODES
 MODE_TYPES = ["CW", "PHONE", "DATA"]
 
+# Mode aliases. Sometimes we get spots with a mode described in a different way that is effectively the same as a mode
+# we already know, or we want to normalise things for consistency. The lookup table for this is here. Incoming spots
+# that match a key in this table will be converted to the corresponding value, so only the modes above will actually be
+# present in the spots.
+MODE_ALIASES = {
+    "RTT": "RTTY",
+    "BPSK": "PSK",
+    "PSK31": "PSK",
+    "BPSK31": "PSK",
+    "MFSK": "FSK",
+    "MFSK32": "FSK",
+    "DIGI": "DATA",
+    "DIGITAL": "DATA"
+}
+
 # Band definitions
 BANDS = [
     Band(name="2200m", start_freq=135700, end_freq=137800),
@@ -62,7 +77,7 @@ BANDS = [
     Band(name="1.25m", start_freq=219000000, end_freq=225000000),
     Band(name="70cm", start_freq=420000000, end_freq=450000000),
     Band(name="23cm", start_freq=1240000000, end_freq=1325000000),
-    Band(name="2.4GHz", start_freq=2300000000, end_freq=2450000000),
+    Band(name="13cm", start_freq=2300000000, end_freq=2450000000),
     Band(name="5.8GHz", start_freq=5725000000, end_freq=5850000000),
     Band(name="10GHz", start_freq=10000000000, end_freq=10500000000),
     Band(name="24GHz", start_freq=24000000000, end_freq=24050000000),

core/lookup_helper.py

@@ -16,7 +16,7 @@ from requests_cache import CachedSession
 from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.config import config
 from core.constants import BANDS, UNKNOWN_BAND, CW_MODES, PHONE_MODES, DATA_MODES, ALL_MODES, \
-    HTTP_HEADERS, HAMQTH_PRG
+    HTTP_HEADERS, HAMQTH_PRG, MODE_ALIASES
 
 
 # Singleton class that provides lookup functionality.
@@ -160,6 +160,9 @@ class LookupHelper:
         for mode in ALL_MODES:
             if mode in comment.upper():
                 return mode
+        for mode in MODE_ALIASES.keys():
+            if mode in comment.upper():
+                return MODE_ALIASES[mode]
         return None
 
     # Infer a "mode family" from a mode.

core/sig_utils.py

@@ -46,6 +46,7 @@ def populate_sig_ref_info(sig_ref):
                 sig_ref.grid = data["locator"] if "locator" in data else None
                 sig_ref.latitude = data["latitude"] if "latitude" in data else None
                 sig_ref.longitude = data["longitude"] if "longitude" in data else None
+                sig_ref.activation_score = data["points"] if "points" in data else None
         elif sig.upper() == "WWBOTA":
             data = SEMI_STATIC_URL_DATA_CACHE.get("https://api.wwbota.org/bunkers/" + ref_id,
                                                   headers=HTTP_HEADERS).json()

data/alert.py

@@ -53,8 +53,6 @@ class Alert:
     sig: str = None
     # SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
     sig_refs: list = None
-    # Activation score. SOTA only
-    activation_score: int = 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"...

data/sig_ref.py

@@ -18,3 +18,5 @@ class SIGRef:
     longitude: float = None
     # Maidenhead grid reference of the reference, if known.
     grid: str = None
+    # Activation score. SOTA only
+    activation_score: int = None

data/spot.py

@@ -10,6 +10,7 @@ import pytz
 from pyhamtools.locator import locator_to_latlong, latlong_to_locator
 
 from core.config import MAX_SPOT_AGE
+from core.constants import MODE_ALIASES
 from core.lookup_helper import lookup_helper
 from core.sig_utils import populate_sig_ref_info, ANY_SIG_REGEX, get_ref_regex_for_sig
 from data.sig_ref import SIGRef
@@ -106,8 +107,6 @@ class Spot:
     sig: str = None
     # SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
     sig_refs: list = None
-    # Activation score. SOTA only
-    activation_score: int = None
 
     # Timing info
 
@@ -215,17 +214,16 @@ class Spot:
             self.mode = lookup_helper.infer_mode_from_frequency(self.freq)
             self.mode_source = "BANDPLAN"
 
-        # Normalise "generic digital" modes. "DIGITAL", "DIGI" and "DATA" are just the same thing with no extra
+        # Normalise mode if necessary.
-        # information, so standardise on "DATA"
+        if self.mode in MODE_ALIASES:
-        if self.mode == "DIGI" or self.mode == "DIGITAL":
+            self.mode = MODE_ALIASES[self.mode]
-            self.mode = "DATA"
 
         # Mode type from mode
         if self.mode and not self.mode_type:
             self.mode_type = lookup_helper.infer_mode_type_from_mode(self.mode)
 
-        # If we have a latitude at this point, it can only have been provided by the spot itself
+        # If we have a latitude or grid at this point, it can only have been provided by the spot itself
-        if self.dx_latitude:
+        if self.dx_latitude or self.dx_grid:
             self.dx_location_source = "SPOT"
 
         # Set the top-level "SIG" if it is missing but we have at least one SIG ref.

server/handlers/api/options.py

@@ -40,6 +40,7 @@ class APIOptionsHandler(tornado.web.RequestHandler):
         # one of our proviers.
         if ALLOW_SPOTTING:
             options["spot_sources"].append("API")
+            options["web-ui-options"]["spot-providers-enabled-by-default"].append("API")
 
         self.write(json.dumps(options, default=serialize_everything))
         self.set_status(200)

spotproviders/dxcluster.py

@@ -12,22 +12,27 @@ from data.spot import Spot
 from spotproviders.spot_provider import SpotProvider
 
 
-# Spot provider for a DX Cluster. Hostname port and login_prompt provided as parameters.
+# Spot provider for a DX Cluster. Hostname, port, login_prompt, login_callsign and allow_rbn_spots are provided in config.
+# See config-example.yml for examples.
 class DXCluster(SpotProvider):
-    # Note the callsign pattern deliberately excludes calls ending in "-#", which are from RBN and can be enabled by
-    # default on some clusters. If you want RBN spots, there is a separate provider for that.
     CALLSIGN_PATTERN = "([a-z|0-9|/]+)"
     FREQUENCY_PATTERN = "([0-9|.]+)"
-    LINE_PATTERN = re.compile(
+    LINE_PATTERN_EXCLUDE_RBN = re.compile(
         "^DX de " + CALLSIGN_PATTERN + ":\\s+" + FREQUENCY_PATTERN + "\\s+" + CALLSIGN_PATTERN + "\\s+(.*)\\s+(\\d{4}Z)",
         re.IGNORECASE)
+    LINE_PATTERN_ALLOW_RBN = re.compile(
+        "^DX de " + CALLSIGN_PATTERN + "-?#?:\\s+" + FREQUENCY_PATTERN + "\\s+" + CALLSIGN_PATTERN + "\\s+(.*)\\s+(\\d{4}Z)",
+        re.IGNORECASE)
 
     # Constructor requires hostname and port
     def __init__(self, provider_config):
         super().__init__(provider_config)
         self.hostname = provider_config["host"]
         self.port = provider_config["port"]
-        self.login_prompt = provider_config["login_prompt"]
+        self.login_prompt = provider_config["login_prompt"] if "login_prompt" in provider_config else "login:"
+        self.login_callsign = provider_config["login_callsign"] if "login_callsign" in provider_config else SERVER_OWNER_CALLSIGN
+        self.allow_rbn_spots = provider_config["allow_rbn_spots"] if "allow_rbn_spots" in provider_config else False
+        self.spot_line_pattern = self.LINE_PATTERN_ALLOW_RBN if self.allow_rbn_spots else self.LINE_PATTERN_EXCLUDE_RBN
         self.telnet = None
         self.thread = Thread(target=self.handle)
         self.thread.daemon = True
@@ -50,7 +55,7 @@ class DXCluster(SpotProvider):
                     logging.info("DX Cluster " + self.hostname + " connecting...")
                     self.telnet = telnetlib3.Telnet(self.hostname, self.port)
                     self.telnet.read_until(self.login_prompt.encode("latin-1"))
-                    self.telnet.write((SERVER_OWNER_CALLSIGN + "\n").encode("latin-1"))
+                    self.telnet.write((self.login_callsign + "\n").encode("latin-1"))
                     connected = True
                     logging.info("DX Cluster " + self.hostname + " connected.")
                 except Exception as e:
@@ -63,7 +68,7 @@ class DXCluster(SpotProvider):
                 try:
                     # Check new telnet info against regular expression
                     telnet_output = self.telnet.read_until("\n".encode("latin-1"))
-                    match = self.LINE_PATTERN.match(telnet_output.decode("latin-1"))
+                    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.today(), spot_time.time()).replace(tzinfo=pytz.UTC)

spotproviders/sota.py

@@ -45,9 +45,8 @@ class SOTA(HTTPSpotProvider):
                             mode=source_spot["mode"].upper(),
                             comment=source_spot["comments"],
                             sig="SOTA",
-                            sig_refs=[SIGRef(id=source_spot["summitCode"], sig="SOTA", name=source_spot["summitName"])],
+                            sig_refs=[SIGRef(id=source_spot["summitCode"], sig="SOTA", name=source_spot["summitName"], activation_score=source_spot["points"])],
-                            time=datetime.fromisoformat(source_spot["timeStamp"]).timestamp(),
+                            time=datetime.fromisoformat(source_spot["timeStamp"].replace("Z", "+00:00")).timestamp())
-                            activation_score=source_spot["points"])
 
                 # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
                 # that for us.

spotproviders/wwbota.py

@@ -30,7 +30,7 @@ class WWBOTA(SSESpotProvider):
                     comment=source_spot["comment"],
                     sig="WWBOTA",
                     sig_refs=refs,
-                    time=datetime.fromisoformat(source_spot["time"]).timestamp(),
+                    time=datetime.fromisoformat(source_spot["time"].replace("Z", "+00:00")).timestamp(),
                     # WWBOTA spots can contain multiple references for bunkers being activated simultaneously. For
                     # now, we will just pick the first one to use as our grid, latitude and longitude.
                     dx_grid=source_spot["references"][0]["locator"],

spotproviders/zlota.py

@@ -35,7 +35,7 @@ class ZLOTA(HTTPSpotProvider):
                         comment=source_spot["comments"],
                         sig="ZLOTA",
                         sig_refs=[SIGRef(id=source_spot["reference"], sig="ZLOTA", name=source_spot["name"])],
-                        time=datetime.fromisoformat(source_spot["referenced_time"]).astimezone(pytz.UTC).timestamp())
+                        time=datetime.fromisoformat(source_spot["referenced_time"].replace("Z", "+00:00")).astimezone(pytz.UTC).timestamp())
 
             new_spots.append(spot)
         return new_spots

templates/about.html

@@ -63,11 +63,7 @@
     <p>This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.</p>
 </div>
 
-<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/common.js?v=6"></script>
-<script src="/js/tools/storage.js?v=5"></script>
-<script src="/js/tools/ui-ham.js?v=5"></script>
-<script src="/js/tools/geo.js?v=5"></script>
-<script src="/js/common.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/add_spot.html

@@ -69,12 +69,8 @@
 
 </div>
 
-<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/common.js?v=6"></script>
-<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/add-spot.js?v=6"></script>
-<script src="/js/tools/ui-ham.js?v=5"></script>
-<script src="/js/tools/geo.js?v=5"></script>
-<script src="/js/common.js?v=5"></script>
-<script src="/js/add-spot.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/alerts.html

@@ -168,12 +168,8 @@
 
 </div>
 
-<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/common.js?v=6"></script>
-<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/alerts.js?v=6"></script>
-<script src="/js/tools/ui-ham.js?v=5"></script>
-<script src="/js/tools/geo.js?v=5"></script>
-<script src="/js/common.js?v=5"></script>
-<script src="/js/alerts.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/bands.html

@@ -134,13 +134,9 @@
 
 </div>
 
-<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/common.js?v=6"></script>
-<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/spotsbandsandmap.js?v=6"></script>
-<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/bands.js?v=6"></script>
-<script src="/js/tools/geo.js?v=5"></script>
-<script src="/js/common.js?v=5"></script>
-<script src="/js/spotsbandsandmap.js?v=5"></script>
-<script src="/js/bands.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/base.html

@@ -46,6 +46,11 @@
             crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js"></script>
 
+    <script src="https://misc.ianrenton.com/jsutils/utils.js?v=6"></script>
+    <script src="https://misc.ianrenton.com/jsutils/storage.js?v=6"></script>
+    <script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=6"></script>
+    <script src="https://misc.ianrenton.com/jsutils/geo.js?v=6"></script>
+
 </head>
 <body>
 <div class="container">

templates/map.html

@@ -152,13 +152,9 @@
 <script src="https://cdn.jsdelivr.net/npm/leaflet.geodesic"></script>
 <script src="https://cdn.jsdelivr.net/npm/@joergdietrich/leaflet.terminator@1.1.0/L.Terminator.min.js"></script>
 
-<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/common.js?v=6"></script>
-<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/spotsbandsandmap.js?v=6"></script>
-<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/map.js?v=6"></script>
-<script src="/js/tools/geo.js?v=5"></script>
-<script src="/js/common.js?v=5"></script>
-<script src="/js/spotsbandsandmap.js?v=5"></script>
-<script src="/js/map.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/spots.html

@@ -223,13 +223,9 @@
 
 </div>
 
-<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/common.js?v=6"></script>
-<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/spotsbandsandmap.js?v=6"></script>
-<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/spots.js?v=6"></script>
-<script src="/js/tools/geo.js?v=5"></script>
-<script src="/js/common.js?v=5"></script>
-<script src="/js/spotsbandsandmap.js?v=5"></script>
-<script src="/js/spots.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

templates/status.html

@@ -3,12 +3,8 @@
 
 <div id="status-container" class="row row-cols-1 row-cols-md-4 g-4 mt-4"></div>
 
-<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/common.js?v=6"></script>
-<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/status.js?v=6"></script>
-<script src="/js/tools/ui-ham.js?v=5"></script>
-<script src="/js/tools/geo.js?v=5"></script>
-<script src="/js/common.js?v=5"></script>
-<script src="/js/status.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}

webassets/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

webassets/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

webassets/apidocs/openapi.yml

@@ -1,4 +1,4 @@
-openapi: 3.0.4
+openapi: 3.1.0
 info:
   title: Spothole API
   description: |-
@@ -9,12 +9,20 @@ info:
     The API calls described below allow third-party software to access data from Spothole, and receive data on spots and alerts in a consistent format regardless of the data sources used by Spothole itself. Utility calls are also provided for general data lookups.
     
     Please note that the data coming out of Spothole is only as good as the data going in. People mis-hear and make typos when spotting callsigns all the time, and there are plenty of areas where Spothole's location data may be inaccurate. If you are doing something where accuracy is important, such as contesting, you should not rely on Spothole's data to fill in any gaps in your log.
+    
+    ## Changelog
+    
+    ### 1.1
+    
+    * Added Server-Sent Event API endpoints for spots and alerts.
+    * Removed band colour and icon information from spots.
+    * Moved activation_score from top-level in Spot and Alert to be part of the SIGRef
   contact:
     email: ian@ianrenton.com
   license:
     name: The Unlicense
     url: https://unlicense.org/#the-unlicense
-  version: v1
+  version: v1.1
 servers:
   - url: https://spothole.app/api/v1
 paths:
@@ -549,6 +557,12 @@ paths:
                         type: integer
                         example: 30
                         description: The suggested default "maximum spot age" that the web UI should retrieve from the API
+                      spot-providers-enabled-by-default:
+                        type: array
+                        description: A list of the spot providers that should be enabled in the web UI on first load, if the user hasn't already got a localStorage setting that sets their preference. This is to allow some high-volume providers like RBN to be enabled in Spothole's back-end and displayable in the web UI if the user wants, but by default the experience will not include them.
+                        items:
+                          type: string
+                          example: "POTA"
                       alert-count:
                         type: array
                         description: An array of suggested "alert counts" that the web UI can retrieve from the API
@@ -858,12 +872,9 @@ components:
         - SSTV
         - JS8
         - HELL
-        - BPSK
-        - PSK
-        - BPSK31
         - OLIVIA
-        - MFSK
+        - PSK
-        - MFSK32
+        - FSK
         - PKT
         - MSK144
     example: SSB
@@ -934,6 +945,10 @@ components:
           type: number
           description: Longitude of the reference, in degrees, if known.
           example: -1.2345
+        activation_score:
+          type: integer
+          description: Activation score. SOTA only
+          example: 0
 
     Spot:
       type: object
@@ -1080,10 +1095,6 @@ components:
           items:
             $ref: '#/components/schemas/SIGRef'
           description: SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
-        activation_score:
-          type: integer
-          description: Activation score. SOTA only
-          example: 0
         qrt:
           type: boolean
           description: QRT state. Some APIs return spots marked as QRT. Otherwise we can check the comments.
@@ -1188,10 +1199,6 @@ components:
           items:
             $ref: '#/components/schemas/SIGRef'
           description: SIG references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO
-        activation_score:
-          type: integer
-          description: Activation score. SOTA only
-          example: 0
         source:
           type: string
           description: Where we got the alert from.

webassets/js/bands.js

@@ -252,7 +252,7 @@ function loadOptions() {
         generateMultiToggleFilterCard("#dx-continent-options", "dx_continent", options["continents"]);
         generateMultiToggleFilterCard("#de-continent-options", "de_continent", options["continents"]);
         generateMultiToggleFilterCard("#mode-options", "mode_type", options["mode_types"]);
-        generateMultiToggleFilterCard("#source-options", "source", options["spot_sources"]);
+        generateSourcesMultiToggleFilterCard(options["spot_sources"], options["web-ui-options"]["spot-providers-enabled-by-default"]);
 
         // Load URL params. These may select things from the various filter & display options, so the function needs
         // to be called after these are set up, but if the URL params ask for "embedded mode", this will suppress

webassets/js/map.js

@@ -184,7 +184,7 @@ function loadOptions() {
         generateMultiToggleFilterCard("#dx-continent-options", "dx_continent", options["continents"]);
         generateMultiToggleFilterCard("#de-continent-options", "de_continent", options["continents"]);
         generateMultiToggleFilterCard("#mode-options", "mode_type", options["mode_types"]);
-        generateMultiToggleFilterCard("#source-options", "source", options["spot_sources"]);
+        generateSourcesMultiToggleFilterCard(options["spot_sources"], options["web-ui-options"]["spot-providers-enabled-by-default"]);
 
         // Load URL params. These may select things from the various filter & display options, so the function needs
         // to be called after these are set up, but if the URL params ask for "embedded mode", this will suppress

webassets/js/spots.js

@@ -422,7 +422,7 @@ function loadOptions() {
         generateMultiToggleFilterCard("#dx-continent-options", "dx_continent", options["continents"]);
         generateMultiToggleFilterCard("#de-continent-options", "de_continent", options["continents"]);
         generateMultiToggleFilterCard("#mode-options", "mode_type", options["mode_types"]);
-        generateMultiToggleFilterCard("#source-options", "source", options["spot_sources"]);
+        generateSourcesMultiToggleFilterCard(options["spot_sources"], options["web-ui-options"]["spot-providers-enabled-by-default"]);
 
         // Load URL params. These may select things from the various filter & display options, so the function needs
         // to be called after these are set up, but if the URL params ask for "embedded mode", this will suppress

webassets/js/spotsbandsandmap.js

@@ -6,10 +6,9 @@ var spots = []
 function addBandToggleColourCSS(band_options) {
     var $style = $('<style>');
     band_options.forEach(o => {
-        // CSS doesn't like IDs with decimal points in, so we need to replace that
+        var domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
-        var cssFormattedBandName = o['name'] ? o['name'].replace('.', 'p') : "unknown";
+        $style.append(`#filter-button-label-band-${domSafeName} { border-color: ${bandToColor(o['name'])}; color: var(--bs-primary);}`);
-        $style.append(`#filter-button-label-band-${cssFormattedBandName} { border-color: ${bandToColor(o['name'])}; color: var(--bs-primary);}`);
+        $style.append(`.btn-check:checked + #filter-button-label-band-${domSafeName} { background-color: ${bandToColor(o['name'])}; color: ${bandToContrastColor(o['name'])};}`);
-        $style.append(`.btn-check:checked + #filter-button-label-band-${cssFormattedBandName} { background-color: ${bandToColor(o['name'])}; color: ${bandToContrastColor(o['name'])};}`);
     });
     $('html > head').append($style);
 }
@@ -18,10 +17,8 @@ function addBandToggleColourCSS(band_options) {
 function generateBandsMultiToggleFilterCard(band_options) {
     // Create a button for each option
     band_options.forEach(o => {
-        // CSS doesn't like IDs with decimal points in, so we need to replace that in the same way as when we originally
+        var domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
-        // queried the options endpoint and set our CSS.
+        $("#band-options").append(`<input type="checkbox" class="btn-check filter-button-band storeable-checkbox" name="options" id="filter-button-band-${domSafeName}" value="${o['name']}" autocomplete="off" onClick="filtersUpdated()" checked><label class="btn btn-outline" id="filter-button-label-band-${domSafeName}" for="filter-button-band-${domSafeName}">${o['name']}</label> `);
-        var cssFormattedBandName = o['name'] ? o['name'].replace('.', 'p') : "unknown";
-        $("#band-options").append(`<input type="checkbox" class="btn-check filter-button-band storeable-checkbox" name="options" id="filter-button-band-${cssFormattedBandName}" value="${o['name']}" autocomplete="off" onClick="filtersUpdated()" checked><label class="btn btn-outline" id="filter-button-label-band-${cssFormattedBandName}" for="filter-button-band-${cssFormattedBandName}">${o['name']}</label> `);
     });
     // Create All/None/Ham HF buttons
     $("#band-options").append(` <span style="display: inline-block"><button id="filter-button-band-all" type="button" class="btn btn-outline-secondary" onclick="toggleFilterButtons('band', true);">All</button> <button id="filter-button-band-none" type="button" class="btn btn-outline-secondary" onclick="toggleFilterButtons('band', false);">None</button> <button id="filter-button-band-none" type="button" class="btn btn-outline-secondary" onclick="setHamHFBandToggles();">Ham HF</button></span>`);
@@ -41,7 +38,8 @@ function setHamHFBandToggles() {
 function generateSIGsMultiToggleFilterCard(sig_options) {
     // Create a button for each option
     sig_options.forEach(o => {
-        $("#sig-options").append(`<input type="checkbox" class="btn-check filter-button-sig storeable-checkbox" name="options" id="filter-button-sig-${o['name']}" value="${o['name']}" autocomplete="off" onClick="filtersUpdated()" checked><label class="btn btn-outline-primary" id="filter-button-label-sig-${o['name']}" for="filter-button-sig-${o['name']}" title="${o['description']}"><i class="fa-solid ${sigToIcon(o['name'], 'fa-tower-cell')}"></i> ${o['name']}</label> `);
+        var domSafeName = o["name"].replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
+        $("#sig-options").append(`<input type="checkbox" class="btn-check filter-button-sig storeable-checkbox" name="options" id="filter-button-sig-${domSafeName}" value="${o['name']}" autocomplete="off" onClick="filtersUpdated()" checked><label class="btn btn-outline-primary" id="filter-button-label-sig-${domSafeName}" for="filter-button-sig-${domSafeName}" title="${o['description']}"><i class="fa-solid ${sigToIcon(o['name'], 'fa-tower-cell')}"></i> ${o['name']}</label> `);
     });
     // Create a bonus "NO_SIG" / "General DX" option
     $("#sig-options").append(`<input type="checkbox" class="btn-check filter-button-sig storeable-checkbox" name="options" id="filter-button-sig-NO_SIG" value="NO_SIG" autocomplete="off" onClick="filtersUpdated()" checked><label class="btn btn-outline-primary" id="filter-button-label-sig-NO_SIG" for="filter-button-sig-NO_SIG"><i class="fa-solid fa-tower-cell"></i> General DX</label> `);
@@ -49,6 +47,20 @@ function generateSIGsMultiToggleFilterCard(sig_options) {
     $("#sig-options").append(` <span style="display: inline-block"><button id="filter-button-sig-all" type="button" class="btn btn-outline-secondary" onclick="toggleFilterButtons('sig', true);">All</button>&nbsp;<button id="filter-button-sig-none" type="button" class="btn btn-outline-secondary" onclick="toggleFilterButtons('sig', false);">None</button></span>`);
 }
 
+// Generate Sources filter card. This one is a minor special case as we create the buttons in the normal way, but then
+// set which ones are enabled by default based on config rather than having them all enabled by default. We also sanitise
+// names here for HTML elements.
+function generateSourcesMultiToggleFilterCard(source_options, sources_enabled_by_default) {
+    // Create a button for each option
+    source_options.forEach(o => {
+        var enable = sources_enabled_by_default.includes(o);
+        var domSafeName = o.replace(/^[^A-Za-z0-9]+|[^\w]+/gi, "");
+        $("#source-options").append(`<input type="checkbox" class="btn-check filter-button-source storeable-checkbox" name="options" id="filter-button-source-${domSafeName}" value="${o}" autocomplete="off" onClick="filtersUpdated()" ${enable ? "checked" : ""}><label class="btn btn-outline-primary" for="filter-button-source-${domSafeName}">${o}</label> `);
+    });
+    // Create All/None buttons
+    $("#source-options").append(` <span style="display: inline-block"><button id="filter-button-source-all" type="button" class="btn btn-outline-secondary" onclick="toggleFilterButtons('source', true);">All</button>&nbsp;<button id="filter-button-source-none" type="button" class="btn btn-outline-secondary" onclick="toggleFilterButtons('source', false);">None</button></span>`);
+}
+
 // Method called when any filter is changed to reload the spots and persist the filter settings.
 function filtersUpdated() {
     loadSpots();

webassets/js/tools/geo.js

@@ -1,104 +0,0 @@
-//
-// GEOGRAPHIC UTILITY FUNCTIONS
-// Great Circle calculation, Maidenhead grid calcs, etc.
-//
-
-// Calculate great circle bearing between two lat/lon points.
-function calcBearing(lat1, lon1, lat2, lon2) {
-    lat1 *= Math.PI / 180;
-    lon1 *= Math.PI / 180;
-    lat2 *= Math.PI / 180;
-    lon2 *= Math.PI / 180;
-    var lonDelta = lon2 - lon1;
-    var y = Math.sin(lonDelta) * Math.cos(lat2);
-    var x = Math.cos(lat1) * Math.sin(lat2) - Math.sin(lat1) * Math.cos(lat2) * Math.cos(lonDelta);
-    var bearing = Math.atan2(y, x);
-    bearing = bearing * (180 / Math.PI);
-    if ( bearing < 0 ) { bearing += 360; }
-    return bearing;
-}
-
-// Convert a Maidenhead grid reference of arbitrary precision to the lat/long of the centre point of the square.
-// Returns null if the grid format is invalid.
-function latLonForGridCentre(grid) {
-    let [lat, lon, latCellSize, lonCellSize] = latLonForGridSWCornerPlusSize(grid);
-    if (lat != null && lon != null && latCellSize != null && lonCellSize != null) {
-        return [lat + latCellSize / 2.0, lon + lonCellSize / 2.0];
-    } else {
-        return null;
-    }
-}
-
-// Convert a Maidenhead grid reference of arbitrary precision to lat/long, including in the result the size of the
-// lowest grid square. This is a utility method used by the main methods that return the centre, southwest, and
-// northeast coordinates of a grid square.
-// The return type is always an array of size 4. The elements in it are null if the grid format is invalid.
-function latLonForGridSWCornerPlusSize(grid) {
-    // Make sure we are in upper case so our maths works. Case is arbitrary for Maidenhead references
-    grid = grid.toUpperCase();
-
-    // Return null if our Maidenhead string is invalid or too short
-    let len = grid.length;
-    if (len <= 0 || (len % 2) !== 0) {
-        return [null, null, null, null];
-    }
-
-    let lat = 0.0; // aggregated latitude
-    let lon = 0.0; // aggregated longitude
-    let latCellSize = 10; // Size in degrees latitude of the current cell. Starts at 20 and gets smaller as the calculation progresses
-    let lonCellSize = 20; // Size in degrees longitude of the current cell. Starts at 20 and gets smaller as the calculation progresses
-    let latCellNo; // grid latitude cell number this time
-    let lonCellNo; // grid longitude cell number this time
-
-    // Iterate through blocks (two-character sections)
-    for (let block = 0; block * 2 < len; block += 1) {
-        if (block % 2 === 0) {
-            // Letters in this block
-            lonCellNo = grid.charCodeAt(block * 2) - 'A'.charCodeAt(0);
-            latCellNo = grid.charCodeAt(block * 2 + 1) - 'A'.charCodeAt(0);
-            // Bail if the values aren't in range. Allowed values are A-R (0-17) for the first letter block, or
-            // A-X (0-23) thereafter.
-            let maxCellNo = (block === 0) ? 17 : 23;
-            if (latCellNo < 0 || latCellNo > maxCellNo || lonCellNo < 0 || lonCellNo > maxCellNo) {
-                return [null, null, null, null];
-            }
-        } else {
-            // Numbers in this block
-            lonCellNo = parseInt(grid.charAt(block * 2));
-            latCellNo = parseInt(grid.charAt(block * 2 + 1));
-            // Bail if the values aren't in range 0-9..
-            if (latCellNo < 0 || latCellNo > 9 || lonCellNo < 0 || lonCellNo > 9) {
-                return [null, null, null, null];
-            }
-        }
-
-        // Aggregate the angles
-        lat += latCellNo * latCellSize;
-        lon += lonCellNo * lonCellSize;
-
-        // Reduce the cell size for the next block, unless we are on the last cell.
-        if (block * 2 < len - 2) {
-            // Still have more work to do, so reduce the cell size
-            if (block % 2 === 0) {
-                // Just dealt with letters, next block will be numbers so cells will be 1/10 the current size
-                latCellSize = latCellSize / 10.0;
-                lonCellSize = lonCellSize / 10.0;
-            } else {
-                // Just dealt with numbers, next block will be letters so cells will be 1/24 the current size
-                latCellSize = latCellSize / 24.0;
-                lonCellSize = lonCellSize / 24.0;
-            }
-        }
-    }
-
-    // Offset back to (-180, -90) where the grid starts
-    lon -= 180.0;
-    lat -= 90.0;
-
-    // Return nulls on maths errors
-    if (isNaN(lat) || isNaN(lon) || isNaN(latCellSize) ||  isNaN(lonCellSize)) {
-        return [null, null, null, null];
-    }
-
-    return [lat, lon, latCellSize, lonCellSize];
-}

webassets/js/tools/storage.js

@@ -1,37 +0,0 @@
-//
-// LOCAL STORAGE FUNCTIONS
-// Generic functions for saving the state of HTML inputs to local storage, and restoring them
-//
-
-let useLocalStorage = true;
-
-// Save settings to local storage. Suppressed if "use local storage" is false.
-function saveSettings() {
-    if (useLocalStorage) {
-        // Find all storeable UI elements, store a key of "element id:property name" mapped to the value of that
-        // property. For a checkbox, that's the "checked" property.
-        $(".storeable-checkbox").each(function() {
-            localStorage.setItem("#" + $(this)[0].id + ":checked", JSON.stringify($(this)[0].checked));
-        });
-        $(".storeable-select").each(function() {
-            localStorage.setItem("#" + $(this)[0].id + ":value", JSON.stringify($(this)[0].value));
-        });
-        $(".storeable-text").each(function() {
-            localStorage.setItem("#" + $(this)[0].id + ":value", JSON.stringify($(this)[0].value));
-        });
-    }
-}
-
-// Load settings from local storage and set up the filter selectors. Suppressed if "use local storage" is false.
-function loadSettings() {
-    if (useLocalStorage) {
-        // Find all local storage entries and push their data to the corresponding UI element
-        Object.keys(localStorage).forEach(function(key) {
-            if (key.startsWith("#") && key.includes(":")) {
-                // Split the key back into an element ID and a property
-                var split = key.split(":");
-                $(split[0]).prop(split[1], JSON.parse(localStorage.getItem(key)));
-            }
-        });
-    }
-}

webassets/js/tools/ui-ham.js

@@ -1,377 +0,0 @@
-//
-// USER INTERFACE FUNCTIONS (AMATEUR RADIO)
-// Functions providing colour schemes for ham radio bands, SIG icons etc.
-//
-
-const BAND_COLOR_SCHEMES = {
-	"PSK Reporter": {
-		"2200m": "#ff4500",
-		"600m": "#1e90ff",
-		"160m": "#7cfc00",
-		"80m": "#e550e5",
-		"60m": "#00008b",
-		"40m": "#5959ff",
-		"30m": "#62d962",
-		"20m": "#f2c40c",
-		"17m": "#f2f261",
-		"15m": "#cca166",
-		"12m": "#b22222",
-		"11m": "#00ff00",
-		"10m": "#ff69b4",
-		"6m": "#FF0000",
-		"5m": "#e0e0e0",
-		"4m": "#cc0044",
-		"2m": "#FF1493",
-		"1.25m": "#CCFF00",
-		"70cm": "#999900",
-		"23cm": "#5AB8C7",
-		"2.4GHz": "#FF7F50",
-		"5.8GHz": "#cc0099",
-		"10GHz": "#696969",
-		"24GHz": "#f3edc6",
-		"47GHz": "#ffe786",
-		"76GHz": "#baf9d8"
-	},
-	"PSK Reporter (Adjusted)": {
-		"2200m": "#ff4500",
-		"600m": "#1e90ff",
-		"160m": "#7cfc00",
-		"80m": "#b33fb3",
-		"60m": "#00008b",
-		"40m": "#5959ff",
-		"30m": "#62d962",
-		"20m": "#f2c40c",
-		"17m": "#f2f261",
-		"15m": "#cca166",
-		"12m": "#b22222",
-		"11m": "#00ff00",
-		"10m": "#ff7eb4",
-		"6m": "#FF0000",
-		"5m": "#e0e0e0",
-		"4m": "#cc0044",
-		"2m": "#FF1493",
-		"1.25m": "#CCFF00",
-		"70cm": "#999900",
-		"23cm": "#5AB8C7",
-		"2.4GHz": "#FF7F50",
-		"5.8GHz": "#cc0099",
-		"10GHz": "#696969",
-		"24GHz": "#f3edc6",
-		"47GHz": "#ffe786",
-		"76GHz": "#baf9d8"
-	},
-	"RBN": {
-		"2200m": "#000000",
-		"600m": "#aaaaaa",
-		"160m": "#ffe000",
-		"80m": "#093F00",
-		"60m": "#777777",
-		"40m": "#ffa500",
-		"30m": "#ff0000",
-		"20m": "#800080",
-		"17m": "#0000ff",
-		"15m": "#444444",
-		"12m": "#00ffff",
-		"11m": "#000000",
-		"10m": "#ff00ff",
-		"6m": "#ffc0cb",
-		"5m": "#000000",
-		"4m": "#a276ff",
-		"2m": "#92FF7F",
-		"1.25m": "#000000",
-		"70cm": "#000000",
-		"23cm": "#000000",
-		"2.4GHz": "#000000",
-		"5.8GHz": "#000000",
-		"10GHz": "#000000",
-		"24GHz": "#000000",
-		"47GHz": "#000000",
-		"76GHz": "#000000"
-	},
-	"Ham Rainbow": {
-		"2200m": "#8e4f37",
-		"600m": "#8e4f37",
-		"160m": "#8e3737",
-		"80m": "#da2f93",
-		"60m": "#792fda",
-		"40m": "#2f4bda",
-		"30m": "#2fdad2",
-		"20m": "#68da2f",
-		"17m": "#dad52f",
-		"15m": "#da832f",
-		"12m": "#da5c2f",
-		"11m": "#8e8e8e",
-		"10m": "#da2f2f",
-		"6m": "#8e377a",
-		"5m": "#8e8e8e",
-		"4m": "#42378e",
-		"2m": "#37748e",
-		"1.25m": "#8e8e8e",
-		"70cm": "#378e65",
-		"23cm": "#8e8e37",
-		"2.4GHz": "#8e6037",
-		"5.8GHz": "#8e6037",
-		"10GHz": "#8e6037",
-		"24GHz": "#8e6037",
-		"47GHz": "#8e6037",
-		"76GHz": "#8e6037"
-	},
-	"Ham Rainbow (Reverse)": {
-		"2200m": "#42378e",
-		"600m": "#42378e",
-		"160m": "#8e377a",
-		"80m": "#da2f2f",
-		"60m": "#da5c2f",
-		"40m": "#da832f",
-		"30m": "#dad52f",
-		"20m": "#68da2f",
-		"17m": "#2fdad2",
-		"15m": "#2f4bda",
-		"12m": "#792fda",
-		"11m": "#8e8e8e",
-		"10m": "#da2f93",
-		"6m": "#8e3737",
-		"5m": "#8e8e8e",
-		"4m": "#8e4f37",
-		"2m": "#8e6037",
-		"1.25m": "#8e8e8e",
-		"70cm": "#8e8e37",
-		"23cm": "#378e65",
-		"2.4GHz": "#37748e",
-		"5.8GHz": "#37748e",
-		"10GHz": "#37748e",
-		"24GHz": "#37748e",
-		"47GHz": "#37748e",
-		"76GHz": "#37748e",
-	},
-	"Kate Morley": {
-		"2200m": "#817",
-		"600m": "#817",
-		"160m": "#817",
-		"80m": "#a35",
-		"60m": "#c66",
-		"40m": "#e94",
-		"30m": "#ed0",
-		"20m": "#9d5",
-		"17m": "#4d8",
-		"15m": "#2cb",
-		"12m": "#0bc",
-		"11m": "#09c",
-		"10m": "#09c",
-		"6m": "#36b",
-		"5m": "#36b",
-		"4m": "#36b",
-		"2m": "#36b",
-		"1.25m": "#36b",
-		"70cm": "#639",
-		"23cm": "#639",
-		"2.4GHz": "#639",
-		"5.8GHz": "#639",
-		"10GHz": "#639",
-		"24GHz": "#639",
-		"47GHz": "#639",
-		"76GHz": "#639",
-	},
-	"ColorBrewer": {
-		"2200m": "#54278f",
-		"600m": "#756bb1",
-		"160m": "#9e9ac8",
-		"80m": "#cbc9e2",
-		"60m": "#08519c",
-		"40m": "#3182bd",
-		"30m": "#6baed6",
-		"20m": "#bdd7e7",
-		"17m": "#006d2c",
-		"15m": "#31a354",
-		"12m": "#74c476",
-		"11m": "#bae4b3",
-		"10m": "#a63603",
-		"6m": "#e6550d",
-		"5m": "#fd8d3c",
-		"4m": "#fdbe85",
-		"2m": "#a50f15",
-		"1.25m": "#de2d26",
-		"70cm": "#fb6a4a",
-		"23cm": "#fcae91",
-		"2.4GHz": "#636363",
-		"5.8GHz": "#636363",
-		"10GHz": "#969696",
-		"24GHz": "#969696",
-		"47GHz": "#cccccc",
-		"76GHz": "#cccccc",
-	},
-	"IWantHue": {
-		"2200m": "#409271",
-		"600m": "#b03ce1",
-		"160m": "#50c640",
-		"80m": "#d545b7",
-		"60m": "#99b936",
-		"40m": "#7260db",
-		"30m": "#60af57",
-		"20m": "#d54788",
-		"17m": "#58c79f",
-		"15m": "#e2462a",
-		"12m": "#49b1d3",
-		"11m": "#df872f",
-		"10m": "#506bb0",
-		"6m": "#c6a639",
-		"5m": "#9554a3",
-		"4m": "#36783c",
-		"2m": "#da405b",
-		"1.25m": "#657527",
-		"70cm": "#8c97e2",
-		"23cm": "#b44f2f",
-		"2.4GHz": "#d386c8",
-		"5.8GHz": "#aaac66",
-		"10GHz": "#9d4760",
-		"24GHz": "#90672c",
-		"47GHz": "#e08086",
-		"76GHz": "#dc9769",
-	},
-	"IWantHue (Color Blind)": {
-		"2200m": "#bf9e3d",
-		"600m": "#9d2fec",
-		"160m": "#79df39",
-		"80m": "#d445db",
-		"60m": "#5dd175",
-		"40m": "#814dd8",
-		"30m": "#d7ce2f",
-		"20m": "#657af1",
-		"17m": "#8cc34a",
-		"15m": "#d635aa",
-		"12m": "#6cbd80",
-		"11m": "#b860c1",
-		"10m": "#e48721",
-		"6m": "#686ccc",
-		"5m": "#d44e2b",
-		"4m": "#51b3db",
-		"2m": "#d74058",
-		"1.25m": "#56c5ad",
-		"70cm": "#d0478d",
-		"23cm": "#708940",
-		"2.4GHz": "#c380c2",
-		"5.8GHz": "#cab775",
-		"10GHz": "#7a7fc2",
-		"24GHz": "#b87148",
-		"47GHz": "#bd678c",
-		"76GHz": "#c3666b",
-	},
-	"Mokole": {
-		"2200m": "#8b4513",
-		"600m": "#006400",
-		"160m": "#808000",
-		"80m": "#483d8b",
-		"60m": "#5f9ea0",
-		"40m": "#000080",
-		"30m": "#9acd32",
-		"20m": "#8b008b",
-		"17m": "#ff0000",
-		"15m": "#ff8c00",
-		"12m": "#ffd700",
-		"11m": "#7fff00",
-		"10m": "#8a2be2",
-		"6m": "#00ff7f",
-		"5m": "#dc143c",
-		"4m": "#00bfff",
-		"2m": "#0000ff",
-		"1.25m": "#d8bfd8",
-		"70cm": "#ff00ff",
-		"23cm": "#1e90ff",
-		"2.4GHz": "#db7093",
-		"5.8GHz": "#f0e68c",
-		"10GHz": "#ff1493",
-		"24GHz": "#ffa07a",
-		"47GHz": "#ee82ee",
-		"76GHz": "#7fffd4",
-	}
-};
-let bandColorScheme = "PSK Reporter (Adjusted)";
-
-// Set the band colour scheme. Returns true if successful, false if the requested scheme was not known
-function setBandColorScheme(scheme) {
-    let ret = BAND_COLOR_SCHEMES[scheme]
-    if (ret) {
-        bandColorScheme = scheme;
-    }
-    return ret;
-}
-
-// Get the list of known bands
-function getKnownBands() {
-    return Array.from(Object.keys(BAND_COLOR_SCHEMES[bandColorScheme]));
-}
-
-// Get the list of available band colour schemes
-function getAvailableBandColorSchemes() {
-    return Array.from(Object.keys(BAND_COLOR_SCHEMES));
-}
-
-// Band name to colour (in the current colour scheme). If the band is unknown, black will be returned.
-function bandToColor(band) {
-    let col = (band != null) ? BAND_COLOR_SCHEMES[bandColorScheme][band] : null;
-    if (col) {
-        return col;
-    } else {
-        return "black";
-    }
-}
-
-// Band name to contrast colour (in the current colour scheme). This is either black or white, contrasting as well as
-// possible with the band colour. If the band is unknown, white will be returned.
-function bandToContrastColor(band) {
-    let tc = tinycolor(bandToColor(band));
-    return tc.isLight() ? "black" : "white";
-}
-
-const MODE_TYPE_COLOR_SCHEMES = {
-    "CW": "green",
-    "PHONE": "red",
-    "DATA": "blue"
-}
-
-// Mode type (CW, PHONE, DATA) to colour. If the mode type is unknown, black will be returned.
-function modeTypeToColor(modeType) {
-    let col = (modeType != null) ? MODE_TYPE_COLOR_SCHEMES[modeType.toUpperCase()] : null;
-    if (col) {
-        return col;
-    } else {
-        return "black";
-    }
-}
-
-const SIG_ICONS = {
-    "POTA": "fa-tree",
-    "SOTA": "fa-mountain-sun",
-    "WWFF": "fa-seedling",
-    "GMA": "fa-person-hiking",
-    "WWBOTA": "fa-radiation",
-    "HEMA": "fa-mound",
-    "IOTA": "fa-umbrella-beach",
-    "MOTA": "fa-fan",
-    "ARLHS": "fa-tower-observation",
-    "ILLW": "fa-tower-observation",
-    "SIOTA": "fa-wheat-awn",
-    "WCA": "fa-chess-rook",
-    "ZLOTA": "fa-kiwi-bird",
-    "WOTA": "fa-w",
-    "BOTA": "fa-water",
-    "KRMNPA": "fa-earth-oceania",
-    "WAB": "fa-table-cells-large",
-    "WAI": "fa-table-cells-large",
-    "TOTA": "fa-toilet"
-}
-
-// Get the Font Awesome icon for a given SIG. If the SIG is unknown, the provided default symbol will be returned
-function sigToIcon(sig, defaultIcon) {
-    let col = (sig != null) ? SIG_ICONS[sig.toUpperCase()] : null;
-    if (col) {
-        return col;
-    } else {
-        return defaultIcon;
-    }
-}
-
-// Get the list of known SIGs
-function getKnownSIGs() {
-    return Array.from(Object.keys(SIG_ICONS));
-}

webassets/js/tools/utils.js

@@ -1,25 +0,0 @@
-//
-// GENERAL UTILITY FUNCTIONS
-// String manipulation etc.
-//
-
-// Utility function to escape HTML characters from a string.
-function escapeHtml(str) {
-    if (typeof str !== 'string') {
-        return '';
-    }
-
-    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;
-        }
-    };
-
-    return str.replace(/[&<>"'`]/g, escapeCharacter);
-}