Renaming signal_strength -> signal_quality, power -> signal_power

ogn/parser/parse.py

@@ -50,14 +50,14 @@ def parse_ogn_aircraft_beacon(aprs_comment):
                 'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms,
                 'turn_rate': float(ac_match.group('turn_rate')),
                 'flightlevel': float(ac_match.group('flight_level')) if ac_match.group('flight_level') else None,
-                'signal_strength': float(ac_match.group('signal')),
+                'signal_quality': float(ac_match.group('signal_quality')),
                 'error_count': float(ac_match.group('errors')),
                 'frequency_offset': float(ac_match.group('frequency_offset')),
                 'gps_status': ac_match.group('gps_accuracy'),
                 'software_version': float(ac_match.group('flarm_software_version')) if ac_match.group('flarm_software_version') else None,
                 'hardware_version': int(ac_match.group('flarm_hardware_version'), 16) if ac_match.group('flarm_hardware_version') else None,
                 'real_address': ac_match.group('flarm_id'),
-                'power': float(ac_match.group('power')) if ac_match.group('power') else None}
+                'signal_power': float(ac_match.group('signal_power')) if ac_match.group('signal_power') else None}
     else:
         return None
 

ogn/parser/pattern.py

@@ -58,13 +58,13 @@ PATTERN_AIRCRAFT_BEACON = re.compile(r"""
     (?P<climb_rate>[+-]\d+?)fpm\s
     (?P<turn_rate>[+-][\d.]+?)rot\s
     (?:FL(?P<flight_level>[\d.]+)\s)?
-    (?P<signal>[\d.]+?)dB\s
+    (?P<signal_quality>[\d.]+?)dB\s
     (?P<errors>\d+)e\s
     (?P<frequency_offset>[+-][\d.]+?)kHz\s?
     (?:gps(?P<gps_accuracy>\d+x\d+)\s?)?
     (?:s(?P<flarm_software_version>[\d.]+)\s?)?
     (?:h(?P<flarm_hardware_version>[\dA-F]{2})\s?)?
     (?:r(?P<flarm_id>[\dA-F]+)\s?)?
-    (?:(?P<power>[+-][\d.]+)dBm\s?)?
+    (?:(?P<signal_power>[+-][\d.]+)dBm\s?)?
     (?:hear(?P<proximity>.+))?
 """, re.VERBOSE | re.MULTILINE)

tests/parser/test_aircraft_beacon.py

@@ -15,7 +15,7 @@ class TestStringMethods(unittest.TestCase):
         self.assertEqual(aircraft_beacon['address'], "DDA5BA")
         self.assertAlmostEqual(aircraft_beacon['climb_rate'] * ms2fpm, -454, 2)
         self.assertEqual(aircraft_beacon['turn_rate'], -1.1)
-        self.assertEqual(aircraft_beacon['signal_strength'], 8.8)
+        self.assertEqual(aircraft_beacon['signal_quality'], 8.8)
         self.assertEqual(aircraft_beacon['error_count'], 0)
         self.assertEqual(aircraft_beacon['frequency_offset'], 51.2)
         self.assertEqual(aircraft_beacon['gps_status'], '4x5')
@@ -47,7 +47,7 @@ class TestStringMethods(unittest.TestCase):
     def test_v025(self):
         aircraft_beacon = parse_ogn_aircraft_beacon("id06DDE28D +535fpm +3.8rot 11.5dB 0e -1.0kHz gps2x3 s6.01 h0C +7.4dBm")
 
-        self.assertEqual(aircraft_beacon['power'], 7.4)
+        self.assertEqual(aircraft_beacon['signal_power'], 7.4)
 
 
 if __name__ == '__main__':