Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 138 insertions, 14 deletions

diff --git a/src/org/traccar/protocol/AquilaProtocolDecoder.java b/src/org/traccar/protocol/AquilaProtocolDecoder.java
index 773210b04..960139b3f 100644
--- a/src/org/traccar/protocol/AquilaProtocolDecoder.java
+++ b/src/org/traccar/protocol/AquilaProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2018 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.
@@ -21,6 +21,8 @@ import org.traccar.DeviceSession;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
 import org.traccar.helper.UnitsConverter;
+import org.traccar.model.CellTower;
+import org.traccar.model.Network;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -32,7 +34,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
         super(protocol);
     }
 
-    private static final Pattern PATTERN = new PatternBuilder()
+    private static final Pattern PATTERN_A = new PatternBuilder()
             .text("$$")
             .expression("[^,]*,")                // client
             .number("(d+),")                     // device serial number
@@ -42,6 +44,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
             .number("(dd)(dd)(dd)")              // date (yymmdd)
             .number("(dd)(dd)(dd),")             // time (hhmmss)
             .expression("([AV]),")               // validity
+            .groupBegin()
             .number("(d+),")                     // gsm
             .number("(d+),")                     // speed
             .number("(d+),")                     // distance
@@ -120,15 +123,17 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
             .number("(d+),")                     // external voltage
             .number("(d+),")                     // internal voltage
             .groupEnd()
+            .or()
+            .number("(d+),")                     // sensor id
+            .expression("([^,]+),")              // sensor data
+            .groupEnd()
             .text("*")
             .number("xx")                        // checksum
             .compile();
 
-    @Override
-    protected Object decode(
-            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+    private Position decodeA(Channel channel, SocketAddress remoteAddress, String sentence) {
 
-        Parser parser = new Parser(PATTERN, (String) msg);
+        Parser parser = new Parser(PATTERN_A, sentence);
         if (!parser.matches()) {
             return null;
         }
@@ -138,8 +143,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
+        Position position = new Position(getProtocolName());
         position.setDeviceId(deviceSession.getDeviceId());
 
         position.set(Position.KEY_EVENT, parser.nextInt(0));
@@ -151,11 +155,11 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
 
         position.setValid(parser.next().equals("A"));
 
-        position.set(Position.KEY_RSSI, parser.nextInt(0));
-
-        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0)));
-
-        position.set(Position.KEY_ODOMETER, parser.nextInt(0));
+        if (parser.hasNext(3)) {
+            position.set(Position.KEY_RSSI, parser.nextInt(0));
+            position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0)));
+            position.set(Position.KEY_ODOMETER, parser.nextInt(0));
+        }
 
         if (parser.hasNext(9)) {
 
@@ -187,7 +191,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
             String dtcs = parser.next();
             position.set(Position.KEY_DTCS, dtcs.substring(1, dtcs.length() - 1).replace('|', ' '));
 
-        } else {
+        } else if (parser.hasNext(10)) {
 
             position.setCourse(parser.nextInt(0));
 
@@ -201,9 +205,129 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
             position.set(Position.KEY_POWER, parser.nextInt(0));
             position.set(Position.KEY_BATTERY, parser.nextInt(0));
 
+        } else if (parser.hasNext(2)) {
+
+            position.set("sensorId", parser.nextInt());
+            position.set("sensorData", parser.next());
+
+        }
+
+        return position;
+    }
+
+    private static final Pattern PATTERN_B = new PatternBuilder()
+            .text("$Header,")
+            .expression("[^,]+,")                // client
+            .expression("[^,]+,")                // firmware version
+            .expression(".{2},")                 // type
+            .number("d+,")                       // message id
+            .expression("[LH],")                 // status
+            .number("(d+),")                     // imei
+            .expression("[^,]+,")                // registration number
+            .number("([01]),")                   // validity
+            .number("(dd)(dd)(dddd),")           // date (ddmmyyyy)
+            .number("(dd)(dd)(dd),")             // time (hhmmss)
+            .number("(-?d+.d+),")                // latitude
+            .expression("([NS]),")
+            .number("(-?d+.d+),")                // longitude
+            .expression("([EW]),")
+            .number("(d+.d+),")                  // speed
+            .number("(d+),")                     // course
+            .number("(d+),")                     // satellites
+            .number("(-?d+.d+),")                // altitude
+            .number("(d+.d+),")                  // pdop
+            .number("(d+.d+),")                  // hdop
+            .expression("[^,]+,")                // operator
+            .number("([01]),")                   // ignition
+            .number("([01]),")                   // charge
+            .number("(d+.d+),")                  // power
+            .number("(d+.d+),")                  // battery
+            .number("[01],")                     // emergency
+            .expression("[CO],")                 // tamper
+            .number("(d+),")                     // rssi
+            .number("(d+),")                     // mcc
+            .number("(d+),")                     // mnc
+            .number("(x+),")                     // lac
+            .number("(x+),")                     // cid
+            .number("(d+),(x+),(x+),")           // cell 1
+            .number("(d+),(x+),(x+),")           // cell 2
+            .number("(d+),(x+),(x+),")           // cell 3
+            .number("(d+),(x+),(x+),")           // cell 4
+            .number("([01])+,")                  // inputs
+            .number("([01])+,")                  // outputs
+            .number("d+,")                       // frame number
+            .number("(d+.d+),")                  // adc1
+            .number("(d+.d+),")                  // adc2
+            .number("d+,")                       // delta distance
+            .any()
+            .compile();
+
+    private Position decodeB(Channel channel, SocketAddress remoteAddress, String sentence) {
+
+        Parser parser = new Parser(PATTERN_B, sentence);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+        if (deviceSession == null) {
+            return null;
+        }
+
+        Position position = new Position(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        position.setValid(parser.nextInt() == 1);
+        position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
+        position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
+        position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
+        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+        position.setCourse(parser.nextInt());
+
+        position.set(Position.KEY_SATELLITES, parser.nextInt());
+
+        position.setAltitude(parser.nextDouble());
+
+        position.set(Position.KEY_PDOP, parser.nextDouble());
+        position.set(Position.KEY_HDOP, parser.nextDouble());
+        position.set(Position.KEY_IGNITION, parser.nextInt() == 1);
+        position.set(Position.KEY_CHARGE, parser.nextInt() == 1);
+        position.set(Position.KEY_POWER, parser.nextDouble());
+        position.set(Position.KEY_BATTERY, parser.nextDouble());
+
+        Network network = new Network();
+
+        int rssi = parser.nextInt();
+        int mcc = parser.nextInt();
+        int mnc = parser.nextInt();
+
+        network.addCellTower(CellTower.from(mcc, mnc, parser.nextHexInt(), parser.nextHexInt(), rssi));
+        for (int i = 0; i < 4; i++) {
+            rssi = parser.nextInt();
+            network.addCellTower(CellTower.from(mcc, mnc, parser.nextHexInt(), parser.nextHexInt(), rssi));
         }
 
+        position.setNetwork(network);
+
+        position.set(Position.KEY_INPUT, parser.nextBinInt());
+        position.set(Position.KEY_OUTPUT, parser.nextBinInt());
+        position.set(Position.PREFIX_ADC + 1, parser.nextDouble());
+        position.set(Position.PREFIX_ADC + 2, parser.nextDouble());
+
         return position;
     }
 
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        String sentence = (String) msg;
+
+        if (sentence.startsWith("$$")) {
+            return decodeA(channel, remoteAddress, sentence);
+        } else {
+            return decodeB(channel, remoteAddress, sentence);
+        }
+    }
+
 }