hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2026-01-16 02:25:30 -05:00
Code Issues Projects Releases Wiki Activity

Fixed building WeatherPacket from json

Browse Source 
This patch fixes an issue with rebuilding a
WeatherPacket from json.   The 'weather' key wasn't
in the json that gets generated from the packet.to_json()
because it isn't part of the packet declaration.  The 'weather'
key only exists in the json that comes from aprslib, when decoding
a raw packet string -> json -> WeatherPacket.
This commit is contained in:
Walter Boring 2026-01-05 17:04:38 -05:00
parent 1da92e52ef
commit 8a82a62dc9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
aprsd/packets/core.py
View File

@ -514,8 +514,13 @@ class WeatherPacket(GPSPacket, DataClassJsonMixin):
speed: Optional[float] = field(default=None)
def _translate(self, raw: dict) -> dict:
for key in raw['weather']:
raw[key] = raw['weather'][key]
# aprslib returns the weather data in a 'weather' key
# We need to move the data out of the 'weather' key
# and into the root of the dictionary
if 'weather' in raw:
for key in raw['weather']:
raw[key] = raw['weather'][key]
del raw['weather']
# If we have the broken aprslib, then we need to
# Convert the course and speed to wind_speed and wind_direction
@ -531,28 +536,27 @@ class WeatherPacket(GPSPacket, DataClassJsonMixin):
wind_speed = raw.get('speed')
if wind_speed:
raw['wind_speed'] = round(wind_speed / 1.852, 3)
raw['weather']['wind_speed'] = raw['wind_speed']
# raw['weather']['wind_speed'] = raw['wind_speed']
if 'speed' in raw:
del raw['speed']
# Let's adjust the rain numbers as well, since it's wrong
raw['rain_1h'] = round((raw.get('rain_1h', 0) / 0.254) * 0.01, 3)
raw['weather']['rain_1h'] = raw['rain_1h']
# raw['weather']['rain_1h'] = raw['rain_1h']
raw['rain_24h'] = round((raw.get('rain_24h', 0) / 0.254) * 0.01, 3)
raw['weather']['rain_24h'] = raw['rain_24h']
# raw['weather']['rain_24h'] = raw['rain_24h']
raw['rain_since_midnight'] = round(
(raw.get('rain_since_midnight', 0) / 0.254) * 0.01, 3
)
raw['weather']['rain_since_midnight'] = raw['rain_since_midnight']
# raw['weather']['rain_since_midnight'] = raw['rain_since_midnight']
if 'wind_direction' not in raw:
wind_direction = raw.get('course')
if wind_direction:
raw['wind_direction'] = wind_direction
raw['weather']['wind_direction'] = raw['wind_direction']
# raw['weather']['wind_direction'] = raw['wind_direction']
if 'course' in raw:
del raw['course']
del raw['weather']
return raw
@classmethod