aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Stl060ProtocolDecoder.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/protocol/Stl060ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Stl060ProtocolDecoder.java19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/org/traccar/protocol/Stl060ProtocolDecoder.java
index 15bb3ddd4..d5ad651e7 100644
--- a/src/org/traccar/protocol/Stl060ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Stl060ProtocolDecoder.java
@@ -16,7 +16,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;
@@ -25,9 +24,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 Stl060ProtocolDecoder extends BaseProtocolDecoder {
@@ -70,7 +66,7 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder {
// Create new position
Position position = new Position();
- ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol());
+ position.setProtocol(getProtocol());
Integer index = 1;
@@ -112,18 +108,15 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(Double.valueOf(parser.group(index++)));
// Other
- extendedInfo.set("milage", Integer.valueOf(parser.group(index++)));
- extendedInfo.set("ignition", Integer.valueOf(parser.group(index++)));
- extendedInfo.set("dip1", Integer.valueOf(parser.group(index++)));
- extendedInfo.set("dip2", Integer.valueOf(parser.group(index++)));
- extendedInfo.set("fuel", Integer.valueOf(parser.group(index++)));
+ position.set("milage", Integer.valueOf(parser.group(index++)));
+ position.set("ignition", Integer.valueOf(parser.group(index++)));
+ position.set("dip1", Integer.valueOf(parser.group(index++)));
+ position.set("dip2", Integer.valueOf(parser.group(index++)));
+ position.set("fuel", Integer.valueOf(parser.group(index++)));
// Validity
position.setValid(parser.group(index++).compareTo("A") == 0);
- // Extended info
- position.setExtendedInfo(extendedInfo.toString());
-
return position;
}