From 3ec3b6958e0cfb2a4e81ae4603908e526dfb1956 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 1 May 2019 23:05:26 -0700 Subject: Implement TechTLT protocol --- setup/default.xml | 1 + .../java/org/traccar/protocol/TechTltProtocol.java | 37 +++++++++ .../traccar/protocol/TechTltProtocolDecoder.java | 87 ++++++++++++++++++++++ .../protocol/TechTltProtocolDecoderTest.java | 22 ++++++ 4 files changed, 147 insertions(+) create mode 100644 src/main/java/org/traccar/protocol/TechTltProtocol.java create mode 100644 src/main/java/org/traccar/protocol/TechTltProtocolDecoder.java create mode 100644 src/test/java/org/traccar/protocol/TechTltProtocolDecoderTest.java diff --git a/setup/default.xml b/setup/default.xml index d4fdefb8d..a783a022b 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -265,5 +265,6 @@ 5186 5187 5188 + 5189 diff --git a/src/main/java/org/traccar/protocol/TechTltProtocol.java b/src/main/java/org/traccar/protocol/TechTltProtocol.java new file mode 100644 index 000000000..69a12532c --- /dev/null +++ b/src/main/java/org/traccar/protocol/TechTltProtocol.java @@ -0,0 +1,37 @@ +/* + * Copyright 2019 Anton Tananaev (anton@traccar.org) + * + * 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 io.netty.handler.codec.string.StringDecoder; +import io.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.PipelineBuilder; +import org.traccar.TrackerServer; + +public class TechTltProtocol extends BaseProtocol { + + public TechTltProtocol() { + addServer(new TrackerServer(true, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new StringEncoder()); + pipeline.addLast(new StringDecoder()); + pipeline.addLast(new Ardi01ProtocolDecoder(TechTltProtocol.this)); + } + }); + } + +} diff --git a/src/main/java/org/traccar/protocol/TechTltProtocolDecoder.java b/src/main/java/org/traccar/protocol/TechTltProtocolDecoder.java new file mode 100644 index 000000000..bad289060 --- /dev/null +++ b/src/main/java/org/traccar/protocol/TechTltProtocolDecoder.java @@ -0,0 +1,87 @@ +/* + * Copyright 2019 Anton Tananaev (anton@traccar.org) + * + * 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 io.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.Protocol; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.CellTower; +import org.traccar.model.Network; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class TechTltProtocolDecoder extends BaseProtocolDecoder { + + public TechTltProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN_POSITION = new PatternBuilder() + .number("(d+)") // id + .text("*POS=Y,") + .number("(dd):(dd):(dd),") // time + .number("(dd)/(dd)/(dd),") // date + .number("(dd)(dd.d+)") // latitude + .expression("([NS]),") + .number("(ddd)(dd.d+)") // longitude + .expression("([EW]),") + .number("(d+.d+),") // speed + .number("(d+.d+),") // course + .number("(d+.d+),") // altitude + .number("(d+),") // satellites + .number("(d+),") // lac + .number("(d+)") // cid + .compile(); + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + Parser parser = new Parser(PATTERN_POSITION, (String) msg); + if (!parser.matches()) { + return null; + } + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + position.setValid(true); + position.setTime(parser.nextDateTime(Parser.DateTimeFormat.HMS_DMY)); + position.setLatitude(parser.nextCoordinate()); + position.setLongitude(parser.nextCoordinate()); + position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble())); + position.setCourse(parser.nextDouble()); + position.setAltitude(parser.nextDouble()); + + position.set(Position.KEY_SATELLITES, parser.nextInt()); + + position.setNetwork(new Network(CellTower.fromLacCid(parser.nextInt(), parser.nextInt()))); + + return position; + } + +} diff --git a/src/test/java/org/traccar/protocol/TechTltProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TechTltProtocolDecoderTest.java new file mode 100644 index 000000000..0fdd26a47 --- /dev/null +++ b/src/test/java/org/traccar/protocol/TechTltProtocolDecoderTest.java @@ -0,0 +1,22 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class TechTltProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + TechTltProtocolDecoder decoder = new TechTltProtocolDecoder(null); + + verifyPosition(decoder, text( + "002422269*POS=Y,16:21:20,25/11/09,3809.8063N,01444.7438E,4.17,117.23,0.4,09,40076,56341"), + position("2009-11-25 16:21:20.000", true, 38.16344, 14.74573)); + + verifyNull(decoder, text( + "002422269,INFOGPRS,V Bat=13.8,TEMP=23,I TIM,15")); + + } + +} -- cgit v1.2.3