Implement new message type

1 files changed, 17 insertions, 11 deletions

diff --git a/src/org/traccar/protocol/ArnaviProtocolDecoder.java b/src/org/traccar/protocol/ArnaviProtocolDecoder.java
index eaa8133e0..7996cf429 100644
--- a/src/org/traccar/protocol/ArnaviProtocolDecoder.java
+++ b/src/org/traccar/protocol/ArnaviProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2019 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.
@@ -48,6 +48,10 @@ public class ArnaviProtocolDecoder extends BaseProtocolDecoder {
             .number("d+,d+,").optional()         // input 2
             .expression("[01],")                 // fix type
             .number("(d+),")                     // satellites
+            .groupBegin()
+            .number("(d+.d+)?,")                 // altitude
+            .number("(?:d+.d+)?,")               // geoid height
+            .groupEnd("?")
             .number("(dd)(dd)(dd),")             // time (hhmmss)
             .number("(dd)(dd.d+)([NS]),")        // latitude
             .number("(ddd)(dd.d+)([EW]),")       // longitude
@@ -74,23 +78,25 @@ public class ArnaviProtocolDecoder extends BaseProtocolDecoder {
         }
         position.setDeviceId(deviceSession.getDeviceId());
 
-        position.set(Position.KEY_INDEX, parser.nextInt(0));
-        position.set(Position.KEY_POWER, parser.nextInt(0) * 0.01);
-        position.set(Position.KEY_BATTERY, parser.nextInt(0) * 0.01);
-        position.set(Position.KEY_IGNITION, parser.nextInt(0) == 1);
-        position.set(Position.KEY_INPUT, parser.nextInt(0));
-        position.set(Position.KEY_SATELLITES, parser.nextInt(0));
+        position.set(Position.KEY_INDEX, parser.nextInt());
+        position.set(Position.KEY_POWER, parser.nextInt() * 0.01);
+        position.set(Position.KEY_BATTERY, parser.nextInt() * 0.01);
+        position.set(Position.KEY_IGNITION, parser.nextInt() == 1);
+        position.set(Position.KEY_INPUT, parser.nextInt());
+        position.set(Position.KEY_SATELLITES, parser.nextInt());
+
+        position.setAltitude(parser.nextDouble(0));
 
         DateBuilder dateBuilder = new DateBuilder()
-                .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
+                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
 
         position.setValid(true);
         position.setLatitude(parser.nextCoordinate());
         position.setLongitude(parser.nextCoordinate());
-        position.setSpeed(parser.nextDouble(0));
-        position.setCourse(parser.nextDouble(0));
+        position.setSpeed(parser.nextDouble());
+        position.setCourse(parser.nextDouble());
 
-        dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
+        dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
         position.setTime(dateBuilder.getDate());
 
         return position;