Add support for DME. Closes #114.

core/constants.py

@@ -32,6 +32,7 @@ SIGS = [
     SIG(name="Tiles", description="Tiles on the Air", ref_regex=r"[A-Za-z]{2}[0-9]{2}[A-Za-z]{2}"),
     SIG(name="WAB", description="Worked All Britain", ref_regex=r"[A-Z]{1,2}[0-9]{2}"),
     SIG(name="WAI", description="Worked All Ireland", ref_regex=r"[A-Z][0-9]{2}"),
+    SIG(name="DME", description="Diplomas de Municipios Españoles", ref_regex=r"\d{4,5}"),
     SIG(name="TOTA", description="Toilets on the Air", ref_regex=r"T\-[0-9]{2}")
 ]
 

core/sig_utils.py

@@ -7,6 +7,9 @@ from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.constants import SIGS, HTTP_HEADERS
 from core.geo_utils import wab_wai_square_to_lat_lon
 
+with open("datafiles/dme-geodata.csv", encoding="utf-8") as _f:
+    _DME_INDEX = {row["dme"]: row for row in csv.DictReader(_f)}
+
 
 def get_ref_regex_for_sig(sig):
     """Utility function to get the regex string for a SIG reference for a named SIG. If no match is found, None will be returned."""
@@ -188,6 +191,17 @@ def populate_sig_ref_info(sig_ref):
                     sig_ref.longitude = ll[1]
                 except:
                     logging.debug("Invalid lat/lon received for reference")
+        elif sig.upper() == "DME":
+            row = _DME_INDEX.get(ref_id)
+            if row:
+                sig_ref.name = row["municipio"] + ", " + row["provincia"]
+                sig_ref.latitude = float(row["lat"]) if row.get("lat") else None
+                sig_ref.longitude = float(row["lon"]) if row.get("lon") else None
+                if sig_ref.latitude and sig_ref.longitude:
+                    try:
+                        sig_ref.grid = latlong_to_locator(sig_ref.latitude, sig_ref.longitude, 6)
+                    except Exception:
+                        logging.debug("Invalid lat/lon received for reference")
     except Exception:
         logging.warning("Failed to look up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)
     return sig_ref

data/spot.py

@@ -263,7 +263,7 @@ class Spot:
                 # If so, add that to the sig_refs list for this spot.
                 ref_regex = get_ref_regex_for_sig(found_sig)
                 if ref_regex:
-                    ref_matches = re.finditer(r"(^|\W)" + found_sig + r"($|\W)(" + ref_regex + r")($|\W)", self.comment,
+                    ref_matches = re.finditer(r"(^|\W)" + found_sig + r"([ -])(" + ref_regex + r")($|\W)", self.comment,
                                               re.IGNORECASE)
                     for ref_match in ref_matches:
                         self._append_sig_ref_if_missing(SIGRef(id=ref_match.group(3).upper(), sig=found_sig))
@@ -290,23 +290,23 @@ class Spot:
         if self.sig_refs and len(self.sig_refs) > 0 and not self.sig:
             self.sig = self.sig_refs[0].sig
 
-        # Parse "de_grid<prop_mode>dx_grid" structures from the comment, e.g. "JN61ES<ES>JM56XT" or "JO02GQ<>KN17LG".
+        # Parse "de_grid<prop_mode>dx_grid" structures from the comment, e.g. "JN61ES(ES)JM56XT" or "JO02GQ<>KN17LG".
         # These are common on cluster spots and can provide grid references in preference to e.g. QRZ lookup, as well as
-        # being the only source we have for propagation mode.
+        # being the only source we have for propagation mode. Brace for nightmare regex from hell.
         if self.comment:
             grid_mode_grid_match = re.search(
-                r'\b([A-Ra-r]{2}\d{2}(?:[A-Xa-x]{2}(?:\d{2})?)?)<([^>]*)>([A-Ra-r]{2}\d{2}(?:[A-Xa-x]{2}(?:\d{2})?)?)\b',
+                r'\b([A-Ra-r]{2}\d{2}(?:[A-Xa-x]{2}(?:\d{2})?)?)(?:<([^>]*)>|\(([^)]*)\))([A-Ra-r]{2}\d{2}(?:[A-Xa-x]{2}(?:\d{2})?)?)\b',
                 self.comment)
             if grid_mode_grid_match:
                 # regex matches, so extract grids:
                 if not self.de_grid:
                     self.de_grid = grid_mode_grid_match.group(1).upper()
                 if not self.dx_grid:
-                    self.dx_grid = grid_mode_grid_match.group(3).upper()
+                    self.dx_grid = grid_mode_grid_match.group(4).upper()
                     self.dx_location_source = "SPOT"
 
-                # And extract propagation mode:
+                # And extract propagation mode (group 2 for <...>, group 3 for (...)):
-                mode_tag = grid_mode_grid_match.group(2).upper()
+                mode_tag = (grid_mode_grid_match.group(2) or grid_mode_grid_match.group(3) or "").upper()
                 if mode_tag and not self.propagation_mode:
                     if mode_tag in PROPAGATION_MODES:
                         self.propagation_mode = PROPAGATION_MODES[mode_tag]

templates/add_spot.html

@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1782076050"></script>
+<script src="/js/add-spot.js?v=1782076701"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/alerts.html

@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1782076050"></script>
+<script src="/js/alerts.js?v=1782076701"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/bands.html

@@ -77,8 +77,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782076050"></script>
+<script src="/js/spotsbandsandmap.js?v=1782076701"></script>
-<script src="/js/bands.js?v=1782076050"></script>
+<script src="/js/bands.js?v=1782076701"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/base.html

@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1782076050" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1782076701" 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=1782076050"></script>
+<script src="/js/utils.js?v=1782076701"></script>
-<script src="/js/ui-ham.js?v=1782076050"></script>
+<script src="/js/ui-ham.js?v=1782076701"></script>
-<script src="/js/geo.js?v=1782076050"></script>
+<script src="/js/geo.js?v=1782076701"></script>
-<script src="/js/common.js?v=1782076050"></script>
+<script src="/js/common.js?v=1782076701"></script>
 {% end %}
 {% block body %}
 <div class="container">

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

templates/map.html

@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782076049"></script>
+<script src="/js/spotsbandsandmap.js?v=1782076701"></script>
-<script src="/js/map.js?v=1782076049"></script>
+<script src="/js/map.js?v=1782076701"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/spots.html

@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782076049"></script>
+<script src="/js/spotsbandsandmap.js?v=1782076701"></script>
-<script src="/js/spots.js?v=1782076049"></script>
+<script src="/js/spots.js?v=1782076701"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/status.html

@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1782076050"></script>
+<script src="/js/status.js?v=1782076701"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

webassets/js/ui-ham.js

@@ -335,6 +335,7 @@ const SIG_ICONS = {
     "WWTOTA": "fa-tower-observation",
     "WAB": "fa-table-cells-large",
     "WAI": "fa-table-cells-large",
+    "DME": "fa-building",
     "Tiles": "fa-square",
     "TOTA": "fa-toilet"
 }