Create duplicate of ARNAVI3 protocol implementation.

Add an entry with ARNAVI4 port to the properties in default.xml.

4 files changed, 149 insertions, 0 deletions

diff --git a/setup/default.xml b/setup/default.xml
index 2fc6c3cf0..223b9a585 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -579,5 +579,6 @@
     <entry key='vt200.port'>5143</entry>
     <entry key='owntracks.port'>5144</entry>
     <entry key='vtfms.port'>5145</entry>
+    <entry key='arnavi4.port'>5146</entry>
 
 </properties>
diff --git a/src/org/traccar/protocol/Arnavi4Protocol.java b/src/org/traccar/protocol/Arnavi4Protocol.java
new file mode 100644
index 000000000..622051fbd
--- /dev/null
+++ b/src/org/traccar/protocol/Arnavi4Protocol.java
@@ -0,0 +1,35 @@
+package org.traccar.protocol;
+
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+/**
+ * Created by Ivan Muratov @binakot on 11.07.2017.
+ */
+public class Arnavi4Protocol extends BaseProtocol {
+
+    public Arnavi4Protocol() {
+        super("arnavi4");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("stringEncoder", new StringEncoder());
+                pipeline.addLast("objectDecoder", new Arnavi4ProtocolDecoder(Arnavi4Protocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/Arnavi4ProtocolDecoder.java b/src/org/traccar/protocol/Arnavi4ProtocolDecoder.java
new file mode 100644
index 000000000..dbedff9a1
--- /dev/null
+++ b/src/org/traccar/protocol/Arnavi4ProtocolDecoder.java
@@ -0,0 +1,87 @@
+package org.traccar.protocol;
+
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.Parser;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+/**
+ * Created by Ivan Muratov @binakot on 11.07.2017.
+ */
+public class Arnavi4ProtocolDecoder extends BaseProtocolDecoder {
+
+    public Arnavi4ProtocolDecoder(Arnavi4Protocol protocol) {
+        super(protocol);
+    }
+
+    private static final Pattern PATTERN = new PatternBuilder()
+            .text("$AV,")
+            .number("Vd,")                       // type
+            .number("(d+),")                     // device id
+            .number("(d+),")                     // index
+            .number("(d+),")                     // power
+            .number("(d+),")                     // battery
+            .number("-?d+,")
+            .expression("[01],")                 // movement
+            .expression("([01]),")               // ignition
+            .number("(d+),")                     // input
+            .number("d+,d+,")                    // input 1
+            .number("d+,d+,").optional()         // input 2
+            .expression("[01],")                 // fix type
+            .number("(d+),")                     // satellites
+            .number("(dd)(dd)(dd),")             // time (hhmmss)
+            .number("(dd)(dd.d+)([NS]),")        // latitude
+            .number("(ddd)(dd.d+)([EW]),")       // longitude
+            .number("(d+.d+),")                  // speed
+            .number("(d+.d+),")                  // course
+            .number("(dd)(dd)(dd)")              // date (ddmmyy)
+            .any()
+            .compile();
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        Parser parser = new Parser(PATTERN, (String) msg);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+        if (deviceSession == null) {
+            return null;
+        }
+        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));
+
+        DateBuilder dateBuilder = new DateBuilder()
+                .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
+
+        position.setValid(true);
+        position.setLatitude(parser.nextCoordinate());
+        position.setLongitude(parser.nextCoordinate());
+        position.setSpeed(parser.nextDouble(0));
+        position.setCourse(parser.nextDouble(0));
+
+        dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
+        position.setTime(dateBuilder.getDate());
+
+        return position;
+    }
+
+}
diff --git a/test/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java b/test/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java
new file mode 100644
index 000000000..b199fe565
--- /dev/null
+++ b/test/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java
@@ -0,0 +1,26 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Ivan Muratov @binakot on 11.07.2017.
+ */
+public class Arnavi4ProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        Arnavi4ProtocolDecoder decoder = new Arnavi4ProtocolDecoder(new Arnavi4Protocol());
+
+        verifyPosition(decoder, text(
+                "$AV,V2,32768,12487,2277,203,-1,0,0,193,0,0,1,13,200741,5950.6773N,03029.1043E,0.0,0.0,121012,*6E"));
+
+        verifyPosition(decoder, text(
+                "$AV,V3,999999,12487,2277,203,65534,0,0,193,65535,65535,65535,65535,1,13,200741,5950.6773N,03029.1043E,300.0,360.0,121012,65535,65535,65535,SF*6E"));
+
+    }
+
+}