From f7198adaf371e08a72a837d417b29531c117c6ba Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 29 Apr 2015 13:41:15 +1200 Subject: Store other data in position --- src/org/traccar/protocol/OsmAndProtocolDecoder.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/org/traccar/protocol/OsmAndProtocolDecoder.java') diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java index 11966e0bd..e6b5476b1 100644 --- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java +++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java @@ -21,7 +21,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Properties; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelFutureListener; @@ -34,9 +33,6 @@ import org.jboss.netty.handler.codec.http.HttpVersion; import org.jboss.netty.handler.codec.http.QueryStringDecoder; import org.traccar.BaseProtocolDecoder; -import org.traccar.database.DataManager; -import org.traccar.helper.Log; -import org.traccar.model.ExtendedInfoFormatter; import org.traccar.model.Position; public class OsmAndProtocolDecoder extends BaseProtocolDecoder { @@ -61,7 +57,7 @@ public class OsmAndProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); + position.setProtocol(getProtocol()); // Identification String id = params.get(params.containsKey("id") ? "id" : "deviceid").get(0); @@ -101,27 +97,25 @@ public class OsmAndProtocolDecoder extends BaseProtocolDecoder { } if (params.containsKey("hdop")) { - extendedInfo.set("hdop", params.get("hdop").get(0)); + position.set("hdop", params.get("hdop").get(0)); } if (params.containsKey("vacc")) { - extendedInfo.set("vacc", params.get("vacc").get(0)); + position.set("vacc", params.get("vacc").get(0)); } if (params.containsKey("hacc")) { - extendedInfo.set("hacc", params.get("hacc").get(0)); + position.set("hacc", params.get("hacc").get(0)); } if (params.containsKey("batt")) { - extendedInfo.set("battery", params.get("batt").get(0)); + position.set("battery", params.get("batt").get(0)); } if (params.containsKey("desc")) { - extendedInfo.set("description", params.get("desc").get(0)); + position.set("description", params.get("desc").get(0)); } - position.setExtendedInfo(extendedInfo.toString()); - // Send response if (channel != null) { HttpResponse response = new DefaultHttpResponse( -- cgit v1.2.3