Extract grid<mode>grid type comments from clusters. Closes #113

data/spot.py

@@ -288,6 +288,19 @@ 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<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.
+        if self.comment:
+            grid_pair_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',
+                self.comment)
+            if grid_pair_match:
+                if not self.de_grid:
+                    self.de_grid = grid_pair_match.group(1).upper()
+                if not self.dx_grid:
+                    self.dx_grid = grid_pair_match.group(2).upper()
+                    self.dx_location_source = "SPOT"
+
         # DX Grid to lat/lon and vice versa in case one is missing
         if self.dx_grid and not self.dx_latitude:
             try:

templates/add_spot.html

@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1782028386"></script>
+<script src="/js/add-spot.js?v=1782029759"></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=1782028386"></script>
+<script src="/js/alerts.js?v=1782029759"></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=1782028386"></script>
+<script src="/js/spotsbandsandmap.js?v=1782029759"></script>
-<script src="/js/bands.js?v=1782028386"></script>
+<script src="/js/bands.js?v=1782029759"></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=1782028386" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1782029759" 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=1782028386"></script>
+<script src="/js/utils.js?v=1782029759"></script>
-<script src="/js/ui-ham.js?v=1782028386"></script>
+<script src="/js/ui-ham.js?v=1782029759"></script>
-<script src="/js/geo.js?v=1782028386"></script>
+<script src="/js/geo.js?v=1782029759"></script>
-<script src="/js/common.js?v=1782028386"></script>
+<script src="/js/common.js?v=1782029759"></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=1782028386"></script>
+<script src="/js/conditions.js?v=1782029759"></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=1782028386"></script>
+<script src="/js/spotsbandsandmap.js?v=1782029759"></script>
-<script src="/js/map.js?v=1782028386"></script>
+<script src="/js/map.js?v=1782029759"></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=1782028386"></script>
+<script src="/js/spotsbandsandmap.js?v=1782029759"></script>
-<script src="/js/spots.js?v=1782028386"></script>
+<script src="/js/spots.js?v=1782029759"></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=1782028386"></script>
+<script src="/js/status.js?v=1782029759"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");