Implement Stesalit T57 protocol

6 files changed, 226 insertions, 0 deletions

diff --git a/setup/default.xml b/setup/default.xml
index ec0ff86d2..c5708633f 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -223,5 +223,6 @@
     <entry key='oko.port'>5152</entry>
     <entry key='ivt401.port'>5153</entry>
     <entry key='sigfox.port'>5154</entry>
+    <entry key='t57.port'>5155</entry>
 
 </properties>
diff --git a/src/org/traccar/protocol/T57FrameDecoder.java b/src/org/traccar/protocol/T57FrameDecoder.java
new file mode 100644
index 000000000..b3b456516
--- /dev/null
+++ b/src/org/traccar/protocol/T57FrameDecoder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2017 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.
+ * 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.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
+
+import java.nio.charset.StandardCharsets;
+
+public class T57FrameDecoder extends FrameDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+
+        if (buf.readableBytes() < 10) {
+            return null;
+        }
+
+        String type = buf.toString(buf.readerIndex() + 5, 2, StandardCharsets.US_ASCII);
+        int count = type.equals("F3") ? 12 : 14;
+
+        int index = 0;
+        while (index >= 0 && count > 0) {
+            index = buf.indexOf(index + 1, buf.writerIndex(), (byte) '#');
+            if (index > 0) {
+                count -= 1;
+            }
+        }
+
+        return index > 0 ? buf.readBytes(index + 1 - buf.readerIndex()) : null;
+    }
+
+}
diff --git a/src/org/traccar/protocol/T57Protocol.java b/src/org/traccar/protocol/T57Protocol.java
new file mode 100644
index 000000000..5149929e9
--- /dev/null
+++ b/src/org/traccar/protocol/T57Protocol.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 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.
+ * 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.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class T57Protocol extends BaseProtocol {
+
+    public T57Protocol() {
+        super("t57");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new T57FrameDecoder());
+                pipeline.addLast("stringEncoder", new StringEncoder());
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectDecoder", new T57ProtocolDecoder(T57Protocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/T57ProtocolDecoder.java b/src/org/traccar/protocol/T57ProtocolDecoder.java
new file mode 100644
index 000000000..db5f94cbb
--- /dev/null
+++ b/src/org/traccar/protocol/T57ProtocolDecoder.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2017 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.
+ * 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.DeviceSession;
+import org.traccar.helper.Parser;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+public class T57ProtocolDecoder extends BaseProtocolDecoder {
+
+    public T57ProtocolDecoder(T57Protocol protocol) {
+        super(protocol);
+    }
+
+    private static final Pattern PATTERN = new PatternBuilder()
+            .text("*T57#")
+            .number("Fd#")                       // type
+            .number("([^#]+)#")                  // device id
+            .number("(dd)(dd)(dd)#")             // date (ddmmyy)
+            .number("(dd)(dd)(dd)#")             // time (hhmmss)
+            .number("(dd)(dd.d+)#")              // latitude
+            .expression("([NS])#")
+            .number("(ddd)(dd.d+)#")             // longitude
+            .expression("([EW])#")
+            .expression("[^#]+#")
+            .number("(d+.d+)#")                  // speed
+            .number("(d+.d+)#")                  // altitude
+            .expression("([AV])")                // valid
+            .number("d#")                        // fix type
+            .number("(d+.d+)#")                  // battery
+            .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;
+        }
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+        if (deviceSession == null) {
+            return null;
+        }
+
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
+
+        position.setLatitude(parser.nextCoordinate());
+        position.setLongitude(parser.nextCoordinate());
+        position.setSpeed(parser.nextDouble());
+        position.setAltitude(parser.nextDouble());
+
+        position.setValid(parser.next().equals("A"));
+
+        position.set(Position.KEY_BATTERY, parser.nextDouble());
+
+        return position;
+    }
+
+}
diff --git a/test/org/traccar/protocol/T57FrameDecoderTest.java b/test/org/traccar/protocol/T57FrameDecoderTest.java
new file mode 100644
index 000000000..f74d3c350
--- /dev/null
+++ b/test/org/traccar/protocol/T57FrameDecoderTest.java
@@ -0,0 +1,19 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class T57FrameDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        T57FrameDecoder decoder = new T57FrameDecoder();
+
+        verifyFrame(
+                binary("2a5435372346312354353731313137303031233330313131372330303038343323323233342e31333033234e2330383832362e313731342345232b302e3234322c2b302e3130392c2d302e37383923302e30303023362e323030303023413223342e3223"),
+                decoder.decode(null, null, binary("2a5435372346312354353731313137303031233330313131372330303038343323323233342e31333033234e2330383832362e313731342345232b302e3234322c2b302e3130392c2d302e37383923302e30303023362e323030303023413223342e32232a5435372346312354353731313137303031233330313131372330303038353323323233342e31333033234e2330383832362e313731342345232b302e3234322c2b302e3130392c2d302e37383923302e30303023362e323030303023413223342e32232a5435372346312354353731313137303031233330313131372330303039303423323233342e31333033234e2330383832362e313731342345232b302e3234322c2b302e3130392c2d302e37383923302e30303023362e323030303023413223342e32232a5435372346312354353731313137303031233330313131372330303039313423323233342e31333033234e2330383832362e313731342345232b302e3234322c2b302e3130392c2d302e37383923302e30303023362e323030303023413223342e32232a5435372346312354353731313137303031233330313131372330303039323423323233342e31333033234e2330383832362e313731342345232b302e3234322c2b302e3130392c2d302e37383923302e30303023362e323030303023413223342e32232a5435372346312354353731313137303031233330313131372330303038333323323233342e31333033234e2330383832362e313731342345232b302e3234322c2b302e3130392c2d302e37383923302e30303023362e323030303023413223342e3223")));
+
+    }
+
+}
diff --git a/test/org/traccar/protocol/T57ProtocolDecoderTest.java b/test/org/traccar/protocol/T57ProtocolDecoderTest.java
new file mode 100644
index 000000000..1100ef17d
--- /dev/null
+++ b/test/org/traccar/protocol/T57ProtocolDecoderTest.java
@@ -0,0 +1,27 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class T57ProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        T57ProtocolDecoder decoder = new T57ProtocolDecoder(new T57Protocol());
+
+        verifyPosition(decoder, text(
+                "*T57#F1#T571117001#301117#000843#2234.1303#N#08826.1714#E#+0.242,+0.109,-0.789#0.000#6.20000#A2#4.2#"));
+
+        verifyPosition(decoder, text(
+                "*T57#F1#0123456789#041117#152900#1258.9653#N#07738.4169#E#00000000000000000000#0.000#926.300#A2#4.0#"));
+
+        verifyPosition(decoder, text(
+                "*T57#F2#0123456789#041117#152900#1258.9653#N#07738.4169#E#00000000000000000000#0.000#926.300#A2#4.0#"));
+
+        verifyNull(decoder, text(
+                "*T57#F3#0123456789#041117#152900#1258.9653#N#07738.4169#E#I#9674432345#340#"));
+
+    }
+
+}