From 3ba58a7d025c33c5f4e5e2d595158ecf9f420008 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 15 Nov 2015 18:07:03 +1300
Subject: Store LAC and CID in right format

---
 src/org/traccar/protocol/Jt600ProtocolDecoder.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/protocol/Jt600ProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
index d9e31fe48..b576b063d 100644
--- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
@@ -94,8 +94,13 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
 
             position.setAltitude(buf.readUnsignedShort());
 
-            position.set(Event.KEY_CID, buf.readUnsignedShort());
-            position.set(Event.KEY_LAC, buf.readUnsignedShort());
+            int cid = buf.readUnsignedShort();
+            int lac = buf.readUnsignedShort();
+            if (cid != 0 && lac != 0) {
+                position.set(Event.KEY_CID, cid);
+                position.set(Event.KEY_LAC, lac);
+            }
+
             position.set(Event.KEY_GSM, buf.readUnsignedByte());
 
         } else if (version == 2) {
-- 
cgit v1.2.3