aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/protocol/DishaProtocolDecoder.java4
-rw-r--r--test/org/traccar/protocol/DishaProtocolDecoderTest.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/DishaProtocolDecoder.java b/src/org/traccar/protocol/DishaProtocolDecoder.java
index eab3de9d9..f9b7579d3 100644
--- a/src/org/traccar/protocol/DishaProtocolDecoder.java
+++ b/src/org/traccar/protocol/DishaProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ public class DishaProtocolDecoder extends BaseProtocolDecoder {
position.setTime(dateBuilder.getDate());
position.setLatitude(parser.nextCoordinate());
- position.setLatitude(parser.nextCoordinate());
+ position.setLongitude(parser.nextCoordinate());
position.setSpeed(parser.nextDouble());
position.setCourse(parser.nextDouble());
diff --git a/test/org/traccar/protocol/DishaProtocolDecoderTest.java b/test/org/traccar/protocol/DishaProtocolDecoderTest.java
index e22de4f5c..99ceecc52 100644
--- a/test/org/traccar/protocol/DishaProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/DishaProtocolDecoderTest.java
@@ -11,6 +11,10 @@ public class DishaProtocolDecoderTest extends ProtocolTest {
DishaProtocolDecoder decoder = new DishaProtocolDecoder(new DishaProtocol());
verifyPosition(decoder, text(
+ "$A#A#864161028848856#A#182134#090116#2232.0191#N#08821.3278#E#001.74#231.4#04#01.5#1300#0#000#0000#9999#54.4#6407.7#0000*"),
+ position("2016-01-09 18:21:34.000", true, 22.53365, 88.35546));
+
+ verifyPosition(decoder, text(
"$A#A#353943046615971#A#064219#281113#1836.7267#N#07347.4177#E#000.00#280.4#09#00.8#3000#2#100#0000#8888#86.5#3919.1#0000*"));
}