diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-26 09:59:55 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-26 09:59:55 +1200 |
| commit | b7f1df549d57582c18b44f74a8af9739b29af040 (patch) | |
| tree | b43f088625b1fd3f720f938500216bd39f5aee1c | |
| parent | 8a5afddcf7c4d9624045d8d5e8e323675dbe3a40 (diff) | |
| download | trackermap-server-b7f1df549d57582c18b44f74a8af9739b29af040.tar.gz trackermap-server-b7f1df549d57582c18b44f74a8af9739b29af040.tar.bz2 trackermap-server-b7f1df549d57582c18b44f74a8af9739b29af040.zip | |
Improve GL200 regex pattern
| -rw-r--r-- | src/org/traccar/protocol/Gl200ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Gl200ProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index 1392c56a8..59d09ae6a 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -61,7 +61,7 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { "(\\p{XDigit}{4}|\\p{XDigit}{8})?," + // LAC "(\\p{XDigit}{4})?," + // Cell "(?:(\\d+\\.\\d)?," + // Odometer - "(\\d{1,3})?)?" + // Battery + "(\\d{1,3})?,)?" + // Battery ".*," + "(\\p{XDigit}{4})\\$?"); diff --git a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java index bbb0fb37a..96be1c5a2 100644 --- a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java @@ -12,6 +12,9 @@ public class Gl200ProtocolDecoderTest extends ProtocolDecoderTest { Gl200ProtocolDecoder decoder = new Gl200ProtocolDecoder(null); verify(decoder.decode(null, null, null, + "+RESP:GTSTT,1A0401,860599000508846,,41,0,0.0,84,107.5,-76.657998,39.497203,20150623160622,0310,0260,B435,3B81,,20150623160622,0F54$")); + + verify(decoder.decode(null, null, null, "+RESP:GTFRI,1A0401,860599000508846,,0,0,1,1,134.8,154,278.7,-76.671089,39.778885,20150623154301,0310,0260,043F,7761,,99,20150623154314,0F24$")); verify(decoder.decode(null, null, null, |