From c2c38bb33784dc25029ba4b8bfa6ff3e11fa49e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Wed, 27 Sep 2017 20:23:43 +0200
Subject: [PATCH 01/14] Timestamp zulu can also be a z instead h and other
 small improvements

---
 ogn/__init__.py             | 0
 ogn/parser/parse.py         | 4 ++--
 ogn/parser/pattern.py       | 4 ++--
 tests/parser/test_beacon.py | 1 +
 tests/parser/test_parse.py  | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 ogn/__init__.py

diff --git a/ogn/__init__.py b/ogn/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index f04c5d1..c5d9e61 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -15,8 +15,8 @@ def parse_aprs(message, reference_date=None, reference_time=None):
     match_position = re.search(PATTERN_APRS_POSITION, message)
     if match_position:
         return {'name': match_position.group('callsign'),
-                'receiver_name': match_position.group('receiver'),
                 'dstcall': match_position.group('dstcall'),
+                'receiver_name': match_position.group('receiver'),
                 'timestamp': createTimestamp(match_position.group('time'), reference_date, reference_time),
                 'latitude': parseAngle('0' + match_position.group('latitude') + (match_position.group('latitude_enhancement') or '0')) *
                 (-1 if match_position.group('latitude_sign') == 'S' else 1),
@@ -32,8 +32,8 @@ def parse_aprs(message, reference_date=None, reference_time=None):
     match_status = re.search(PATTERN_APRS_STATUS, message)
     if match_status:
         return {'name': match_status.group('callsign'),
-                'receiver_name': match_status.group('receiver'),
                 'dstcall': match_status.group('dstcall'),
+                'receiver_name': match_status.group('receiver'),
                 'timestamp': createTimestamp(match_status.group('time'), reference_date, reference_time),
                 'comment': match_status.group('comment')}
 
diff --git a/ogn/parser/pattern.py b/ogn/parser/pattern.py
index c166e89..4093e1f 100644
--- a/ogn/parser/pattern.py
+++ b/ogn/parser/pattern.py
@@ -1,8 +1,8 @@
 import re
 
 
-PATTERN_APRS_POSITION = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):/(?P<time>\d{6})+h(?P<latitude>\d{4}\.\d{2})(?P<latitude_sign>N|S)(?P<symbol_table>.)(?P<longitude>\d{5}\.\d{2})(?P<longitude_sign>E|W)(?P<symbol>.)(?P<course_extension>(?P<course>\d{3})/(?P<ground_speed>\d{3}))?/A=(?P<altitude>\d{6})(?P<pos_extension>\s!W((?P<latitude_enhancement>\d)(?P<longitude_enhancement>\d))!)?(?:\s(?P<comment>.*))?$")
-PATTERN_APRS_STATUS = re.compile(r"(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):>(?P<time>\d{6})+h\s(?P<comment>.*)$")
+PATTERN_APRS_POSITION = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),((?P<relay>[A-Za-z0-9]+)\*)?.*,(?P<receiver>.+?):/(?P<time>\d{6})+(h|z)(?P<latitude>\d{4}\.\d{2})(?P<latitude_sign>N|S)(?P<symbol_table>.)(?P<longitude>\d{5}\.\d{2})(?P<longitude_sign>E|W)(?P<symbol>.)(?P<course_extension>(?P<course>\d{3})/(?P<ground_speed>\d{3}))?/A=(?P<altitude>\d{6})(?P<pos_extension>\s!W((?P<latitude_enhancement>\d)(?P<longitude_enhancement>\d))!)?(?:\s(?P<comment>.*))?$")
+PATTERN_APRS_STATUS = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):>(?P<time>\d{6})+h\s(?P<comment>.*)$")
 
 # The following regexp patterns are part of the ruby ogn-client.
 # source: https://github.com/svoop/ogn_client-ruby
diff --git a/tests/parser/test_beacon.py b/tests/parser/test_beacon.py
index eff74ea..23b80dd 100644
--- a/tests/parser/test_beacon.py
+++ b/tests/parser/test_beacon.py
@@ -16,6 +16,7 @@ class TestStringMethods(unittest.TestCase):
         message = parse_aprs("FLRDDA5BA>APRS,qAS,LFMX:/160829h4415.41N/00600.03E'342/049/A=005524 this is a comment",
                              reference_date=datetime(2015, 1, 1, 16, 8, 29))
         self.assertEqual(message['name'], "FLRDDA5BA")
+        self.assertEqual(message['dstcall'], "APRS")
         self.assertEqual(message['receiver_name'], "LFMX")
         self.assertEqual(message['timestamp'].strftime('%H:%M:%S'), "16:08:29")
         self.assertAlmostEqual(message['latitude'], 44.25683, 5)
diff --git a/tests/parser/test_parse.py b/tests/parser/test_parse.py
index 30d6bde..404e0ca 100644
--- a/tests/parser/test_parse.py
+++ b/tests/parser/test_parse.py
@@ -1,5 +1,6 @@
 import unittest
 import unittest.mock as mock
+import os
 
 from datetime import datetime
 from time import sleep
@@ -10,7 +11,7 @@ from ogn.parser.exceptions import AprsParseError
 
 class TestStringMethods(unittest.TestCase):
     def test_valid_beacons(self):
-        with open('tests/valid_beacons.txt') as f:
+        with open(os.path.dirname(__file__) + '/../valid_beacons.txt') as f:
             for line in f:
                 if not line[0] == '#':
                     aprs = parse_aprs(line, datetime(2015, 4, 10, 17, 0))

From a36d2a76ffb65c1bd913314ee560c37e29b07c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Wed, 27 Sep 2017 22:43:04 +0200
Subject: [PATCH 02/14] Added APRS beacons for LT24, Naviter, Skylines, Spider,
 SPOT

---
 tests/parser/test_parse.py                    | 23 +++++++++++++++++--
 .../valid_beacon_data/aprs.txt}               | 15 +++++++-----
 .../valid_beacon_data/aprs_aircraft.txt       | 15 ++++++++++++
 tests/parser/valid_beacon_data/lt24.txt       | 16 +++++++++++++
 tests/parser/valid_beacon_data/naviter.txt    |  7 ++++++
 tests/parser/valid_beacon_data/ogn_flarm.txt  |  7 ++++++
 .../parser/valid_beacon_data/ogn_receiver.txt | 16 +++++++++++++
 .../parser/valid_beacon_data/ogn_tracker.txt  |  9 ++++++++
 tests/parser/valid_beacon_data/skylines.txt   |  6 +++++
 tests/parser/valid_beacon_data/spider.txt     | 23 +++++++++++++++++++
 tests/parser/valid_beacon_data/spot.txt       | 10 ++++++++
 11 files changed, 139 insertions(+), 8 deletions(-)
 rename tests/{valid_beacons.txt => parser/valid_beacon_data/aprs.txt} (88%)
 create mode 100644 tests/parser/valid_beacon_data/aprs_aircraft.txt
 create mode 100644 tests/parser/valid_beacon_data/lt24.txt
 create mode 100644 tests/parser/valid_beacon_data/naviter.txt
 create mode 100644 tests/parser/valid_beacon_data/ogn_flarm.txt
 create mode 100644 tests/parser/valid_beacon_data/ogn_receiver.txt
 create mode 100644 tests/parser/valid_beacon_data/ogn_tracker.txt
 create mode 100644 tests/parser/valid_beacon_data/skylines.txt
 create mode 100644 tests/parser/valid_beacon_data/spider.txt
 create mode 100644 tests/parser/valid_beacon_data/spot.txt

diff --git a/tests/parser/test_parse.py b/tests/parser/test_parse.py
index 404e0ca..a66b1b8 100644
--- a/tests/parser/test_parse.py
+++ b/tests/parser/test_parse.py
@@ -10,14 +10,33 @@ from ogn.parser.exceptions import AprsParseError
 
 
 class TestStringMethods(unittest.TestCase):
-    def test_valid_beacons(self):
-        with open(os.path.dirname(__file__) + '/../valid_beacons.txt') as f:
+    def parse_valid_beacon_data_file(self, filename):
+        with open(os.path.dirname(__file__) + '/valid_beacon_data/' + filename) as f:
             for line in f:
                 if not line[0] == '#':
                     aprs = parse_aprs(line, datetime(2015, 4, 10, 17, 0))
+                    self.assertFalse(aprs is None)
                     if aprs['comment']:
                         parse_ogn_beacon(aprs['comment'])
 
+    def test_aprs_beacons(self):
+        self.parse_valid_beacon_data_file('aprs.txt')
+
+    def test_lt24_beacons(self):
+        self.parse_valid_beacon_data_file('lt24.txt')
+
+    def test_naviter_beacons(self):
+        self.parse_valid_beacon_data_file('naviter.txt')
+
+    def test_skylines_beacons(self):
+        self.parse_valid_beacon_data_file('skylines.txt')
+
+    def test_spider_beacons(self):
+        self.parse_valid_beacon_data_file('spider.txt')
+
+    def test_spot_beacons(self):
+        self.parse_valid_beacon_data_file('spot.txt')
+
     def test_fail_parse_aprs_none(self):
         with self.assertRaises(TypeError):
             parse_aprs(None)
diff --git a/tests/valid_beacons.txt b/tests/parser/valid_beacon_data/aprs.txt
similarity index 88%
rename from tests/valid_beacons.txt
rename to tests/parser/valid_beacon_data/aprs.txt
index 5b9d9e4..9704e81 100644
--- a/tests/valid_beacons.txt
+++ b/tests/parser/valid_beacon_data/aprs.txt
@@ -1,6 +1,6 @@
-# aprsc 2.0.14-g28c5a6a 10 Apr 2015 18:58:47 GMT GLIDERN1 37.187.40.234:14580
-FLRDDA5BA>APRS,qAS,LFMX:/165829h4415.41N/00600.03E'342/049/A=005524 id0ADDA5BA -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5
-ICA4B0E3A>APRS,qAS,Letzi:/165319h4711.75N\00802.59E^327/149/A=006498 id154B0E3A -3959fpm +0.5rot 9.0dB 0e -6.3kHz gps1x3
+# Until OGN software 0.2.6 all beacons (flarms, ogn trackers and receivers) have the dstcall "APRS"
+# These are example beacons for receivers
+#
 Lachens>APRS,TCPIP*,qAC,GLIDERN2:/165334h4344.70NI00639.19E&/A=005435 v0.2.1 CPU:0.3 RAM:1764.4/2121.4MB NTP:2.8ms/+4.9ppm +47.0C RF:+0.70dB
 LFGU>APRS,TCPIP*,qAC,GLIDERN2:/165556h4907.63NI00706.41E&/A=000833 v0.2.0 CPU:0.9 RAM:281.3/458.9MB NTP:0.5ms/-19.1ppm +53.0C RF:+0.70dB
 FLRDDB091>APRS,qAS,Letzi:/165831h4740.04N/00806.01EX152/124/A=004881 id06DD8E80 +198fpm +0.0rot 6.5dB 13e +4.0kHz gps3x4
@@ -15,6 +15,7 @@ Salland>APRS,TCPIP*,qAC,GLIDERN2:/165426h5227.93NI00620.03E&/A=000049 v0.2.2 CPU
 LSGS>APRS,TCPIP*,qAC,GLIDERN1:/165345h4613.25NI00719.68E&/A=001581 CPU:0.7 RAM:247.9/456.4MB NTP:0.7ms/-11.4ppm +44.4C RF:+53+71.9ppm/+0.4dB
 Drenstein>APRS,TCPIP*,qAC,GLIDERN1:/165011h5147.51NI00744.45E&/A=000213 v0.2.2 CPU:0.8 RAM:695.7/4025.5MB NTP:16000.0ms/+0.0ppm +63.0C
 ZK-GSC>APRS,qAS,Omarama:/165202h4429.25S/16959.33E'/A=001407 id05C821EA +020fpm +0.0rot 16.8dB 0e -3.1kHz gps1x3 hear1084 hearB597 hearB598
+#
 # since 0.2.5 for receiver information not only the "aprs position" format is used but also the "aprs status" format (without lat/lon/alt informations)
 Cordoba>APRS,TCPIP*,qAC,GLIDERN3:/194847h3112.85SI06409.56W&/A=001712 v0.2.5.ARM CPU:0.4 RAM:755.4/970.8MB NTP:6.7ms/-0.1ppm +45.5C RF:+48+18.3ppm/+3.45dB
 Cordoba>APRS,TCPIP*,qAC,GLIDERN3:>194847h v0.2.5.ARM CPU:0.4 RAM:755.4/970.8MB NTP:6.7ms/-0.1ppm +45.5C 0/0Acfts[1h] RF:+48+18.3ppm/+3.45dB/+0.4dB@10km[71]/+0.4dB@10km[1/1]
@@ -26,9 +27,11 @@ CNF3a>APRS,TCPIP*,qAC,GLIDERN3:/042143h4529.25NI07505.65W&/A=000259 v0.2.5.ARM C
 CNF3a>APRS,TCPIP*,qAC,GLIDERN3:>042143h v0.2.5.ARM CPU:0.6 RAM:514.6/970.8MB NTP:4.5ms/-1.5ppm +27.2C 0/0Acfts[1h] RF:+0-0.4ppm/+18.69dB/+13.0dB@10km[104282]/+9.7dB@10km[2/3]
 VITACURA2>APRS,TCPIP*,qAC,GLIDERN3:/042136h3322.81SI07034.95W&/A=002345 v0.2.5.ARM CPU:0.3 RAM:695.0/970.5MB NTP:0.6ms/-5.7ppm +51.5C RF:+0-0.0ppm/+1.32dB
 VITACURA2>APRS,TCPIP*,qAC,GLIDERN3:>042136h v0.2.5.ARM CPU:0.3 RAM:695.0/970.5MB NTP:0.6ms/-5.7ppm +52.1C 0/0Acfts[1h] RF:+0-0.0ppm/+1.32dB/+2.1dB@10km[193897]/+9.0dB@10km[10/20]
-### since 0.2.6
-### ... the ogn comment of a receiver beacon is just optional
+#
+# since 0.2.6
+# ... the ogn comment of a receiver beacon is just optional
 Ulrichamn>APRS,TCPIP*,qAC,GLIDERN1:/085616h5747.30NI01324.77E&/A=001322
-### ... a aircraft beacon needs just an ID, climb rate and turn rate or just the ID
+#
+# ... and a aircraft beacon needs just an ID, climb rate and turn rate or just the ID
 ICA3ECE59>APRS,qAS,GLDRTR:/171254h5144.78N/00616.67E'263/000/A=000075 id093D0930 +000fpm +0.0rot
 ICA3ECE59>APRS,qAS,GLDRTR:/171254h5144.78N/00616.67E'263/000/A=000075 id053ECE59
\ No newline at end of file
diff --git a/tests/parser/valid_beacon_data/aprs_aircraft.txt b/tests/parser/valid_beacon_data/aprs_aircraft.txt
new file mode 100644
index 0000000..7dfc257
--- /dev/null
+++ b/tests/parser/valid_beacon_data/aprs_aircraft.txt
@@ -0,0 +1,15 @@
+# Until OGN software 0.2.6 all beacons (flarms, ogn trackers and receivers) have the dstcall "APRS"
+# These are example beacons for flarms and ogn trackers
+#
+FLRDDA5BA>APRS,qAS,LFMX:/165829h4415.41N/00600.03E'342/049/A=005524 id0ADDA5BA -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5
+ICA4B0E3A>APRS,qAS,Letzi:/165319h4711.75N\00802.59E^327/149/A=006498 id154B0E3A -3959fpm +0.5rot 9.0dB 0e -6.3kHz gps1x3
+FLRDDB091>APRS,qAS,Letzi:/165831h4740.04N/00806.01EX152/124/A=004881 id06DD8E80 +198fpm +0.0rot 6.5dB 13e +4.0kHz gps3x4
+FLRDDDD33>APRS,qAS,LFNF:/165341h4344.27N/00547.41E'/A=000886 id06DDDD33 +020fpm +0.0rot 20.8dB 0e -14.3kHz gps3x4
+FLRDDE026>APRS,qAS,LFNF:/165341h4358.58N/00553.89E'204/055/A=005048 id06DDE026 +257fpm +0.1rot 7.2dB 0e -0.8kHz gps4x7
+ICA484A9C>APRS,qAS,LFMX:/165341h4403.50N/00559.67E'/A=001460 id05484A9C +000fpm +0.0rot 18.0dB 0e +3.5kHz gps4x7
+OGNE95A16>APRS,qAS,Sylwek:/165641h5001.94N/01956.91E'270/004/A=000000 id07E95A16 +000fpm +0.1rot 37.8dB 0e -0.4kHz
+ZK-GSC>APRS,qAS,Omarama:/165202h4429.25S/16959.33E'/A=001407 id05C821EA +020fpm +0.0rot 16.8dB 0e -3.1kHz gps1x3 hear1084 hearB597 hearB598
+#
+# since 0.2.6 a aircraft beacon needs just an ID, climb rate and turn rate or just the ID
+ICA3ECE59>APRS,qAS,GLDRTR:/171254h5144.78N/00616.67E'263/000/A=000075 id093D0930 +000fpm +0.0rot
+ICA3ECE59>APRS,qAS,GLDRTR:/171254h5144.78N/00616.67E'263/000/A=000075 id053ECE59
\ No newline at end of file
diff --git a/tests/parser/valid_beacon_data/lt24.txt b/tests/parser/valid_beacon_data/lt24.txt
new file mode 100644
index 0000000..ca2196f
--- /dev/null
+++ b/tests/parser/valid_beacon_data/lt24.txt
@@ -0,0 +1,16 @@
+# The following beacons are example for LT24 APRS format
+# source: https://github.com/glidernet/ogn-aprs-protocol
+#
+# the id25387 is the LT24 user ID that is unique.
+# GPS means that the coordinates are from the GPS unit of the smartphone vs. the GSM network.
+#
+FLRDDE48A>OGLT24,qAS,LT24:/102606h4030.47N/00338.38W'000/018/A=002267 id25387 +000fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/102608h4030.47N/00338.38W'044/018/A=002270 id25387 +000fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/102611h4030.47N/00338.38W'108/000/A=002280 id25387 +001fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/102612h4030.47N/00338.38W'000/000/A=002280 id25387 +000fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/102615h4030.47N/00338.39W'224/003/A=002280 id25387 +000fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/102616h4030.47N/00338.38W'028/003/A=002250 id25387 -009fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/102621h4030.47N/00338.38W'142/001/A=002267 id25387 +001fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/102628h4030.47N/00338.38W'034/000/A=002263 id25387 +000fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/102717h4030.47N/00338.38W'000/000/A=002263 id25387 +000fpm GPS
+FLRDDE48A>OGLT24,qAS,LT24:/110453h4030.47N/00338.38W'154/004/A=002253 id25387 +000fpm GPS
diff --git a/tests/parser/valid_beacon_data/naviter.txt b/tests/parser/valid_beacon_data/naviter.txt
new file mode 100644
index 0000000..9633cf2
--- /dev/null
+++ b/tests/parser/valid_beacon_data/naviter.txt
@@ -0,0 +1,7 @@
+# The following beacons are example for NAVITER's APRS format version OGNAVI-1
+# source: https://github.com/glidernet/ogn-aprs-protocol
+#
+NAV042121>OGNAVI,qAS,NAVITER:/140648h4550.36N/01314.85E'090/152/A=001086 !W47! id0440042121 +000fpm +0.5rot
+NAV04220E>OGNAVI,qAS,NAVITER:/140748h4552.27N/01155.61E'090/012/A=006562 !W81! id044004220E +060fpm +1.2rot
+NAV07220E>OGNAVI,qAS,NAVITER:/125447h4557.77N/01220.19E'258/056/A=006562 !W76! id1C4007220E +180fpm +0.0rot
+FLRFFFFFF>OGNAVI,NAV07220E*,qAS,NAVITER:/092002h1000.00S/01000.00W'000/000/A=003281 !W00! id2820FFFFFF +300fpm +1.7rot
\ No newline at end of file
diff --git a/tests/parser/valid_beacon_data/ogn_flarm.txt b/tests/parser/valid_beacon_data/ogn_flarm.txt
new file mode 100644
index 0000000..8fef574
--- /dev/null
+++ b/tests/parser/valid_beacon_data/ogn_flarm.txt
@@ -0,0 +1,7 @@
+# With OGN software 0.2.7 flarms have the dstcall "OGFLR"
+#
+FLRDD89C9>OGFLR,qAS,LIDH:/115054h4543.22N/01132.84E'260/072/A=002542 !W10! id06DD89C9 +198fpm -0.8rot 7.0dB 0e +0.7kHz gps2x3
+FLRDD98C6>OGFLR,qAS,LIDH:/115054h4543.21N/01132.80E'255/074/A=002535 !W83! id0ADD98C6 +158fpm -1.8rot 10.5dB 0e -0.8kHz gps2x3 s6.09 h02
+ICAA8CBA8>OGFLR,qAS,MontCAIO:/231150z4512.12N\01059.03E^192/106/A=009519 !W20! id21A8CBA8 -039fpm +0.0rot 3.5dB 2e -8.7kHz gps1x2 s6.09 h43 rDF0267
+ICAA8CBA8>OGFLR,qAS,MontCAIO:/114949h4512.44N\01059.12E^190/106/A=009522 !W33! id21A8CBA8 -039fpm +0.1rot 4.5dB 1e -8.7kHz gps1x2 +14.3dBm
+ICA3D1C35>OGFLR,qAS,Padova:/094220h4552.41N/01202.28E'110/099/A=003982 !W96! id053D1C35 -1187fpm +0.0rot 0.8dB 2e +4.5kHz gps1x2 s6.09 h32 rDD09D0
\ No newline at end of file
diff --git a/tests/parser/valid_beacon_data/ogn_receiver.txt b/tests/parser/valid_beacon_data/ogn_receiver.txt
new file mode 100644
index 0000000..5632954
--- /dev/null
+++ b/tests/parser/valid_beacon_data/ogn_receiver.txt
@@ -0,0 +1,16 @@
+# With OGN software 0.2.7 receivers have the dstcall "OGNSDR"
+#
+LILH>OGNSDR,TCPIP*,qAC,GLIDERN2:/132201h4457.61NI00900.58E&/A=000423
+LILH>OGNSDR,TCPIP*,qAC,GLIDERN2:>132201h v0.2.7.RPI-GPU CPU:0.7 RAM:770.2/968.2MB NTP:1.8ms/-3.3ppm +55.7C 7/8Acfts[1h] RF:+54-1.1ppm/-0.16dB/+7.1dB@10km[19481]/+16.8dB@10km[7/13]
+MontCAIO>OGNSDR,TCPIP*,qAC,GLIDERN3:/132231h4427.84NI01009.60E&/A=004822
+MontCAIO>OGNSDR,TCPIP*,qAC,GLIDERN3:>132231h v0.2.7.RPI-GPU CPU:0.8 RAM:747.0/970.5MB NTP:2.8ms/-1.0ppm +73.1C 5/5Acfts[1h] RF:+69+1.3ppm/+3.53dB/+16.9dB@10km[7697]/+23.7dB@10km[3/6]
+Padova>OGNSDR,TCPIP*,qAC,GLIDERN1:/132326h4525.38NI01156.29E&/A=000069
+Padova>OGNSDR,TCPIP*,qAC,GLIDERN1:>132326h v0.2.7.RPI-GPU CPU:0.5 RAM:605.1/970.5MB NTP:0.5ms/-2.0ppm +65.5C 1/1Acfts[1h] RF:+0-1.1ppm/+13.97dB/+17.1dB@10km[6524]/+19.9dB@10km[5/9]
+LIDH>OGNSDR,TCPIP*,qAC,GLIDERN1:/132447h4540.89NI01129.65E&/A=000328
+LIDH>OGNSDR,TCPIP*,qAC,GLIDERN1:>132447h v0.2.7.RPI-GPU CPU:0.4 RAM:593.4/970.5MB NTP:3.7ms/-7.6ppm +67.7C 5/5Acfts[1h] RF:+61+1.0ppm/+12.63dB/+3.7dB@10km[27143]/+3.3dB@10km[3/6]
+LZHL>OGNSDR,TCPIP*,qAC,GLIDERN3:/132457h4849.09NI01708.30E&/A=000528
+LZHL>OGNSDR,TCPIP*,qAC,GLIDERN3:>132457h v0.2.7.arm CPU:0.9 RAM:75.3/253.6MB NTP:2.0ms/-15.2ppm +0.1C 2/2Acfts[1h] RF:+77+1.7ppm/+2.34dB/+6.5dB@10km[5411]/+10.1dB@10km[3/5]
+BELG>OGNSDR,TCPIP*,qAC,GLIDERN3:/132507h4509.60NI00919.20E&/A=000246
+BELG>OGNSDR,TCPIP*,qAC,GLIDERN3:>132507h v0.2.7.RPI-GPU CPU:1.2 RAM:35.7/455.2MB NTP:2.5ms/-5.3ppm +67.0C 1/1Acfts[1h] RF:+79+8.8ppm/+4.97dB/-0.0dB@10km[299]/+4.9dB@10km[2/3]
+Saleve>OGNSDR,TCPIP*,qAC,GLIDERN1:/132624h4607.70NI00610.41E&/A=004198 Antenna: chinese, on a pylon, 20 meter above ground
+Saleve>OGNSDR,TCPIP*,qAC,GLIDERN1:>132624h v0.2.7.arm CPU:1.7 RAM:812.3/1022.5MB NTP:1.8ms/+4.5ppm 0.000V 0.000A 3/4Acfts[1h] RF:+67+2.9ppm/+4.18dB/+11.7dB@10km[5018]/+17.2dB@10km[8/16]
\ No newline at end of file
diff --git a/tests/parser/valid_beacon_data/ogn_tracker.txt b/tests/parser/valid_beacon_data/ogn_tracker.txt
new file mode 100644
index 0000000..861b1a3
--- /dev/null
+++ b/tests/parser/valid_beacon_data/ogn_tracker.txt
@@ -0,0 +1,9 @@
+# With OGN software 0.2.7 ogn tracker have the dstcall "OGNTRK"
+#
+OGN3FC859>OGNTRK,qAS,LZHL:>093215h h00 v00 9sat/1 164m 1002.6hPa +20.2degC 0% 3.34V 14/-110.5dBm 1/min
+OGN2FD00F>OGNTRK,qAS,LZHL:/093213h4848.78N/01708.32E'000/000/A=000538 !W12! id072FD00F -058fpm +0.0rot FL003.12 32.8dB 0e -0.8kHz gps3x5
+FLRDD9C70>OGNTRK,OGN2FD00F*,qAS,LZHL:/093214h4848.77N/01708.33E'000/000/A=000515 !W56! id06DD9C70 -019fpm +0.0rot 32.2dB 0e -0.8kHz gps2x3
+FLRDD9C70>OGNTRK,OGN2FD00F*,qAS,LZHL:/093021h4848.77N/01708.33E'000/000/A=000518 !W66! id06DD9C70 -019fpm +0.0rot 29.0dB 0e -0.8kHz gps2x3 s6.09 h03
+OGN03AF2A>OGNTRK,qAS,LZHL:/092912h4848.77N/01708.33E'000/000/A=000535 !W53! id0703AF2A +000fpm +0.0rot FL003.15 4.5dB 1e -0.1kHz gps4x5 -11.2dBm
+OGN2FD00F>OGNTRK,qAS,LZHL:>092840h h00 v00 11sat/2 165m 1001.9hPa +27.1degC 0% 3.28V 14/-111.5dBm 127/min
+FLRDD9C70>OGNTRK,RELAY*,qAS,LZHL:/094124h4848.78N/01708.33E'000/000/A=000397 !W15! id06DD9C70 +099fpm +0.0rot 24.5dB 0e -1.4kHz gps10x15
\ No newline at end of file
diff --git a/tests/parser/valid_beacon_data/skylines.txt b/tests/parser/valid_beacon_data/skylines.txt
new file mode 100644
index 0000000..8a196c9
--- /dev/null
+++ b/tests/parser/valid_beacon_data/skylines.txt
@@ -0,0 +1,6 @@
+# The following beacons are example for Skylines (XCsoar) APRS format
+# source: https://github.com/glidernet/ogn-aprs-protocol
+#
+# The id2816 is the Pilot ID from Skylines (XCsoar) and it is unique within the skyline system
+#
+FLRDDDD78>OGSKYL,qAS,SKYLINES:/134403h4225.90N/00144.83E'000/000/A=008438 id2816 +000fpm
diff --git a/tests/parser/valid_beacon_data/spider.txt b/tests/parser/valid_beacon_data/spider.txt
new file mode 100644
index 0000000..36a0508
--- /dev/null
+++ b/tests/parser/valid_beacon_data/spider.txt
@@ -0,0 +1,23 @@
+# The following beacons are example for Spider APRS format
+# source: https://github.com/glidernet/ogn-aprs-protocol
+#
+# id3003... is the unique identifier from the SPIDER server
+# LWE is the registration within the SPIDER system
+# 3D is the quality of the signal  3D vs. 2D
+#
+FLRDDF944>OGSPID,qAS,SPIDER:/190930h3322.78S/07034.60W'000/000/A=002263 id300234010617040 +19dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/190930h3322.78S/07034.60W'000/000/A=002263 id300234010617040 +19dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/192430h3322.78S/07034.61W'000/000/A=002250 id300234010617040 +12dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/193930h3322.10S/07034.26W'273/027/A=004071 id300234010617040 +9dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/195430h3322.82S/07034.90W'000/000/A=002217 id300234010617040 +10dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/193930h3322.78S/07034.60W'348/000/A=002286 id300234010617040 +12dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/195430h3323.16S/07037.68W'302/034/A=003316 id300234010617040 +10dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/195430h3323.16S/07037.68W'302/034/A=003316 id300234010617040 +10dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/200930h3319.13S/07036.12W'128/031/A=005482 id300234010617040 +15dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/200930h3319.13S/07036.12W'128/031/A=005482 id300234010617040 +15dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/202430h3314.92S/07032.08W'138/032/A=006453 id300234010617040 +9dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/203930h3321.38S/07027.29W'104/034/A=006272 id300234010617040 +8dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/205430h3322.13S/07033.53W'296/031/A=003927 id300234010617040 +7dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/210930h3322.05S/07035.74W'165/030/A=005187 id300234010617040 +8dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/212430h3322.02S/07036.14W'281/028/A=004550 id300234010617040 +7dB LWE 3D
+FLRDDF944>OGSPID,qAS,SPIDER:/213930h3322.17S/07033.97W'332/028/A=003428 id300234010617040 +7dB LWE 3D
diff --git a/tests/parser/valid_beacon_data/spot.txt b/tests/parser/valid_beacon_data/spot.txt
new file mode 100644
index 0000000..473e463
--- /dev/null
+++ b/tests/parser/valid_beacon_data/spot.txt
@@ -0,0 +1,10 @@
+# The following beacons are example for SPOT APRS format
+# source: https://github.com/glidernet/ogn-aprs-protocol
+#
+# id0-28... is a unique ID within the SPOT system.
+# SPOT2 is the Spot model
+# GOOD is the battery status or some other help messages.
+#
+ICA3E7540>OGSPOT,qAS,SPOT:/161427h1448.35S/04610.86W'000/000/A=008677 id0-2860357 SPOT3 GOOD
+ICA3E7540>OGSPOT,qAS,SPOT:/162923h1431.99S/04604.33W'000/000/A=006797 id0-2860357 SPOT3 GOOD
+ICA3E7540>OGSPOT,qAS,SPOT:/163421h1430.38S/04604.43W'000/000/A=007693 id0-2860357 SPOT3 GOOD

From e63b74650406cc49fd168766d46387ba1f6aa454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Wed, 27 Sep 2017 23:04:47 +0200
Subject: [PATCH 03/14] parser: distinguish between different dstcalls

---
 ogn/parser/parse.py                 | 57 ++++++++++++++++++-----------
 tests/parser/test_beacon_naviter.py | 44 ++++++++++++++++++++++
 tests/parser/test_parse.py          |  2 +-
 3 files changed, 80 insertions(+), 23 deletions(-)
 create mode 100644 tests/parser/test_beacon_naviter.py

diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index c5d9e61..9df6746 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -40,27 +40,40 @@ def parse_aprs(message, reference_date=None, reference_time=None):
     raise AprsParseError(message)
 
 
-def parse_ogn_aircraft_beacon(aprs_comment):
-    ac_match = re.search(PATTERN_AIRCRAFT_BEACON, aprs_comment)
-    if ac_match:
-        return {'address_type': int(ac_match.group('details'), 16) & 0b00000011,
-                'aircraft_type': (int(ac_match.group('details'), 16) & 0b01111100) >> 2,
-                'stealth': (int(ac_match.group('details'), 16) & 0b10000000) >> 7 == 1,
-                'address': ac_match.group('id'),
-                'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
-                'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None,
-                'flightlevel': float(ac_match.group('flight_level')) if ac_match.group('flight_level') else None,
-                'signal_quality': float(ac_match.group('signal_quality')) if ac_match.group('signal_quality') else None,
-                'error_count': int(ac_match.group('errors')) if ac_match.group('errors') else None,
-                'frequency_offset': float(ac_match.group('frequency_offset')) if ac_match.group('frequency_offset') else None,
-                'gps_status': ac_match.group('gps_accuracy') if ac_match.group('gps_accuracy') else None,
-                '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') if ac_match.group('flarm_id') else None,
-                'signal_power': float(ac_match.group('signal_power')) if ac_match.group('signal_power') else None,
-                'proximity': [hear[4:] for hear in ac_match.group('proximity').split(" ")] if ac_match.group('proximity') else None}
+def parse_ogn_aircraft_beacon(aprs_comment, dstcall="APRS"):
+    if dstcall == "APRS":
+        ac_match = re.search(PATTERN_AIRCRAFT_BEACON, aprs_comment)
+        if ac_match:
+            return {'address_type': int(ac_match.group('details'), 16) & 0b00000011,
+                    'aircraft_type': (int(ac_match.group('details'), 16) & 0b01111100) >> 2,
+                    'stealth': (int(ac_match.group('details'), 16) & 0b10000000) >> 7 == 1,
+                    'address': ac_match.group('id'),
+                    'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
+                    'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None,
+                    'flightlevel': float(ac_match.group('flight_level')) if ac_match.group('flight_level') else None,
+                    'signal_quality': float(ac_match.group('signal_quality')) if ac_match.group('signal_quality') else None,
+                    'error_count': int(ac_match.group('errors')) if ac_match.group('errors') else None,
+                    'frequency_offset': float(ac_match.group('frequency_offset')) if ac_match.group('frequency_offset') else None,
+                    'gps_status': ac_match.group('gps_accuracy') if ac_match.group('gps_accuracy') else None,
+                    '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') if ac_match.group('flarm_id') else None,
+                    'signal_power': float(ac_match.group('signal_power')) if ac_match.group('signal_power') else None,
+                    'proximity': [hear[4:] for hear in ac_match.group('proximity').split(" ")] if ac_match.group('proximity') else None}
+        else:
+            return None
+    elif dstcall == "OGLT24":
+        raise NotImplementedError("LT24 parser not implemented")
+    elif dstcall == "OGNAVI":
+        raise NotImplementedError("Naviter parser not implemented")
+    elif dstcall == "OGSKYL":
+        raise NotImplementedError("Skylines parser not implemented")
+    elif dstcall == "OGSPID":
+        raise NotImplementedError("Spider parser not implemented")
+    elif dstcall == "OGSPOT":
+        raise NotImplementedError("SPOT parser not implemented")
     else:
-        return None
+        raise ValueError("dstcall {} unknown".format(dstcall))
 
 
 def parse_ogn_receiver_beacon(aprs_comment):
@@ -90,11 +103,11 @@ def parse_ogn_receiver_beacon(aprs_comment):
         return None
 
 
-def parse_ogn_beacon(aprs_comment):
+def parse_ogn_beacon(aprs_comment, dstcall="APRS"):
     if not aprs_comment:
         return {'beacon_type': 'receiver_beacon'}
 
-    ac_data = parse_ogn_aircraft_beacon(aprs_comment)
+    ac_data = parse_ogn_aircraft_beacon(aprs_comment, dstcall)
     if ac_data:
         ac_data.update({'beacon_type': 'aircraft_beacon'})
         return ac_data
diff --git a/tests/parser/test_beacon_naviter.py b/tests/parser/test_beacon_naviter.py
new file mode 100644
index 0000000..f66527b
--- /dev/null
+++ b/tests/parser/test_beacon_naviter.py
@@ -0,0 +1,44 @@
+import unittest
+
+from ogn.parser.utils import ms2fpm
+from ogn.parser.parse import parse_aprs, parse_ogn_aircraft_beacon
+
+
+class TestStringMethods(unittest.TestCase):
+    def test_basic(self):
+        message = parse_aprs("NAV042121>OGNAVI,qAS,NAVITER:/140648h4550.36N/01314.85E'090/152/A=001086 !W47! id0440042121 +000fpm +0.5rot")
+        self.assertEqual(message['name'], "NAV042121")
+        self.assertEqual(message['dstcall'], "OGNAVI")
+        self.assertEqual(message['receiver_name'], "NAVITER")
+        # ... APRS format is tested enough
+        self.assertEqual(message['comment'], "id0440042121 +000fpm +0.5rot")
+
+        naviter_message = parse_ogn_aircraft_beacon(message['comment'], dstcall=message['dstcall'])
+        # NAVITER specific values
+        # id0440042121 == 0b0000 0100 0100 0000 0000 0100 0010 0001 0010 0001
+        # bit 0: stealth mode
+        # bit 1: do not track mode
+        # bits 2-5: aircraft type
+        # bits 6-11: address type (namespace is extended from 2 to 6 bits to avoid collisions with other tracking providers)
+        # bits 12-15: reserved for use at a later time
+        # bits 16-39: device id (24-bit device identifier, same as in APRS header)
+        self.assertEqual(naviter_message['stealth'], False)
+        self.assertEqual(naviter_message['do_not_track'], False)
+        self.assertEqual(naviter_message['aircraft_type'], 1)
+        self.assertEqual(naviter_message['address_type'], 4)
+        self.assertEqual(naviter_message['reserved'], 0)
+        self.assertEqual(naviter_message['address'], "042121")
+
+        self.assertAlmostEqual(naviter_message['climb_rate'] * ms2fpm, 0, 2)
+        self.assertEqual(naviter_message['turn_rate'], 0.5)
+
+    def test_relayed(self):
+        message = parse_aprs("FLRFFFFFF>OGNAVI,NAVABCDEF*,qAS,NAVITER:/092002h1000.00S/01000.00W'000/000/A=003281 !W00! id2820FFFFFF +300fpm +1.7rot")
+
+        self.assertEqual(message['name'], "FLRFFFFFF")
+        self.assertEqual(message['dstcall'], "OGNAVI")
+        self.assertEqual(message['relay_id'], "NAVABCDEF")
+        self.assertEqual(message['receiver_name'], "NAVITER")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/parser/test_parse.py b/tests/parser/test_parse.py
index a66b1b8..76cb75b 100644
--- a/tests/parser/test_parse.py
+++ b/tests/parser/test_parse.py
@@ -17,7 +17,7 @@ class TestStringMethods(unittest.TestCase):
                     aprs = parse_aprs(line, datetime(2015, 4, 10, 17, 0))
                     self.assertFalse(aprs is None)
                     if aprs['comment']:
-                        parse_ogn_beacon(aprs['comment'])
+                        parse_ogn_beacon(aprs['comment'], dstcall=aprs['dstcall'])
 
     def test_aprs_beacons(self):
         self.parse_valid_beacon_data_file('aprs.txt')

From a57a17e644ac55db325cf4ce6478bff5b6755068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 28 Sep 2017 07:17:35 +0200
Subject: [PATCH 04/14] Split naviter test into aprs part and comment part

---
 tests/parser/test_beacon.py         |  7 +++++++
 tests/parser/test_beacon_naviter.py | 21 ++++-----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/tests/parser/test_beacon.py b/tests/parser/test_beacon.py
index 23b80dd..ab40efd 100644
--- a/tests/parser/test_beacon.py
+++ b/tests/parser/test_beacon.py
@@ -53,6 +53,13 @@ class TestStringMethods(unittest.TestCase):
 
         self.assertEqual(message['comment'], None)
 
+    def test_v026_relay(self):
+        # beacons can be relayed
+        raw_message = "FLRFFFFFF>OGNAVI,NAV07220E*,qAS,NAVITER:/092002h1000.00S/01000.00W'000/000/A=003281 !W00! id2820FFFFFF +300fpm +1.7rot"
+        message = parse_aprs(raw_message, reference_date=datetime(2015, 1, 1, 8, 56, 0))
+
+        self.assertEqual(message['relay'], "NAV07220E")
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/parser/test_beacon_naviter.py b/tests/parser/test_beacon_naviter.py
index f66527b..0442738 100644
--- a/tests/parser/test_beacon_naviter.py
+++ b/tests/parser/test_beacon_naviter.py
@@ -1,20 +1,14 @@
 import unittest
 
 from ogn.parser.utils import ms2fpm
-from ogn.parser.parse import parse_aprs, parse_ogn_aircraft_beacon
+from ogn.parser.parse import parse_ogn_aircraft_beacon
 
 
 class TestStringMethods(unittest.TestCase):
-    def test_basic(self):
-        message = parse_aprs("NAV042121>OGNAVI,qAS,NAVITER:/140648h4550.36N/01314.85E'090/152/A=001086 !W47! id0440042121 +000fpm +0.5rot")
-        self.assertEqual(message['name'], "NAV042121")
-        self.assertEqual(message['dstcall'], "OGNAVI")
-        self.assertEqual(message['receiver_name'], "NAVITER")
-        # ... APRS format is tested enough
-        self.assertEqual(message['comment'], "id0440042121 +000fpm +0.5rot")
+    def test_OGNAVI_1(self):
+        message = "id0440042121 +000fpm +0.5rot"
+        naviter_message = parse_ogn_aircraft_beacon(message, dstcall='OGNAVI')
 
-        naviter_message = parse_ogn_aircraft_beacon(message['comment'], dstcall=message['dstcall'])
-        # NAVITER specific values
         # id0440042121 == 0b0000 0100 0100 0000 0000 0100 0010 0001 0010 0001
         # bit 0: stealth mode
         # bit 1: do not track mode
@@ -32,13 +26,6 @@ class TestStringMethods(unittest.TestCase):
         self.assertAlmostEqual(naviter_message['climb_rate'] * ms2fpm, 0, 2)
         self.assertEqual(naviter_message['turn_rate'], 0.5)
 
-    def test_relayed(self):
-        message = parse_aprs("FLRFFFFFF>OGNAVI,NAVABCDEF*,qAS,NAVITER:/092002h1000.00S/01000.00W'000/000/A=003281 !W00! id2820FFFFFF +300fpm +1.7rot")
-
-        self.assertEqual(message['name'], "FLRFFFFFF")
-        self.assertEqual(message['dstcall'], "OGNAVI")
-        self.assertEqual(message['relay_id'], "NAVABCDEF")
-        self.assertEqual(message['receiver_name'], "NAVITER")
 
 if __name__ == '__main__':
     unittest.main()

From 5faf78b239e6e862c9e8ae0f27fcc8c8677ec71c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 28 Sep 2017 08:43:50 +0200
Subject: [PATCH 05/14] Test beacon_type

---
 ogn/parser/parse.py                           | 120 +++++++++++-------
 tests/parser/test_beacon_naviter.py           |   4 +-
 tests/parser/test_parse.py                    |  22 ++--
 .../{aprs.txt => aprs_receiver.txt}           |  13 +-
 tests/parser/valid_beacon_data/naviter.txt    |   2 +-
 5 files changed, 92 insertions(+), 69 deletions(-)
 rename tests/parser/valid_beacon_data/{aprs.txt => aprs_receiver.txt} (74%)

diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index 9df6746..e76758b 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -40,40 +40,27 @@ def parse_aprs(message, reference_date=None, reference_time=None):
     raise AprsParseError(message)
 
 
-def parse_ogn_aircraft_beacon(aprs_comment, dstcall="APRS"):
-    if dstcall == "APRS":
-        ac_match = re.search(PATTERN_AIRCRAFT_BEACON, aprs_comment)
-        if ac_match:
-            return {'address_type': int(ac_match.group('details'), 16) & 0b00000011,
-                    'aircraft_type': (int(ac_match.group('details'), 16) & 0b01111100) >> 2,
-                    'stealth': (int(ac_match.group('details'), 16) & 0b10000000) >> 7 == 1,
-                    'address': ac_match.group('id'),
-                    'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
-                    'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None,
-                    'flightlevel': float(ac_match.group('flight_level')) if ac_match.group('flight_level') else None,
-                    'signal_quality': float(ac_match.group('signal_quality')) if ac_match.group('signal_quality') else None,
-                    'error_count': int(ac_match.group('errors')) if ac_match.group('errors') else None,
-                    'frequency_offset': float(ac_match.group('frequency_offset')) if ac_match.group('frequency_offset') else None,
-                    'gps_status': ac_match.group('gps_accuracy') if ac_match.group('gps_accuracy') else None,
-                    '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') if ac_match.group('flarm_id') else None,
-                    'signal_power': float(ac_match.group('signal_power')) if ac_match.group('signal_power') else None,
-                    'proximity': [hear[4:] for hear in ac_match.group('proximity').split(" ")] if ac_match.group('proximity') else None}
-        else:
-            return None
-    elif dstcall == "OGLT24":
-        raise NotImplementedError("LT24 parser not implemented")
-    elif dstcall == "OGNAVI":
-        raise NotImplementedError("Naviter parser not implemented")
-    elif dstcall == "OGSKYL":
-        raise NotImplementedError("Skylines parser not implemented")
-    elif dstcall == "OGSPID":
-        raise NotImplementedError("Spider parser not implemented")
-    elif dstcall == "OGSPOT":
-        raise NotImplementedError("SPOT parser not implemented")
+def parse_ogn_aircraft_beacon(aprs_comment):
+    ac_match = re.search(PATTERN_AIRCRAFT_BEACON, aprs_comment)
+    if ac_match:
+        return {'address_type': int(ac_match.group('details'), 16) & 0b00000011,
+                'aircraft_type': (int(ac_match.group('details'), 16) & 0b01111100) >> 2,
+                'stealth': (int(ac_match.group('details'), 16) & 0b10000000) >> 7 == 1,
+                'address': ac_match.group('id'),
+                'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
+                'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None,
+                'flightlevel': float(ac_match.group('flight_level')) if ac_match.group('flight_level') else None,
+                'signal_quality': float(ac_match.group('signal_quality')) if ac_match.group('signal_quality') else None,
+                'error_count': int(ac_match.group('errors')) if ac_match.group('errors') else None,
+                'frequency_offset': float(ac_match.group('frequency_offset')) if ac_match.group('frequency_offset') else None,
+                'gps_status': ac_match.group('gps_accuracy') if ac_match.group('gps_accuracy') else None,
+                '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') if ac_match.group('flarm_id') else None,
+                'signal_power': float(ac_match.group('signal_power')) if ac_match.group('signal_power') else None,
+                'proximity': [hear[4:] for hear in ac_match.group('proximity').split(" ")] if ac_match.group('proximity') else None}
     else:
-        raise ValueError("dstcall {} unknown".format(dstcall))
+        return None
 
 
 def parse_ogn_receiver_beacon(aprs_comment):
@@ -103,18 +90,61 @@ def parse_ogn_receiver_beacon(aprs_comment):
         return None
 
 
+def parse_lt24_beacon(aprs_comment):
+    raise NotImplementedError("LT24 parser not implemented")
+
+
+def parse_naviter_beacon(aprs_comment):
+    raise NotImplementedError("Naviter parser not implemented")
+
+
+def parse_skylines_beacon(aprs_comment):
+    raise NotImplementedError("Skylines parser not implemented")
+
+
+def parse_spider_beacon(aprs_comment):
+    raise NotImplementedError("Spider parser not implemented")
+
+
+def parse_spot_beacon(aprs_comment):
+    raise NotImplementedError("SPOT parser not implemented")
+
+
 def parse_ogn_beacon(aprs_comment, dstcall="APRS"):
-    if not aprs_comment:
-        return {'beacon_type': 'receiver_beacon'}
+    if dstcall == "APRS":
+        if not aprs_comment:
+            return {'beacon_type': 'receiver_beacon'}
 
-    ac_data = parse_ogn_aircraft_beacon(aprs_comment, dstcall)
-    if ac_data:
-        ac_data.update({'beacon_type': 'aircraft_beacon'})
+        ac_data = parse_ogn_aircraft_beacon(aprs_comment)
+        if ac_data:
+            ac_data.update({'beacon_type': 'aircraft_beacon'})
+            return ac_data
+
+        rc_data = parse_ogn_receiver_beacon(aprs_comment)
+        if rc_data:
+            rc_data.update({'beacon_type': 'receiver_beacon'})
+            return rc_data
+
+        raise OgnParseError(aprs_comment)
+    elif dstcall == "OGLT24":
+        ac_data = parse_lt24_beacon(aprs_comment)
+        ac_data.update({'beacon_type': 'lt24_beacon'})
         return ac_data
-
-    rc_data = parse_ogn_receiver_beacon(aprs_comment)
-    if rc_data:
-        rc_data.update({'beacon_type': 'receiver_beacon'})
-        return rc_data
-
-    raise OgnParseError(aprs_comment)
+    elif dstcall == "OGNAVI":
+        ac_data = parse_naviter_beacon(aprs_comment)
+        ac_data.update({'beacon_type': 'naviter_beacon'})
+        return ac_data
+    elif dstcall == "OGSKYL":
+        ac_data = parse_skylines_beacon(aprs_comment)
+        ac_data.update({'beacon_type': 'skylines_beacon'})
+        return ac_data
+    elif dstcall == "OGSPID":
+        ac_data = parse_spider_beacon(aprs_comment)
+        ac_data.update({'beacon_type': 'spider_beacon'})
+        return ac_data
+    elif dstcall == "OGSPOT":
+        ac_data = parse_spot_beacon(aprs_comment)
+        ac_data.update({'beacon_type': 'spot_beacon'})
+        return ac_data
+    else:
+        raise ValueError("dstcall {} unknown".format(dstcall))
diff --git a/tests/parser/test_beacon_naviter.py b/tests/parser/test_beacon_naviter.py
index 0442738..cd56134 100644
--- a/tests/parser/test_beacon_naviter.py
+++ b/tests/parser/test_beacon_naviter.py
@@ -1,13 +1,13 @@
 import unittest
 
 from ogn.parser.utils import ms2fpm
-from ogn.parser.parse import parse_ogn_aircraft_beacon
+from ogn.parser.parse import parse_naviter_beacon
 
 
 class TestStringMethods(unittest.TestCase):
     def test_OGNAVI_1(self):
         message = "id0440042121 +000fpm +0.5rot"
-        naviter_message = parse_ogn_aircraft_beacon(message, dstcall='OGNAVI')
+        naviter_message = parse_naviter_beacon(message)
 
         # id0440042121 == 0b0000 0100 0100 0000 0000 0100 0010 0001 0010 0001
         # bit 0: stealth mode
diff --git a/tests/parser/test_parse.py b/tests/parser/test_parse.py
index 76cb75b..1c151a7 100644
--- a/tests/parser/test_parse.py
+++ b/tests/parser/test_parse.py
@@ -10,32 +10,36 @@ from ogn.parser.exceptions import AprsParseError
 
 
 class TestStringMethods(unittest.TestCase):
-    def parse_valid_beacon_data_file(self, filename):
+    def parse_valid_beacon_data_file(self, filename, beacon_type):
         with open(os.path.dirname(__file__) + '/valid_beacon_data/' + filename) as f:
             for line in f:
                 if not line[0] == '#':
                     aprs = parse_aprs(line, datetime(2015, 4, 10, 17, 0))
                     self.assertFalse(aprs is None)
                     if aprs['comment']:
-                        parse_ogn_beacon(aprs['comment'], dstcall=aprs['dstcall'])
+                        message = parse_ogn_beacon(aprs['comment'], dstcall=aprs['dstcall'])
+                        self.assertEqual(message['beacon_type'], beacon_type)
 
-    def test_aprs_beacons(self):
-        self.parse_valid_beacon_data_file('aprs.txt')
+    def test_aprs_aircraft_beacons(self):
+        self.parse_valid_beacon_data_file(filename='aprs_aircraft.txt', beacon_type='aircraft_beacon')
+
+    def test_aprs_receiver_beacons(self):
+        self.parse_valid_beacon_data_file(filename='aprs_receiver.txt', beacon_type='receiver_beacon')
 
     def test_lt24_beacons(self):
-        self.parse_valid_beacon_data_file('lt24.txt')
+        self.parse_valid_beacon_data_file(filename='lt24.txt', beacon_type='lt24_beacon')
 
     def test_naviter_beacons(self):
-        self.parse_valid_beacon_data_file('naviter.txt')
+        self.parse_valid_beacon_data_file(filename='naviter.txt', beacon_type='naviter_beacon')
 
     def test_skylines_beacons(self):
-        self.parse_valid_beacon_data_file('skylines.txt')
+        self.parse_valid_beacon_data_file(filename='skylines.txt', beacon_type='skylines_beacon')
 
     def test_spider_beacons(self):
-        self.parse_valid_beacon_data_file('spider.txt')
+        self.parse_valid_beacon_data_file(filename='spider.txt', beacon_type='spider_beacon')
 
     def test_spot_beacons(self):
-        self.parse_valid_beacon_data_file('spot.txt')
+        self.parse_valid_beacon_data_file(filename='spot.txt', beacon_type='spot_beacon')
 
     def test_fail_parse_aprs_none(self):
         with self.assertRaises(TypeError):
diff --git a/tests/parser/valid_beacon_data/aprs.txt b/tests/parser/valid_beacon_data/aprs_receiver.txt
similarity index 74%
rename from tests/parser/valid_beacon_data/aprs.txt
rename to tests/parser/valid_beacon_data/aprs_receiver.txt
index 9704e81..846ac90 100644
--- a/tests/parser/valid_beacon_data/aprs.txt
+++ b/tests/parser/valid_beacon_data/aprs_receiver.txt
@@ -3,18 +3,12 @@
 #
 Lachens>APRS,TCPIP*,qAC,GLIDERN2:/165334h4344.70NI00639.19E&/A=005435 v0.2.1 CPU:0.3 RAM:1764.4/2121.4MB NTP:2.8ms/+4.9ppm +47.0C RF:+0.70dB
 LFGU>APRS,TCPIP*,qAC,GLIDERN2:/165556h4907.63NI00706.41E&/A=000833 v0.2.0 CPU:0.9 RAM:281.3/458.9MB NTP:0.5ms/-19.1ppm +53.0C RF:+0.70dB
-FLRDDB091>APRS,qAS,Letzi:/165831h4740.04N/00806.01EX152/124/A=004881 id06DD8E80 +198fpm +0.0rot 6.5dB 13e +4.0kHz gps3x4
 LSGS>APRS,TCPIP*,qAC,GLIDERN1:/165345h4613.25NI00719.68E&/A=001581 CPU:0.7 RAM:247.9/456.4MB NTP:0.7ms/-11.4ppm +44.4C RF:+53+71.9ppm/+0.4dB
-FLRDDDD33>APRS,qAS,LFNF:/165341h4344.27N/00547.41E'/A=000886 id06DDDD33 +020fpm +0.0rot 20.8dB 0e -14.3kHz gps3x4
-FLRDDE026>APRS,qAS,LFNF:/165341h4358.58N/00553.89E'204/055/A=005048 id06DDE026 +257fpm +0.1rot 7.2dB 0e -0.8kHz gps4x7
-ICA484A9C>APRS,qAS,LFMX:/165341h4403.50N/00559.67E'/A=001460 id05484A9C +000fpm +0.0rot 18.0dB 0e +3.5kHz gps4x7
 WolvesSW>APRS,TCPIP*,qAC,GLIDERN2:/165343h5232.23NI00210.91W&/A=000377 CPU:1.5 RAM:159.9/458.7MB NTP:6.6ms/-36.7ppm +45.5C RF:+130-0.4ppm/-0.1dB
 Oxford>APRS,TCPIP*,qAC,GLIDERN1:/165533h5142.96NI00109.68W&/A=000380 v0.1.3 CPU:0.9 RAM:268.8/458.6MB NTP:0.5ms/-45.9ppm +60.5C RF:+55+2.9ppm/+1.54dB
-OGNE95A16>APRS,qAS,Sylwek:/165641h5001.94N/01956.91E'270/004/A=000000 id07E95A16 +000fpm +0.1rot 37.8dB 0e -0.4kHz
 Salland>APRS,TCPIP*,qAC,GLIDERN2:/165426h5227.93NI00620.03E&/A=000049 v0.2.2 CPU:0.7 RAM:659.3/916.9MB NTP:2.5ms/-75.0ppm RF:+0.41dB
 LSGS>APRS,TCPIP*,qAC,GLIDERN1:/165345h4613.25NI00719.68E&/A=001581 CPU:0.7 RAM:247.9/456.4MB NTP:0.7ms/-11.4ppm +44.4C RF:+53+71.9ppm/+0.4dB
 Drenstein>APRS,TCPIP*,qAC,GLIDERN1:/165011h5147.51NI00744.45E&/A=000213 v0.2.2 CPU:0.8 RAM:695.7/4025.5MB NTP:16000.0ms/+0.0ppm +63.0C
-ZK-GSC>APRS,qAS,Omarama:/165202h4429.25S/16959.33E'/A=001407 id05C821EA +020fpm +0.0rot 16.8dB 0e -3.1kHz gps1x3 hear1084 hearB597 hearB598
 #
 # since 0.2.5 for receiver information not only the "aprs position" format is used but also the "aprs status" format (without lat/lon/alt informations)
 Cordoba>APRS,TCPIP*,qAC,GLIDERN3:/194847h3112.85SI06409.56W&/A=001712 v0.2.5.ARM CPU:0.4 RAM:755.4/970.8MB NTP:6.7ms/-0.1ppm +45.5C RF:+48+18.3ppm/+3.45dB
@@ -28,10 +22,5 @@ CNF3a>APRS,TCPIP*,qAC,GLIDERN3:>042143h v0.2.5.ARM CPU:0.6 RAM:514.6/970.8MB NTP
 VITACURA2>APRS,TCPIP*,qAC,GLIDERN3:/042136h3322.81SI07034.95W&/A=002345 v0.2.5.ARM CPU:0.3 RAM:695.0/970.5MB NTP:0.6ms/-5.7ppm +51.5C RF:+0-0.0ppm/+1.32dB
 VITACURA2>APRS,TCPIP*,qAC,GLIDERN3:>042136h v0.2.5.ARM CPU:0.3 RAM:695.0/970.5MB NTP:0.6ms/-5.7ppm +52.1C 0/0Acfts[1h] RF:+0-0.0ppm/+1.32dB/+2.1dB@10km[193897]/+9.0dB@10km[10/20]
 #
-# since 0.2.6
-# ... the ogn comment of a receiver beacon is just optional
+# since 0.2.6 the ogn comment of a receiver beacon is just optional
 Ulrichamn>APRS,TCPIP*,qAC,GLIDERN1:/085616h5747.30NI01324.77E&/A=001322
-#
-# ... and a aircraft beacon needs just an ID, climb rate and turn rate or just the ID
-ICA3ECE59>APRS,qAS,GLDRTR:/171254h5144.78N/00616.67E'263/000/A=000075 id093D0930 +000fpm +0.0rot
-ICA3ECE59>APRS,qAS,GLDRTR:/171254h5144.78N/00616.67E'263/000/A=000075 id053ECE59
\ No newline at end of file
diff --git a/tests/parser/valid_beacon_data/naviter.txt b/tests/parser/valid_beacon_data/naviter.txt
index 9633cf2..0456dc1 100644
--- a/tests/parser/valid_beacon_data/naviter.txt
+++ b/tests/parser/valid_beacon_data/naviter.txt
@@ -4,4 +4,4 @@
 NAV042121>OGNAVI,qAS,NAVITER:/140648h4550.36N/01314.85E'090/152/A=001086 !W47! id0440042121 +000fpm +0.5rot
 NAV04220E>OGNAVI,qAS,NAVITER:/140748h4552.27N/01155.61E'090/012/A=006562 !W81! id044004220E +060fpm +1.2rot
 NAV07220E>OGNAVI,qAS,NAVITER:/125447h4557.77N/01220.19E'258/056/A=006562 !W76! id1C4007220E +180fpm +0.0rot
-FLRFFFFFF>OGNAVI,NAV07220E*,qAS,NAVITER:/092002h1000.00S/01000.00W'000/000/A=003281 !W00! id2820FFFFFF +300fpm +1.7rot
\ No newline at end of file
+FLRFFFFFF>OGNAVI,NAV07220E*,qAS,NAVITER:/092002h1000.00S/01000.00W'000/000/A=003281 !W00! id2820FFFFFF +300fpm +1.7rot

From 63d8d2fc4e325badf4bcd5fce036ca7384664a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 28 Sep 2017 19:10:27 +0200
Subject: [PATCH 06/14] Implemented Naviter parser

---
 ogn/parser/parse.py   | 14 +++++++++++++-
 ogn/parser/pattern.py |  6 ++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index e76758b..8ad23ca 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -3,6 +3,7 @@ from datetime import datetime
 
 from ogn.parser.utils import createTimestamp, parseAngle, kts2kmh, feet2m, fpm2ms
 from ogn.parser.pattern import PATTERN_APRS_POSITION, PATTERN_APRS_STATUS, PATTERN_RECEIVER_BEACON, PATTERN_AIRCRAFT_BEACON
+from ogn.parser.pattern import PATTERN_NAVITER_BEACON
 from ogn.parser.exceptions import AprsParseError, OgnParseError
 
 
@@ -95,7 +96,18 @@ def parse_lt24_beacon(aprs_comment):
 
 
 def parse_naviter_beacon(aprs_comment):
-    raise NotImplementedError("Naviter parser not implemented")
+    ac_match = re.search(PATTERN_NAVITER_BEACON, aprs_comment)
+    if ac_match:
+        return {'stealth': (int(ac_match.group('details'), 16) & 0b1000000000000000) >> 15 == 1,
+                'do_not_track': (int(ac_match.group('details'), 16) & 0b0100000000000000) >> 14 == 1,
+                'aircraft_type': (int(ac_match.group('details'), 16) & 0b0011110000000000) >> 10,
+                'address_type': (int(ac_match.group('details'), 16) & 0b0000001111110000) >> 4,
+                'reserved': (int(ac_match.group('details'), 16) & 0b0000000000001111),
+                'address': ac_match.group('id'),
+                'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
+                'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None}
+    else:
+        raise OgnParseError(aprs_comment)
 
 
 def parse_skylines_beacon(aprs_comment):
diff --git a/ogn/parser/pattern.py b/ogn/parser/pattern.py
index 4093e1f..8a0dce2 100644
--- a/ogn/parser/pattern.py
+++ b/ogn/parser/pattern.py
@@ -4,6 +4,12 @@ import re
 PATTERN_APRS_POSITION = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),((?P<relay>[A-Za-z0-9]+)\*)?.*,(?P<receiver>.+?):/(?P<time>\d{6})+(h|z)(?P<latitude>\d{4}\.\d{2})(?P<latitude_sign>N|S)(?P<symbol_table>.)(?P<longitude>\d{5}\.\d{2})(?P<longitude_sign>E|W)(?P<symbol>.)(?P<course_extension>(?P<course>\d{3})/(?P<ground_speed>\d{3}))?/A=(?P<altitude>\d{6})(?P<pos_extension>\s!W((?P<latitude_enhancement>\d)(?P<longitude_enhancement>\d))!)?(?:\s(?P<comment>.*))?$")
 PATTERN_APRS_STATUS = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):>(?P<time>\d{6})+h\s(?P<comment>.*)$")
 
+PATTERN_NAVITER_BEACON = re.compile("""
+    id(?P<details>[\dA-F]{4})(?P<id>[\dA-F]{6})\s
+    (?P<climb_rate>[+-]\d+)fpm\s
+    (?P<turn_rate>[+-][\d.]+)rot
+""", re.VERBOSE | re.MULTILINE)
+
 # The following regexp patterns are part of the ruby ogn-client.
 # source: https://github.com/svoop/ogn_client-ruby
 

From 5fcaf0412573f0b62cf733b435e9c733b3f45b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 28 Sep 2017 19:16:34 +0200
Subject: [PATCH 07/14] If we have a dstcall other than "APRS" the pattern must
 match

---
 ogn/parser/parse.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index 8ad23ca..20b52aa 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -97,17 +97,14 @@ def parse_lt24_beacon(aprs_comment):
 
 def parse_naviter_beacon(aprs_comment):
     ac_match = re.search(PATTERN_NAVITER_BEACON, aprs_comment)
-    if ac_match:
-        return {'stealth': (int(ac_match.group('details'), 16) & 0b1000000000000000) >> 15 == 1,
-                'do_not_track': (int(ac_match.group('details'), 16) & 0b0100000000000000) >> 14 == 1,
-                'aircraft_type': (int(ac_match.group('details'), 16) & 0b0011110000000000) >> 10,
-                'address_type': (int(ac_match.group('details'), 16) & 0b0000001111110000) >> 4,
-                'reserved': (int(ac_match.group('details'), 16) & 0b0000000000001111),
-                'address': ac_match.group('id'),
-                'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
-                'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None}
-    else:
-        raise OgnParseError(aprs_comment)
+    return {'stealth': (int(ac_match.group('details'), 16) & 0b1000000000000000) >> 15 == 1,
+            'do_not_track': (int(ac_match.group('details'), 16) & 0b0100000000000000) >> 14 == 1,
+            'aircraft_type': (int(ac_match.group('details'), 16) & 0b0011110000000000) >> 10,
+            'address_type': (int(ac_match.group('details'), 16) & 0b0000001111110000) >> 4,
+            'reserved': (int(ac_match.group('details'), 16) & 0b0000000000001111),
+            'address': ac_match.group('id'),
+            'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
+            'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None}
 
 
 def parse_skylines_beacon(aprs_comment):
@@ -122,6 +119,10 @@ def parse_spot_beacon(aprs_comment):
     raise NotImplementedError("SPOT parser not implemented")
 
 
+def parse_capture_beacon(aprs_comment):
+    raise NotImplementedError("Capture beacon parser not yet implemented")
+
+
 def parse_ogn_beacon(aprs_comment, dstcall="APRS"):
     if dstcall == "APRS":
         if not aprs_comment:

From 76a45bc53187d4f181233ad8a17d6bd8f6fd47ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 28 Sep 2017 19:24:41 +0200
Subject: [PATCH 08/14] Each dstcall gets a separate treatment

---
 ogn/parser/parse.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index 20b52aa..bd91565 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -124,7 +124,7 @@ def parse_capture_beacon(aprs_comment):
 
 
 def parse_ogn_beacon(aprs_comment, dstcall="APRS"):
-    if dstcall == "APRS":
+    if dstcall == "APRS":   # this can be a receiver or an aircraft
         if not aprs_comment:
             return {'beacon_type': 'receiver_beacon'}
 
@@ -139,6 +139,14 @@ def parse_ogn_beacon(aprs_comment, dstcall="APRS"):
             return rc_data
 
         raise OgnParseError(aprs_comment)
+    elif dstcall == "OGNFLR":
+        ac_data = parse_ogn_aircraft_beacon(aprs_comment)
+        ac_data.update({'beacon_type': 'aircraft_beacon'})
+        return ac_data
+    elif dstcall == "OGNTRK":
+        ac_data = parse_ogn_aircraft_beacon(aprs_comment)
+        ac_data.update({'beacon_type': 'aircraft_beacon'})
+        return ac_data
     elif dstcall == "OGLT24":
         ac_data = parse_lt24_beacon(aprs_comment)
         ac_data.update({'beacon_type': 'lt24_beacon'})

From 4f1f6c09aef541973d69dbd07f9d8ed86a32c376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 28 Sep 2017 22:25:32 +0200
Subject: [PATCH 09/14] Added group 'relay'

---
 ogn/parser/parse.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index bd91565..a2348de 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -17,6 +17,7 @@ def parse_aprs(message, reference_date=None, reference_time=None):
     if match_position:
         return {'name': match_position.group('callsign'),
                 'dstcall': match_position.group('dstcall'),
+                'relay': match_position.group('relay') if match_position.group('relay') else None,
                 'receiver_name': match_position.group('receiver'),
                 'timestamp': createTimestamp(match_position.group('time'), reference_date, reference_time),
                 'latitude': parseAngle('0' + match_position.group('latitude') + (match_position.group('latitude_enhancement') or '0')) *

From 6044e58773f28e674b15356e804f8e98af46f5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 28 Sep 2017 22:30:06 +0200
Subject: [PATCH 10/14] Tests for OGFLR, OGNTRK and OGNSDR

---
 ogn/parser/parse.py        | 6 +++++-
 tests/parser/test_parse.py | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index a2348de..474ff56 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -140,7 +140,7 @@ def parse_ogn_beacon(aprs_comment, dstcall="APRS"):
             return rc_data
 
         raise OgnParseError(aprs_comment)
-    elif dstcall == "OGNFLR":
+    elif dstcall == "OGFLR":
         ac_data = parse_ogn_aircraft_beacon(aprs_comment)
         ac_data.update({'beacon_type': 'aircraft_beacon'})
         return ac_data
@@ -148,6 +148,10 @@ def parse_ogn_beacon(aprs_comment, dstcall="APRS"):
         ac_data = parse_ogn_aircraft_beacon(aprs_comment)
         ac_data.update({'beacon_type': 'aircraft_beacon'})
         return ac_data
+    elif dstcall == "OGNSDR":
+        ac_data = parse_ogn_receiver_beacon(aprs_comment)
+        ac_data.update({'beacon_type': 'receiver_beacon'})
+        return ac_data
     elif dstcall == "OGLT24":
         ac_data = parse_lt24_beacon(aprs_comment)
         ac_data.update({'beacon_type': 'lt24_beacon'})
diff --git a/tests/parser/test_parse.py b/tests/parser/test_parse.py
index 1c151a7..b855baa 100644
--- a/tests/parser/test_parse.py
+++ b/tests/parser/test_parse.py
@@ -26,6 +26,15 @@ class TestStringMethods(unittest.TestCase):
     def test_aprs_receiver_beacons(self):
         self.parse_valid_beacon_data_file(filename='aprs_receiver.txt', beacon_type='receiver_beacon')
 
+    def test_ogn_flarm_beacons(self):
+        self.parse_valid_beacon_data_file(filename='ogn_flarm.txt', beacon_type='aircraft_beacon')
+
+    def test_ogn_receiver_beacons(self):
+        self.parse_valid_beacon_data_file(filename='ogn_receiver.txt', beacon_type='receiver_beacon')
+
+    def test_ogn_tracker_beacons(self):
+        self.parse_valid_beacon_data_file(filename='ogn_tracker.txt', beacon_type='aircraft_beacon')
+
     def test_lt24_beacons(self):
         self.parse_valid_beacon_data_file(filename='lt24.txt', beacon_type='lt24_beacon')
 

From ca5636456a0e3cd0285ec5b3a2b31420caffdbc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Fri, 29 Sep 2017 08:54:48 +0200
Subject: [PATCH 11/14] Add APRS type to message

---
 ogn/parser/parse.py         | 6 ++++--
 tests/parser/test_beacon.py | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index 474ff56..13d3237 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -29,7 +29,8 @@ def parse_aprs(message, reference_date=None, reference_time=None):
                 'track': int(match_position.group('course')) if match_position.group('course_extension') else None,
                 'ground_speed': int(match_position.group('ground_speed')) * kts2kmh if match_position.group('ground_speed') else None,
                 'altitude': int(match_position.group('altitude')) * feet2m,
-                'comment': match_position.group('comment')}
+                'comment': match_position.group('comment'),
+                'aprs_type': 'position'}
 
     match_status = re.search(PATTERN_APRS_STATUS, message)
     if match_status:
@@ -37,7 +38,8 @@ def parse_aprs(message, reference_date=None, reference_time=None):
                 'dstcall': match_status.group('dstcall'),
                 'receiver_name': match_status.group('receiver'),
                 'timestamp': createTimestamp(match_status.group('time'), reference_date, reference_time),
-                'comment': match_status.group('comment')}
+                'comment': match_status.group('comment'),
+                'aprs_type': 'status'}
 
     raise AprsParseError(message)
 
diff --git a/tests/parser/test_beacon.py b/tests/parser/test_beacon.py
index ab40efd..fd94ded 100644
--- a/tests/parser/test_beacon.py
+++ b/tests/parser/test_beacon.py
@@ -28,6 +28,8 @@ class TestStringMethods(unittest.TestCase):
         self.assertAlmostEqual(message['altitude'] * m2feet, 5524, 5)
         self.assertEqual(message['comment'], "this is a comment")
 
+        self.assertEqual(message['aprs_type'], 'position')
+
     def test_v024(self):
         # higher precision datum format introduced
         raw_message = "FLRDDA5BA>APRS,qAS,LFMX:/160829h4415.41N/00600.03E'342/049/A=005524 !W26! id21400EA9 -2454fpm +0.9rot 19.5dB 0e -6.6kHz gps1x1 s6.02 h44 rDF0C56"
@@ -46,6 +48,8 @@ class TestStringMethods(unittest.TestCase):
         self.assertEqual(message['timestamp'].strftime('%H:%M:%S'), "09:34:56")
         self.assertEqual(message['comment'], "this is a comment")
 
+        self.assertEqual(message['aprs_type'], 'status')
+
     def test_v026(self):
         # from 0.2.6 the ogn comment of a receiver beacon is just optional
         raw_message = "Ulrichamn>APRS,TCPIP*,qAC,GLIDERN1:/085616h5747.30NI01324.77E&/A=001322"

From d995f0320bf3844fdd71060af6e6975e29a7fa59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Fri, 29 Sep 2017 09:04:09 +0200
Subject: [PATCH 12/14] Cosmetics

---
 tests/parser/test_beacon_naviter.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/parser/test_beacon_naviter.py b/tests/parser/test_beacon_naviter.py
index cd56134..207e623 100644
--- a/tests/parser/test_beacon_naviter.py
+++ b/tests/parser/test_beacon_naviter.py
@@ -6,8 +6,7 @@ from ogn.parser.parse import parse_naviter_beacon
 
 class TestStringMethods(unittest.TestCase):
     def test_OGNAVI_1(self):
-        message = "id0440042121 +000fpm +0.5rot"
-        naviter_message = parse_naviter_beacon(message)
+        message = parse_naviter_beacon("id0440042121 +123fpm +0.5rot")
 
         # id0440042121 == 0b0000 0100 0100 0000 0000 0100 0010 0001 0010 0001
         # bit 0: stealth mode
@@ -16,15 +15,15 @@ class TestStringMethods(unittest.TestCase):
         # bits 6-11: address type (namespace is extended from 2 to 6 bits to avoid collisions with other tracking providers)
         # bits 12-15: reserved for use at a later time
         # bits 16-39: device id (24-bit device identifier, same as in APRS header)
-        self.assertEqual(naviter_message['stealth'], False)
-        self.assertEqual(naviter_message['do_not_track'], False)
-        self.assertEqual(naviter_message['aircraft_type'], 1)
-        self.assertEqual(naviter_message['address_type'], 4)
-        self.assertEqual(naviter_message['reserved'], 0)
-        self.assertEqual(naviter_message['address'], "042121")
+        self.assertEqual(message['stealth'], False)
+        self.assertEqual(message['do_not_track'], False)
+        self.assertEqual(message['aircraft_type'], 1)
+        self.assertEqual(message['address_type'], 4)
+        self.assertEqual(message['reserved'], 0)
+        self.assertEqual(message['address'], "042121")
 
-        self.assertAlmostEqual(naviter_message['climb_rate'] * ms2fpm, 0, 2)
-        self.assertEqual(naviter_message['turn_rate'], 0.5)
+        self.assertAlmostEqual(message['climb_rate'] * ms2fpm, 123, 2)
+        self.assertEqual(message['turn_rate'], 0.5)
 
 
 if __name__ == '__main__':

From 127f3935d2c4c135028867c9df23f5229d940015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Sat, 30 Sep 2017 08:48:56 +0200
Subject: [PATCH 13/14] Separated parser in separate files

---
 ogn/parser/__init__.py                        |   2 +-
 ogn/parser/parse.py                           | 104 +++---------------
 ogn/parser/parse_lt24.py                      |   2 +
 ogn/parser/parse_naviter.py                   |  16 +++
 ogn/parser/parse_ogn.py                       |  54 +++++++++
 ogn/parser/parse_skylines.py                  |   2 +
 ogn/parser/parse_spider.py                    |   2 +
 ogn/parser/parse_spot.py                      |   2 +
 .../{test_beacon.py => test_parse_aprs.py}    |   0
 ...eacon_naviter.py => test_parse_naviter.py} |   4 +-
 ...t_beacon.py => test_parse_ogn_aircraft.py} |  20 ++--
 ...r_beacon.py => test_parse_ogn_receiver.py} |  12 +-
 12 files changed, 111 insertions(+), 109 deletions(-)
 create mode 100644 ogn/parser/parse_lt24.py
 create mode 100644 ogn/parser/parse_naviter.py
 create mode 100644 ogn/parser/parse_ogn.py
 create mode 100644 ogn/parser/parse_skylines.py
 create mode 100644 ogn/parser/parse_spider.py
 create mode 100644 ogn/parser/parse_spot.py
 rename tests/parser/{test_beacon.py => test_parse_aprs.py} (100%)
 rename tests/parser/{test_beacon_naviter.py => test_parse_naviter.py} (89%)
 rename tests/parser/{test_aircraft_beacon.py => test_parse_ogn_aircraft.py} (64%)
 rename tests/parser/{test_receiver_beacon.py => test_parse_ogn_receiver.py} (68%)

diff --git a/ogn/parser/__init__.py b/ogn/parser/__init__.py
index 3e79519..5bcc93f 100644
--- a/ogn/parser/__init__.py
+++ b/ogn/parser/__init__.py
@@ -1,2 +1,2 @@
-from ogn.parser.parse import parse_aprs, parse_ogn_beacon, parse_ogn_receiver_beacon, parse_ogn_aircraft_beacon # flake8: noqa
+from ogn.parser.parse import parse_aprs, parse_ogn_beacon, parse_receiver_beacon, parse_aircraft_beacon # flake8: noqa
 from ogn.parser.exceptions import ParseError, AprsParseError, OgnParseError, AmbigousTimeError # flake8: noqa
diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index 13d3237..6978668 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -1,11 +1,17 @@
 import re
 from datetime import datetime
 
-from ogn.parser.utils import createTimestamp, parseAngle, kts2kmh, feet2m, fpm2ms
-from ogn.parser.pattern import PATTERN_APRS_POSITION, PATTERN_APRS_STATUS, PATTERN_RECEIVER_BEACON, PATTERN_AIRCRAFT_BEACON
-from ogn.parser.pattern import PATTERN_NAVITER_BEACON
+from ogn.parser.utils import createTimestamp, parseAngle, kts2kmh, feet2m
+from ogn.parser.pattern import PATTERN_APRS_POSITION, PATTERN_APRS_STATUS
 from ogn.parser.exceptions import AprsParseError, OgnParseError
 
+from ogn.parser.parse_ogn import parse_aircraft_beacon, parse_receiver_beacon
+from ogn.parser.parse_naviter import parse as parse_naviter_beacon
+from ogn.parser.parse_lt24 import parse as parse_lt24_beacon
+from ogn.parser.parse_spider import parse as parse_spider_beacon
+from ogn.parser.parse_spot import parse as parse_spot_beacon
+from ogn.parser.parse_skylines import parse as parse_skylines_beacon
+
 
 def parse_aprs(message, reference_date=None, reference_time=None):
     if reference_date is None:
@@ -44,114 +50,32 @@ def parse_aprs(message, reference_date=None, reference_time=None):
     raise AprsParseError(message)
 
 
-def parse_ogn_aircraft_beacon(aprs_comment):
-    ac_match = re.search(PATTERN_AIRCRAFT_BEACON, aprs_comment)
-    if ac_match:
-        return {'address_type': int(ac_match.group('details'), 16) & 0b00000011,
-                'aircraft_type': (int(ac_match.group('details'), 16) & 0b01111100) >> 2,
-                'stealth': (int(ac_match.group('details'), 16) & 0b10000000) >> 7 == 1,
-                'address': ac_match.group('id'),
-                'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
-                'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None,
-                'flightlevel': float(ac_match.group('flight_level')) if ac_match.group('flight_level') else None,
-                'signal_quality': float(ac_match.group('signal_quality')) if ac_match.group('signal_quality') else None,
-                'error_count': int(ac_match.group('errors')) if ac_match.group('errors') else None,
-                'frequency_offset': float(ac_match.group('frequency_offset')) if ac_match.group('frequency_offset') else None,
-                'gps_status': ac_match.group('gps_accuracy') if ac_match.group('gps_accuracy') else None,
-                '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') if ac_match.group('flarm_id') else None,
-                'signal_power': float(ac_match.group('signal_power')) if ac_match.group('signal_power') else None,
-                'proximity': [hear[4:] for hear in ac_match.group('proximity').split(" ")] if ac_match.group('proximity') else None}
-    else:
-        return None
-
-
-def parse_ogn_receiver_beacon(aprs_comment):
-    rec_match = re.search(PATTERN_RECEIVER_BEACON, aprs_comment)
-    if rec_match:
-        return {'version': rec_match.group('version'),
-                'platform': rec_match.group('platform'),
-                'cpu_load': float(rec_match.group('cpu_load')),
-                'free_ram': float(rec_match.group('ram_free')),
-                'total_ram': float(rec_match.group('ram_total')),
-                'ntp_error': float(rec_match.group('ntp_offset')),
-                'rt_crystal_correction': float(rec_match.group('ntp_correction')),
-                'voltage': float(rec_match.group('voltage')) if rec_match.group('voltage') else None,
-                'amperage': float(rec_match.group('amperage')) if rec_match.group('amperage') else None,
-                'cpu_temp': float(rec_match.group('cpu_temperature')) if rec_match.group('cpu_temperature') else None,
-                'senders_visible': int(rec_match.group('visible_senders')) if rec_match.group('visible_senders') else None,
-                'senders_total': int(rec_match.group('senders')) if rec_match.group('senders') else None,
-                'rec_crystal_correction': int(rec_match.group('rf_correction_manual')) if rec_match.group('rf_correction_manual') else None,
-                'rec_crystal_correction_fine': float(rec_match.group('rf_correction_automatic')) if rec_match.group('rf_correction_automatic') else None,
-                'rec_input_noise': float(rec_match.group('signal_quality')) if rec_match.group('signal_quality') else None,
-                'senders_signal': float(rec_match.group('senders_signal_quality')) if rec_match.group('senders_signal_quality') else None,
-                'senders_messages': float(rec_match.group('senders_messages')) if rec_match.group('senders_messages') else None,
-                'good_senders_signal': float(rec_match.group('good_senders_signal_quality')) if rec_match.group('good_senders_signal_quality') else None,
-                'good_senders': float(rec_match.group('good_senders')) if rec_match.group('good_senders') else None,
-                'good_and_bad_senders': float(rec_match.group('good_and_bad_senders')) if rec_match.group('good_and_bad_senders') else None}
-    else:
-        return None
-
-
-def parse_lt24_beacon(aprs_comment):
-    raise NotImplementedError("LT24 parser not implemented")
-
-
-def parse_naviter_beacon(aprs_comment):
-    ac_match = re.search(PATTERN_NAVITER_BEACON, aprs_comment)
-    return {'stealth': (int(ac_match.group('details'), 16) & 0b1000000000000000) >> 15 == 1,
-            'do_not_track': (int(ac_match.group('details'), 16) & 0b0100000000000000) >> 14 == 1,
-            'aircraft_type': (int(ac_match.group('details'), 16) & 0b0011110000000000) >> 10,
-            'address_type': (int(ac_match.group('details'), 16) & 0b0000001111110000) >> 4,
-            'reserved': (int(ac_match.group('details'), 16) & 0b0000000000001111),
-            'address': ac_match.group('id'),
-            'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
-            'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None}
-
-
-def parse_skylines_beacon(aprs_comment):
-    raise NotImplementedError("Skylines parser not implemented")
-
-
-def parse_spider_beacon(aprs_comment):
-    raise NotImplementedError("Spider parser not implemented")
-
-
-def parse_spot_beacon(aprs_comment):
-    raise NotImplementedError("SPOT parser not implemented")
-
-
-def parse_capture_beacon(aprs_comment):
-    raise NotImplementedError("Capture beacon parser not yet implemented")
-
-
 def parse_ogn_beacon(aprs_comment, dstcall="APRS"):
     if dstcall == "APRS":   # this can be a receiver or an aircraft
         if not aprs_comment:
             return {'beacon_type': 'receiver_beacon'}
 
-        ac_data = parse_ogn_aircraft_beacon(aprs_comment)
+        ac_data = parse_aircraft_beacon(aprs_comment)
         if ac_data:
             ac_data.update({'beacon_type': 'aircraft_beacon'})
             return ac_data
 
-        rc_data = parse_ogn_receiver_beacon(aprs_comment)
+        rc_data = parse_receiver_beacon(aprs_comment)
         if rc_data:
             rc_data.update({'beacon_type': 'receiver_beacon'})
             return rc_data
 
         raise OgnParseError(aprs_comment)
     elif dstcall == "OGFLR":
-        ac_data = parse_ogn_aircraft_beacon(aprs_comment)
+        ac_data = parse_aircraft_beacon(aprs_comment)
         ac_data.update({'beacon_type': 'aircraft_beacon'})
         return ac_data
     elif dstcall == "OGNTRK":
-        ac_data = parse_ogn_aircraft_beacon(aprs_comment)
+        ac_data = parse_aircraft_beacon(aprs_comment)
         ac_data.update({'beacon_type': 'aircraft_beacon'})
         return ac_data
     elif dstcall == "OGNSDR":
-        ac_data = parse_ogn_receiver_beacon(aprs_comment)
+        ac_data = parse_receiver_beacon(aprs_comment)
         ac_data.update({'beacon_type': 'receiver_beacon'})
         return ac_data
     elif dstcall == "OGLT24":
diff --git a/ogn/parser/parse_lt24.py b/ogn/parser/parse_lt24.py
new file mode 100644
index 0000000..44fa237
--- /dev/null
+++ b/ogn/parser/parse_lt24.py
@@ -0,0 +1,2 @@
+def parse(aprs_comment):
+    raise NotImplementedError("LT24 beacon parser not yet implemented")
diff --git a/ogn/parser/parse_naviter.py b/ogn/parser/parse_naviter.py
new file mode 100644
index 0000000..5787d8e
--- /dev/null
+++ b/ogn/parser/parse_naviter.py
@@ -0,0 +1,16 @@
+import re
+
+from ogn.parser.utils import fpm2ms
+from ogn.parser.pattern import PATTERN_NAVITER_BEACON
+
+
+def parse(aprs_comment):
+    match = re.search(PATTERN_NAVITER_BEACON, aprs_comment)
+    return {'stealth': (int(match.group('details'), 16) & 0b1000000000000000) >> 15 == 1,
+            'do_not_track': (int(match.group('details'), 16) & 0b0100000000000000) >> 14 == 1,
+            'aircraft_type': (int(match.group('details'), 16) & 0b0011110000000000) >> 10,
+            'address_type': (int(match.group('details'), 16) & 0b0000001111110000) >> 4,
+            'reserved': (int(match.group('details'), 16) & 0b0000000000001111),
+            'address': match.group('id'),
+            'climb_rate': int(match.group('climb_rate')) * fpm2ms if match.group('climb_rate') else None,
+            'turn_rate': float(match.group('turn_rate')) if match.group('turn_rate') else None}
diff --git a/ogn/parser/parse_ogn.py b/ogn/parser/parse_ogn.py
new file mode 100644
index 0000000..cd5f004
--- /dev/null
+++ b/ogn/parser/parse_ogn.py
@@ -0,0 +1,54 @@
+import re
+
+from ogn.parser.utils import fpm2ms
+from ogn.parser.pattern import PATTERN_RECEIVER_BEACON, PATTERN_AIRCRAFT_BEACON
+
+
+def parse_aircraft_beacon(aprs_comment):
+    ac_match = re.search(PATTERN_AIRCRAFT_BEACON, aprs_comment)
+    if ac_match:
+        return {'address_type': int(ac_match.group('details'), 16) & 0b00000011,
+                'aircraft_type': (int(ac_match.group('details'), 16) & 0b01111100) >> 2,
+                'stealth': (int(ac_match.group('details'), 16) & 0b10000000) >> 7 == 1,
+                'address': ac_match.group('id'),
+                'climb_rate': int(ac_match.group('climb_rate')) * fpm2ms if ac_match.group('climb_rate') else None,
+                'turn_rate': float(ac_match.group('turn_rate')) if ac_match.group('turn_rate') else None,
+                'flightlevel': float(ac_match.group('flight_level')) if ac_match.group('flight_level') else None,
+                'signal_quality': float(ac_match.group('signal_quality')) if ac_match.group('signal_quality') else None,
+                'error_count': int(ac_match.group('errors')) if ac_match.group('errors') else None,
+                'frequency_offset': float(ac_match.group('frequency_offset')) if ac_match.group('frequency_offset') else None,
+                'gps_status': ac_match.group('gps_accuracy') if ac_match.group('gps_accuracy') else None,
+                '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') if ac_match.group('flarm_id') else None,
+                'signal_power': float(ac_match.group('signal_power')) if ac_match.group('signal_power') else None,
+                'proximity': [hear[4:] for hear in ac_match.group('proximity').split(" ")] if ac_match.group('proximity') else None}
+    else:
+        return None
+
+
+def parse_receiver_beacon(aprs_comment):
+    rec_match = re.search(PATTERN_RECEIVER_BEACON, aprs_comment)
+    if rec_match:
+        return {'version': rec_match.group('version'),
+                'platform': rec_match.group('platform'),
+                'cpu_load': float(rec_match.group('cpu_load')),
+                'free_ram': float(rec_match.group('ram_free')),
+                'total_ram': float(rec_match.group('ram_total')),
+                'ntp_error': float(rec_match.group('ntp_offset')),
+                'rt_crystal_correction': float(rec_match.group('ntp_correction')),
+                'voltage': float(rec_match.group('voltage')) if rec_match.group('voltage') else None,
+                'amperage': float(rec_match.group('amperage')) if rec_match.group('amperage') else None,
+                'cpu_temp': float(rec_match.group('cpu_temperature')) if rec_match.group('cpu_temperature') else None,
+                'senders_visible': int(rec_match.group('visible_senders')) if rec_match.group('visible_senders') else None,
+                'senders_total': int(rec_match.group('senders')) if rec_match.group('senders') else None,
+                'rec_crystal_correction': int(rec_match.group('rf_correction_manual')) if rec_match.group('rf_correction_manual') else None,
+                'rec_crystal_correction_fine': float(rec_match.group('rf_correction_automatic')) if rec_match.group('rf_correction_automatic') else None,
+                'rec_input_noise': float(rec_match.group('signal_quality')) if rec_match.group('signal_quality') else None,
+                'senders_signal': float(rec_match.group('senders_signal_quality')) if rec_match.group('senders_signal_quality') else None,
+                'senders_messages': float(rec_match.group('senders_messages')) if rec_match.group('senders_messages') else None,
+                'good_senders_signal': float(rec_match.group('good_senders_signal_quality')) if rec_match.group('good_senders_signal_quality') else None,
+                'good_senders': float(rec_match.group('good_senders')) if rec_match.group('good_senders') else None,
+                'good_and_bad_senders': float(rec_match.group('good_and_bad_senders')) if rec_match.group('good_and_bad_senders') else None}
+    else:
+        return None
diff --git a/ogn/parser/parse_skylines.py b/ogn/parser/parse_skylines.py
new file mode 100644
index 0000000..94f0b70
--- /dev/null
+++ b/ogn/parser/parse_skylines.py
@@ -0,0 +1,2 @@
+def parse(aprs_comment):
+    raise NotImplementedError("Skylines beacon parser not yet implemented")
diff --git a/ogn/parser/parse_spider.py b/ogn/parser/parse_spider.py
new file mode 100644
index 0000000..41ae86c
--- /dev/null
+++ b/ogn/parser/parse_spider.py
@@ -0,0 +1,2 @@
+def parse(aprs_comment):
+    raise NotImplementedError("Spider beacon parser not yet implemented")
diff --git a/ogn/parser/parse_spot.py b/ogn/parser/parse_spot.py
new file mode 100644
index 0000000..d8503d1
--- /dev/null
+++ b/ogn/parser/parse_spot.py
@@ -0,0 +1,2 @@
+def parse(aprs_comment):
+    raise NotImplementedError("SPOT beacon parser not yet implemented")
diff --git a/tests/parser/test_beacon.py b/tests/parser/test_parse_aprs.py
similarity index 100%
rename from tests/parser/test_beacon.py
rename to tests/parser/test_parse_aprs.py
diff --git a/tests/parser/test_beacon_naviter.py b/tests/parser/test_parse_naviter.py
similarity index 89%
rename from tests/parser/test_beacon_naviter.py
rename to tests/parser/test_parse_naviter.py
index 207e623..a282068 100644
--- a/tests/parser/test_beacon_naviter.py
+++ b/tests/parser/test_parse_naviter.py
@@ -1,12 +1,12 @@
 import unittest
 
 from ogn.parser.utils import ms2fpm
-from ogn.parser.parse import parse_naviter_beacon
+from ogn.parser.parse_naviter import parse
 
 
 class TestStringMethods(unittest.TestCase):
     def test_OGNAVI_1(self):
-        message = parse_naviter_beacon("id0440042121 +123fpm +0.5rot")
+        message = parse("id0440042121 +123fpm +0.5rot")
 
         # id0440042121 == 0b0000 0100 0100 0000 0000 0100 0010 0001 0010 0001
         # bit 0: stealth mode
diff --git a/tests/parser/test_aircraft_beacon.py b/tests/parser/test_parse_ogn_aircraft.py
similarity index 64%
rename from tests/parser/test_aircraft_beacon.py
rename to tests/parser/test_parse_ogn_aircraft.py
index 7f6eee3..438a966 100644
--- a/tests/parser/test_aircraft_beacon.py
+++ b/tests/parser/test_parse_ogn_aircraft.py
@@ -1,15 +1,15 @@
 import unittest
 
 from ogn.parser.utils import ms2fpm
-from ogn.parser.parse import parse_ogn_aircraft_beacon
+from ogn.parser.parse import parse_aircraft_beacon
 
 
 class TestStringMethods(unittest.TestCase):
     def test_invalid_token(self):
-        self.assertEqual(parse_ogn_aircraft_beacon("notAValidToken"), None)
+        self.assertEqual(parse_aircraft_beacon("notAValidToken"), None)
 
     def test_basic(self):
-        aircraft_beacon = parse_ogn_aircraft_beacon("id0ADDA5BA -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5 hear1084 hearB597 hearB598")
+        aircraft_beacon = parse_aircraft_beacon("id0ADDA5BA -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5 hear1084 hearB597 hearB598")
 
         self.assertEqual(aircraft_beacon['address_type'], 2)
         self.assertEqual(aircraft_beacon['aircraft_type'], 2)
@@ -27,33 +27,33 @@ class TestStringMethods(unittest.TestCase):
         self.assertEqual(aircraft_beacon['proximity'][2], 'B598')
 
     def test_stealth(self):
-        aircraft_beacon = parse_ogn_aircraft_beacon("id0ADD1234 -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5 hear1084 hearB597 hearB598")
+        aircraft_beacon = parse_aircraft_beacon("id0ADD1234 -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5 hear1084 hearB597 hearB598")
         self.assertFalse(aircraft_beacon['stealth'])
 
-        aircraft_beacon = parse_ogn_aircraft_beacon("id8ADD1234 -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5 hear1084 hearB597 hearB598")
+        aircraft_beacon = parse_aircraft_beacon("id8ADD1234 -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5 hear1084 hearB597 hearB598")
         self.assertTrue(aircraft_beacon['stealth'])
 
     def test_v024(self):
-        aircraft_beacon = parse_ogn_aircraft_beacon("id21400EA9 -2454fpm +0.9rot 19.5dB 0e -6.6kHz gps1x1 s6.02 h0A rDF0C56")
+        aircraft_beacon = parse_aircraft_beacon("id21400EA9 -2454fpm +0.9rot 19.5dB 0e -6.6kHz gps1x1 s6.02 h0A rDF0C56")
 
         self.assertEqual(aircraft_beacon['software_version'], 6.02)
         self.assertEqual(aircraft_beacon['hardware_version'], 10)
         self.assertEqual(aircraft_beacon['real_address'], "DF0C56")
 
     def test_v024_ogn_tracker(self):
-        aircraft_beacon = parse_ogn_aircraft_beacon("id07353800 +020fpm -14.0rot FL004.43 38.5dB 0e -2.9kHz")
+        aircraft_beacon = parse_aircraft_beacon("id07353800 +020fpm -14.0rot FL004.43 38.5dB 0e -2.9kHz")
 
         self.assertEqual(aircraft_beacon['flightlevel'], 4.43)
 
     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")
+        aircraft_beacon = parse_aircraft_beacon("id06DDE28D +535fpm +3.8rot 11.5dB 0e -1.0kHz gps2x3 s6.01 h0C +7.4dBm")
 
         self.assertEqual(aircraft_beacon['signal_power'], 7.4)
 
     def test_v026(self):
         # from 0.2.6 it is sufficent we have only the ID, climb and turn rate or just the ID
-        aircraft_beacon_triple = parse_ogn_aircraft_beacon("id093D0930 +000fpm +0.0rot")
-        aircraft_beacon_single = parse_ogn_aircraft_beacon("id093D0930")
+        aircraft_beacon_triple = parse_aircraft_beacon("id093D0930 +000fpm +0.0rot")
+        aircraft_beacon_single = parse_aircraft_beacon("id093D0930")
 
         self.assertIsNotNone(aircraft_beacon_triple)
         self.assertIsNotNone(aircraft_beacon_single)
diff --git a/tests/parser/test_receiver_beacon.py b/tests/parser/test_parse_ogn_receiver.py
similarity index 68%
rename from tests/parser/test_receiver_beacon.py
rename to tests/parser/test_parse_ogn_receiver.py
index c3fbae6..80b6b20 100644
--- a/tests/parser/test_receiver_beacon.py
+++ b/tests/parser/test_parse_ogn_receiver.py
@@ -1,14 +1,14 @@
 import unittest
 
-from ogn.parser.parse import parse_ogn_receiver_beacon
+from ogn.parser.parse import parse_receiver_beacon
 
 
 class TestStringMethods(unittest.TestCase):
     def test_fail_validation(self):
-        self.assertEqual(parse_ogn_receiver_beacon("notAValidToken"), None)
+        self.assertEqual(parse_receiver_beacon("notAValidToken"), None)
 
     def test_v021(self):
-        receiver_beacon = parse_ogn_receiver_beacon("v0.2.1 CPU:0.8 RAM:25.6/458.9MB NTP:0.1ms/+2.3ppm +51.9C RF:+26-1.4ppm/-0.25dB")
+        receiver_beacon = parse_receiver_beacon("v0.2.1 CPU:0.8 RAM:25.6/458.9MB NTP:0.1ms/+2.3ppm +51.9C RF:+26-1.4ppm/-0.25dB")
 
         self.assertEqual(receiver_beacon['version'], "0.2.1")
         self.assertEqual(receiver_beacon['cpu_load'], 0.8)
@@ -23,17 +23,17 @@ class TestStringMethods(unittest.TestCase):
         self.assertEqual(receiver_beacon['rec_input_noise'], -0.25)
 
     def test_v022(self):
-        receiver_beacon = parse_ogn_receiver_beacon("v0.2.2.x86 CPU:0.5 RAM:669.9/887.7MB NTP:1.0ms/+6.2ppm +52.0C RF:+0.06dB")
+        receiver_beacon = parse_receiver_beacon("v0.2.2.x86 CPU:0.5 RAM:669.9/887.7MB NTP:1.0ms/+6.2ppm +52.0C RF:+0.06dB")
         self.assertEqual(receiver_beacon['platform'], 'x86')
 
     def test_v025(self):
-        receiver_beacon = parse_ogn_receiver_beacon("v0.2.5.RPI-GPU CPU:0.8 RAM:287.3/458.7MB NTP:1.0ms/-6.4ppm 5.016V 0.534A +51.9C RF:+55+0.4ppm/-0.67dB/+10.8dB@10km[57282]")
+        receiver_beacon = parse_receiver_beacon("v0.2.5.RPI-GPU CPU:0.8 RAM:287.3/458.7MB NTP:1.0ms/-6.4ppm 5.016V 0.534A +51.9C RF:+55+0.4ppm/-0.67dB/+10.8dB@10km[57282]")
         self.assertEqual(receiver_beacon['voltage'], 5.016)
         self.assertEqual(receiver_beacon['amperage'], 0.534)
         self.assertEqual(receiver_beacon['senders_signal'], 10.8)
         self.assertEqual(receiver_beacon['senders_messages'], 57282)
 
-        receiver_beacon = parse_ogn_receiver_beacon("v0.2.5.ARM CPU:0.4 RAM:638.0/970.5MB NTP:0.2ms/-1.1ppm +65.5C 14/16Acfts[1h] RF:+45+0.0ppm/+3.88dB/+24.0dB@10km[143717]/+26.7dB@10km[68/135]")
+        receiver_beacon = parse_receiver_beacon("v0.2.5.ARM CPU:0.4 RAM:638.0/970.5MB NTP:0.2ms/-1.1ppm +65.5C 14/16Acfts[1h] RF:+45+0.0ppm/+3.88dB/+24.0dB@10km[143717]/+26.7dB@10km[68/135]")
         self.assertEqual(receiver_beacon['senders_visible'], 14)
         self.assertEqual(receiver_beacon['senders_total'], 16)
         self.assertEqual(receiver_beacon['senders_signal'], 24.0)

From d122fc1d3f5e2013c007e2aa9c8862fad565cb71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Sat, 30 Sep 2017 08:50:26 +0200
Subject: [PATCH 14/14] Update readme

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0546d56..7e485b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 - parser: Added support for heared aircrafts
+- parser: Added support for naviter beacons
 - client: Allow client to do sequential connect-disconnect
 
 ## 0.7.1 - 2017-06-05