From ff6011468a3d2b24eb4e67412e777fdf262a6824 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 14 Nov 2018 10:45:26 +1300
Subject: Make ITS AIS140 format more flexible

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

(limited to 'src')

diff --git a/src/org/traccar/protocol/ItsProtocolDecoder.java b/src/org/traccar/protocol/ItsProtocolDecoder.java
index f6112d122..226c27cd8 100644
--- a/src/org/traccar/protocol/ItsProtocolDecoder.java
+++ b/src/org/traccar/protocol/ItsProtocolDecoder.java
@@ -38,7 +38,7 @@ public class ItsProtocolDecoder extends BaseProtocolDecoder {
             .expression("[^,]+,")                // event
             .groupBegin()
             .expression("[^,]+,")                // vendor
-            .number("d+.d+.d+,")                 // firmware version
+            .expression("[^,]+,")                // firmware version
             .groupEnd("?")
             .expression("[^,]+,")                // type
             .groupBegin()
@@ -52,8 +52,8 @@ public class ItsProtocolDecoder extends BaseProtocolDecoder {
             .expression("[^,]+,")                // vehicle registration
             .number("([01]),")                   // valid
             .groupEnd()
-            .number("(dd),(dd),(dddd),")         // date (ddmmyyyy)
-            .number("(dd),(dd),(dd),")           // time (hhmmss)
+            .number("(dd),?(dd),?(dddd),")       // date (ddmmyyyy)
+            .number("(dd),?(dd),?(dd),")         // time (hhmmss)
             .expression("([AV]),").optional()    // valid
             .number("(d+.d+),([NS]),")           // latitude
             .number("(d+.d+),([EW]),")           // longitude
-- 
cgit v1.2.3