diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-08-09 21:46:58 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-08-09 21:46:58 +1200 |
commit | 635b158070a163c91a66fba857d61bf8acb5bd5d (patch) | |
tree | a49952b1c87c70b90dda61bb0cf32e28c794d4e0 | |
parent | c10858c1ae7f4dca0c9ae88e19bb069b91ad0792 (diff) | |
download | traccar-server-635b158070a163c91a66fba857d61bf8acb5bd5d.tar.gz traccar-server-635b158070a163c91a66fba857d61bf8acb5bd5d.tar.bz2 traccar-server-635b158070a163c91a66fba857d61bf8acb5bd5d.zip |
Added Topflytech protocol (fix #282)
-rw-r--r-- | default.cfg | 4 | ||||
-rw-r--r-- | src/org/traccar/ServerManager.java | 16 | ||||
-rw-r--r-- | src/org/traccar/protocol/TopflytechProtocolDecoder.java | 127 | ||||
-rw-r--r-- | test/org/traccar/protocol/TopflytechProtocolDecoderTest.java | 20 |
4 files changed, 167 insertions, 0 deletions
diff --git a/default.cfg b/default.cfg index 3bbcf2445..2835340d2 100644 --- a/default.cfg +++ b/default.cfg @@ -250,4 +250,8 @@ <entry key='ruptela.enable'>true</entry> <entry key='ruptela.port'>5046</entry> + <!-- Topflytech server configuration --> + <entry key='topflytech.enable'>true</entry> + <entry key='topflytech.port'>5047</entry> + </properties> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 84933b093..0811a48be 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -142,6 +142,7 @@ public class ServerManager { initAtrackServer("atrack"); initPt3000Server("pt3000"); initRuptelaServer("ruptela"); + initTopflytechServer("topflytech"); // Initialize web server if (Boolean.valueOf(properties.getProperty("http.enable"))) { @@ -870,4 +871,19 @@ public class ServerManager { } } + private void initTopflytechServer(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) ')' }; + pipeline.addLast("frameDecoder", + new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new TopflytechProtocolDecoder(ServerManager.this)); + } + }); + } + } + } diff --git a/src/org/traccar/protocol/TopflytechProtocolDecoder.java b/src/org/traccar/protocol/TopflytechProtocolDecoder.java new file mode 100644 index 000000000..e84867890 --- /dev/null +++ b/src/org/traccar/protocol/TopflytechProtocolDecoder.java @@ -0,0 +1,127 @@ +/* + * 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.ExtendedInfoFormatter; +import org.traccar.model.Position; + +public class TopflytechProtocolDecoder extends BaseProtocolDecoder { + + private Long deviceId; + + public TopflytechProtocolDecoder(ServerManager serverManager) { + super(serverManager); + } + + static private Pattern pattern = Pattern.compile( + "\\(" + + "(\\d+)" + // IMEI + ".*" + + "(\\d{2})(\\d{2})(\\d{2})" + // Date (YYMMDD) + "(\\d{2})(\\d{2})(\\d{2})" + // Time (HHMMSS) + "([AV])" + // Validity + "(\\d{2})(\\d{2}\\.\\d{4})" + // Latitude (DDMM.MMMM) + "([NS])" + + "(\\d{3})(\\d{2}\\.\\d{4})" + // Longitude (DDDMM.MMMM) + "([EW])" + + "(\\d{3}\\.\\d)" + // Speed + "(\\d+\\.\\d+)"); // Course + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + String sentence = (String) msg; + + // Detect device identifier + if (sentence.startsWith("[!")) { + } + + // Parse message + else if (deviceId != null) { + + // Parse message + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + return null; + } + + // Create new position + Position position = new Position(); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("topflytech"); + Integer index = 1; + + // Identifier + String imei = parser.group(index++); + try { + position.setDeviceId(getDataManager().getDeviceByImei(imei).getId()); + } catch(Exception error) { + Log.warning("Unknown device - " + imei); + } + + // 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, 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()); + + // Validity + position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false); + + // Latitude + Double latitude = Double.valueOf(parser.group(index++)); + latitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("S") == 0) latitude = -latitude; + position.setLatitude(latitude); + + // Longitude + Double lonlitude = Double.valueOf(parser.group(index++)); + lonlitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude; + position.setLongitude(lonlitude); + + // Speed + position.setSpeed(Double.valueOf(parser.group(index++))); + + // Course + position.setCourse(Double.valueOf(parser.group(index++))); + + // Altitude + position.setAltitude(0.0); + + position.setExtendedInfo(extendedInfo.toString()); + return position; + } + + return null; + } + +} diff --git a/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java b/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java new file mode 100644 index 000000000..7e253c80d --- /dev/null +++ b/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java @@ -0,0 +1,20 @@ +package org.traccar.protocol; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import org.junit.Test; + +public class TopflytechProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + TopflytechProtocolDecoder decoder = new TopflytechProtocolDecoder(null); + decoder.setDataManager(new TestDataManager()); + + assertNotNull(decoder.decode(null, null, + "(880316890094910BP00XG00b600000000L00074b54S00000000R0C0F0014000100f0130531152205A0706.1395S11024.0965E000.0251.25")); + + } + +} |