w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2026-04-29 18:25:58 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

More tweaks for string lat/lons

Browse Source
This commit is contained in:
Ian Renton
2026-04-03 15:32:48 +01:00
parent 9cfc3051a5
commit 8d2fcc69b0
10 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/spot.py
View File

@@ -337,11 +337,15 @@ class Spot:
self.dx_grid = lookup_helper.infer_grid_from_callsign_dxcc(self.dx_call) self.dx_grid = lookup_helper.infer_grid_from_callsign_dxcc(self.dx_call)
self.dx_location_source = "DXCC" self.dx_location_source = "DXCC"
# It looks like we can sometimes get a string into lat/lon, so reject that before we try looking anything up # It looks like we can sometimes get a string into lat/lon, so try to parse as float, reject if not valid
if isinstance(self.dx_latitude, str) or isinstance(self.dx_longitude, str): if isinstance(self.dx_latitude, str) or isinstance(self.dx_longitude, str):
logging.warning("Received strings in lat/lon (" + str(self.dx_latitude) + ", " + str(self.dx_longitude) + ") for call " + self.dx_call + ", rejecting it") try:
self.dx_latitude = None self.dx_latitude = float(self.dx_latitude)
self.dx_longitude = None self.dx_longitude = float(self.dx_longitude)
except (TypeError, ValueError):
logging.warning("Received non-numeric strings in lat/lon (" + str(self.dx_latitude) + ", " + str(self.dx_longitude) + ") for call " + self.dx_call + ", rejecting it")
self.dx_latitude = None
self.dx_longitude = None
# CQ and ITU zone lookup, preferably from location but failing that, from callsign # CQ and ITU zone lookup, preferably from location but failing that, from callsign
if not self.dx_cq_zone: if not self.dx_cq_zone:

2
templates/about.html
View File

@@ -67,7 +67,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> <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> </div>
<script src="/js/common.js?v=1775225976"></script> <script src="/js/common.js?v=1775226769"></script>
<script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

4
templates/add_spot.html
View File

@@ -69,8 +69,8 @@
</div> </div>
<script src="/js/common.js?v=1775225976"></script> <script src="/js/common.js?v=1775226769"></script>
<script src="/js/add-spot.js?v=1775225976"></script> <script src="/js/add-spot.js?v=1775226769"></script>
<script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

4
templates/alerts.html
View File

@@ -56,8 +56,8 @@
</div> </div>
<script src="/js/common.js?v=1775225975"></script> <script src="/js/common.js?v=1775226769"></script>
<script src="/js/alerts.js?v=1775225975"></script> <script src="/js/alerts.js?v=1775226769"></script>
<script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

6
templates/bands.html
View File

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

8
templates/base.html
View File

@@ -46,10 +46,10 @@
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js"></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=1775225975"></script> <script src="https://misc.ianrenton.com/jsutils/utils.js?v=1775226769"></script>
<script src="https://misc.ianrenton.com/jsutils/storage.js?v=1775225975"></script> <script src="https://misc.ianrenton.com/jsutils/storage.js?v=1775226769"></script>
<script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1775225975"></script> <script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1775226769"></script>
<script src="https://misc.ianrenton.com/jsutils/geo.js?v=1775225975"></script> <script src="https://misc.ianrenton.com/jsutils/geo.js?v=1775226769"></script>
</head> </head>
<body> <body>

4
templates/conditions.html
View File

@@ -189,8 +189,8 @@
</div> </div>
</div> </div>
<script src="/js/common.js?v=1775225975"></script> <script src="/js/common.js?v=1775226769"></script>
<script src="/js/conditions.js?v=1775225975"></script> <script src="/js/conditions.js?v=1775226769"></script>
<script>$(document).ready(function() { $("#nav-link-conditions").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-conditions").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

6
templates/map.html
View File

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

6
templates/spots.html
View File

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

4
templates/status.html
View File

@@ -59,8 +59,8 @@
</div> </div>
</div> </div>
<script src="/js/common.js?v=1775225975"></script> <script src="/js/common.js?v=1775226769"></script>
<script src="/js/status.js?v=1775225975"></script> <script src="/js/status.js?v=1775226769"></script>
<script> <script>
$(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav --> $(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav -->
</script> </script>