aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-01-25 14:42:09 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-01-25 14:42:09 +1300
commitcf058d4890b2b1adce9902417f6f56d17a540ff7 (patch)
tree55c7318a0dc8b51f4ba871ef9492c160b09f77b1
parentf40140e60895e99c6933926496ae792561df17a3 (diff)
downloadtrackermap-server-cf058d4890b2b1adce9902417f6f56d17a540ff7.tar.gz
trackermap-server-cf058d4890b2b1adce9902417f6f56d17a540ff7.tar.bz2
trackermap-server-cf058d4890b2b1adce9902417f6f56d17a540ff7.zip
Implement Kenji KJ-8501 protocol
-rw-r--r--debug.xml1
-rwxr-xr-xsrc/org/traccar/protocol/KenjiProtocol.java46
-rwxr-xr-xsrc/org/traccar/protocol/KenjiProtocolDecoder.java90
-rwxr-xr-xtest/org/traccar/protocol/KenjiProtocolDecoderTest.java18
4 files changed, 155 insertions, 0 deletions
diff --git a/debug.xml b/debug.xml
index 7096e4cde..e641bda56 100644
--- a/debug.xml
+++ b/debug.xml
@@ -269,5 +269,6 @@
<entry key='pathaway.port'>5099</entry>
<entry key='arnavi.port'>5100</entry>
<entry key='nvs.port'>5101</entry>
+ <entry key='kenji.port'>5102</entry>
</properties>
diff --git a/src/org/traccar/protocol/KenjiProtocol.java b/src/org/traccar/protocol/KenjiProtocol.java
new file mode 100755
index 000000000..6639021cb
--- /dev/null
+++ b/src/org/traccar/protocol/KenjiProtocol.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2016 by Carlos Alvarez (carlos.alvarez.rozas@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.TrackerServer;
+
+import java.util.List;
+
+public class KenjiProtocol extends BaseProtocol {
+
+ public KenjiProtocol() {
+ super("kenji");
+ }
+
+
+ @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("objectDecoder", new KenjiProtocolDecoder(KenjiProtocol.this));
+ }
+ });
+ }
+
+}
diff --git a/src/org/traccar/protocol/KenjiProtocolDecoder.java b/src/org/traccar/protocol/KenjiProtocolDecoder.java
new file mode 100755
index 000000000..e1f8130fa
--- /dev/null
+++ b/src/org/traccar/protocol/KenjiProtocolDecoder.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2016 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 java.net.SocketAddress;
+import java.util.regex.Pattern;
+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;
+
+public class KenjiProtocolDecoder extends BaseProtocolDecoder {
+
+ public KenjiProtocolDecoder(KenjiProtocol protocol) {
+ super(protocol);
+ }
+
+ private static final Pattern PATTERN = new PatternBuilder()
+ .text(">")
+ .number("C(d{6}),") // device id
+ .number("M(x{6}),") // alarm
+ .number("O(x{4}),") // output
+ .number("I(x{4}),") // input
+ .number("D(dd)(dd)(dd),") // time
+ .expression("([AV]),") // valid
+ .number("([NS])(dd)(dd.d+),") // latitude
+ .number("([EW])(ddd)(dd.d+),") // longitude
+ .number("T(d+.d+),") // speed
+ .number("H(d+.d+),") // course
+ .number("Y(dd)(dd)(dd),") // date
+ .number("G(d+)") // satellites
+ .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());
+
+ if (!identify(parser.next(), channel, remoteAddress)) {
+ return null;
+ }
+ position.setDeviceId(getDeviceId());
+
+ position.set(Event.KEY_ALARM, parser.nextInt(16));
+ position.set(Event.KEY_OUTPUT, parser.nextInt(16));
+ position.set(Event.KEY_INPUT, parser.nextInt(16));
+
+ DateBuilder dateBuilder = new DateBuilder()
+ .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+
+ position.setValid(parser.next().equals("A"));
+
+ position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN));
+ position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN));
+ position.setSpeed(parser.nextDouble());
+ position.setCourse(parser.nextDouble());
+
+ dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
+ position.setTime(dateBuilder.getDate());
+
+ position.set(Event.KEY_SATELLITES, parser.nextInt());
+
+ return position;
+ }
+
+}
diff --git a/test/org/traccar/protocol/KenjiProtocolDecoderTest.java b/test/org/traccar/protocol/KenjiProtocolDecoderTest.java
new file mode 100755
index 000000000..dcb5aea01
--- /dev/null
+++ b/test/org/traccar/protocol/KenjiProtocolDecoderTest.java
@@ -0,0 +1,18 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class KenjiProtocolDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ KenjiProtocolDecoder decoder = new KenjiProtocolDecoder(new KenjiProtocol());
+
+ verifyPosition(decoder, text(
+ ">C800000,M005004,O0000,I0002,D124057,A,S3137.2783,W05830.2978,T000.0,H254.3,Y240116,G06*17"),
+ position("2016-01-24 12:40:57.000", true, -31.62131, -58.50496));
+ }
+
+}