diff --git a/ogn/model/aircraft_beacon.py b/ogn/model/aircraft_beacon.py index 61fb0e7..f9439c1 100644 --- a/ogn/model/aircraft_beacon.py +++ b/ogn/model/aircraft_beacon.py @@ -12,17 +12,17 @@ class AircraftBeacon(Beacon): aircraft_type = Column(SmallInteger) stealth = Column(Boolean) address = Column(String(6)) - climb_rate = Column(Float) - turn_rate = Column(Float) - flightlevel = Column(Float) - signal_quality = Column(Float) - error_count = Column(Integer) - frequency_offset = Column(Float) + climb_rate = Column(Float(precision=2)) + turn_rate = Column(Float(precision=2)) + flightlevel = Column(Float(precision=2)) + signal_quality = Column(Float(precision=2)) + error_count = Column(SmallInteger) + frequency_offset = Column(Float(precision=2)) gps_status = Column(String) - software_version = Column(Float) + software_version = Column(Float(precision=2)) hardware_version = Column(SmallInteger) real_address = Column(String(6)) - signal_power = Column(Float) + signal_power = Column(Float(precision=2)) proximity = None gps_satellites = None @@ -37,6 +37,7 @@ class AircraftBeacon(Beacon): relays = None # Calculated values + status = Column(SmallInteger, default=0) distance = Column(Float) location_mgrs = Column(String(15), index=True) diff --git a/ogn/model/beacon.py b/ogn/model/beacon.py index 6b3e2cc..56a0326 100644 --- a/ogn/model/beacon.py +++ b/ogn/model/beacon.py @@ -12,7 +12,7 @@ class Beacon(AbstractConcreteBase, Base): # APRS data location_wkt = Column('location', Geometry('POINT', srid=4326)) - altitude = Column(Integer) + altitude = Column(Float(precision=2)) name = Column(String) receiver_name = Column(String(9)) @@ -21,7 +21,7 @@ class Beacon(AbstractConcreteBase, Base): symboltable = None symbolcode = None track = Column(Integer) - ground_speed = Column(Float) + ground_speed = Column(Float(precision=2)) comment = None relay = None diff --git a/ogn/model/receiver_beacon.py b/ogn/model/receiver_beacon.py index ba6fa39..aa86228 100644 --- a/ogn/model/receiver_beacon.py +++ b/ogn/model/receiver_beacon.py @@ -10,22 +10,22 @@ class ReceiverBeacon(Beacon): # ReceiverBeacon specific data version = Column(String) platform = Column(String) - cpu_load = Column(Float) - free_ram = Column(Float) - total_ram = Column(Float) - ntp_error = Column(Float) - rt_crystal_correction = Column(Float) - voltage = Column(Float) - amperage = Column(Float) - cpu_temp = Column(Float) + cpu_load = Column(Float(precision=2)) + free_ram = Column(Float(precision=2)) + total_ram = Column(Float(precision=2)) + ntp_error = Column(Float(precision=2)) + rt_crystal_correction = Column(Float(precision=2)) + voltage = Column(Float(precision=2)) + amperage = Column(Float(precision=2)) + cpu_temp = Column(Float(precision=2)) senders_visible = Column(Integer) senders_total = Column(Integer) rec_crystal_correction = 0 # obsolete since 0.2.0 rec_crystal_correction_fine = 0 # obsolete since 0.2.0 - rec_input_noise = Column(Float) - senders_signal = Column(Float) + rec_input_noise = Column(Float(precision=2)) + senders_signal = Column(Float(precision=2)) senders_messages = Column(Integer) - good_senders_signal = Column(Float) + good_senders_signal = Column(Float(precision=2)) good_senders = Column(Integer) good_and_bad_senders = Column(Integer)