aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/AtrackProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-04-29 13:41:15 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-04-29 13:41:15 +1200
commitf7198adaf371e08a72a837d417b29531c117c6ba (patch)
tree853fb51b64cd00aaa6e53d4e510bbf69859e7765 /src/org/traccar/protocol/AtrackProtocolDecoder.java
parentcb0a3831c2d89a22e9f3b68d3ee17f6e2abdd424 (diff)
downloadtrackermap-server-f7198adaf371e08a72a837d417b29531c117c6ba.tar.gz
trackermap-server-f7198adaf371e08a72a837d417b29531c117c6ba.tar.bz2
trackermap-server-f7198adaf371e08a72a837d417b29531c117c6ba.zip
Store other data in position
Diffstat (limited to 'src/org/traccar/protocol/AtrackProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/AtrackProtocolDecoder.java30
1 files changed, 12 insertions, 18 deletions
diff --git a/src/org/traccar/protocol/AtrackProtocolDecoder.java b/src/org/traccar/protocol/AtrackProtocolDecoder.java
index 29070f6e1..b898d9e92 100644
--- a/src/org/traccar/protocol/AtrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/AtrackProtocolDecoder.java
@@ -20,7 +20,6 @@ import java.nio.charset.Charset;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.Properties;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
@@ -28,9 +27,6 @@ import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
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 AtrackProtocolDecoder extends BaseProtocolDecoder {
@@ -106,7 +102,7 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
// Create new position
Position position = new Position();
position.setDeviceId(getDeviceId());
- ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol());
+ position.setProtocol(getProtocol());
// Date and time
position.setTime(new Date(buf.readUnsignedInt() * 1000)); // gps time
@@ -122,41 +118,39 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(buf.readUnsignedShort());
// Report type
- extendedInfo.set("type", buf.readUnsignedByte());
+ position.set("type", buf.readUnsignedByte());
// Milage
- extendedInfo.set("milage", buf.readUnsignedInt() * 0.1);
+ position.set("milage", buf.readUnsignedInt() * 0.1);
// Accuracy
- extendedInfo.set("hdop", buf.readUnsignedShort() * 0.1);
+ position.set("hdop", buf.readUnsignedShort() * 0.1);
// Input
- extendedInfo.set("input", buf.readUnsignedByte());
+ position.set("input", buf.readUnsignedByte());
// Speed
position.setSpeed(buf.readUnsignedShort() * 0.539957);
// Output
- extendedInfo.set("output", buf.readUnsignedByte());
+ position.set("output", buf.readUnsignedByte());
// ADC
- extendedInfo.set("adc", buf.readUnsignedShort() * 0.001);
+ position.set("adc", buf.readUnsignedShort() * 0.001);
// Driver
- extendedInfo.set("driver", readString(buf));
+ position.set("driver", readString(buf));
// Temperature
- extendedInfo.set("temperature1", buf.readShort() * 0.1);
- extendedInfo.set("temperature2", buf.readShort() * 0.1);
+ position.set("temperature1", buf.readShort() * 0.1);
+ position.set("temperature2", buf.readShort() * 0.1);
// Text Message
- extendedInfo.set("message", readString(buf));
+ position.set("message", readString(buf));
// With AT$FORM Command you can extend atrack protocol.
// For example adding AT$FORM %FC /Fuel used you can add the line in this position:
- // extendedInfo.set("fuelused", buf.readUnsignedInt() * 0.1);
-
- position.setExtendedInfo(extendedInfo.toString());
+ // position.set("fuelused", buf.readUnsignedInt() * 0.1);
positions.add(position);
}