Merge pull request #95 from lemoidului/master

add safesky parser
glidernet · May 8, 2021 · f83c4c7 · f83c4c7
2 parents 464969a + b51a3e9
commit f83c4c7
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 0 deletions.
diff --git a/ogn/parser/aprs_comment/safesky_parser.py b/ogn/parser/aprs_comment/safesky_parser.py
@@ -0,0 +1,32 @@
+from ogn.parser.utils import FPM_TO_MS
+from ogn.parser.pattern import PATTERN_SAFESKY_POSITION_COMMENT
+
+from .base import BaseParser
+
+
+class SafeskyParser(BaseParser):
+    def __init__(self):
+        self.beacon_type = 'safesky'
+        self.position_pattern = PATTERN_SAFESKY_POSITION_COMMENT
+
+    def parse_position(self, aprs_comment):
+        match = self.position_pattern.match(aprs_comment)
+        result = dict()
+        if match.group('details'):
+            result.update({
+                'address_type': int(match.group('details'), 16) & 0b00000011,
+                'aircraft_type': (int(match.group('details'), 16) & 0b00111100) >> 2,
+                'no-tracking': (int(match.group('details'), 16) & 0b01000000) >> 6 == 1,
+                'stealth': (int(match.group('details'), 16) & 0b10000000) >> 7 == 1,
+                'address': match.group('address'),
+            })
+        result.update(
+            {'climb_rate': int(match.group('climb_rate')) * FPM_TO_MS if match.group('climb_rate') else None})
+        if match.group('gps_quality'):
+            result.update({
+                'gps_quality': {
+                    'horizontal': int(match.group('gps_quality_horizontal')),
+                    'vertical': int(match.group('gps_quality_vertical'))
+                }
+            })
+        return result
diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
@@ -16,6 +16,7 @@
 from ogn.parser.aprs_comment.spider_parser import SpiderParser
 from ogn.parser.aprs_comment.spot_parser import SpotParser
 from ogn.parser.aprs_comment.inreach_parser import InreachParser
+from ogn.parser.aprs_comment.safesky_parser import SafeskyParser
 from ogn.parser.aprs_comment.generic_parser import GenericParser
 
 positions = {}
@@ -155,6 +156,7 @@ def parse_aprs(message, reference_timestamp=None):
                           'OGSKYL': SkylinesParser(),
                           'OGSPID': SpiderParser(),
                           'OGSPOT': SpotParser(),
+                          'OGNSKY': SafeskyParser(),
                           'GENERIC': GenericParser(beacon_type='unknown'),
                           }
 

diff --git a/ogn/parser/pattern.py b/ogn/parser/pattern.py
@@ -82,6 +82,12 @@
     (?:(?P<signal_power>[+-][\d.]+)dBm\s?)?
 """, re.VERBOSE | re.MULTILINE)
 
+PATTERN_SAFESKY_POSITION_COMMENT = re.compile(r"""
+    id(?P<details>[\dA-F]{2})(?P<address>[\dA-F]{6}?)\s?
+    (?:(?P<climb_rate>[+-]\d+?)fpm\s)?
+    (?:gps(?P<gps_quality>(?P<gps_quality_horizontal>(\d+))x(?P<gps_quality_vertical>(\d+)))?)?
+""", re.VERBOSE | re.MULTILINE)
+
 PATTERN_TRACKER_STATUS_COMMENT = re.compile(r"""
     h(?P<hardware_version>[\d]{2})\s
     v(?P<software_version>[\d]{2})\s?

diff --git a/tests/parser/test_parse_safesky.py b/tests/parser/test_parse_safesky.py
@@ -0,0 +1,20 @@
+import unittest
+
+from ogn.parser.utils import FPM_TO_MS
+from ogn.parser.aprs_comment.safesky_parser import SafeskyParser
+
+
+class TestStringMethods(unittest.TestCase):
+    def test_position_comment(self):
+        # "SKY3E5906>OGNSKY,qAS,SafeSky:/072555h5103.47N/00524.81E'065/031/A=001250 !W05! id1C3E5906 +010fpm gps6x1"
+        message = SafeskyParser().parse_position("id1C3E5906 +010fpm gps6x1")
+        self.assertEqual(message['address'], '3E5906')
+        self.assertEqual(message['address_type'], 0)
+        self.assertEqual(message['aircraft_type'], 7)
+        self.assertFalse(message['stealth'])
+        self.assertAlmostEqual(message['climb_rate'], 10 * FPM_TO_MS, 2)
+        self.assertEqual(message['gps_quality'], {'horizontal': 6, 'vertical': 1})
+
+
+if __name__ == '__main__':
+    unittest.main()