From 55f11c9dda7394d4c8c96bfe5da9497756df6866 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 13 Dec 2015 08:23:26 +1300 Subject: Add support for U-pro protocol --- src/org/traccar/helper/Parser.java | 5 ++ src/org/traccar/protocol/UproProtocol.java | 45 +++++++++++++ src/org/traccar/protocol/UproProtocolDecoder.java | 77 +++++++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 src/org/traccar/protocol/UproProtocol.java create mode 100644 src/org/traccar/protocol/UproProtocolDecoder.java (limited to 'src') diff --git a/src/org/traccar/helper/Parser.java b/src/org/traccar/helper/Parser.java index c5f5d2e37..a36d8ee6e 100644 --- a/src/org/traccar/helper/Parser.java +++ b/src/org/traccar/helper/Parser.java @@ -89,6 +89,7 @@ public class Parser { public enum CoordinateFormat { DEG_DEG, DEG_HEM, + DEG_MIN_MIN, DEG_MIN_HEM, DEG_MIN_MIN_HEM, HEM_DEG_MIN_MIN, @@ -109,6 +110,10 @@ public class Parser { coordinate = nextDouble(); hemisphere = next(); break; + case DEG_MIN_MIN: + coordinate = nextInt(); + coordinate += Double.parseDouble(next() + '.' + next()) / 60; + break; case DEG_MIN_MIN_HEM: coordinate = nextInt(); coordinate += Double.parseDouble(next() + '.' + next()) / 60; diff --git a/src/org/traccar/protocol/UproProtocol.java b/src/org/traccar/protocol/UproProtocol.java new file mode 100644 index 000000000..36115edb4 --- /dev/null +++ b/src/org/traccar/protocol/UproProtocol.java @@ -0,0 +1,45 @@ +/* + * Copyright 2015 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 org.jboss.netty.bootstrap.ServerBootstrap; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.handler.codec.string.StringDecoder; +import org.traccar.BaseProtocol; +import org.traccar.CharacterDelimiterFrameDecoder; +import org.traccar.TrackerServer; + +import java.util.List; + +public class UproProtocol extends BaseProtocol { + + public UproProtocol() { + super("upro"); + } + + @Override + public void initTrackerServers(List serverList) { + serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, '#')); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new UproProtocolDecoder(UproProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/UproProtocolDecoder.java b/src/org/traccar/protocol/UproProtocolDecoder.java new file mode 100644 index 000000000..f7166e589 --- /dev/null +++ b/src/org/traccar/protocol/UproProtocolDecoder.java @@ -0,0 +1,77 @@ +/* + * Copyright 2012 - 2015 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 org.jboss.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.helper.DateBuilder; +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 UproProtocolDecoder extends BaseProtocolDecoder { + + public UproProtocolDecoder(UproProtocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("*AI20") + .number("(d+),") // device id + .expression("A.+&A") + .number("(dd)(dd)(dd)") // time + .number("(dd)(dd)(dddd)") // latitude + .number("(ddd)(dd)(dddd)") // longitude + .number("d{5}") + .number("(dd)(dd)(dd)") // date + .expression("&B") + .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; + } + + Position position = new Position(); + position.setProtocol(getProtocolName()); + + if (!identify(parser.next(), channel, remoteAddress)) { + return null; + } + position.setDeviceId(getDeviceId()); + + DateBuilder dateBuilder = new DateBuilder() + .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); + + position.setValid(true); + position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN)); + position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN)); + + dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt()); + position.setTime(dateBuilder.getDate()); + + return position; + } + +} -- cgit v1.2.3