Merge Aquila B and ITS

3 files changed, 23 insertions, 214 deletions

diff --git a/src/main/java/org/traccar/protocol/AquilaProtocolDecoder.java b/src/main/java/org/traccar/protocol/AquilaProtocolDecoder.java
index 57af5e366..3c43ddf2a 100644
--- a/src/main/java/org/traccar/protocol/AquilaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/AquilaProtocolDecoder.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.
@@ -17,15 +17,11 @@ package org.traccar.protocol;
 
 import io.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
-import org.traccar.Context;
 import org.traccar.DeviceSession;
-import org.traccar.NetworkMessage;
 import org.traccar.Protocol;
 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;
@@ -134,9 +130,11 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
             .number("xx")                        // checksum
             .compile();
 
-    private Position decodeA(Channel channel, SocketAddress remoteAddress, String sentence) {
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        Parser parser = new Parser(PATTERN_A, sentence);
+        Parser parser = new Parser(PATTERN_A, (String) msg);
         if (!parser.matches()) {
             return null;
         }
@@ -218,186 +216,4 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
         return position;
     }
 
-    private static final Pattern PATTERN_B_1 = new PatternBuilder()
-            .text("$")
-            .expression("[^,]+,")                // header
-            .expression("[^,]+,")                // client
-            .expression("[^,]+,")                // firmware version
-            .expression(".{2},")                 // packet 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 static final Pattern PATTERN_B_2 = new PatternBuilder()
-            .text("$")
-            .expression("[^,]+,")                // header
-            .expression("[^,]+,")                // client
-            .expression("(.{3}),")               // message type
-            .number("(d+),")                     // imei
-            .expression(".{2},")                 // packet type
-            .number("(dd)(dd)(dddd)")            // date (ddmmyyyy)
-            .number("(dd)(dd)(dd),")             // time (hhmmss)
-            .expression("([AV]),")               // validity
-            .number("(-?d+.d+),")                // latitude
-            .expression("([NS]),")
-            .number("(-?d+.d+),")                // longitude
-            .expression("([EW]),")
-            .number("(-?d+.d+),")                // altitude
-            .number("(d+.d+),")                  // speed
-            .any()
-            .compile();
-
-    private Position decodeB2(Channel channel, SocketAddress remoteAddress, String sentence) {
-
-        Parser parser = new Parser(PATTERN_B_2, sentence);
-        if (!parser.matches()) {
-            return null;
-        }
-
-        String type = parser.next();
-        String id = parser.next();
-        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
-        if (deviceSession == null) {
-            return null;
-        }
-
-        Position position = new Position(getProtocolName());
-        position.setDeviceId(deviceSession.getDeviceId());
-
-        position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
-        position.setValid(parser.next().equals("A"));
-        position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
-        position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
-        position.setAltitude(parser.nextDouble());
-        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
-
-        if (type.equals("EMR") && channel != null) {
-            String password = Context.getIdentityManager().lookupAttributeString(
-                    deviceSession.getDeviceId(), getProtocolName() + ".password", "aquila123", true);
-            channel.writeAndFlush(new NetworkMessage(
-                    "#set$" + id + "@" + password + "#EMR_MODE:0*", remoteAddress));
-        }
-
-        return position;
-    }
-
-    private Position decodeB1(Channel channel, SocketAddress remoteAddress, String sentence) {
-
-        Parser parser = new Parser(PATTERN_B_1, sentence);
-        if (!parser.matches()) {
-            return null;
-        }
-
-        String id = parser.next();
-        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
-        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());
-
-        if (parser.nextInt() == 1) {
-            position.set(Position.KEY_ALARM, Position.ALARM_SOS);
-        }
-
-        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;
-    }
-
-    private Position decodeB(Channel channel, SocketAddress remoteAddress, String sentence) {
-        if (sentence.contains("EMR") || sentence.contains("SEM")) {
-            return decodeB2(channel, remoteAddress, sentence);
-        } else {
-            return decodeB1(channel, remoteAddress, sentence);
-        }
-    }
-
-    @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);
-        }
-    }
-
 }
diff --git a/src/test/java/org/traccar/protocol/AquilaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AquilaProtocolDecoderTest.java
index 793b2c646..489024ed5 100644
--- a/src/test/java/org/traccar/protocol/AquilaProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/AquilaProtocolDecoderTest.java
@@ -51,29 +51,4 @@ public class AquilaProtocolDecoderTest extends ProtocolTest {
 
     }
 
-    @Test
-    public void testDecodeB() throws Exception {
-
-        AquilaProtocolDecoder decoder = new AquilaProtocolDecoder(null);
-
-        verifyPosition(decoder, text(
-                "$Header,nliven,EMR,861693034634154,NM,09112017155133,A,12.976495,N,77.549713,E,906.0,0.0,23,G,KA01I2000,+919844098440*4B"));
-
-        verifyPosition(decoder, text(
-                "$EPB,iTriangle1,EMR,864495034445822,SP,03082018110730,A,22.829292,N,75.935806,E,543.0,0.0,0,G,KA01G1234,+9164061023*13"));
-
-        verifyPosition(decoder, text(
-                "$Header,iTriangle,1_37T02B0164MAIS_2,NR,1,L,864495034490141,KA01I2000,1,19042018,102926,22.846401,N,75.948952,E,0.0,311,5,578.0,3.80,3.67,AirTel,0,1,12.5,4.3,1,C,14,404,93,0456,16db,29,ebd8,0458,28,3843,18ab,25,072e,18ab,22,35da,0458,0000,00,031181,0.0,0.0,0,()*34"));
-
-        verifyPosition(decoder, text(
-                "$Header,nliven,1_37T02B0164MAIS,BR,6,L,861693034634154,KA01I2000,1,09112017,160702,12.976593,N,77.549782,E,25.1,344,15,911.0,1.04,0.68,Airtel,1,1,11.8,3.8,1,C,24,404,45,61b4,9ad9,31,9adb,61b4,35,ffff,0000,33,ffff,0000,31,ffff,0000,0001,00,000014,0.0,0.1,4,()*1E"));
-
-        verifyPosition(decoder, text(
-                "$Header,iTriangle,1_37T02B0164MAIS_2,NR,1,L,864495034490141,KA01I2000,1,31032018,122247,22.845999,N,75.949005,E,0.0,44,16,545.0,1.19,0.65,AirTel,1,1,12.0,4.3,0,C,13,404,93,0456,16db,27,16dd,0456,22,3843,18ab,19,ebd8,0458,14,072c,18ab,0101,00,003735,0.0,0.0,0,()*48"));
-
-        verifyNull(decoder, text(
-                "$Header,nliven,KA01I2000,861693034634154,1_37T02B0164MAIS,AIS140,12.976545,N,77.549759,E*50"));
-
-    }
-
 }
diff --git a/src/test/java/org/traccar/protocol/ItsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ItsProtocolDecoderTest.java
index 1992892df..f4f095518 100644
--- a/src/test/java/org/traccar/protocol/ItsProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/ItsProtocolDecoderTest.java
@@ -67,6 +67,24 @@ public class ItsProtocolDecoderTest extends ProtocolTest {
         verifyPosition(decoder, text(
                 "$,04,XYZ123,0.0.1,BR,06,L,861359034137271,MH12AB1234,0,00,00,0000,00,00,00,000.000000,N,000.000000,E,000.0,000.00,00,000.0,00.00,00.00,IDEAIN,1,1,00.0,3.8,1,O,17,404,22,2797,11b7,11b9,2797,-093,11b8,2797,-098,0000,0000,0000,0000,0000,0000,1000,00,000006,abd26284,"));
 
+        verifyNull(decoder, text(
+                "$Header,nliven,EMR,861693034634154,NM,09112017155133,A,12.976495,N,77.549713,E,906.0,0.0,23,G,KA01I2000,+919844098440*4B"));
+
+        verifyNull(decoder, text(
+                "$EPB,iTriangle1,EMR,864495034445822,SP,03082018110730,A,22.829292,N,75.935806,E,543.0,0.0,0,G,KA01G1234,+9164061023*13"));
+
+        verifyPosition(decoder, text(
+                "$Header,iTriangle,1_37T02B0164MAIS_2,NR,1,L,864495034490141,KA01I2000,1,19042018,102926,22.846401,N,75.948952,E,0.0,311,5,578.0,3.80,3.67,AirTel,0,1,12.5,4.3,1,C,14,404,93,0456,16db,29,ebd8,0458,28,3843,18ab,25,072e,18ab,22,35da,0458,0000,00,031181,0.0,0.0,0,()*34"));
+
+        verifyPosition(decoder, text(
+                "$Header,nliven,1_37T02B0164MAIS,BR,6,L,861693034634154,KA01I2000,1,09112017,160702,12.976593,N,77.549782,E,25.1,344,15,911.0,1.04,0.68,Airtel,1,1,11.8,3.8,1,C,24,404,45,61b4,9ad9,31,9adb,61b4,35,ffff,0000,33,ffff,0000,31,ffff,0000,0001,00,000014,0.0,0.1,4,()*1E"));
+
+        verifyPosition(decoder, text(
+                "$Header,iTriangle,1_37T02B0164MAIS_2,NR,1,L,864495034490141,KA01I2000,1,31032018,122247,22.845999,N,75.949005,E,0.0,44,16,545.0,1.19,0.65,AirTel,1,1,12.0,4.3,0,C,13,404,93,0456,16db,27,16dd,0456,22,3843,18ab,19,ebd8,0458,14,072c,18ab,0101,00,003735,0.0,0.0,0,()*48"));
+
+        verifyNull(decoder, text(
+                "$Header,nliven,KA01I2000,861693034634154,1_37T02B0164MAIS,AIS140,12.976545,N,77.549759,E*50"));
+
     }
 
 }