aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2012-10-31 20:58:54 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2012-10-31 20:58:54 +1300
commit4ad61d312d4e1c42de2269f1e70f2d556375a337 (patch)
tree5f53295bb0b11f58bc12f684176fc8ad9507fd6a /src/org
parentaf73f3436fc25f52e0157bce7b725ecd85f49869 (diff)
downloadtraccar-server-4ad61d312d4e1c42de2269f1e70f2d556375a337.tar.gz
traccar-server-4ad61d312d4e1c42de2269f1e70f2d556375a337.tar.bz2
traccar-server-4ad61d312d4e1c42de2269f1e70f2d556375a337.zip
Fix meiligao protocol (fix #67)
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/MeiligaoProtocolDecoder.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index 6b48b41fa..388565207 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -46,15 +46,15 @@ public class MeiligaoProtocolDecoder extends GenericProtocolDecoder {
* Regular expressions pattern
*/
static private Pattern pattern = Pattern.compile(
- "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS)
+ "(\\d{2})(\\d{2})(\\d{2})\\.(\\d{3})," + // Time (HHMMSS.SSS)
"([AV])," + // Validity
- "([\\d]{2})([\\d]{2}.[\\d]{4})," + // Latitude (DDMM.MMMM)
+ "(\\d{2})(\\d{2}\\.\\d{4})," + // Latitude (DDMM.MMMM)
"([NS])," +
- "([\\d]{3})([\\d]{2}.[\\d]{4})," + // Longitude (DDDMM.MMMM)
+ "(\\d{3})(\\d{2}\\.\\d{4})," + // Longitude (DDDMM.MMMM)
"([EW])," +
- "([\\d]+.[\\d]+)," + // Speed
- "([\\d]+.[\\d]+)?," + // Course
- "([\\d]{2})([\\d]{2})([\\d]{2})," + // Date (DDMMYY)
+ "(\\d+.\\d+)," + // Speed
+ "(\\d+\\.?\\d+)?," + // Course
+ "(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
"[^\\|]+\\|(\\d+.\\d)\\|" + // Dilution of precision
"(\\d+)\\|" + // Altitude
"([0-9a-fA-F]+)\\|" + // State