diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-10 01:35:35 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-10 09:36:23 +1300 |
| commit | 9d9dbcdd3229c6f852031d2e458aca194bcee8b9 (patch) | |
| tree | 2037183d285d692f3546ca753f0eb83d33e1f733 | |
| parent | ef7247060c22c060744580f825391673773703c5 (diff) | |
| download | trackermap-server-9d9dbcdd3229c6f852031d2e458aca194bcee8b9.tar.gz trackermap-server-9d9dbcdd3229c6f852031d2e458aca194bcee8b9.tar.bz2 trackermap-server-9d9dbcdd3229c6f852031d2e458aca194bcee8b9.zip | |
Fix issues with upro coordinates
| -rw-r--r-- | src/org/traccar/protocol/UproProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/UproProtocolDecoderTest.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/UproProtocolDecoder.java b/src/org/traccar/protocol/UproProtocolDecoder.java index e48162322..02a241ddd 100644 --- a/src/org/traccar/protocol/UproProtocolDecoder.java +++ b/src/org/traccar/protocol/UproProtocolDecoder.java @@ -72,7 +72,7 @@ public class UproProtocolDecoder extends BaseProtocolDecoder { position.setLatitude(-position.getLatitude()); } if (!BitUtil.check(flags, 2)) { - position.setLatitude(-position.getLatitude()); + position.setLongitude(-position.getLongitude()); } position.setSpeed(parser.nextInt() * 2); diff --git a/test/org/traccar/protocol/UproProtocolDecoderTest.java b/test/org/traccar/protocol/UproProtocolDecoderTest.java index d553d5f52..034fd78a1 100644 --- a/test/org/traccar/protocol/UproProtocolDecoderTest.java +++ b/test/org/traccar/protocol/UproProtocolDecoderTest.java @@ -10,6 +10,10 @@ public class UproProtocolDecoderTest extends ProtocolTest { UproProtocolDecoder decoder = new UproProtocolDecoder(new UproProtocol()); + verifyPosition(decoder, text( + "*MG201693502000034964,AB&A0800253335360507036975710000091116&P0730000032d2a94d&B0000000000&N13&Z12&U_P\0\0\0\u0004\0\0\0\0\0\0\0\0\0\0#"), + position("2016-11-09 08:00:25.000", true, -33.58934, -70.61626)); + verifyNothing(decoder, text( "*MG20113800138000,AH#")); @@ -23,7 +27,8 @@ public class UproProtocolDecoderTest extends ProtocolTest { "*AI2000905447674,BA&A2003064913201201845107561627121016&B0100000000&C05>8=961&F0333&K023101002154A7#")); verifyPosition(decoder, text( - "*AI200905300036,AH&A0317264913209801844913060000251115&B0500000000&C0;4?72:9&F0000#")); + "*AI200905300036,AH&A0317264913209801844913060000251115&B0500000000&C0;4?72:9&F0000#"), + position("2015-11-25 03:17:26.000", false, 49.22016, 18.74855)); verifyPosition(decoder, text( "*AI2000905300036,AS&A1647304913209801844913060000251115&B0400000000&C0;4?72:9&F0000")); |