diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-05-27 18:32:47 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-05-27 18:32:47 +1200 |
| commit | 76ab97612a13e6d89b45596372fb311a3dafa826 (patch) | |
| tree | a835218410dfe10fe33aacae4e4f4dc99c27fe56 | |
| parent | 80941e9f1e63e0c4b932408527ed94a246906f4f (diff) | |
| download | trackermap-server-76ab97612a13e6d89b45596372fb311a3dafa826.tar.gz trackermap-server-76ab97612a13e6d89b45596372fb311a3dafa826.tar.bz2 trackermap-server-76ab97612a13e6d89b45596372fb311a3dafa826.zip | |
Fix tlt2h protocol decoder (fix #273)
| -rw-r--r-- | src/org/traccar/protocol/Tlt2hProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java index e38b3ab7b..99101aa34 100644 --- a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java +++ b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java @@ -40,9 +40,9 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder { "\\$GPRMC," + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d+)," + // Time (HHMMSS.SSS) "([AV])," + // Validity - "(\\d{2})(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM) + "(\\d+)(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM) "([NS])," + - "(\\d{3})(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM) + "(\\d+)(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM) "([EW])," + "(\\d+\\.\\d{2})?," + // Speed "(\\d+\\.\\d{2})?," + // Course diff --git a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java index 070aec4e1..c096c7ecf 100644 --- a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java @@ -24,6 +24,11 @@ public class Tlt2hProtocolDecoderTest { "#25ee0dff$GPRMC,083945.180,A,2233.4249,N,11406.0046,E,0.00,315.00,251207,,,A*6E\r\n" + "#25ee0dff$GPRMC,083950.180,A,2233.4249,N,11406.0046,E,0.00,315.00,251207,,,A*6E\r\n" + "#25ee0dff$GPRMC,083955.180,A,2233.4249,N,11406.0046,E,0.00,315.00,251207,,,A*6E")); + + assertNotNull(decoder.decode(null, null, + "#353686009063310#353686009063310#0000#AUTO#2\r\n" + + "#239757a9$GPRMC,150252.001,A,2326.6856,S,4631.8154,W,,,260513,,,A*52\r\n" + + "#239757a9$GPRMC,150322.001,A,2326.6854,S,4631.8157,W,,,260513,,,A*55")); } |