aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-02-25 19:43:13 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2013-02-25 19:43:13 -0800
commit63c453b07baad3c8e6c671fd0cc05a53b4faacd6 (patch)
tree83ef04d59930c210a4305736e92d285928f78232 /src/org
parentfbba01063cf4f79d83d58700f1e19486c8b26f16 (diff)
parent5fe033327cbb8ef12883934ac494e4857d6a9592 (diff)
downloadtrackermap-server-63c453b07baad3c8e6c671fd0cc05a53b4faacd6.tar.gz
trackermap-server-63c453b07baad3c8e6c671fd0cc05a53b4faacd6.tar.bz2
trackermap-server-63c453b07baad3c8e6c671fd0cc05a53b4faacd6.zip
Merge pull request #148 from hallmark9/feature
Fixed Meiligao VT300 protocol
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/MeiligaoProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index f40d64b26..9be8a8555 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -49,8 +49,8 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
"([EW])," +
"(\\d+.\\d+)," + // Speed
"(\\d+\\.?\\d*)?," + // Course
- "(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
- "[^\\|]+\\|(\\d+\\.\\d)\\|" + // Dilution of precision
+ "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY)
+ "[^\\|]*\\|(\\d+\\.\\d)\\|" + // Dilution of precision
"(\\d+\\.?\\d*)\\|" + // Altitude
"([0-9a-fA-F]+)?" + // State
"(?:\\|([0-9a-fA-F]+),([0-9a-fA-F]+))?" + // ADC