diff options
author | Abyss777 <abyss@fox5.ru> | 2016-08-23 11:03:31 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-08-23 11:03:31 +0500 |
commit | 16ae4c2e1b03c38f9f21791d844959764892f8d0 (patch) | |
tree | 217530ae767235624a6f8ff37c27e6d470086aa2 /src/org/traccar/protocol/NavisProtocolDecoder.java | |
parent | 6c6b62351aadd68928b9bd3e39e2bf96d78695e8 (diff) | |
download | trackermap-server-16ae4c2e1b03c38f9f21791d844959764892f8d0.tar.gz trackermap-server-16ae4c2e1b03c38f9f21791d844959764892f8d0.tar.bz2 trackermap-server-16ae4c2e1b03c38f9f21791d844959764892f8d0.zip |
- Fixed units of KEY_ODOMETER to meters in some protocols
- Fixed some wrong using of odometer and distance
- Waiting meters in ReportUtils.calculateDistance
Diffstat (limited to 'src/org/traccar/protocol/NavisProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/NavisProtocolDecoder.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/org/traccar/protocol/NavisProtocolDecoder.java index 72c5f53c3..03e578fe9 100644 --- a/src/org/traccar/protocol/NavisProtocolDecoder.java +++ b/src/org/traccar/protocol/NavisProtocolDecoder.java @@ -147,9 +147,8 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder { position.setSpeed(buf.readFloat()); position.setCourse(buf.readUnsignedShort()); - position.set(Position.KEY_ODOMETER, buf.readFloat()); - - position.set("segment", buf.readFloat()); // last segment + position.set(Position.KEY_ODOMETER, buf.readFloat() * 1000); + position.set(Position.KEY_DISTANCE, buf.readFloat()); // Segment times buf.readUnsignedShort(); |