aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-05-02 22:16:14 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2013-05-02 22:16:14 +1200
commit81beb5afb946d8c9ccfa2bbdfcfe884771a5bd3b (patch)
treece4d0b24f1c82381da30472844052f8cfdc1a164 /src/org/traccar/protocol/TeltonikaProtocolDecoder.java
parentf367b71b9c081416f6d64f6efd9844cd05f047ea (diff)
downloadtrackermap-server-81beb5afb946d8c9ccfa2bbdfcfe884771a5bd3b.tar.gz
trackermap-server-81beb5afb946d8c9ccfa2bbdfcfe884771a5bd3b.tar.bz2
trackermap-server-81beb5afb946d8c9ccfa2bbdfcfe884771a5bd3b.zip
Fix extended info XML format
Diffstat (limited to 'src/org/traccar/protocol/TeltonikaProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/TeltonikaProtocolDecoder.java19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
index 100792cb9..4d9e72588 100644
--- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -26,6 +26,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.traccar.BaseProtocolDecoder;
import org.traccar.ServerManager;
import org.traccar.helper.Log;
+import org.traccar.model.ExtendedInfoFormatter;
import org.traccar.model.Position;
public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
@@ -65,32 +66,26 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
for (int i = 0; i < count; i++) {
Position position = new Position();
- StringBuilder extendedInfo = new StringBuilder("<protocol>teltonika</protocol>");
+ ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("teltonika");
position.setDeviceId(deviceId);
position.setTime(new Date(buf.readLong()));
-
- extendedInfo.append("<priority>");
- extendedInfo.append(buf.readUnsignedByte());
- extendedInfo.append("</priority>");
+
+ extendedInfo.set("priority", buf.readUnsignedByte());
position.setLongitude(buf.readUnsignedInt() / 10000000.0);
position.setLatitude(buf.readUnsignedInt() / 10000000.0);
position.setAltitude((double) buf.readUnsignedShort());
position.setCourse((double) buf.readUnsignedShort());
- extendedInfo.append("<satellites>");
int satellites = buf.readUnsignedByte();
- extendedInfo.append(satellites);
- extendedInfo.append("</satellites>");
+ extendedInfo.set("satellites", satellites);
position.setValid(satellites != 0);
position.setSpeed((double) buf.readUnsignedShort());
-
- extendedInfo.append("<event>");
- extendedInfo.append(buf.readUnsignedByte());
- extendedInfo.append("</event>");
+
+ extendedInfo.set("event", buf.readUnsignedByte());
// Skip IO data
buf.readUnsignedByte(); // total IO data records