X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fzmsg.py;h=28c233a3cafe7b45f89fc6b0c44f94c8a98d5251;hb=117fd17ef103bb32940433955eba22f7fa457b99;hp=80cf0003cbb97eee3baf55684a9085cb010d2c3f;hpb=80e795c08def3466884223357798cd1aff265212;p=loctrkd.git

diff --git a/gps303/zmsg.py b/gps303/zmsg.py
index 80cf000..28c233a 100644
--- a/gps303/zmsg.py
+++ b/gps303/zmsg.py
@@ -1,6 +1,7 @@
 """ Zeromq messages """
 
 from datetime import datetime, timezone
+from json import dumps, loads
 import ipaddress as ip
 from struct import pack, unpack
 
@@ -59,15 +60,20 @@ class _Zmsg:
             ),
         )
 
+    def __eq__(self, other):
+        return all(
+            [getattr(self, k) == getattr(other, k) for k, _ in self.KWARGS]
+        )
+
     def decode(self, buffer):
-        raise RuntimeError(
-            self.__class__.__name__ + "must implement `encode()` method"
+        raise NotImplementedError(
+            self.__class__.__name__ + "must implement `decode()` method"
         )
 
     @property
     def packed(self):
-        raise RuntimeError(
-            self.__class__.__name__ + "must implement `encode()` method"
+        raise NotImplementedError(
+            self.__class__.__name__ + "must implement `packed()` property"
         )
 
 
@@ -133,18 +139,40 @@ class LocEvt(_Zmsg):
         ("is_gps", True),
     )
 
+    # This message is for external consumption, so use json encoding,
+    # except imei that forms 16 byte prefix that can be used as the
+    # topic to subscribe.
     @property
     def packed(self):
-        return self.imei.encode() + pack(
-            "!dddB",
-            self.devtime.replace(tzinfo=timezone.utc).timestamp(),
-            self.lat,
-            self.lon,
-            int(self.is_gps),
+        return (
+                ("0000000000000000" + self.imei)[-16:].encode()
+            + dumps(
+                {
+                    "devtime": str(self.devtime),
+                    "latitude": self.lat,
+                    "longitude": self.lon,
+                    "is-gps": self.is_gps,
+                }
+            ).encode()
+        )
+
+    # And this is full json that can be sent over websocket etc.
+    @property
+    def json(self):
+        return dumps(
+            {
+                "imei": self.imei,
+                "devtime": str(self.devtime),
+                "latitude": self.lat,
+                "longitude": self.lon,
+                "is-gps": self.is_gps,
+            }
         )
 
     def decode(self, buffer):
         self.imei = buffer[:16].decode()
-        when, self.lat, self.lon, is_gps = unpack("!dddB", buffer[16:])
-        self.devtime = datetime.fromtimestamp(when).astimezone(tz=timezone.utc)
-        self.is_gps = bool(is_gps)
+        json_data = loads(buffer[16:])
+        self.devtime = datetime.fromisoformat(json_data["devtime"])
+        self.lat = json_data["latitude"]
+        self.lon = json_data["longitude"]
+        self.is_gps = json_data["is-gps"]