diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-07-21 21:54:24 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2021-07-21 21:54:24 -0700 |
commit | b8256eb4140dd0a03b98ae6c3e67fcbc561d0229 (patch) | |
tree | b9e808b9e9aa66aaa240c8e6f46b2e074d6b361f /src/main/java/org/traccar/protocol | |
parent | b6f241706a3b79b0336bbff059e7b61c8cf58772 (diff) | |
download | trackermap-server-b8256eb4140dd0a03b98ae6c3e67fcbc561d0229.tar.gz trackermap-server-b8256eb4140dd0a03b98ae6c3e67fcbc561d0229.tar.bz2 trackermap-server-b8256eb4140dd0a03b98ae6c3e67fcbc561d0229.zip |
Add Transistor Software geolocation
Diffstat (limited to 'src/main/java/org/traccar/protocol')
-rw-r--r-- | src/main/java/org/traccar/protocol/AppletProtocolDecoder.java | 48 | ||||
-rw-r--r-- | src/main/java/org/traccar/protocol/LacakProtocol.java (renamed from src/main/java/org/traccar/protocol/AppletProtocol.java) | 8 | ||||
-rw-r--r-- | src/main/java/org/traccar/protocol/LacakProtocolDecoder.java | 95 |
3 files changed, 99 insertions, 52 deletions
diff --git a/src/main/java/org/traccar/protocol/AppletProtocolDecoder.java b/src/main/java/org/traccar/protocol/AppletProtocolDecoder.java deleted file mode 100644 index 7a995cc24..000000000 --- a/src/main/java/org/traccar/protocol/AppletProtocolDecoder.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 io.netty.channel.Channel; -import io.netty.handler.codec.http.FullHttpRequest; -import io.netty.handler.codec.http.HttpResponseStatus; -import org.traccar.BaseHttpProtocolDecoder; -import org.traccar.DeviceSession; -import org.traccar.Protocol; - -import java.net.SocketAddress; - -public class AppletProtocolDecoder extends BaseHttpProtocolDecoder { - - public AppletProtocolDecoder(Protocol protocol) { - super(protocol); - } - - @Override - protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { - - FullHttpRequest request = (FullHttpRequest) msg; - - DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, request.headers().get("From")); - if (deviceSession != null) { - sendResponse(channel, HttpResponseStatus.OK); - } else { - sendResponse(channel, HttpResponseStatus.BAD_REQUEST); - } - - return null; - } - -} diff --git a/src/main/java/org/traccar/protocol/AppletProtocol.java b/src/main/java/org/traccar/protocol/LacakProtocol.java index 2297dca03..0a0499ad7 100644 --- a/src/main/java/org/traccar/protocol/AppletProtocol.java +++ b/src/main/java/org/traccar/protocol/LacakProtocol.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2021 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. @@ -22,16 +22,16 @@ import org.traccar.BaseProtocol; import org.traccar.PipelineBuilder; import org.traccar.TrackerServer; -public class AppletProtocol extends BaseProtocol { +public class LacakProtocol extends BaseProtocol { - public AppletProtocol() { + public LacakProtocol() { addServer(new TrackerServer(false, getName()) { @Override protected void addProtocolHandlers(PipelineBuilder pipeline) { pipeline.addLast(new HttpResponseEncoder()); pipeline.addLast(new HttpRequestDecoder()); pipeline.addLast(new HttpObjectAggregator(16384)); - pipeline.addLast(new AppletProtocolDecoder(AppletProtocol.this)); + pipeline.addLast(new LacakProtocolDecoder(LacakProtocol.this)); } }); } diff --git a/src/main/java/org/traccar/protocol/LacakProtocolDecoder.java b/src/main/java/org/traccar/protocol/LacakProtocolDecoder.java new file mode 100644 index 000000000..132087c8f --- /dev/null +++ b/src/main/java/org/traccar/protocol/LacakProtocolDecoder.java @@ -0,0 +1,95 @@ +/* + * Copyright 2021 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 io.netty.handler.codec.http.FullHttpRequest; +import io.netty.handler.codec.http.HttpResponseStatus; +import org.traccar.BaseHttpProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.Protocol; +import org.traccar.helper.DateUtil; +import org.traccar.model.Position; + +import javax.json.Json; +import javax.json.JsonObject; +import java.io.StringReader; +import java.net.SocketAddress; +import java.nio.charset.StandardCharsets; + +public class LacakProtocolDecoder extends BaseHttpProtocolDecoder { + + public LacakProtocolDecoder(Protocol protocol) { + super(protocol); + } + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + FullHttpRequest request = (FullHttpRequest) msg; + JsonObject root = Json.createReader( + new StringReader(request.content().toString(StandardCharsets.US_ASCII))).readObject(); + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, root.getString("device_id")); + if (deviceSession == null) { + sendResponse(channel, HttpResponseStatus.BAD_REQUEST); + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + JsonObject location = root.getJsonObject("location"); + + position.setTime(DateUtil.parseDate(location.getString("timestamp"))); + + if (location.containsKey("coords")) { + JsonObject coordinates = location.getJsonObject("coords"); + position.setLatitude(coordinates.getJsonNumber("latitude").doubleValue()); + position.setLongitude(coordinates.getJsonNumber("longitude").doubleValue()); + position.setAccuracy(coordinates.getJsonNumber("accuracy").doubleValue()); + position.setSpeed(coordinates.getJsonNumber("speed").doubleValue()); + position.setCourse(coordinates.getJsonNumber("heading").doubleValue()); + position.setAltitude(coordinates.getJsonNumber("altitude").doubleValue()); + } + + if (location.containsKey("event")) { + position.set(Position.KEY_EVENT, location.getString("event")); + } + if (location.containsKey("is_moving")) { + position.set(Position.KEY_MOTION, location.getBoolean("is_moving")); + } + if (location.containsKey("odometer")) { + position.set(Position.KEY_ODOMETER, location.getInt("odometer")); + } + if (location.containsKey("mock")) { + position.set("mock", location.getBoolean("mock")); + } + if (location.containsKey("activity")) { + position.set("activity", location.getJsonObject("activity").getString("type")); + } + if (location.containsKey("battery")) { + JsonObject battery = location.getJsonObject("battery"); + position.set(Position.KEY_BATTERY_LEVEL, (int) (battery.getJsonNumber("level").doubleValue() * 100)); + position.set(Position.KEY_CHARGE, battery.getBoolean("is_charging")); + } + + sendResponse(channel, HttpResponseStatus.OK); + return position; + } + +} |