From e5dffc3d9f79164eddaaf43e6310969bb6a8fa6b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 11 Aug 2019 18:13:12 +0200
Subject: [PATCH] better decoding

---
 owrx/kiss.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/owrx/kiss.py b/owrx/kiss.py
index 010a64f..d153d5b 100644
--- a/owrx/kiss.py
+++ b/owrx/kiss.py
@@ -103,6 +103,7 @@ class KissClient(object):
         logger.debug(data)
 
         def parseCoordinates(raw):
+            # TODO parse N/S and E/W
             return {
                 "lat": int(raw[0:2]) + float(raw[2:7]) / 60,
                 "lon": int(raw[9:12]) + float(raw[12:17]) / 60
@@ -119,13 +120,15 @@ class KissClient(object):
             coords["comment"] = data[27:]
             return coords
         elif data[0] == "@":
+            # MOBILE
             # TODO CSE, SPD, BRG, 90Q, comments
-            if data[26] == "$":
-                # MOBILE
-                return parseCoordinates(data[8:26])
-            elif data[26] == "\\":
+            if data[26] == "\\":
                 # DF
                 return parseCoordinates(data[8:26])
+            coords = parseCoordinates(data[8:26])
+            coords["symbol"] = data[26]
+            coords["comment"] = data[27:]
+            return coords
         return {}
 
     def extractCallsign(self, input):