Workaround for Granit coordinates (fix #2664)

3 files changed, 34 insertions, 13 deletions

diff --git a/src/org/traccar/protocol/GranitProtocolDecoder.java b/src/org/traccar/protocol/GranitProtocolDecoder.java
index 5fa786e4d..6e8bc24bf 100644
--- a/src/org/traccar/protocol/GranitProtocolDecoder.java
+++ b/src/org/traccar/protocol/GranitProtocolDecoder.java
@@ -61,7 +61,7 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder {
     private static void sendResponseCurrent(Channel channel, int deviceId, long time) {
         ChannelBuffer response = ChannelBuffers.dynamicBuffer(ByteOrder.LITTLE_ENDIAN, 0);
         response.writeBytes("BB+UGRC~".getBytes(StandardCharsets.US_ASCII));
-        response.writeShort(6); //binary length
+        response.writeShort(6); // length
         response.writeInt((int) time);
         response.writeShort(deviceId);
         appendChecksum(response, 16);
@@ -71,7 +71,7 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder {
     private static void sendResponseArchive(Channel channel, int deviceId, int packNum) {
         ChannelBuffer response = ChannelBuffers.dynamicBuffer(ByteOrder.LITTLE_ENDIAN, 0);
         response.writeBytes("BB+ARCF~".getBytes(StandardCharsets.US_ASCII));
-        response.writeShort(4); //binary length
+        response.writeShort(4); // length
         response.writeShort(packNum);
         response.writeShort(deviceId);
         appendChecksum(response, 14);
@@ -95,14 +95,19 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder {
         int latDegrees = buf.readUnsignedByte();
         int lonMinutes = buf.readUnsignedShort();
         int latMinutes = buf.readUnsignedShort();
+
         double latitude = latDegrees + latMinutes / 60000.0;
         double longitude = lonDegrees + lonMinutes / 60000.0;
-        if (!BitUtil.check(flags, 4)) {
-            latitude = -latitude;
-        }
-        if (!BitUtil.check(flags, 5)) {
-            longitude = -longitude;
+
+        if (position.getValid()) {
+            if (!BitUtil.check(flags, 4)) {
+                latitude = -latitude;
+            }
+            if (!BitUtil.check(flags, 5)) {
+                longitude = -longitude;
+            }
         }
+
         position.setLongitude(longitude);
         position.setLatitude(latitude);
 
@@ -135,11 +140,11 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder {
 
         position.setAltitude(buf.readUnsignedByte() * 10);
 
-        short diOut = buf.readUnsignedByte();
+        int output = buf.readUnsignedByte();
         for (int i = 0; i < 8; i++) {
-            position.set(Position.PREFIX_IO + (i + 1), BitUtil.check(diOut, i));
+            position.set(Position.PREFIX_IO + (i + 1), BitUtil.check(output, i));
         }
-        buf.skipBytes(1); //StatMess
+        buf.readUnsignedByte(); // status message buffer
     }
 
     @Override
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java
index 756393288..93f3150c7 100644
--- a/test/org/traccar/ProtocolTest.java
+++ b/test/org/traccar/ProtocolTest.java
@@ -135,7 +135,9 @@ public class ProtocolTest extends BaseTest {
             if (expected != null) {
 
                 if (expected.getFixTime() != null) {
-                    Assert.assertEquals("time", expected.getFixTime(), position.getFixTime());
+                    DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+                    dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+                    Assert.assertEquals("time", dateFormat.format(expected.getFixTime()), dateFormat.format(position.getFixTime()));
                 }
                 Assert.assertEquals("valid", expected.getValid(), position.getValid());
                 Assert.assertEquals("latitude", expected.getLatitude(), position.getLatitude(), 0.00001);
diff --git a/test/org/traccar/protocol/GranitProtocolDecoderTest.java b/test/org/traccar/protocol/GranitProtocolDecoderTest.java
index 1fea1d98c..6e85b5cfc 100644
--- a/test/org/traccar/protocol/GranitProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GranitProtocolDecoderTest.java
@@ -13,6 +13,20 @@ public class GranitProtocolDecoderTest extends ProtocolTest {
         GranitProtocolDecoder decoder = new GranitProtocolDecoder(new GranitProtocol());
 
         verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN,
+                "2b444441547e8400c500040130050c43495808002839aee3150200000000640000000000000008002839aee3150200000000640000000000000008002839aee3150200000000640000000000000008002839aee3150200000000640000000000000008002839aee3150200000000640000000000000008002839aee3150200000000640000000000000014002a37420d0a"));
+
+        verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN,
+                "2b525243427e1a00c5008443495808002839aee315020000000064000000000000002a37410d0a"),
+                position("2016-12-08 11:27:00.000", false, 57.00888, 40.97143));
+
+        verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN,
+                "2b525243427e1a00c500ec904858b842283997e30002000000005e000000000d00002a32390d0a"),
+                position("2016-12-07 22:45:00.000", true, 57.00853, 40.97105));
+
+        verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN,
+                "2b525243427e1a00c500009148580800283997e30002000000005f000000000000002a33410d0a"));
+
+        verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN,
                 "2b444441547e84003b6d0401b10e9217445800b051398f35d34a313b000072000000010b000080b051398f35d34a313b000072000000010b0000f0b051390f33314c303b900371000000010b0000f0b05139cd31e54c2f3cd0016f000000010b0000f0b051396831204d303d950071000000010b0000f0b051397530aa4d323c610171000000010b00000a002a30420d0a"));
 
         verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN,
@@ -24,11 +38,11 @@ public class GranitProtocolDecoderTest extends ProtocolTest {
         verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN,
                 "2b444441547e84003e290401d41680747c57f8a03c38987f50e6005300006c000000001c0000f8b03c38987f50e6005300006c000000001c0000fefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefe14002a4346"));
 
-        //+IDNT: Navigator.04x  Firmware version  0712GLN *21
+        // +IDNT: Navigator.04x  Firmware version  0712GLN *21
         verifyAttributes(decoder, binary(ByteOrder.LITTLE_ENDIAN,
                 "2b49444e543a204e6176696761746f722e30347820204669726d776172652076657273696f6e202030373132474c4e202a3231"));
 
-        //ERROR WRONG CHECKSUM_1
+        // ERROR WRONG CHECKSUM_1
         verifyAttributes(decoder, binary(ByteOrder.LITTLE_ENDIAN,
                 "4552524f522057524f4e4720434845434b53554d5f31"));