mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-09-20 22:37:44 +00:00
Merge branch 'main' into 147-sig-activity-changes
This commit is contained in:
@@ -69,8 +69,8 @@ class APRSIS(SpotProvider):
|
||||
de_call=de_call,
|
||||
de_ssid=de_ssid,
|
||||
comment=str(data["comment"]) if "comment" in data else None,
|
||||
dx_latitude=float(data["latitude"]) if "latitude" in data else None,
|
||||
dx_longitude=float(data["longitude"]) if "longitude" in data else None,
|
||||
dx_latitude=float(data["latitude"]) if data.get("latitude") is not None else None,
|
||||
dx_longitude=float(data["longitude"]) if data.get("longitude") is not None else None,
|
||||
time=datetime.now(pytz.UTC).timestamp(),
|
||||
) # APRS-IS spots are live so we can assume spot time is "now"
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ class UKPacketNet(HTTPSpotProvider):
|
||||
)
|
||||
comment = (
|
||||
f"{comment} {listed_port['baud']!s} baud"
|
||||
if "baud" in listed_port and listed_port["baud"] > 0
|
||||
if listed_port.get("baud") and listed_port["baud"] > 0
|
||||
else comment
|
||||
)
|
||||
|
||||
@@ -50,7 +50,7 @@ class UKPacketNet(HTTPSpotProvider):
|
||||
# very hacky but a lot of node comments contain their frequency as the first or second
|
||||
# word of their comment, but not in the proper data structure field.
|
||||
freq = (
|
||||
listed_port["freq"] if "freq" in listed_port and listed_port["freq"] > 0 else None
|
||||
listed_port["freq"] if listed_port.get("freq") and listed_port["freq"] > 0 else None
|
||||
)
|
||||
if not freq and comment:
|
||||
possible_freq = comment.split(" ")[0].upper().replace("MHZ", "")
|
||||
|
||||
@@ -36,7 +36,7 @@ class WWBOTA(SSESpotProvider):
|
||||
dx_call=source_spot["call"].upper(),
|
||||
de_call=source_spot["spotter"].upper(),
|
||||
freq=float(source_spot["freq"]) * 1000000,
|
||||
mode=Mode.from_name(source_spot["mode"].upper()) if "mode" in source_spot else None,
|
||||
mode=Mode.from_name(source_spot["mode"].upper()) if source_spot.get("mode") else None,
|
||||
comment=source_spot["comment"],
|
||||
sig=ActivityName.WWBOTA,
|
||||
sig_refs=refs,
|
||||
|
||||
Reference in New Issue
Block a user