diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-02 05:32:51 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-02 05:32:51 +1300 |
| commit | 10cc148834ac5bb694d9ba482f65a2e71faebbb4 (patch) | |
| tree | c34cdbf67867dcd5a2297cd620a5d867cde5ac89 | |
| parent | a79386202fcf1feb86b7770cbbbcfe65fa4a95ca (diff) | |
| download | trackermap-server-10cc148834ac5bb694d9ba482f65a2e71faebbb4.tar.gz trackermap-server-10cc148834ac5bb694d9ba482f65a2e71faebbb4.tar.bz2 trackermap-server-10cc148834ac5bb694d9ba482f65a2e71faebbb4.zip | |
Support new TAIP message type
| -rw-r--r-- | src/org/traccar/protocol/TaipProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/TaipProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java index 9c98799fb..81bebdef7 100644 --- a/src/org/traccar/protocol/TaipProtocolDecoder.java +++ b/src/org/traccar/protocol/TaipProtocolDecoder.java @@ -47,7 +47,7 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder { .groupEnd("?") .number("(d{5})") // seconds .or() - .expression("(?:RGP|RCQ|RBR)") // type + .expression("(?:RGP|RCQ|RCV|RBR)") // type .number("(dd)?") // event .number("(dd)(dd)(dd)") // date (mmddyy) .number("(dd)(dd)(dd)") // time (hhmmss) diff --git a/test/org/traccar/protocol/TaipProtocolDecoderTest.java b/test/org/traccar/protocol/TaipProtocolDecoderTest.java index cdf5ff4a3..a92e82498 100644 --- a/test/org/traccar/protocol/TaipProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TaipProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class TaipProtocolDecoderTest extends ProtocolTest { TaipProtocolDecoder decoder = new TaipProtocolDecoder(new TaipProtocol()); verifyPosition(decoder, text( + ">RCV12270218010247-3471349-058400030002057F001200020A1D013010600001509+0000FF+0000FF;#1DE2;ID=7196;*03<")); + + verifyPosition(decoder, text( ">RPV03874+3477708-0923453100029212;ID=0017;*71<")); verifyNull(decoder, text( |