diff options
Diffstat (limited to 'src/org/traccar/protocol/M2mProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/M2mProtocolDecoder.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/org/traccar/protocol/M2mProtocolDecoder.java b/src/org/traccar/protocol/M2mProtocolDecoder.java index 606f3b8ab..026a067b4 100644 --- a/src/org/traccar/protocol/M2mProtocolDecoder.java +++ b/src/org/traccar/protocol/M2mProtocolDecoder.java @@ -16,7 +16,6 @@ package org.traccar.protocol; import java.util.Calendar; -import java.util.Properties; import java.util.TimeZone; import org.jboss.netty.buffer.ChannelBuffer; @@ -24,9 +23,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 M2mProtocolDecoder extends BaseProtocolDecoder { @@ -73,7 +69,7 @@ public class M2mProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); + position.setProtocol(getProtocol()); position.setDeviceId(getDeviceId()); // Date and time @@ -120,12 +116,10 @@ public class M2mProtocolDecoder extends BaseProtocolDecoder { if (satellites == 0) { return null; // cell information } - extendedInfo.set("satellites", satellites); + position.set("satellites", satellites); position.setValid(true); // TODO decode everything else - - position.setExtendedInfo(extendedInfo.toString()); return position; } |