Add support for Disha device protocol

4 files changed, 170 insertions, 0 deletions

diff --git a/debug.xml b/debug.xml
index 0dd829aa1..009a223f4 100644
--- a/debug.xml
+++ b/debug.xml
@@ -348,5 +348,6 @@
     <entry key='t800x.port'>5094</entry>
     <entry key='upro.port'>5095</entry>
     <entry key='auru.port'>5096</entry>
+    <entry key='disha.port'>5097</entry>
 
 </properties>
diff --git a/src/org/traccar/protocol/DishaProtocol.java b/src/org/traccar/protocol/DishaProtocol.java
new file mode 100644
index 000000000..18dd1ab34
--- /dev/null
+++ b/src/org/traccar/protocol/DishaProtocol.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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.traccar.BaseProtocol;
+import org.traccar.CharacterDelimiterFrameDecoder;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class DishaProtocol extends BaseProtocol {
+
+    public DishaProtocol() {
+        super("disha");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectDecoder", new DishaProtocolDecoder(DishaProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/DishaProtocolDecoder.java b/src/org/traccar/protocol/DishaProtocolDecoder.java
new file mode 100644
index 000000000..eab3de9d9
--- /dev/null
+++ b/src/org/traccar/protocol/DishaProtocolDecoder.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.Parser;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+public class DishaProtocolDecoder extends BaseProtocolDecoder {
+
+    public DishaProtocolDecoder(DishaProtocol protocol) {
+        super(protocol);
+    }
+
+    private static final Pattern PATTERN = new PatternBuilder()
+            .text("$A#A#")
+            .number("(d+)#")                     // imei
+            .expression("([AVMX])#")             // validity
+            .number("(dd)(dd)(dd)#")             // time
+            .number("(dd)(dd)(dd)#")             // date (ddmmyy)
+            .number("(dd)(dd.d+)#")              // latitude
+            .expression("([NS])#")
+            .number("(ddd)(dd.d+)#")             // longitude
+            .expression("([EW])#")
+            .number("(d+.d+)#")                  // speed
+            .number("(d+.d+)#")                  // course
+            .number("(d+)#")                     // satellites
+            .number("(d+.d+)#")                  // hdop
+            .number("(d+)#")                     // gsm
+            .expression("([012])#")              // power mode
+            .number("(d+)#")                     // battery
+            .number("(d+)#")                     // adc 1
+            .number("(d+)#")                     // adc 2
+            .number("d+.d+#")                    // day distance
+            .number("(d+.d+)#")                  // odometer
+            .expression("([01]+)")               // digital inputs
+            .text("*")
+            .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());
+
+        if (!identify(parser.next(), channel, remoteAddress)) {
+            return null;
+        }
+        position.setDeviceId(getDeviceId());
+
+        position.setValid(parser.next().equals("A"));
+
+        DateBuilder dateBuilder = new DateBuilder()
+                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt())
+                .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
+        position.setTime(dateBuilder.getDate());
+
+        position.setLatitude(parser.nextCoordinate());
+        position.setLatitude(parser.nextCoordinate());
+
+        position.setSpeed(parser.nextDouble());
+        position.setCourse(parser.nextDouble());
+
+        position.set(Event.KEY_SATELLITES, parser.next());
+        position.set(Event.KEY_HDOP, parser.next());
+        position.set(Event.KEY_GSM, parser.next());
+        position.set(Event.KEY_CHARGE, parser.nextInt() == 2);
+        position.set(Event.KEY_BATTERY, parser.next());
+
+        position.set(Event.PREFIX_ADC + 1, parser.nextInt());
+        position.set(Event.PREFIX_ADC + 1, parser.nextInt());
+
+        position.set(Event.KEY_ODOMETER, parser.next());
+        position.set(Event.KEY_INPUT, parser.next());
+
+        return position;
+    }
+
+}
diff --git a/test/org/traccar/protocol/DishaProtocolDecoderTest.java b/test/org/traccar/protocol/DishaProtocolDecoderTest.java
new file mode 100644
index 000000000..e22de4f5c
--- /dev/null
+++ b/test/org/traccar/protocol/DishaProtocolDecoderTest.java
@@ -0,0 +1,18 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class DishaProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        DishaProtocolDecoder decoder = new DishaProtocolDecoder(new DishaProtocol());
+
+        verifyPosition(decoder, text(
+                "$A#A#353943046615971#A#064219#281113#1836.7267#N#07347.4177#E#000.00#280.4#09#00.8#3000#2#100#0000#8888#86.5#3919.1#0000*"));
+
+    }
+
+}