diff options
| -rw-r--r-- | debug.xml | 1 | ||||
| -rw-r--r-- | setup/unix/traccar.xml | 1 | ||||
| -rw-r--r-- | setup/windows/traccar.xml | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/LdplProtocol.java | 45 | ||||
| -rw-r--r-- | src/org/traccar/protocol/LdplProtocolDecoder.java | 117 | ||||
| -rw-r--r-- | test/org/traccar/protocol/LdplProtocolDecoderTest.java | 23 |
6 files changed, 188 insertions, 0 deletions
@@ -305,5 +305,6 @@ <entry key='arknav.port'>5107</entry> <entry key='supermate.port'>5108</entry> <entry key='appello.port'>5109</entry> + <entry key='ldpl.port'>5110</entry> </properties> diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml index 4103634ac..bcb9a79e5 100644 --- a/setup/unix/traccar.xml +++ b/setup/unix/traccar.xml @@ -297,5 +297,6 @@ <entry key='arknav.port'>5107</entry> <entry key='supermate.port'>5108</entry> <entry key='appello.port'>5109</entry> + <entry key='ldpl.port'>5110</entry> </properties> diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml index 5748f3993..9191c5ffb 100644 --- a/setup/windows/traccar.xml +++ b/setup/windows/traccar.xml @@ -297,5 +297,6 @@ <entry key='arknav.port'>5107</entry>
<entry key='supermate.port'>5108</entry>
<entry key='appello.port'>5109</entry>
+ <entry key='ldpl.port'>5110</entry>
</properties>
diff --git a/src/org/traccar/protocol/LdplProtocol.java b/src/org/traccar/protocol/LdplProtocol.java new file mode 100644 index 000000000..517055f2f --- /dev/null +++ b/src/org/traccar/protocol/LdplProtocol.java @@ -0,0 +1,45 @@ +/* + * Copyright 2013 - 2014 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.List; + +import org.jboss.netty.bootstrap.ConnectionlessBootstrap; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.handler.codec.string.StringDecoder; +import org.jboss.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.TrackerServer; + +public class LdplProtocol extends BaseProtocol { + + public LdplProtocol() { + super("ldpl"); + } + + @Override + public void initTrackerServers(List<TrackerServer> serverList) { + serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new LdplProtocolDecoder(LdplProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/LdplProtocolDecoder.java b/src/org/traccar/protocol/LdplProtocolDecoder.java new file mode 100644 index 000000000..52d7cd020 --- /dev/null +++ b/src/org/traccar/protocol/LdplProtocolDecoder.java @@ -0,0 +1,117 @@ +/* + * Copyright 2013 - 2014 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.net.SocketAddress; +import java.util.regex.Pattern; + +import org.jboss.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.Protocol; +import org.traccar.helper.DateBuilder; +import org.traccar.helper.Parser; +import org.traccar.helper.Parser.CoordinateFormat; +import org.traccar.helper.PatternBuilder; +import org.traccar.model.Position; + +public class LdplProtocolDecoder extends BaseProtocolDecoder { + + public LdplProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("*ID") // start of frame + .number("(d+),") // command code + .number("(d+),") // imei + .number("(dd)(dd)(dd),") // current date + .number("(dd)(dd)(dd),") // current time + .expression("([A|V]),") // gps fix + .number("(dd)(dd).?(d+),([NS]),") // latitude + .number("(ddd)(dd).?(d+),([EW]),") // longitude + .number("(d{1,3}.dd),") // speed + .number("(d{1,3}.dd),") // course + .number("(d{1,2}),") // sats + .number("(d{1,3}),") // gsm signal strength + .expression("([A|N|S]),") // vehicle status + .expression("([0|1]),") // main power status + .number("(d.dd),") // internal battery voltage + .expression("([0|1]),") // sos alert + .expression("([0|1]),") // body tamper + .expression("([0|1])([0|1]),") // ac status + ign_status + .expression("([0|1|2]),") // output1 status + .number("(d{1,3}),") // adc1 + .number("(d{1,3}),") // adc2 + .expression("([0-9A-Z]{3}),") // software version + .expression("([L|R]),") // message type + .expression("([0-9A-Z]{4})#") // crc + .compile(); + + @Override + protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + Parser parser = new Parser(PATTERN, (String) msg); + if (!parser.matches()) { + return null; + } + + Position position = new Position(); + position.setProtocol(getProtocolName()); + position.set(Position.KEY_TYPE, parser.nextInt()); + + if (!identify(parser.next(), channel, remoteAddress)) { + return null; + } + position.setDeviceId(getDeviceId()); + + DateBuilder dateBuilder = new DateBuilder() + .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt()) + .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); + position.setTime(dateBuilder.getDate()); + + if ("A".equals(parser.next())) { + position.setValid(true); + } else { + position.setValid(false); + } + + position.setLatitude(parser.nextCoordinate(CoordinateFormat.DEG_MIN_MIN_HEM)); + position.setLongitude(parser.nextCoordinate(CoordinateFormat.DEG_MIN_MIN_HEM)); + + position.setSpeed(parser.nextDouble()); + position.setCourse(parser.nextDouble()); + + position.set(Position.KEY_SATELLITES, parser.nextInt()); + position.set(Position.KEY_GSM, parser.nextInt()); + parser.next(); // vehicle status + position.set(Position.KEY_POWER, parser.nextInt()); + position.set(Position.KEY_BATTERY, parser.nextDouble()); + position.set(Position.KEY_ALARM, parser.nextInt()); + parser.nextInt(); // body tamper + parser.nextInt(); // acStatus + position.set(Position.KEY_IGNITION, parser.nextInt()); + position.set(Position.KEY_OUTPUT, parser.nextInt()); + position.set(Position.PREFIX_ADC + 1, parser.nextInt()); + position.set(Position.PREFIX_ADC + 2, parser.nextInt()); + position.set(Position.KEY_VERSION, parser.next()); + position.set(Position.KEY_ARCHIVE, parser.next().equals("R")); + + parser.next(); // checksum + + return position; + } + +} diff --git a/test/org/traccar/protocol/LdplProtocolDecoderTest.java b/test/org/traccar/protocol/LdplProtocolDecoderTest.java new file mode 100644 index 000000000..0900d8c42 --- /dev/null +++ b/test/org/traccar/protocol/LdplProtocolDecoderTest.java @@ -0,0 +1,23 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class LdplProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + LdplProtocolDecoder decoder = new LdplProtocolDecoder(new LdplProtocol()); + + verifyPosition(decoder, text( + "*ID1,863071011086474,210314,153218,A,1831.4577,N,07351.1433,E,0.79,240.64,9,20,A,1,4.20,0,1,01,1,0,0,A01,R,935D#"), + position("2014-03-21 15:32:18.000", true, 18.524295, 73.852388333333)); + + verifyPosition(decoder, text( + "*ID1,863071011086474,210314,162752,A,1831.4412,N,07351.0983,E,0.04,213.84,9,25,A,1,4.20,0,1,01,1,0,0,A01,L,EA01#")); + + + } + +} |