aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
diff options
context:
space:
mode:
authorHans van den Elsen <hans.elsen@esds.nl>2016-02-13 16:13:35 +0100
committerHans van den Elsen <hans.elsen@esds.nl>2016-02-13 16:13:35 +0100
commit54f8bba338b7262ad6c938bb2284c148fee6cd62 (patch)
treed87961aa0c060f461d17f9ac00b8122eb34be22b /src/org/traccar/protocol/Tlt2hProtocolDecoder.java
parent8622ba6e081b987a96e3b1885209576f3c389266 (diff)
parent9b11013c2376ad0401c194d5cfa0014e0a08502e (diff)
downloadtraccar-server-54f8bba338b7262ad6c938bb2284c148fee6cd62.tar.gz
traccar-server-54f8bba338b7262ad6c938bb2284c148fee6cd62.tar.bz2
traccar-server-54f8bba338b7262ad6c938bb2284c148fee6cd62.zip
Merge branch 'master' of https://github.com/tananaev/traccar
Diffstat (limited to 'src/org/traccar/protocol/Tlt2hProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Tlt2hProtocolDecoder.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
index 5f44bd989..802b00f1f 100644
--- a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
@@ -35,7 +35,7 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern PATTERN_HEADER = new PatternBuilder()
.number("#(d+)#") // imei
- .expression("[^#]+#")
+ .expression("[^#]*#")
.number("d+#")
.expression("([^#]+)#") // status
.number("d+") // number of records
@@ -50,8 +50,8 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
.expression("([NS]),")
.number("(d+)(dd.d+),") // longitude
.number("([EW]),")
- .number("(d+.d+)?,") // speed
- .number("(d+.d+)?,") // course
+ .number("(d+.?d*)?,") // speed
+ .number("(d+.?d*)?,") // course
.number("(dd)(dd)(dd)") // date (ddmmyy)
.any()
.compile();