From 16ae4c2e1b03c38f9f21791d844959764892f8d0 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 23 Aug 2016 11:03:31 +0500
Subject: - Fixed units of KEY_ODOMETER  to meters in some protocols

- Fixed some wrong using of odometer and distance
- Waiting meters in ReportUtils.calculateDistance
---
 src/org/traccar/protocol/NavisProtocolDecoder.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

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();
-- 
cgit v1.2.3