From 3591ef137ae12e5401fc148a637799949ec5c2a7 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 29 Jul 2015 11:10:21 +1200
Subject: Fix Box regex pattern

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

(limited to 'src')

diff --git a/src/org/traccar/protocol/BoxProtocolDecoder.java b/src/org/traccar/protocol/BoxProtocolDecoder.java
index ffc9f9bd0..2230b1356 100644
--- a/src/org/traccar/protocol/BoxProtocolDecoder.java
+++ b/src/org/traccar/protocol/BoxProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2014 - 2015 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.
@@ -43,7 +43,7 @@ public class BoxProtocolDecoder extends BaseProtocolDecoder {
             "(-?\\d+\\.\\d+)," +          // Longitude
             "(\\d+\\.?\\d*)," +           // Speed
             "(\\d+\\.?\\d*)," +           // Course
-            "(\\d+)," +                   // Distance
+            "(\\d+\\.?\\d*)," +           // Distance
             "(\\d+)," +                   // Event
             "(\\d+)" +                    // Status
             ".*");
@@ -62,7 +62,7 @@ public class BoxProtocolDecoder extends BaseProtocolDecoder {
             identify(id, channel);
         }
         
-        else if (sentence.startsWith("L,")) {
+        else if (hasDeviceId() && sentence.startsWith("L,")) {
 
             // Parse message
             Matcher parser = pattern.matcher(sentence);
-- 
cgit v1.2.3