aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2021-04-15 20:40:54 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2021-04-15 20:40:54 -0700
commit994fd7a2d3ffeb4d46bc92d0178dffd87a64f9a9 (patch)
tree79f36d510614ac37598b6ba1fb461c61b543546a
parente2531fc5c0d1d28c190ceeba6a0e8627b26d6c60 (diff)
downloadtrackermap-server-994fd7a2d3ffeb4d46bc92d0178dffd87a64f9a9.tar.gz
trackermap-server-994fd7a2d3ffeb4d46bc92d0178dffd87a64f9a9.tar.bz2
trackermap-server-994fd7a2d3ffeb4d46bc92d0178dffd87a64f9a9.zip
Fix event decoding
-rw-r--r--src/main/java/org/traccar/protocol/StartekProtocolDecoder.java2
-rw-r--r--src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
index 3868e96fe..b80c8e174 100644
--- a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
@@ -41,7 +41,7 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
.number("d+,") // length
.number("(d+),") // imei
.number("xxx,") // command
- .number("(d),") // event
+ .number("(d+),") // event
.expression("[^,]*,") // event data
.number("(dd)(dd)(dd)") // date (yyymmdd)
.number("(dd)(dd)(dd),") // time (hhmmss)
diff --git a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
index c9a331904..2b880a884 100644
--- a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class StartekProtocolDecoderTest extends ProtocolTest {
var decoder = new StartekProtocolDecoder(null);
verifyPosition(decoder, text(
+ "&&>141,860262050010565,000,36,,210407094323,V,-38.229711,145.043161,0,0.0,0,0,0,14222,505|1|306E|082D6115,24,00000039,00,00,04C0|0164|0000|0000,1,,41"));
+
+ verifyPosition(decoder, text(
"&&A147,021104023195429,000,0,,180106093046,A,22.646430,114.065730,8,0.9,54,86,76,326781,460|0|27B3|0EA7,27,0000000F,02,01,04E2|018C|01C8|0000,1,0104B0,01013D|02813546"));
verifyPosition(decoder, text(