aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Gps103ProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-06-01 05:14:08 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-06-08 11:31:50 +1200
commit6c68a7531289c4166b7e8ea58fc1ffdbe4893ed4 (patch)
treebfb527e7e640318050c0458156eef7e6ba5a8661 /src/org/traccar/protocol/Gps103ProtocolDecoder.java
parent318a881e57246f9714a9284ce0486fdc59186cf9 (diff)
downloadtrackermap-server-6c68a7531289c4166b7e8ea58fc1ffdbe4893ed4.tar.gz
trackermap-server-6c68a7531289c4166b7e8ea58fc1ffdbe4893ed4.tar.bz2
trackermap-server-6c68a7531289c4166b7e8ea58fc1ffdbe4893ed4.zip
Fix GPS103 course decoding
Diffstat (limited to 'src/org/traccar/protocol/Gps103ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolDecoder.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index 9883079d1..9a27dd9d2 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -66,13 +66,13 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
.expression("([EW]),").optional()
.number("(d+)(dd.d+),") // longitude (dddmm.mmmm)
.expression("([EW])?,").optional()
- .number("(d+.?d*)?,").optional() // speed
- .number("(d+.?d*)?,").optional() // course
- .number("(d+.?d*)?,").optional() // altitude
- .number("([01])?,").optional() // ignition
- .number("([01])?,").optional() // door
- .number("(?:(d+.d+)%)?,").optional() // fuel 1
- .number("(?:(d+.d+)%)?,").optional() // fuel 2
+ .number("(d+.?d*)?").optional() // speed
+ .number(",(d+.?d*)?").optional() // course
+ .number(",(d+.?d*)?").optional() // altitude
+ .number(",([01])?").optional() // ignition
+ .number(",([01])?").optional() // door
+ .number(",(?:(d+.d+)%)?").optional() // fuel 1
+ .number(",(?:(d+.d+)%)?").optional() // fuel 2
.number("(-?d+)?") // temperature
.groupEnd()
.any()