Implement CR-GPS protocol support

2 files changed, 22 insertions, 5 deletions

diff --git a/src/main/java/org/traccar/protocol/PortmanProtocolDecoder.java b/src/main/java/org/traccar/protocol/PortmanProtocolDecoder.java
index da9403313..716f2694b 100644
--- a/src/main/java/org/traccar/protocol/PortmanProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/PortmanProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 - 2021 Anton Tananaev (anton@traccar.org)
+ * Copyright 2020 - 2023 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,11 @@ public class PortmanProtocolDecoder extends BaseProtocolDecoder {
     }
 
     private static final Pattern PATTERN_STANDARD = new PatternBuilder()
+            .groupBegin()
             .text("$PTMLA,")                     // header
+            .or()
+            .text("%%")                          // header
+            .groupEnd()
             .expression("([^,]+),")              // id
             .expression("([ABCL]),")             // validity
             .number("(dd)(dd)(dd)")              // date (yymmdd)
@@ -47,12 +51,19 @@ public class PortmanProtocolDecoder extends BaseProtocolDecoder {
             .number("(d+),")                     // course
             .number("(?:NA|C(-?d+)),")           // temperature
             .number("(x{8}),")                   // status
-            .number("(?:NA|(d+)),")              // card id
+            .groupBegin()
+            .text("NA")
+            .or()
+            .number("F(d+)")                     // fuel
+            .or()
+            .number("(d+)")                      // card id
+            .groupEnd(",")
             .number("(d+),")                     // event
             .number("(d+),")                     // satellites
             .number("(d+.d+),")                  // odometer
-            .number("(d+),")                     // rssi
-            .number("(?:G(d+)|[^,]*)")           // fuel
+            .number("(d+)")                      // rssi
+            .number(",G(d+)").optional()         // fuel
+            .any()
             .compile();
 
     private Object decodeStandard(Channel channel, SocketAddress remoteAddress, String sentence) {
@@ -79,6 +90,9 @@ public class PortmanProtocolDecoder extends BaseProtocolDecoder {
 
         position.set(Position.PREFIX_TEMP + 1, parser.next());
         position.set(Position.KEY_STATUS, parser.nextHexLong());
+        if (parser.hasNext()) {
+            position.set(Position.KEY_FUEL_LEVEL, parser.nextInt() * 0.1);
+        }
         position.set(Position.KEY_DRIVER_UNIQUE_ID, parser.next());
 
         int event = parser.nextInt();
@@ -159,7 +173,7 @@ public class PortmanProtocolDecoder extends BaseProtocolDecoder {
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
         String sentence = (String) msg;
-        if (sentence.startsWith("$PTMLA")) {
+        if (sentence.startsWith("%%") || sentence.startsWith("$PTMLA")) {
             return decodeStandard(channel, remoteAddress, sentence);
         } else if (sentence.startsWith("$EXT")) {
             return decodeExtended(channel, remoteAddress, sentence);
diff --git a/src/test/java/org/traccar/protocol/PortmanProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/PortmanProtocolDecoderTest.java
index c5d57aa25..c4fbff7e9 100644
--- a/src/test/java/org/traccar/protocol/PortmanProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/PortmanProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class PortmanProtocolDecoderTest extends ProtocolTest {
         var decoder = inject(new PortmanProtocolDecoder(null));
 
         verifyPosition(decoder, text(
+                "%%355854050074633,A,200612153351,N2543.0681W10009.2974,0,190,NA,C9830000,NA,108,8,2.66,16"));
+
+        verifyPosition(decoder, text(
                 "$EXT,P0RTMANGRANT,A,210609201710,N0951.6879W08357.0129,0,0,NA,NA,11,25,174700.25,NA,01820000,108"));
 
         verifyPosition(decoder, text(