From 3db0861ba8dca2963b86d8ff7e318a6b4b897d62 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 14 Apr 2013 11:23:48 +1200
Subject: Improve V680 decoder

---
 src/org/traccar/protocol/V680ProtocolDecoder.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/org/traccar')

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(
-- 
cgit v1.2.3