X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fzmsg.py;h=28c233a3cafe7b45f89fc6b0c44f94c8a98d5251;hb=ccfb47bba216d7f1b99f1d2e4f488afec4c37738;hp=898918cab10204384986bf2b36ae710148dbab9c;hpb=da8493cf8d5652664822afed88f073c683278d5f;p=loctrkd.git

diff --git a/gps303/zmsg.py b/gps303/zmsg.py
index 898918c..28c233a 100644
--- a/gps303/zmsg.py
+++ b/gps303/zmsg.py
@@ -145,7 +145,7 @@ class LocEvt(_Zmsg):
     @property
     def packed(self):
         return (
-            self.imei.encode()
+                ("0000000000000000" + self.imei)[-16:].encode()
             + dumps(
                 {
                     "devtime": str(self.devtime),
@@ -156,6 +156,19 @@ class LocEvt(_Zmsg):
             ).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()
         json_data = loads(buffer[16:])