From f7198adaf371e08a72a837d417b29531c117c6ba Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 29 Apr 2015 13:41:15 +1200
Subject: Store other data in position

---
 .../traccar/protocol/AtrackProtocolDecoder.java    | 30 +++++++++-------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'src/org/traccar/protocol/AtrackProtocolDecoder.java')

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);
         }
 
-- 
cgit v1.2.3