kopia lustrzana https://github.com/glidernet/ogn-python
Modifications for 0.2.5 protocol
rodzic
a3e4d21e1a
commit
16984883e3
|
@ -30,7 +30,21 @@ def process_beacon(raw_message, reference_date=None, reference_time=None):
|
||||||
# \n: ?
|
# \n: ?
|
||||||
# /z: ?
|
# /z: ?
|
||||||
# /o: ?
|
# /o: ?
|
||||||
if message['symboltable'] == "I" and message['symbolcode'] == '&':
|
if 'symboltable' not in message and 'symbolcode' not in message:
|
||||||
|
# we have a receiver_beacon (status message)
|
||||||
|
message.update(parse_ogn_receiver_beacon(message['comment']))
|
||||||
|
beacon = ReceiverBeacon(**message)
|
||||||
|
|
||||||
|
# connect beacon with receiver
|
||||||
|
receiver = session.query(Receiver.id) \
|
||||||
|
.filter(Receiver.name == beacon.name) \
|
||||||
|
.first()
|
||||||
|
if receiver is None:
|
||||||
|
receiver = Receiver()
|
||||||
|
receiver.name = beacon.name
|
||||||
|
session.add(receiver)
|
||||||
|
beacon.receiver_id = receiver.id
|
||||||
|
elif message['symboltable'] == "I" and message['symbolcode'] == '&':
|
||||||
# ... we have a receiver_beacon
|
# ... we have a receiver_beacon
|
||||||
message.update(parse_ogn_receiver_beacon(message['comment']))
|
message.update(parse_ogn_receiver_beacon(message['comment']))
|
||||||
message = replace_lonlat_with_wkt(message)
|
message = replace_lonlat_with_wkt(message)
|
||||||
|
|
|
@ -21,6 +21,12 @@ class ReceiverBeacon(Beacon):
|
||||||
rec_crystal_correction_fine = 0 # obsolete since 0.2.0
|
rec_crystal_correction_fine = 0 # obsolete since 0.2.0
|
||||||
rec_input_noise = Column(Float)
|
rec_input_noise = Column(Float)
|
||||||
|
|
||||||
|
snr_total_average = None
|
||||||
|
snr_total_fixes = None
|
||||||
|
snr_filtered_average_daily = None
|
||||||
|
snr_devices_daily_selection = None
|
||||||
|
snr_devices_daily = None
|
||||||
|
|
||||||
# Relations
|
# Relations
|
||||||
receiver_id = Column(Integer, ForeignKey('receiver.id', ondelete='SET NULL'), index=True)
|
receiver_id = Column(Integer, ForeignKey('receiver.id', ondelete='SET NULL'), index=True)
|
||||||
receiver = relationship('Receiver', foreign_keys=[receiver_id])
|
receiver = relationship('Receiver', foreign_keys=[receiver_id])
|
||||||
|
|
Ładowanie…
Reference in New Issue