aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-12-16 13:22:02 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2017-12-16 13:22:02 +1300
commitb3e1a81f722ddf93ba70f16686301022bfe2454e (patch)
tree92050812ac01d151f0b60ac64757c1fee39801fe
parent84990b99467ee04ac4385f6add30a5718a898e0d (diff)
downloadtrackermap-server-b3e1a81f722ddf93ba70f16686301022bfe2454e.tar.gz
trackermap-server-b3e1a81f722ddf93ba70f16686301022bfe2454e.tar.bz2
trackermap-server-b3e1a81f722ddf93ba70f16686301022bfe2454e.zip
Support ES310 location message
-rw-r--r--src/org/traccar/protocol/EskyProtocolDecoder.java2
-rw-r--r--test/org/traccar/protocol/EskyProtocolDecoderTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/EskyProtocolDecoder.java b/src/org/traccar/protocol/EskyProtocolDecoder.java
index d524224af..b509d821f 100644
--- a/src/org/traccar/protocol/EskyProtocolDecoder.java
+++ b/src/org/traccar/protocol/EskyProtocolDecoder.java
@@ -33,7 +33,7 @@ public class EskyProtocolDecoder extends BaseProtocolDecoder {
}
private static final Pattern PATTERN = new PatternBuilder()
- .text("EO;") // header
+ .expression("..;") // header
.number("d+;") // index
.number("(d+);") // imei
.text("R;") // data type
diff --git a/test/org/traccar/protocol/EskyProtocolDecoderTest.java b/test/org/traccar/protocol/EskyProtocolDecoderTest.java
index 2ff58fc33..5132f42c1 100644
--- a/test/org/traccar/protocol/EskyProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/EskyProtocolDecoderTest.java
@@ -19,7 +19,7 @@ public class EskyProtocolDecoderTest extends ProtocolTest {
verifyPosition(decoder, text(
"EO;0;864906029196626;R;0+170808155352+0.00000+0.00000+0.00+0+0x1+0+0+0+1233"));
- verifyNull(decoder, text(
+ verifyPosition(decoder, text(
"ET;1;014682000989425;R;0+171216001250+33.34405+-111.96682+0.00+0+0x1+0+25598+0+1257+0"));
}