mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-09-20 14:27:42 +00:00
Turns out "if x in list" returns true if list[x] = None, so guard against that by checking list.get(x) instead
This commit is contained in:
@@ -124,8 +124,8 @@ class HamQTH(APIQueryCallsignDataProvider):
|
||||
lat = None
|
||||
lon = None
|
||||
if (
|
||||
"latitude" in data
|
||||
and "longitude" in data
|
||||
data.get("latitude") is not None
|
||||
and data.get("longitude") is not None
|
||||
and (float(data["latitude"]) != 0 or float(data["longitude"]) != 0)
|
||||
and -89.9 < float(data["latitude"]) < 89.9
|
||||
):
|
||||
@@ -134,7 +134,7 @@ class HamQTH(APIQueryCallsignDataProvider):
|
||||
|
||||
# Check for sensible grids
|
||||
grid = None
|
||||
if "grid" in data and not data["grid"].startswith("AA00"):
|
||||
if data.get("grid") and not data["grid"].startswith("AA00"):
|
||||
grid = data["grid"]
|
||||
|
||||
return Callsign(
|
||||
@@ -147,8 +147,8 @@ class HamQTH(APIQueryCallsignDataProvider):
|
||||
latitude=lat,
|
||||
longitude=lon,
|
||||
grid=grid,
|
||||
dxcc_id=int(data["adif"]) if "adif" in data else None,
|
||||
cq_zone=int(data["cq"]) if "cq" in data else None,
|
||||
itu_zone=int(data["itu"]) if "itu" in data else None,
|
||||
dxcc_id=int(data["adif"]) if data.get("adif") is not None else None,
|
||||
cq_zone=int(data["cq"]) if data.get("cq") is not None else None,
|
||||
itu_zone=int(data["itu"]) if data.get("itu") is not None else None,
|
||||
location_source=LocationSourceForCallsign.HOME_QTH,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user