From 570cd3cbd9290df1388eb8be6e4b2636afc33951 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 13 Apr 2013 01:02:17 +1200 Subject: Add IntelliTrac protocol support --- default.cfg | 4 + src/org/traccar/ServerManager.java | 17 +++ .../protocol/IntellitracProtocolDecoder.java | 132 +++++++++++++++++++++ .../protocol/IntellitracProtocolDecoderTest.java | 49 ++++++++ 4 files changed, 202 insertions(+) create mode 100644 src/org/traccar/protocol/IntellitracProtocolDecoder.java create mode 100644 test/org/traccar/protocol/IntellitracProtocolDecoderTest.java diff --git a/default.cfg b/default.cfg index bb2996ece..9cbfc56ff 100644 --- a/default.cfg +++ b/default.cfg @@ -208,5 +208,9 @@ true 5036 + + + true + 5037 diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 18535307c..34c903cc5 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -142,6 +142,7 @@ public class ServerManager { initGalileoServer("galileo"); initYwtServer("ywt"); initTk102Server("tk102"); + initIntellitracServer("intellitrac"); // Initialize web server if (Boolean.valueOf(properties.getProperty("http.enable"))) { @@ -780,5 +781,21 @@ public class ServerManager { }); } } + + private void initIntellitracServer(String protocol) throws SQLException { + if (isProtocolEnabled(properties, protocol)) { + serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + byte delimiter[] = { (byte) '\r', (byte) '\n' }; + pipeline.addLast("frameDecoder", + new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("objectDecoder", new IntellitracProtocolDecoder(ServerManager.this)); + } + }); + } + } } diff --git a/src/org/traccar/protocol/IntellitracProtocolDecoder.java b/src/org/traccar/protocol/IntellitracProtocolDecoder.java new file mode 100644 index 000000000..7b1cb3880 --- /dev/null +++ b/src/org/traccar/protocol/IntellitracProtocolDecoder.java @@ -0,0 +1,132 @@ +/* + * Copyright 2013 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.util.Calendar; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.BaseProtocolDecoder; +import org.traccar.ServerManager; +import org.traccar.helper.Log; +import org.traccar.model.Position; + +public class IntellitracProtocolDecoder extends BaseProtocolDecoder { + + public IntellitracProtocolDecoder(ServerManager serverManager) { + super(serverManager); + } + + static private Pattern pattern = Pattern.compile( + "(?:.+,)?(\\d+)," + // Device Identifier + "(\\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+)," + // Report Identifier + "(\\d+)," + // Input + "(\\d+),?" + // Output + "(\\d+\\.\\d+)?,?" + // ADC1 + "(\\d+\\.\\d+)?"); // ADC2 + + @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(); + StringBuilder extendedInfo = new StringBuilder("intellitrac"); + Integer index = 1; + + // Detect device + String id = parser.group(index++); + try { + position.setDeviceId(getDataManager().getDeviceByImei(id).getId()); + } catch(Exception error) { + Log.warning("Unknown device - " + id); + 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, 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++))); + 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.append(""); + extendedInfo.append(satellites); + extendedInfo.append(""); + + // Report identifier + position.setId(Long.valueOf(parser.group(index++))); + + // Input + extendedInfo.append(""); + extendedInfo.append(parser.group(index++)); + extendedInfo.append(""); + + // Output + extendedInfo.append(""); + extendedInfo.append(parser.group(index++)); + extendedInfo.append(""); + + // ADC1 + String adc1 = parser.group(index++); + if (adc1 != null) { + extendedInfo.append("").append(adc1).append(""); + } + + // ADC2 + String adc2 = parser.group(index++); + if (adc2 != null) { + extendedInfo.append("").append(adc2).append(""); + } + + position.setExtendedInfo(extendedInfo.toString()); + return position; + } + +} diff --git a/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java b/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java new file mode 100644 index 000000000..098c9415e --- /dev/null +++ b/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java @@ -0,0 +1,49 @@ +package org.traccar.protocol; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import org.junit.Test; + +public class IntellitracProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + IntellitracProtocolDecoder decoder = new IntellitracProtocolDecoder(null); + decoder.setDataManager(new TestDataManager()); + + assertNull(decoder.decode(null, null, "$OK:TRACKING")); + + assertNotNull(decoder.decode(null, null, + "1010000002,20030217132813,121.646060,25.061725,20,157,133,7,0,11,15,0.096,0.000")); + + assertNotNull(decoder.decode(null, null, + "1001070919,20130405084206,37.903730,48.011377,0,0,235,10,2,2,0,20.211,0.153")); + + assertNotNull(decoder.decode(null, null, + "1010000002,20030217144230,121.646102,25.061398,0,0,139,0,0,0,0,0.093,0.000")); + + assertNotNull(decoder.decode(null, null, + "1010000004,20050513153524,121.646075,25.063675,0,166,50,6,1,0,0,0.118,0.000")); + + assertNotNull(decoder.decode(null, null, + "1010000004,20050513154001,121.646075,25.063675,0,166,55,7,1,0,0,0.096,0.000")); + + assertNotNull(decoder.decode(null, null, + "1010000002,20030217132813,121.646060,25.061725,20,157,0,7,0,11,15")); + + assertNotNull(decoder.decode(null, null, + "12345,1010000002,20030217132813,121.646060,25.061725,20,157,0,7,0,11,15")); + + assertNotNull(decoder.decode(null, null, + "1010000002,20030217144230,121.646102,25.061398,0,0,0,7,2,0,0")); + + assertNotNull(decoder.decode(null, null, + "$RP:12345,1010000002,20030217144230,121.646102,25.061398,0,0,0,7,2,0,0")); + + assertNotNull(decoder.decode(null, null, + "1010000001,20030105092129,121.651598,25.052325,0,0,33,0,1,0,0")); + + } + +} -- cgit v1.2.3