Support PUBX NMEA messages

1 files changed, 60 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java b/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java
index 409c7e768..1529aae29 100644
--- a/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 2022 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.
@@ -125,6 +125,30 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
             .expression("([01])")                // ignition
             .compile();
 
+    private static final Pattern PATTERN_PUBX = new PatternBuilder()
+            .text("$PUBX,")
+            .number("(d+),")                     // index
+            .number("(dd)(dd)(dd).d+,")          // time (hhmmss)
+            .number("(dd)(dd.d+),([NS]),")       // latitude
+            .number("(ddd)(dd.d+),([EW]),")      // longitude
+            .number("(-?d+.d+),")                // altitude
+            .expression("(..),")                 // status
+            .number("(d+.d+),")                  // horizontal accuracy
+            .number("d+.d+,")                    // vertical accuracy
+            .number("(d+.d+),")                  // speed
+            .number("(d+.d+),")                  // course
+            .number("-?d+.d+,")                  // vertical velocity
+            .expression("[^,]*,")                // corrections age
+            .number("(d+.d+),")                  // hdop
+            .number("(d+.d+),")                  // vdop
+            .number("d+.d+,")                    // tdop
+            .number("(d+),")                     // satellites
+            .number("(d+),")                     // device id
+            .number("d+")
+            .text("*")
+            .number("xx")                        // checksum
+            .compile();
+
     private Position position = null;
 
     private Position decodeGprmc(
@@ -303,6 +327,39 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
         return position;
     }
 
+    private Position decodePubx(Channel channel, SocketAddress remoteAddress, String sentence) {
+
+        Parser parser = new Parser(PATTERN_PUBX, sentence);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        Position position = new Position(getProtocolName());
+
+        position.set(Position.KEY_INDEX, parser.nextInt());
+
+        position.setTime(parser.nextDateTime(Parser.DateTimeFormat.HMS));
+        position.setLatitude(parser.nextCoordinate());
+        position.setLongitude(parser.nextCoordinate());
+        position.setAltitude(parser.nextDouble());
+        position.setValid(!parser.next().equals("NF"));
+        position.setAccuracy(parser.nextDouble());
+        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+        position.setCourse(parser.nextDouble());
+
+        position.set(Position.KEY_HDOP, parser.nextDouble());
+        position.set(Position.KEY_VDOP, parser.nextDouble());
+        position.set(Position.KEY_SATELLITES, parser.nextInt());
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+        if (deviceSession != null) {
+            position.setDeviceId(deviceSession.getDeviceId());
+            return position;
+        }
+
+        return null;
+    }
+
     @Override
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -357,6 +414,8 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
             return decodeGpiop(deviceSession, sentence);
         } else if (sentence.startsWith("QZE")) {
             return decodeQze(channel, remoteAddress, sentence);
+        } else if (sentence.startsWith("$PUBX")) {
+            return decodePubx(channel, remoteAddress, sentence);
         }
 
         return null;