Support ITS EMR messages

1 files changed, 7 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java b/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java
index 482f34e65..17833dda9 100644
--- a/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java
@@ -45,7 +45,7 @@ public class ItsProtocolDecoder extends BaseProtocolDecoder {
             .number("d+,")
             .expression("[LH],")                 // history
             .or()
-            .expression("[^,]+,")                // type
+            .expression("([^,]+),")              // type
             .groupEnd()
             .number("(d{15}),")                  // imei
             .groupBegin()
@@ -121,6 +121,8 @@ public class ItsProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
+        String type = parser.next();
+
         DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
         if (deviceSession == null) {
             return null;
@@ -129,6 +131,10 @@ public class ItsProtocolDecoder extends BaseProtocolDecoder {
         Position position = new Position(getProtocolName());
         position.setDeviceId(deviceSession.getDeviceId());
 
+        if (type != null && type.equals("EMR")) {
+            position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+        }
+
         if (parser.hasNext()) {
             position.set(Position.KEY_ALARM, decodeAlarm(parser.next()));
         }