diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-02-23 06:35:05 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-02-23 06:35:05 +1300 |
commit | 0d6b84af0aac6f312fd654cba33d8a1a13e2ed25 (patch) | |
tree | 3129bc39d2a7fdb1204e132ed3c82bdb78874bfd | |
parent | c7cb3de0ef6745cd66cec065c1d6250258b18628 (diff) | |
download | traccar-server-0d6b84af0aac6f312fd654cba33d8a1a13e2ed25.tar.gz traccar-server-0d6b84af0aac6f312fd654cba33d8a1a13e2ed25.tar.bz2 traccar-server-0d6b84af0aac6f312fd654cba33d8a1a13e2ed25.zip |
Implement GlobeKeeper protocol
-rw-r--r-- | setup/default.xml | 1 | ||||
-rw-r--r-- | src/org/traccar/protocol/GlobeKeeperProtocol.java | 45 | ||||
-rw-r--r-- | src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java | 69 | ||||
-rw-r--r-- | test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java | 33 |
4 files changed, 148 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml index 72e6de9af..2c4f45712 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -226,5 +226,6 @@ <entry key='t57.port'>5155</entry> <entry key='spot.port'>5156</entry> <entry key='m2c.port'>5157</entry> + <entry key='globekeeper.port'>5158</entry> </properties> diff --git a/src/org/traccar/protocol/GlobeKeeperProtocol.java b/src/org/traccar/protocol/GlobeKeeperProtocol.java new file mode 100644 index 000000000..9231c067c --- /dev/null +++ b/src/org/traccar/protocol/GlobeKeeperProtocol.java @@ -0,0 +1,45 @@ +/* + * Copyright 2018 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 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; + +import java.util.List; + +public class GlobeKeeperProtocol extends BaseProtocol { + + public GlobeKeeperProtocol() { + super("globekeeper"); + } + + @Override + public void initTrackerServers(List<TrackerServer> serverList) { + serverList.add(new TrackerServer(new ConnectionlessBootstrap(), getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new GlobeKeeperProtocolDecoder(GlobeKeeperProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java b/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java new file mode 100644 index 000000000..c4daf4409 --- /dev/null +++ b/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java @@ -0,0 +1,69 @@ +/* + * Copyright 2018 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 org.jboss.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class GlobeKeeperProtocolDecoder extends BaseProtocolDecoder { + + public GlobeKeeperProtocolDecoder(GlobeKeeperProtocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .number("(d+);") // imei + .number("(dddd)-(dd)-(dd) ") // date + .number("(dd):(dd):(dd);") // time + .number("(-?d+,d+);") // latitude + .number("(-?d+,d+);") // longitude + .any() + .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; + } + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + position.setTime(parser.nextDateTime()); + + position.setValid(true); + position.setLongitude(Double.parseDouble(parser.next().replace(',', '.'))); + position.setLatitude(Double.parseDouble(parser.next().replace(',', '.'))); + + return position; + } + +} diff --git a/test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java b/test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java new file mode 100644 index 000000000..918fd9083 --- /dev/null +++ b/test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java @@ -0,0 +1,33 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class GlobeKeeperProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + GlobeKeeperProtocolDecoder decoder = new GlobeKeeperProtocolDecoder(new GlobeKeeperProtocol()); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1")); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0")); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0")); + + } + +} |