aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2012-12-07 17:52:58 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2012-12-07 17:52:58 +1300
commit9cfee9cc32c5074dba6e8bd888db196bcbb91b87 (patch)
treedb7780d417e8e8baf0f89bbfb763ae060364fde8 /src/org
parentb444e789127951b902d557517a520d44c59f15d2 (diff)
downloadtraccar-server-9cfee9cc32c5074dba6e8bd888db196bcbb91b87.tar.gz
traccar-server-9cfee9cc32c5074dba6e8bd888db196bcbb91b87.tar.bz2
traccar-server-9cfee9cc32c5074dba6e8bd888db196bcbb91b87.zip
Fixed meiligao parser (fix #104)
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/MeiligaoProtocolDecoder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index d5658b9a2..4696343d6 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -46,6 +46,7 @@ public class MeiligaoProtocolDecoder extends GenericProtocolDecoder {
/**
* Regular expressions pattern
*/
+ //"155422.000,V,2230.7623,N,11403.4218,E,0.00,0,060211,,*1A|0.0|26|0000|0000,0000|0000000000000000|63|00000000"
static private Pattern pattern = Pattern.compile(
"(\\d{2})(\\d{2})(\\d{2})\\.(\\d{3})," + // Time (HHMMSS.SSS)
"([AV])," + // Validity
@@ -54,7 +55,7 @@ public class MeiligaoProtocolDecoder extends GenericProtocolDecoder {
"(\\d{3})(\\d{2}\\.\\d{4})," + // Longitude (DDDMM.MMMM)
"([EW])," +
"(\\d+.\\d+)," + // Speed
- "(\\d+\\.?\\d+)?," + // Course
+ "(\\d+\\.?\\d*)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
"[^\\|]+\\|(\\d+\\.\\d)\\|" + // Dilution of precision
"(\\d+)\\|" + // Altitude