diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-21 16:24:21 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-21 16:24:21 +1200 |
| commit | 1d64602c49e495bfa97059b0ac4d657ffc9c75e1 (patch) | |
| tree | c05e3d1dc6b0369b0aafbfc3f144fa74e5cb6571 | |
| parent | b6b9f360a96b8d3c42df35454f76095cb7e360cb (diff) | |
| download | trackermap-server-1d64602c49e495bfa97059b0ac4d657ffc9c75e1.tar.gz trackermap-server-1d64602c49e495bfa97059b0ac4d657ffc9c75e1.tar.bz2 trackermap-server-1d64602c49e495bfa97059b0ac4d657ffc9c75e1.zip | |
Fix new Totem format decoding
| -rw-r--r-- | src/org/traccar/protocol/TotemProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/TotemProtocolDecoderTest.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java index a22bbf71e..5e9557189 100644 --- a/src/org/traccar/protocol/TotemProtocolDecoder.java +++ b/src/org/traccar/protocol/TotemProtocolDecoder.java @@ -59,7 +59,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { "(\\d{3})" + // Battery "(\\d{4})\\|" + // External Power "(?:(\\d+)\\|)?" + // ADC - "(\\p{XDigit}{8})\\|" + // Location Code + "(\\p{XDigit}+)\\|" + // Location Code "(\\d+)\\|" + // Temperature "(\\d+.\\d+)\\|" + // Odometer "\\d+\\|" + // Serial Number diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/test/org/traccar/protocol/TotemProtocolDecoderTest.java index cdb6be355..c01640241 100644 --- a/test/org/traccar/protocol/TotemProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TotemProtocolDecoderTest.java @@ -11,7 +11,10 @@ public class TotemProtocolDecoderTest extends ProtocolDecoderTest { public void testDecode() throws Exception { TotemProtocolDecoder decoder = new TotemProtocolDecoder(new TotemProtocol()); - + + verify(decoder.decode(null, null, + "$$BE863771024392112|AA$GPRMC,044704.000,A,1439.3334,N,12059.1417,E,0.00,0.00,200815,,,A*67|01.7|00.8|01.4|000000000000|20150820044704|14291265|00000000|4EECBF8B31|0000|0.0000|0002|00000|56E7")); + verify(decoder.decode(null, null, "$$AE860990002922822|AA$GPRMC,051002.00,A,0439.26245,N,10108.94448,E,0.023,,140315,,,A*71|02.98|01.95|02.26|000000000000|20150314051003|13841157|105A3B1C|0000|0.0000|0005|5324")); |