Merge branch 'main' into 95-send-spots-to-xota

# Conflicts:
#	core/constants.py
#	data/spot.py

webassets/apidocs/openapi.yml

@@ -26,6 +26,11 @@ info:
     ### 1.4
     
     * Spots can now include a "propagation_mode" field, and the `/options` call enumerates the options that can have.
+    * Added support for the Diploma de Municipios Españoles (DME) SIG
+    * Renamed some SIGs to avoid confusion between Towers, Tiles and Toilets
+    * Added `comment_names` to SIGs in the `/options`, to reflect how they might be referred to in spot comments where
+      it differs from their `name`.
+    * Added `propagation_mode` field to spots
 
     ### 1.3
 
@@ -785,7 +790,7 @@ components:
         - ZLOTA
         - WOTA
         - LLOTA
-        - WWTOTA
+        - Towers
         - Tiles
         - Cluster
         - RBN
@@ -804,7 +809,7 @@ components:
         - HEMA
         - WCA
         - MOTA
-        - SIOTA
+        - SiOTA
         - ARLHS
         - ILLW
         - ZLOTA
@@ -813,11 +818,12 @@ components:
         - WOTA
         - BOTA
         - LLOTA
-        - WWTOTA
+        - Towers
         - Tiles
         - WAB
         - WAI
-        - TOTA
+        - DME
+        - Toilets
       example: POTA
 
     SIGNameIncludingNoSIG:
@@ -1435,6 +1441,16 @@ components:
           type: string
           description: The full name of the SIG
           example: Parks on the Air
+        comment_names:
+          type: array
+          description: >
+            Names by which this SIG may be referred to in cluster spot comments. Most SIGs have a
+            single entry matching their programme name (e.g. ["POTA"]), but some have none (where
+            the name is ambiguous with other SIGs, such as Tiles and Toilets on the Air) or multiple
+            entries (e.g. WWBOTA accepts both "WWBOTA" and "BOTA" since the latter is often used).
+          items:
+            type: string
+          example: [ "TOTA" ]
         ref_regex:
           type: string
           description: >

webassets/js/ui-ham.js

@@ -358,11 +358,12 @@ const SIG_ICONS = {
     "BOTA": "fa-umbrella-beach",
     "KRMNPA": "fa-earth-oceania",
     "LLOTA": "fa-water",
-    "WWTOTA": "fa-tower-observation",
+    "Towers": "fa-tower-observation",
     "WAB": "fa-table-cells-large",
     "WAI": "fa-table-cells-large",
+    "DME": "fa-building",
     "Tiles": "fa-square",
-    "TOTA": "fa-toilet"
+    "Toilets": "fa-toilet"
 }
 
 const SIG_NAMES = {