From 84fd882f8a9ca7d1e90cd5f40dfe04979498e7f5 Mon Sep 17 00:00:00 2001
From: Edward Valley <ed.valley@yandex.com>
Date: Tue, 16 Jul 2019 12:04:50 -0400
Subject: Changes after second review

---
 src/main/java/org/traccar/model/Position.java            |  2 +-
 .../java/org/traccar/protocol/LaipacProtocolDecoder.java | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/traccar/model/Position.java b/src/main/java/org/traccar/model/Position.java
index 51743d0de..2c0e22c9e 100644
--- a/src/main/java/org/traccar/model/Position.java
+++ b/src/main/java/org/traccar/model/Position.java
@@ -84,7 +84,7 @@ public class Position extends Message {
     public static final String KEY_AXLE_WEIGHT = "axleWeight";
     public static final String KEY_G_SENSOR = "gSensor";
     public static final String KEY_ICCID = "iccid";
-    public static final String KEY_PHONE_NUMBER = "phoneNumber";
+    public static final String KEY_PHONE = "phone";
 
     public static final String KEY_DTCS = "dtcs";
     public static final String KEY_OBD_SPEED = "obdSpeed"; // knots
diff --git a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
index 924725041..2185b707e 100644
--- a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
@@ -44,9 +44,9 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
             .text("$EAVSYS,")
             .expression("([^,]+),")              // identifier
             .expression("([0-9]+),")             // iccid
-            .expression("(\\+?[0-9]*),")         // sim phone number
+            .expression("(\\+?[0-9]+)?,")        // sim phone number
             .expression("(?:[^,]*),")            // owner name
-            .expression("([^,]*)")               // firmware version
+            .expression("([^,]*)?")              // firmware version
             .text("*")
             .number("(xx)")                      // checksum
             .compile();
@@ -189,16 +189,8 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
         getLastLocation(position, null);
 
         position.set(Position.KEY_ICCID, parser.next());
-
-        String phoneNumber = parser.next();
-        if (!phoneNumber.isEmpty()) {
-            position.set(Position.KEY_PHONE_NUMBER, phoneNumber);
-        }
-
-        String firmware = parser.next();
-        if (!firmware.isEmpty()) {
-            position.set(Position.KEY_VERSION_FW, firmware);
-        }
+        position.set(Position.KEY_PHONE, parser.next());
+        position.set(Position.KEY_VERSION_FW, parser.next());
 
         return position;
     }
-- 
cgit v1.2.3