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/CarTrackProtocolDecoder.java    | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

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

diff --git a/src/org/traccar/protocol/CarTrackProtocolDecoder.java b/src/org/traccar/protocol/CarTrackProtocolDecoder.java
index b4e5bf134..b88f9840d 100644
--- a/src/org/traccar/protocol/CarTrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/CarTrackProtocolDecoder.java
@@ -17,7 +17,6 @@
 package org.traccar.protocol;
 
 import java.util.Calendar;
-import java.util.Properties;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -26,9 +25,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 CarTrackProtocolDecoder extends BaseProtocolDecoder {
@@ -73,7 +69,7 @@ public class CarTrackProtocolDecoder extends BaseProtocolDecoder {
 
         // Create new position
         Position position = new Position();
-        ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol());
+        position.setProtocol(getProtocol());
         Integer index = 1;
 
         // Get device by unique identifier
@@ -83,7 +79,7 @@ public class CarTrackProtocolDecoder extends BaseProtocolDecoder {
         position.setDeviceId(getDeviceId());
 
         // Command
-        extendedInfo.set("command", parser.group(index++));
+        position.set("command", parser.group(index++));
 
         // Time
         Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
@@ -127,7 +123,7 @@ public class CarTrackProtocolDecoder extends BaseProtocolDecoder {
         position.setTime(time.getTime());
         
         // State
-        extendedInfo.set("io", parser.group(index++));
+        position.set("io", parser.group(index++));
         /* Start : Added By Rohit Singhal, Decode Milage Data*/
         // Prepare Mile Meter Data
         String milage = parser.group(index++);
@@ -137,13 +133,11 @@ public class CarTrackProtocolDecoder extends BaseProtocolDecoder {
         milage = milage.replace("=", "D");
         milage = milage.replace(">", "E");
         milage = milage.replace("?", "F");
-        extendedInfo.set("milage", Integer.parseInt(milage, 16));
-        /* Commented By Rohit extendedInfo.set("milage", parser.group(index++)); */
+        position.set("milage", Integer.parseInt(milage, 16));
+        /* Commented By Rohit position.set("milage", parser.group(index++)); */
         /*End : Added By Rohit Singhal, Decode Milage Data*/
-        extendedInfo.set("alarm", parser.group(index++));
-        extendedInfo.set("ad", parser.group(index++));
-
-        position.setExtendedInfo(extendedInfo.toString());
+        position.set("alarm", parser.group(index++));
+        position.set("ad", parser.group(index++));
         return position;
     }
 
-- 
cgit v1.2.3