Remove duplicated enums in spec #83

README.md

@@ -10,7 +10,7 @@ The API is deliberately well-defined with an OpenAPI specification and auto-gene
 
 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, 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, the UK Packet Repeater Network, and NG3K.
 
 ![Screenshot](/images/screenshot2.png)
 

config-example.yml

@@ -81,18 +81,6 @@ spot-providers:
     class: "UKPacketNet"
     name: "UK Packet Radio Net"
     enabled: false
-  -
-    class: "XOTA"
-    name: "39C3 TOTA"
-    enabled: false
-    url: "https://39c3.c3nav.de/"
-    # Fixed SIG/latitude/longitude for all spots from a provider is currently only a feature for the "XOTA" provider,
-    # the software found at https://github.com/nischu/xOTA/. This is because this is a generic backend for xOTA
-    # programmes and so different URLs provide different programmes.
-    sig: "TOTA"
-    latitude: 53.5622678
-    longitude: 9.9855205
-
 
 # Alert providers to use. Same setup as the spot providers list above.
 alert-providers:

core/constants.py

@@ -29,8 +29,7 @@ SIGS = [
    SIG(name="BOTA", description="Beaches on the Air", icon="water"),
    SIG(name="KRMNPA", description="Keith Roget Memorial National Parks Award", icon="earth-oceania"),
    SIG(name="WAB", description="Worked All Britain", icon="table-cells-large", ref_regex=r"[A-Z]{1,2}[0-9]{2}"),
-   SIG(name="WAI", description="Worked All Ireland", icon="table-cells-large", ref_regex=r"[A-Z][0-9]{2}"),
-   SIG(name="TOTA", description="Toilets on the Air", icon="toilet", ref_regex=r"T\-[0-9]{2}")
+   SIG(name="WAI", description="Worked All Ireland", icon="table-cells-large", ref_regex=r"[A-Z][0-9]{2}")
 ]
 
 # Modes. Note "DIGI" and "DIGITAL" are also supported but are normalised into "DATA".

core/lookup_helper.py

@@ -418,7 +418,20 @@ class LookupHelper:
     # Infer a mode from the frequency (in Hz) according to the band plan. Just a guess really.
     def infer_mode_from_frequency(self, freq):
         try:
-            return freq_to_band(freq / 1000.0)["mode"]
+            khz = freq / 1000.0
+            mode = freq_to_band(khz)["mode"]
+            # Some additional common digimode ranges in addition to what the 3rd-party freq_to_band function returns.
+            # This is mostly here just because freq_to_band is very specific about things like FT8 frequencies, and e.g.
+            # a spot at 7074.5 kHz will be indicated as LSB, even though it's clearly in the FT8 range. Future updates
+            # might include other common digimode centres of activity here, but this achieves the main goal of keeping
+            # large numbers of clearly-FT* spots off the list of people filtering out digimodes.
+            if (7074 <= khz < 7077) or (10136 <= khz < 10139) or (14074 <= khz < 14077) or (18100 <= khz < 18103) or (
+                    21074 <= khz < 21077) or (24915 <= khz < 24918) or (28074 <= khz < 28077):
+                mode = "FT8"
+            if (7047.5 <= khz < 7050.5) or (10140 <= khz < 10143) or (14080 <= khz < 14083) or (
+                    18104 <= khz < 18107) or (21140 <= khz < 21143) or (24919 <= khz < 24922) or (28180 <= khz < 28183):
+                mode = "FT4"
+            return mode
         except KeyError:
             return None
 

spotproviders/xota.py

@@ -1,43 +0,0 @@
-from datetime import datetime
-
-from data.sig_ref import SIGRef
-from data.spot import Spot
-from spotproviders.http_spot_provider import HTTPSpotProvider
-
-
-# Spot provider for servers based on the "xOTA" software at https://github.com/nischu/xOTA/
-# The provider typically doesn't give us a lat/lon or SIG explicitly, so our own config provides this information. This
-# functionality is implemented for TOTA events.
-class XOTA(HTTPSpotProvider):
-    POLL_INTERVAL_SEC = 300
-    FIXED_LATITUDE = None
-    FIXED_LONGITUDE = None
-    SIG = None
-
-    def __init__(self, provider_config):
-        super().__init__(provider_config, provider_config["url"] + "/api/spot/all", self.POLL_INTERVAL_SEC)
-        self.FIXED_LATITUDE = provider_config["latitude"] if "latitude" in provider_config else None
-        self.FIXED_LONGITUDE = provider_config["longitude"] if "longitude" in provider_config else None
-        self.SIG = provider_config["sig"] if "sig" in provider_config else None
-
-    def http_response_to_spots(self, http_response):
-        new_spots = []
-        # Iterate through source data
-        for source_spot in http_response.json():
-            # Convert to our spot format
-            spot = Spot(source=self.name,
-                        source_id=source_spot["id"],
-                        dx_call=source_spot["stationCallSign"].upper(),
-                        freq=float(source_spot["freq"]) * 1000,
-                        mode=source_spot["mode"].upper(),
-                        sig=self.SIG,
-                        sig_refs=[SIGRef(id=source_spot["reference"]["title"], sig=self.SIG, url=source_spot["reference"]["website"])],
-                        time=datetime.fromisoformat(source_spot["modificationDate"]).timestamp(),
-                        dx_latitude=self.FIXED_LATITUDE,
-                        dx_longitude=self.FIXED_LONGITUDE,
-                        qrt=source_spot["state"] != "active")
-
-            # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other code will do
-            # that for us.
-            new_spots.append(spot)
-        return new_spots

views/webpage_about.tpl

@@ -16,10 +16,10 @@
     <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>
     <h4 class="mt-4">What data sources are supported?</h4>
-    <p>Spothole can retrieve spots from: Telnet-based DX clusters, the Reverse Beacon Network (RBN), the APRS Internet Service (APRS-IS), POTA, SOTA, WWFF, GMA, WWBOTA, HEMA, Parks 'n' Peaks, ZLOTA, WOTA, the UK Packet Repeater Network, and any site based on the xOTA software by nischu.</p>
+    <p>Spothole can retrieve spots from: Telnet-based DX clusters, the Reverse Beacon Network (RBN), the APRS Internet Service (APRS-IS), POTA, SOTA, WWFF, GMA, WWBOTA, HEMA, Parks 'n' Peaks, ZLOTA, WOTA, and the UK Packet Repeater Network.</p>
     <p>Spothole can retrieve alerts from: NG3K, POTA, SOTA, WWFF, Parks 'n' Peaks, WOTA and BOTA.</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), Worked All Britain (WAB), Worked All Ireland (WAI), and Toilets on the Air (TOTA).</p>
+    <p>Between the various data sources, the following Special Interest Groups (SIGs) are supported: POTA, SOTA, WWFF, GMA, WWBOTA, HEMA, IOTA, MOTA, ARLHS, ILLW, SIOTA, WCA, ZLOTA, KRMNPA, WOTA, BOTA, WAB & WAI.</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>

webassets/apidocs/openapi.yml

@@ -52,52 +52,16 @@ paths:
             type: number
         - name: source
           in: query
-          description: "Limit the spots to only ones from one or more sources. To select more than one source, supply a comma-separated list. The allowed options will vary based on how the sources are named within the server's config. See the /options call for how to retrieve a list of these."
+          description: "Limit the spots to only ones from one or more sources. To select more than one source, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - POTA
-              - SOTA
-              - WWFF
-              - WWBOTA
-              - GMA
-              - HEMA
-              - ParksNPeaks
-              - ZLOTA
-              - WOTA
-              - BOTA
-              - Cluster
-              - RBN
-              - APRS-IS
-              - UKPacketNet
-              - TOTA
+            $ref: "#/components/schemas/Source"
         - name: sig
           in: query
           description: "Limit the spots to only ones from one or more Special Interest Groups provided as an argument. To select more than one SIG, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - POTA
-              - SOTA
-              - WWFF
-              - WWBOTA
-              - GMA
-              - HEMA
-              - WCA
-              - MOTA
-              - SIOTA
-              - ARLHS
-              - ILLW
-              - ZLOTA
-              - KRMNPA
-              - IOTA
-              - WOTA
-              - BOTA
-              - WAB
-              - WAI
-              - TOTA
+            $ref: "#/components/schemas/SIGName"
         - name: needs_sig
           in: query
           description: "Limit the spots to only ones with a Special Interest Group such as POTA. Because supplying all known SIGs as a `sigs` parameter is unwieldy, and leaving `sigs` blank will also return spots with *no* SIG, this parameter can be set true to return only spots with a SIG, regardless of what it is, so long as it's not blank. This is what Field Spotter uses to exclude generic cluster spots and only retrieve xOTA things."
@@ -117,96 +81,31 @@ paths:
           description: "Limit the spots to only ones from one or more bands. To select more than one band, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - 160m
-              - 80m
-              - 60m
-              - 40m
-              - 30m
-              - 20m
-              - 17m
-              - 15m
-              - 12m
-              - 10m
-              - 6m
-              - 4m
-              - 2m
-              - 70cm
-              - 23cm
-              - 13cm
+            $ref: "#/components/schemas/BandName"
         - name: mode
           in: query
           description: "Limit the spots to only ones from one or more modes. To select more than one mode, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - CW
-              - PHONE
-              - SSB
-              - USB
-              - LSB
-              - AM
-              - FM
-              - DV
-              - DMR
-              - DSTAR
-              - C4FM
-              - M17
-              - DIGI
-              - DATA
-              - FT8
-              - FT4
-              - RTTY
-              - SSTV
-              - JS8
-              - HELL
-              - BPSK
-              - PSK
-              - BPSK31
-              - OLIVIA
-              - MFSK
-              - MFSK32
-              - PKT
+            $ref: "#/components/schemas/Mode"
         - name: mode_type
           in: query
           description: "Limit the spots to only ones from one or more mode families. To select more than one mode family, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - CW
-              - PHONE
-              - DATA
+            $ref: "#/components/schemas/Mode"
         - name: dx_continent
           in: query
           description: "Limit the spots to only ones where the DX (the operator being spotted) is on the given continent(s). To select more than one continent, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - EU
-              - NA
-              - SA
-              - AS
-              - AF
-              - OC
-              - AN
+            $ref: "#/components/schemas/Continent"
         - name: de_continent
           in: query
           description: "Limit the spots to only ones where the spotteris on the given continent(s). To select more than one continent, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - EU
-              - NA
-              - SA
-              - AS
-              - AF
-              - OC
-              - AN
+            $ref: "#/components/schemas/Continent"
         - name: dedupe
           in: query
           description: "\"De-duplicate\" the spots, returning only the latest spot for any given callsign."
@@ -285,66 +184,22 @@ paths:
             type: boolean
         - name: source
           in: query
-          description: "Limit the alerts to only ones from one or more sources. To select more than one source, supply a comma-separated list.  The options will vary based on how the sources are named within the server's config. See the /options call for how to retrieve a list of these."
+          description: "Limit the alerts to only ones from one or more sources. To select more than one source, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - POTA
-              - SOTA
-              - WWFF
-              - WWBOTA
-              - GMA
-              - HEMA
-              - ParksNPeaks
-              - ZLOTA
-              - WOTA
-              - BOTA
-              - Cluster
-              - RBN
-              - APRS-IS
-              - UKPacketNet
-              - TOTA
+            $ref: "#/components/schemas/Source"
         - name: sig
           in: query
           description: "Limit the alerts to only ones from one or more Special Interest Groups. To select more than one SIG, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - POTA
-              - SOTA
-              - WWFF
-              - WWBOTA
-              - GMA
-              - HEMA
-              - WCA
-              - MOTA
-              - SIOTA
-              - ARLHS
-              - ILLW
-              - ZLOTA
-              - KRMNPA
-              - IOTA
-              - WOTA
-              - BOTA
-              - WAB
-              - WAI
-              - TOTA
+            $ref: "#/components/schemas/SIGName"
         - name: dx_continent
           in: query
           description: "Limit the alerts to only ones where the DX operator is on the given continent(s). To select more than one continent, supply a comma-separated list."
           required: false
           schema:
-            type: string
-            enum:
-              - EU
-              - NA
-              - SA
-              - AS
-              - AF
-              - OC
-              - AN
+            $ref: "#/components/schemas/Continent"
         - name: dx_call_includes
           in: query
           description: "Limit the alerts to only ones where the DX callsign includes the supplied string (case-insensitive). Generally a complete callsign, but you can supply a shorter string for partial matches."
@@ -574,17 +429,8 @@ paths:
                     description: Country flag of the operator. This is limited to the range of emoji flags. For some DXCCs there may not be an official emoji flag, e.g. Northern Ireland, so the appearance may vary depending on your browser and operating system. Some small islands may also have no flag. Many DXCCs may also share a flag, e.g. mainland Spain, Balearic Islands, etc.
                     example: ""
                   continent:
-                    type: string
                     description: Continent of the operator
-                    enum:
-                      - EU
-                      - NA
-                      - SA
-                      - AS
-                      - AF
-                      - OC
-                      - AN
-                    example: EU
+                    $ref: "#/components/schemas/Continent"
                   dxcc_id:
                     type: integer
                     description: DXCC ID of the operator
@@ -610,13 +456,8 @@ paths:
                     description: Longitude of the opertor's QTH, in degrees. This could be from an online lookup service, or just based on the DXCC.
                     example: -1.2345
                   location_source:
-                    type: string
                     description: Where we got the location (grid/latitude/longitude) from. Unlike a spot where we might have a summit position or WAB square, here the only options are an online QTH lookup, or a location based purely on DXCC, or nothing.
-                    enum:
-                      - "HOME QTH"
-                      - DXCC
-                      - NONE
-                    example: "HOME QTH"
+                    $ref: "#/components/schemas/LocationSourceForAlert"
         '422':
           description: Validation error e.g. callsign missing or format incorrect
           content:
@@ -638,28 +479,7 @@ paths:
           in: query
           description: Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
           required: true
-          type: string
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - WCA
-            - MOTA
-            - SIOTA
-            - ARLHS
-            - ILLW
-            - ZLOTA
-            - KRMNPA
-            - IOTA
-            - WOTA
-            - BOTA
-            - WAB
-            - WAI
-            - TOTA
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         - name: id
           in: query
           description: ID of a reference in that SIG
@@ -729,6 +549,158 @@ paths:
 
 components:
   schemas:
+    Source:
+      type: string
+      enum:
+        - POTA
+        - SOTA
+        - WWFF
+        - WWBOTA
+        - GMA
+        - HEMA
+        - ParksNPeaks
+        - ZLOTA
+        - WOTA
+        - Cluster
+        - RBN
+        - APRS-IS
+        - UKPacketNet
+      example: POTA
+
+    SIGName:
+      type: string
+      enum:
+        - POTA
+        - SOTA
+        - WWFF
+        - WWBOTA
+        - GMA
+        - HEMA
+        - WCA
+        - MOTA
+        - SIOTA
+        - ARLHS
+        - ILLW
+        - ZLOTA
+        - KRMNPA
+        - IOTA
+        - WOTA
+        - BOTA
+        - WAB
+        - WAI
+      example: POTA
+
+    Continent:
+      type: string
+      enum:
+        - EU
+        - NA
+        - SA
+        - AS
+        - AF
+        - OC
+        - AN
+      example: EU
+
+    BandName:
+      type: string
+      enum:
+        - 2200m
+        - 600m
+        - 160m
+        - 80m
+        - 60m
+        - 40m
+        - 30m
+        - 20m
+        - 17m
+        - 15m
+        - 12m
+        - 11m
+        - 10m
+        - 6m
+        - 5m
+        - 4m
+        - 2m
+        - 1.25m
+        - 70cm
+        - 23cm
+        - 2.4GHz
+        - 5.8GHz
+        - 10GHz
+        - 24GHz
+        - 47GHz
+        - 76GHz
+      example: 40m
+
+    Mode:
+      type: string
+      enum:
+        - CW
+        - PHONE
+        - SSB
+        - USB
+        - LSB
+        - AM
+        - FM
+        - DV
+        - DMR
+        - DSTAR
+        - C4FM
+        - M17
+        - DIGI
+        - DATA
+        - FT8
+        - FT4
+        - RTTY
+        - SSTV
+        - JS8
+        - HELL
+        - BPSK
+        - PSK
+        - BPSK31
+        - OLIVIA
+        - MFSK
+        - MFSK32
+        - PKT
+    example: SSB
+
+    ModeType:
+      type: string
+      enum:
+        - CW
+        - PHONE
+        - DATA
+      example: CW
+
+    ModeSource:
+      type: string
+      enum:
+        - SPOT
+        - COMMENT
+        - BANDPLAN
+        - NONE
+      example: SPOT
+
+    LocationSourceForSpot:
+      type: string
+      enum:
+        - SPOT
+        - "SIG REF LOOKUP"
+        - "WAB/WAI GRID"
+        - "HOME QTH"
+        - DXCC
+        - NONE
+      example: SPOT
+
+    LocationSourceForAlert:
+      type: string
+      enum:
+        - "HOME QTH"
+        - DXCC
+        - NONE
+      example: "HOME QTH"
+
     SIGRef:
       type: object
       properties:
@@ -737,29 +709,8 @@ components:
           description: SIG reference ID.
           example: GB-0001
         sig:
-          type: string
           description: SIG that this reference is in.
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - WCA
-            - MOTA
-            - SIOTA
-            - ARLHS
-            - ILLW
-            - ZLOTA
-            - KRMNPA
-            - IOTA
-            - WOTA
-            - BOTA
-            - WAB
-            - WAI
-            - TOTA
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         name:
           type: string
           description: SIG reference name
@@ -809,17 +760,8 @@ components:
           description: Country flag of the DX operator. This is limited to the range of emoji flags. For some DXCCs there may not be an official emoji flag, e.g. Northern Ireland, so the appearance may vary depending on your browser and operating system. Some small islands may also have no flag. Many DXCCs may also share a flag, e.g. mainland Spain, Balearic Islands, etc.
           example: ""
         dx_continent:
-          type: string
           description: Continent of the DX operator
-          enum:
-            - EU
-            - NA
-            - SA
-            - AS
-            - AF
-            - OC
-            - AN
-          example: EU
+          $ref: "#/components/schemas/Continent"
         dx_dxcc_id:
           type: integer
           description: DXCC ID of the DX operator
@@ -849,16 +791,8 @@ components:
           description: Longitude of the DX spot, in degrees. This could be from a geographical reference e.g. POTA, or from a QRZ lookup
           example: -1.2345
         dx_location_source:
-          type: string
           description: Where we got the DX location (grid/latitude/longitude) from. If this was from the spot itself, or from a lookup of the SIG ref (e.g. park) it's likely quite accurate, but if we had to fall back to QRZ lookup, or even a location based on the DXCC itself, it will be a lot less accurate.
-          enum:
-            - SPOT
-            - "SIG REF LOOKUP"
-            - "WAB/WAI GRID"
-            - "HOME QTH"
-            - DXCC
-            - NONE
-          example: SPOT
+          $ref: "#/components/schemas/LocationSourceForSpot"
         dx_location_good:
           type: boolean
           description: Does the software think the location is good enough to put a marker on a map? This is true if the source is "SPOT", "SIG REF LOOKUP" or "WAB/WAI GRID", or alternatively if the source is "HOME QTH" and the callsign doesn't have a slash in it (i.e. operator likely at home).
@@ -876,17 +810,8 @@ components:
           description: Country flag of the spotter. This is limited to the range of emoji flags. For some DXCCs there may not be an official emoji flag, e.g. Northern Ireland, so the appearance may vary depending on your browser and operating system. Some small islands may also have no flag. Many DXCCs may also share a flag, e.g. mainland Spain, Balearic Islands, etc.
           example: ""
         de_continent:
-          type: string
-          enum:
-            - EU
-            - NA
-            - SA
-            - AS
-            - AF
-            - OC
-            - AN
           description: Continent of the spotter
-          example: EU
+          $ref: "#/components/schemas/Continent"
         de_dxcc_id:
           type: integer
           description: DXCC ID of the spotter
@@ -905,82 +830,25 @@ components:
           example: 51.2345
         de_longitude:
           type: number
-          description: Longitude of the spotter, 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.
+          description: Longitude of the DX spotspotter, 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.
           example: -1.2345
         mode:
-          type: string
           description: Reported mode.
-          enum:
-            - CW
-            - PHONE
-            - SSB
-            - USB
-            - LSB
-            - AM
-            - FM
-            - DV
-            - DMR
-            - DSTAR
-            - C4FM
-            - M17
-            - DIGI
-            - DATA
-            - FT8
-            - FT4
-            - RTTY
-            - SSTV
-            - JS8
-            - HELL
-            - BPSK
-            - PSK
-            - BPSK31
-            - OLIVIA
-            - MFSK
-            - MFSK32
-            - PKT
+          $ref: "#/components/schemas/Mode"
           example: SSB
         mode_type:
-          type: string
           description: Inferred mode "family".
-          enum:
-            - CW
-            - PHONE
-            - DATA
-          example: PHONE
+          $ref: "#/components/schemas/ModeType"
         mode_source:
-          type: string
           description: Where we got the mode from. If this was from the spot itself, it's likely quite accurate, but if we had to fall back to the bandplan, it might not be correct.
-          enum:
-            - SPOT
-            - COMMENT
-            - BANDPLAN
-            - NONE
+          $ref: "#/components/schemas/ModeSource"
         freq:
           type: number
           description: Frequency, in Hz
           example: 7150500
         band:
-          type: string
           description: Band, defined by the frequency.
-          enum:
-            - 160m
-            - 80m
-            - 60m
-            - 40m
-            - 30m
-            - 20m
-            - 17m
-            - 15m
-            - 12m
-            - 10m
-            - 6m
-            - 4m
-            - 2m
-            - 70cm
-            - 23cm
-            - 13cm
-            - Unknown
-          example: 40m
+          $ref: "#/components/schemas/BandName"
         time:
           type: number
           description: Time of the spot, UTC seconds since UNIX epoch
@@ -1002,29 +870,8 @@ components:
           description: Comment left by the spotter, if any
           example: "59 in NY 73"
         sig:
-          type: string
           description: Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - WCA
-            - MOTA
-            - SIOTA
-            - ARLHS
-            - ILLW
-            - ZLOTA
-            - KRMNPA
-            - IOTA
-            - WOTA
-            - BOTA
-            - WAB
-            - WAI
-            - TOTA
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         sig_refs:
           type: array
           items:
@@ -1041,7 +888,7 @@ components:
         band_color:
           type: string
           descripton: Colour to represent this spot, if a client chooses to colour spots based on their frequency band, using PSK Reporter's default colours. HTML colour e.g. hex.
-          example: #ff0000"
+          example: "#ff0000"
         band_contrast_color:
           type: string
           descripton: Black or white, whichever best contrasts with "band_color".
@@ -1051,24 +898,8 @@ components:
           description: QRT state. Some APIs return spots marked as QRT. Otherwise we can check the comments.
           example: false
         source:
-          type: string
-          description: Where we got the spot from. The options will vary based on how the sources are named within the server's config. See the /options call for how to retrieve a list of these.
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - ParksNPeaks
-            - ZLOTA
-            - WOTA
-            - Cluster
-            - RBN
-            - APRS-IS
-            - UKPacketNet
-            - TOTA
-          example: POTA
+          description: Where we got the spot from.
+          $ref: "#/components/schemas/Source"
         source_id:
           type: string
           description: The ID the source gave it, if any.
@@ -1103,17 +934,8 @@ components:
           description: Country flag of the DX operator. This is limited to the range of emoji flags. For some DXCCs there may not be an official emoji flag, e.g. Northern Ireland, so the appearance may vary depending on your browser and operating system. Some small islands may also have no flag. Many DXCCs may also share a flag, e.g. mainland Spain, Balearic Islands, etc.
           example: ""
         dx_continent:
-          type: string
           description: Continent of the DX operator
-          enum:
-            - EU
-            - NA
-            - SA
-            - AS
-            - AF
-            - OC
-            - AN
-          example: EU
+          $ref: "#/components/schemas/Continent"
         dx_dxcc_id:
           type: integer
           description: DXCC ID of the DX operator
@@ -1159,27 +981,8 @@ components:
           description: Comment made by the activator, if any
           example: "2025 DXpedition to null island"
         sig:
-          type: string
           description: Special Interest Group (SIG), e.g. outdoor activity programme such as POTA
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - WCA
-            - MOTA
-            - SIOTA
-            - ARLHS
-            - ILLW
-            - ZLOTA
-            - IOTA
-            - WOTA
-            - BOTA
-            - WAB
-            - WAI
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         sig_refs:
           type: array
           items:
@@ -1196,22 +999,7 @@ components:
         source:
           type: string
           description: Where we got the alert from.
-          enum:
-            - POTA
-            - SOTA
-            - WWFF
-            - WWBOTA
-            - GMA
-            - HEMA
-            - ParksNPeaks
-            - ZLOTA
-            - WOTA
-            - BOTA
-            - Cluster
-            - RBN
-            - APRS-IS
-            - UKPacketNet
-          example: POTA
+          $ref: "#/components/schemas/Source"
         source_id:
           type: string
           description: The ID the source gave it, if any.
@@ -1221,9 +1009,8 @@ components:
       type: object
       properties:
         name:
-          type: string
           description: The name of the provider.
-          example: POTA
+          $ref: "#/components/schemas/Source"
         enabled:
           type: boolean
           description: Whether the provider is enabled or not.
@@ -1245,9 +1032,8 @@ components:
       type: object
       properties:
         name:
-          type: string
           description: The name of the provider.
-          example: POTA
+          $ref: "#/components/schemas/Source"
         enabled:
           type: boolean
           description: Whether the provider is enabled or not.
@@ -1265,9 +1051,8 @@ components:
       type: object
       properties:
         name:
-          type: string
           description: The name of the band
-          example: 40m
+          $ref: "#/components/schemas/BandName"
         start_freq:
           type: int
           description: The start frequency of this band, in Hz.
@@ -1289,9 +1074,8 @@ components:
       type: object
       properties:
         name:
-          type: string
           description: The abbreviated name of the SIG
-          example: POTA
+          $ref: "#/components/schemas/SIGName"
         description:
           type: string
           description: The full name of the SIG