aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/TotemProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-08-21 21:00:41 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2013-08-21 21:00:41 +1200
commitba4cb97520ef9bbdd9be90b0c4307073469739c7 (patch)
treed9846ac56ca8de619c354ba5408d3b9ca0c3cf33 /src/org/traccar/protocol/TotemProtocolDecoder.java
parent99e93aa69ac34222101b35c0515fa1f31ff99be4 (diff)
downloadtrackermap-server-ba4cb97520ef9bbdd9be90b0c4307073469739c7.tar.gz
trackermap-server-ba4cb97520ef9bbdd9be90b0c4307073469739c7.tar.bz2
trackermap-server-ba4cb97520ef9bbdd9be90b0c4307073469739c7.zip
Fix Totem regular expr
Diffstat (limited to 'src/org/traccar/protocol/TotemProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/TotemProtocolDecoder.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index b4fa177be..73bb18aac 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -45,13 +45,13 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
"([NS])," +
"(\\d+)(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM)
"([EW])," +
- "(\\d+\\.\\d+)?," + // Speed
- "(\\d+\\.\\d+)?," + // Course
+ "(\\d+\\.?\\d*)?," + // Speed
+ "(\\d+\\.?\\d*)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY)
"[^\\*]+\\*\\p{XDigit}{2}\\|" + // Checksum
- "\\d+.\\d\\|" + // PDOP
- "(\\d+.\\d)\\|" + // HDOP
- "\\d+.\\d\\|" + // VDOP
+ "\\d+\\.\\d+\\|" + // PDOP
+ "(\\d+\\.\\d+)\\|" + // HDOP
+ "\\d+\\.\\d+\\|" + // VDOP
"(\\d+)\\|" + // IO Status
"\\d+\\|" + // Time
"\\d" + // Charged
@@ -78,7 +78,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
"([EW])\\|" +
"(\\d+\\.\\d+)?\\|" + // Speed
"(\\d+)?\\|" + // Course
- "(\\d+.\\d+)\\|" + // HDOP
+ "(\\d+\\.\\d+)\\|" + // HDOP
"(\\d+)\\|" + // IO Status
"\\d" + // Charged
"(\\d{2})" + // Battery