mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-03-15 12:24:29 +00:00
Extra protection against string lat/longs creeping into the system
This commit is contained in:
@@ -364,10 +364,10 @@ class LookupHelper:
|
||||
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 and (float(data["latitude"]) != 0 or float(data["longitude"]) != 0) and -89.9 < float(data["latitude"]) < 89.9:
|
||||
return [data["latitude"], data["longitude"]]
|
||||
return [float(data["latitude"]), float(data["longitude"])]
|
||||
data = self.get_hamqth_data_for_callsign(call)
|
||||
if data and "latitude" in data and "longitude" in data and (float(data["latitude"]) != 0 or float(data["longitude"]) != 0) and -89.9 < float(data["latitude"]) < 89.9:
|
||||
return [data["latitude"], data["longitude"]]
|
||||
return [float(data["latitude"]), float(data["longitude"])]
|
||||
else:
|
||||
return None
|
||||
|
||||
@@ -399,7 +399,7 @@ class LookupHelper:
|
||||
try:
|
||||
data = self.CALL_INFO_BASIC.get_lat_long(call)
|
||||
if data and "latitude" in data and "longitude" in data:
|
||||
loc = [data["latitude"], data["longitude"]]
|
||||
loc = [float(data["latitude"]), float(data["longitude"])]
|
||||
else:
|
||||
loc = None
|
||||
except KeyError:
|
||||
@@ -408,11 +408,11 @@ class LookupHelper:
|
||||
if not loc:
|
||||
data = self.get_clublog_xml_data_for_callsign(call)
|
||||
if data and "Lat" in data and "Lon" in data:
|
||||
loc = [data["Lat"], data["Lon"]]
|
||||
loc = [float(data["Lat"]), float(data["Lon"])]
|
||||
if not loc:
|
||||
data = self.get_clublog_api_data_for_callsign(call)
|
||||
if data and "Lat" in data and "Lon" in data:
|
||||
loc = [data["Lat"], data["Lon"]]
|
||||
loc = [float(data["Lat"]), float(data["Lon"])]
|
||||
return loc
|
||||
|
||||
# Infer a grid locator from a callsign (using DXCC, probably very inaccurate)
|
||||
|
||||
Reference in New Issue
Block a user