aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-04-14 11:23:48 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2013-04-14 11:23:48 +1200
commit3db0861ba8dca2963b86d8ff7e318a6b4b897d62 (patch)
tree44e87be9d4a8d5cfbc1b60708e0fe5952df185aa /src/org/traccar
parent577df9d651b16700b820b5aeadfcacd68016ed86 (diff)
downloadtrackermap-server-3db0861ba8dca2963b86d8ff7e318a6b4b897d62.tar.gz
trackermap-server-3db0861ba8dca2963b86d8ff7e318a6b4b897d62.tar.bz2
trackermap-server-3db0861ba8dca2963b86d8ff7e318a6b4b897d62.zip
Improve V680 decoder
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/protocol/V680ProtocolDecoder.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/V680ProtocolDecoder.java b/src/org/traccar/protocol/V680ProtocolDecoder.java
index e8c3d3426..40549857a 100644
--- a/src/org/traccar/protocol/V680ProtocolDecoder.java
+++ b/src/org/traccar/protocol/V680ProtocolDecoder.java
@@ -40,16 +40,17 @@ public class V680ProtocolDecoder extends BaseProtocolDecoder {
"([^#]+)#" + // Password
"[^#]+#" +
"(\\d+)#" + // Packet number
- "(\\d+)." + // GSM base station
- "[^#]+#" +
- "(\\d{3})(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM)
+ "([^#]+)#" + // GSM base station
+ "(?:[^#]+#)?" +
+ "(\\d+)(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM)
"([EW])," +
"(\\d{2})(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM)
"([NS])," +
"(\\d+\\.\\d+)," + // Speed
- "(\\d+)#" + // Course
+ "(\\d+\\.?\\d*)#" + // Course
"(\\d{2})(\\d{2})(\\d{2})#" + // Date (DDMMYY)
- "(\\d{2})(\\d{2})(\\d{2})"); // Time (HHMMSS)
+ "(\\d{2})(\\d{2})(\\d{2})" + // Time (HHMMSS)
+ ".*");
@Override
protected Object decode(