From 85e0a7354c2044ff87baa2b382c1fbb089287016 Mon Sep 17 00:00:00 2001 From: Ian Renton Date: Mon, 3 Nov 2025 20:14:41 +0000 Subject: [PATCH] Reject "AA00aa" grids and 0/0 latlons from online lookup --- core/lookup_helper.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/lookup_helper.py b/core/lookup_helper.py index faf9cd4..41db87e 100644 --- a/core/lookup_helper.py +++ b/core/lookup_helper.py @@ -315,23 +315,25 @@ class LookupHelper: return None # Infer a latitude and longitude from a callsign (requires QRZ.com/HamQTH) + # Coordinates that look default are rejected (apologies if your position really is 0,0, enjoy your voyage) def infer_latlon_from_callsign_online_lookup(self, call): data = self.get_qrz_data_for_callsign(call) - if data and "latitude" in data and "longitude" in data: + if data and "latitude" in data and "longitude" in data and (data["latitude"] != 0 or data["longitude"] != 0): return [data["latitude"], data["longitude"]] data = self.get_hamqth_data_for_callsign(call) - if data and "latitude" in data and "longitude" in data: + if data and "latitude" in data and "longitude" in data and (data["latitude"] != 0 or data["longitude"] != 0): return [data["latitude"], data["longitude"]] else: return None - # Infer a grid locator from a callsign (requires QRZ.com/HamQTH) + # Infer a grid locator from a callsign (requires QRZ.com/HamQTH). + # Grids that look default are rejected (apologies if your grid really is AA00aa, enjoy your research) def infer_grid_from_callsign_online_lookup(self, call): data = self.get_qrz_data_for_callsign(call) - if data and "locator" in data: + if data and "locator" in data and data["locator"].upper() != "AA00" and data["locator"].upper() != "AA00AA" and data["locator"].upper() != "AA00AA00": return data["locator"] data = self.get_hamqth_data_for_callsign(call) - if data and "grid" in data: + if data and "grid" in data and data["grid"].upper() != "AA00" and data["grid"].upper() != "AA00AA" and data["grid"].upper() != "AA00AA00": return data["grid"] else: return None