From ba4cb97520ef9bbdd9be90b0c4307073469739c7 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 21 Aug 2013 21:00:41 +1200
Subject: Fix Totem regular expr

---
 src/org/traccar/protocol/TotemProtocolDecoder.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/org/traccar/protocol/TotemProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index b4fa177be..73bb18aac 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -45,13 +45,13 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             "([NS])," +
             "(\\d+)(\\d{2}\\.\\d+)," +          // Longitude (DDDMM.MMMM)
             "([EW])," +
-            "(\\d+\\.\\d+)?," +                 // Speed
-            "(\\d+\\.\\d+)?," +                 // Course
+            "(\\d+\\.?\\d*)?," +                // Speed
+            "(\\d+\\.?\\d*)?," +                // Course
             "(\\d{2})(\\d{2})(\\d{2})" +        // Date (DDMMYY)
             "[^\\*]+\\*\\p{XDigit}{2}\\|" +     // Checksum
-            "\\d+.\\d\\|" +                     // PDOP
-            "(\\d+.\\d)\\|" +                   // HDOP
-            "\\d+.\\d\\|" +                     // VDOP
+            "\\d+\\.\\d+\\|" +                  // PDOP
+            "(\\d+\\.\\d+)\\|" +                // HDOP
+            "\\d+\\.\\d+\\|" +                  // VDOP
             "(\\d+)\\|" +                       // IO Status
             "\\d+\\|" +                         // Time
             "\\d" +                             // Charged
@@ -78,7 +78,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             "([EW])\\|" +
             "(\\d+\\.\\d+)?\\|" +               // Speed
             "(\\d+)?\\|" +                      // Course
-            "(\\d+.\\d+)\\|" +                  // HDOP
+            "(\\d+\\.\\d+)\\|" +                // HDOP
             "(\\d+)\\|" +                       // IO Status
             "\\d" +                             // Charged
             "(\\d{2})" +                        // Battery
-- 
cgit v1.2.3