aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-01-21 12:29:32 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-01-21 12:29:32 +1300
commitddc9dbefd717b1b037a4397e55dae34bf13598c0 (patch)
treefc4068fd06d68d1d48b7ec9bd158d89dd4d18d9f
parentda4ff9311bd8573ad0c6aaa04d80c893b4f780e7 (diff)
downloadtrackermap-server-ddc9dbefd717b1b037a4397e55dae34bf13598c0.tar.gz
trackermap-server-ddc9dbefd717b1b037a4397e55dae34bf13598c0.tar.bz2
trackermap-server-ddc9dbefd717b1b037a4397e55dae34bf13598c0.zip
Implement XT013 support (fix #1035)
-rw-r--r--default.cfg4
-rw-r--r--src/org/traccar/ServerManager.java14
-rw-r--r--src/org/traccar/protocol/Xt013ProtocolDecoder.java117
-rw-r--r--test/org/traccar/protocol/Xt013ProtocolDecoderTest.java20
4 files changed, 155 insertions, 0 deletions
diff --git a/default.cfg b/default.cfg
index 17e47621e..5f4279c15 100644
--- a/default.cfg
+++ b/default.cfg
@@ -373,4 +373,8 @@
<entry key='ardi01.enable'>true</entry>
<entry key='ardi01.port'>5075</entry>
+ <!-- XT013 server configuration -->
+ <entry key='xt013.enable'>true</entry>
+ <entry key='xt013.port'>5076</entry>
+
</properties>
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 6afd214a3..88a443a24 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -176,6 +176,7 @@ public class ServerManager {
initTramigoServer("tramigo");
initTr900Server("tr900");
initArdi01Server("ardi01");
+ initXt013Server("xt013");
initProtocolDetector();
@@ -1269,4 +1270,17 @@ public class ServerManager {
}
}
+ private void initXt013Server(final String protocol) throws SQLException {
+ if (isProtocolEnabled(properties, protocol)) {
+ serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
+ pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectDecoder", new Xt013ProtocolDecoder(dataManager, protocol, properties));
+ }
+ });
+ }
+ }
+
}
diff --git a/src/org/traccar/protocol/Xt013ProtocolDecoder.java b/src/org/traccar/protocol/Xt013ProtocolDecoder.java
new file mode 100644
index 000000000..493955195
--- /dev/null
+++ b/src/org/traccar/protocol/Xt013ProtocolDecoder.java
@@ -0,0 +1,117 @@
+/*
+ * 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.jboss.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.database.DataManager;
+import org.traccar.helper.Log;
+import org.traccar.model.ExtendedInfoFormatter;
+import org.traccar.model.Position;
+
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Properties;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Xt013ProtocolDecoder extends BaseProtocolDecoder {
+
+ public Xt013ProtocolDecoder(DataManager dataManager, String protocol, Properties properties) {
+ super(dataManager, protocol, properties);
+ }
+
+ private static final Pattern pattern = Pattern.compile(
+ "TK," +
+ "(\\d+)," + // IMEI
+ "(\\d{2})(\\d{2})(\\d{2})" + // Date (YYMMDD)
+ "(\\d{2})(\\d{2})(\\d{2})," + // Time (HHMMSS)
+ "([+-]\\d+\\.\\d+)," + // Latitude
+ "([+-]\\d+\\.\\d+)," + // Longitude
+ "(\\d+)," + // Altitude
+ "(\\d+)," + // Course
+ "(\\d+)," + // Speed
+ "\\d+," +
+ "([FL])," + // GPS fix
+ "\\d+," +
+ "(\\d+)," + // GPS level
+ "\\p{XDigit}+," +
+ "\\p{XDigit}+," +
+ "(\\d+)," + // GSM level
+ "[^,]*," +
+ "(\\d+\\.\\d+)," + // Battery
+ "(\\d)," + // Charging
+ ".*");
+
+ @Override
+ protected Object decode(
+ ChannelHandlerContext ctx, Channel channel, Object msg)
+ throws Exception {
+
+ // Parse message
+ String sentence = (String) msg;
+ Matcher parser = pattern.matcher(sentence);
+ if (!parser.matches()) {
+ throw new ParseException(null, 0);
+ }
+
+ // Create new position
+ Position position = new Position();
+ ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol());
+
+ Integer index = 1;
+
+ // Identify device
+ String imei = parser.group(index++);
+ try {
+ position.setDeviceId(getDataManager().getDeviceByImei(imei).getId());
+ } catch(Exception error) {
+ Log.warning("Unknown device - " + imei);
+ return null;
+ }
+
+ // Time
+ Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ time.clear();
+ time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
+ time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
+ time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
+ time.set(Calendar.HOUR_OF_DAY, Integer.valueOf(parser.group(index++)));
+ time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
+ time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
+ position.setTime(time.getTime());
+
+ // Location
+ position.setLatitude(Double.valueOf(parser.group(index++)));
+ position.setLongitude(Double.valueOf(parser.group(index++)));
+ position.setAltitude(Double.valueOf(parser.group(index++)));
+ position.setCourse(Double.valueOf(parser.group(index++)));
+ position.setSpeed(Double.valueOf(parser.group(index++)));
+ position.setValid(parser.group(index++).equals("F"));
+
+ // Other
+ extendedInfo.set("gps", parser.group(index++));
+ extendedInfo.set("gsm", parser.group(index++));
+ extendedInfo.set("battery", parser.group(index++));
+ extendedInfo.set("charging", parser.group(index++));
+
+ position.setExtendedInfo(extendedInfo.toString());
+ return position;
+ }
+
+}
diff --git a/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java b/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java
new file mode 100644
index 000000000..db375ad19
--- /dev/null
+++ b/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java
@@ -0,0 +1,20 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.helper.TestDataManager;
+
+import static org.traccar.helper.DecoderVerifier.verify;
+
+public class Xt013ProtocolDecoderTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ Xt013ProtocolDecoder decoder = new Xt013ProtocolDecoder(new TestDataManager(), null, null);
+
+ verify(decoder.decode(null, null,
+ "TK,862950021650364,150118113832,+53.267722,+5.767143,0,86,12,0,F,204,08,C94,336C,22,,4.21,1,,,,,,,,"));
+
+ }
+
+}