aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-11-14 10:45:26 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2018-11-14 10:45:26 +1300
commitff6011468a3d2b24eb4e67412e777fdf262a6824 (patch)
tree0f611f6b29ae040b567a54681ed5e4cd22272995 /src/org
parent460f7e624281690bef0ca04ede190d8c6e1b9557 (diff)
downloadtrackermap-server-ff6011468a3d2b24eb4e67412e777fdf262a6824.tar.gz
trackermap-server-ff6011468a3d2b24eb4e67412e777fdf262a6824.tar.bz2
trackermap-server-ff6011468a3d2b24eb4e67412e777fdf262a6824.zip
Make ITS AIS140 format more flexible
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/ItsProtocolDecoder.java6
1 files changed, 3 insertions, 3 deletions
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