aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-08-23 21:50:04 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2014-08-23 21:50:04 +1200
commitc4f8eb50fb65d1e4872685073c1d934734cb3e30 (patch)
treea65d14d5b30ad3d20570aa0229e9ae0770f0dfdc /src/org/traccar
parent4d62f1b57100c95dcc62a72362978cd544c987c7 (diff)
downloadtrackermap-server-c4f8eb50fb65d1e4872685073c1d934734cb3e30.tar.gz
trackermap-server-c4f8eb50fb65d1e4872685073c1d934734cb3e30.tar.bz2
trackermap-server-c4f8eb50fb65d1e4872685073c1d934734cb3e30.zip
Fix enfora regex pattern (fix #837)
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/protocol/EnforaProtocolDecoder.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/EnforaProtocolDecoder.java b/src/org/traccar/protocol/EnforaProtocolDecoder.java
index a4c581979..eec724e30 100644
--- a/src/org/traccar/protocol/EnforaProtocolDecoder.java
+++ b/src/org/traccar/protocol/EnforaProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,14 +38,14 @@ public class EnforaProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern pattern = Pattern.compile(
"GPRMC," +
- "(\\d{2})(\\d{2})(\\d{2}).(\\d{2})," + // Time (HHMMSS.SS)
+ "(\\d{2})(\\d{2})(\\d{2}).(\\d+)," + // Time (HHMMSS.SS)
"([AV])," + // Validity
- "(\\d{2})(\\d{2}.\\d{6})," + // Latitude (DDMM.MMMMMM)
+ "(\\d{2})(\\d{2}.\\d+)," + // Latitude (DDMM.MMMMMM)
"([NS])," +
- "(\\d{3})(\\d{2}.\\d{6})," + // Longitude (DDDMM.MMMMMM)
+ "(\\d{3})(\\d{2}.\\d+)," + // Longitude (DDDMM.MMMMMM)
"([EW])," +
- "(\\d+.\\d)?," + // Speed
- "(\\d+.\\d)?," + // Course
+ "(\\d+.\\d+)?," + // Speed
+ "(\\d+.\\d+)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
".*[\r\n\u0000]*");