From 2507a8183ff78cc75dea82327523d9e151d95920 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 12 Jul 2020 19:10:19 -0700
Subject: Support alternative location report

---
 .../org/traccar/protocol/Jt600ProtocolDecoder.java | 55 ++++++++++++----------
 1 file changed, 30 insertions(+), 25 deletions(-)

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

diff --git a/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java
index f456cd1ef..d745153a4 100644
--- a/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java
@@ -90,6 +90,35 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
         return buf.getUnsignedByte(flagIndex) >> 4 == 0x7;
     }
 
+    static void decodeBinaryLocation(ByteBuf buf, Position position) {
+
+        DateBuilder dateBuilder = new DateBuilder()
+                .setDay(BcdUtil.readInteger(buf, 2))
+                .setMonth(BcdUtil.readInteger(buf, 2))
+                .setYear(BcdUtil.readInteger(buf, 2))
+                .setHour(BcdUtil.readInteger(buf, 2))
+                .setMinute(BcdUtil.readInteger(buf, 2))
+                .setSecond(BcdUtil.readInteger(buf, 2));
+        position.setTime(dateBuilder.getDate());
+
+        double latitude = convertCoordinate(BcdUtil.readInteger(buf, 8));
+        double longitude = convertCoordinate(BcdUtil.readInteger(buf, 9));
+
+        byte flags = buf.readByte();
+        position.setValid((flags & 0x1) == 0x1);
+        if ((flags & 0x2) == 0) {
+            latitude = -latitude;
+        }
+        position.setLatitude(latitude);
+        if ((flags & 0x4) == 0) {
+            longitude = -longitude;
+        }
+        position.setLongitude(longitude);
+
+        position.setSpeed(BcdUtil.readInteger(buf, 2));
+        position.setCourse(buf.readUnsignedByte() * 2.0);
+    }
+
     private List<Position> decodeBinary(ByteBuf buf, Channel channel, SocketAddress remoteAddress) {
 
         List<Position> positions = new LinkedList<>();
@@ -117,31 +146,7 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
             Position position = new Position(getProtocolName());
             position.setDeviceId(deviceSession.getDeviceId());
 
-            DateBuilder dateBuilder = new DateBuilder()
-                    .setDay(BcdUtil.readInteger(buf, 2))
-                    .setMonth(BcdUtil.readInteger(buf, 2))
-                    .setYear(BcdUtil.readInteger(buf, 2))
-                    .setHour(BcdUtil.readInteger(buf, 2))
-                    .setMinute(BcdUtil.readInteger(buf, 2))
-                    .setSecond(BcdUtil.readInteger(buf, 2));
-            position.setTime(dateBuilder.getDate());
-
-            double latitude = convertCoordinate(BcdUtil.readInteger(buf, 8));
-            double longitude = convertCoordinate(BcdUtil.readInteger(buf, 9));
-
-            byte flags = buf.readByte();
-            position.setValid((flags & 0x1) == 0x1);
-            if ((flags & 0x2) == 0) {
-                latitude = -latitude;
-            }
-            position.setLatitude(latitude);
-            if ((flags & 0x4) == 0) {
-                longitude = -longitude;
-            }
-            position.setLongitude(longitude);
-
-            position.setSpeed(BcdUtil.readInteger(buf, 2));
-            position.setCourse(buf.readUnsignedByte() * 2.0);
+            decodeBinaryLocation(buf, position);
 
             if (longFormat) {
 
-- 
cgit v1.2.3