aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.cfg4
-rw-r--r--src/org/traccar/ServerManager.java16
-rw-r--r--src/org/traccar/protocol/Ardi01ProtocolDecoder.java115
-rw-r--r--test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java21
4 files changed, 155 insertions, 1 deletions
diff --git a/default.cfg b/default.cfg
index 119f0469f..7270355cc 100644
--- a/default.cfg
+++ b/default.cfg
@@ -368,4 +368,8 @@
<entry key='tr900.enable'>true</entry>
<entry key='tr900.port'>5074</entry>
+ <!-- Ardi_01 server configuration -->
+ <entry key='ardi01.enable'>true</entry>
+ <entry key='ardi01.port'>5075</entry>
+
</properties>
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 37a5256db..1f1a380e4 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -178,7 +178,8 @@ public class ServerManager {
initRitiServer("riti");
initUlbotechServer("ulbotech");
initTramigoServer("tramigo");
- initTramigoServer("tr900");
+ initTr900Server("tr900");
+ initArdi01Server("ardi01");
// Initialize web server
if (Boolean.valueOf(properties.getProperty("http.enable"))) {
@@ -1247,4 +1248,17 @@ public class ServerManager {
}
}
+ private void initArdi01Server(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 Ardi01ProtocolDecoder(dataManager, protocol, properties));
+ }
+ });
+ }
+ }
+
}
diff --git a/src/org/traccar/protocol/Ardi01ProtocolDecoder.java b/src/org/traccar/protocol/Ardi01ProtocolDecoder.java
new file mode 100644
index 000000000..e25ff1c57
--- /dev/null
+++ b/src/org/traccar/protocol/Ardi01ProtocolDecoder.java
@@ -0,0 +1,115 @@
+/*
+ * 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.util.Calendar;
+import java.util.Properties;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Ardi01ProtocolDecoder extends BaseProtocolDecoder {
+
+ public Ardi01ProtocolDecoder(DataManager dataManager, String protocol, Properties properties) {
+ super(dataManager, protocol, properties);
+ }
+
+ private static final Pattern pattern = Pattern.compile(
+ "(\\d+)," + // IMEI
+ "(\\d{4})(\\d{2})(\\d{2})" + // Date (YYYYMMDD)
+ "(\\d{2})(\\d{2})(\\d{2})," + // Time (HHMMSS)
+ "(-?\\d+\\.\\d+)," + // Longitude
+ "(-?\\d+\\.\\d+)," + // Latitude
+ "(\\d+\\.?\\d*)," + // Speed
+ "(\\d+\\.?\\d*)," + // Course
+ "(-?\\d+\\.?\\d*)," + // Altitude
+ "(\\d+)," + // Satellites
+ "(\\d+)," + // Event
+ "(\\d+)," + // Battery
+ "(-?\\d+)"); // Temperature
+
+ @Override
+ protected Object decode(
+ ChannelHandlerContext ctx, Channel channel, Object msg)
+ throws Exception {
+
+ String sentence = (String) msg;
+
+ // Parse message
+ Matcher parser = pattern.matcher(sentence);
+ if (!parser.matches()) {
+ return null;
+ }
+
+ // Create new position
+ Position position = new Position();
+ ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol());
+ Integer index = 1;
+
+ // Detect device
+ String imei = parser.group(index++);
+ try {
+ position.setDeviceId(getDataManager().getDeviceByImei(imei).getId());
+ } catch(Exception error) {
+ Log.warning("Unknown device - " + imei);
+ return null;
+ }
+
+ // Date and time
+ Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ time.clear();
+ time.set(Calendar.YEAR, 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 data
+ position.setLongitude(Double.valueOf(parser.group(index++)));
+ position.setLatitude(Double.valueOf(parser.group(index++)));
+ position.setSpeed(Double.valueOf(parser.group(index++)) * 0.539957);
+ position.setCourse(Double.valueOf(parser.group(index++)));
+ position.setAltitude(Double.valueOf(parser.group(index++)));
+
+ // Satellites
+ int satellites = Integer.valueOf(parser.group(index++));
+ position.setValid(satellites >= 3);
+ extendedInfo.set("satellites", satellites);
+
+ // Event
+ extendedInfo.set("event", parser.group(index++));
+
+ // Input
+ extendedInfo.set("battery", parser.group(index++));
+
+ // Output
+ extendedInfo.set("temperature", parser.group(index++));
+
+ position.setExtendedInfo(extendedInfo.toString());
+ return position;
+ }
+
+}
diff --git a/test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java b/test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java
new file mode 100644
index 000000000..7e4a2eb95
--- /dev/null
+++ b/test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java
@@ -0,0 +1,21 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.helper.TestDataManager;
+
+import static org.junit.Assert.assertNull;
+import static org.traccar.helper.DecoderVerifier.verify;
+
+public class Ardi01ProtocolDecoderTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ Ardi01ProtocolDecoder decoder = new Ardi01ProtocolDecoder(new TestDataManager(), null, null);
+
+ verify(decoder.decode(null, null,
+ "013227003054776,20141010052719,24.4736042,56.8445807,110,289,40,7,5,78,-1"));
+
+ }
+
+}