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/TotemProtocolDecoder.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/TotemProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/TotemProtocolDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java index 72c0f6306..e7a689a8b 100644 --- a/src/org/traccar/protocol/TotemProtocolDecoder.java +++ b/src/org/traccar/protocol/TotemProtocolDecoder.java @@ -252,7 +252,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { } position.set(Position.PREFIX_TEMP + 1, parser.next()); - position.set(Position.KEY_ODOMETER, parser.next()); + position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000); } else if (pattern == PATTERN3) { if (parser.hasNext()) { @@ -314,7 +314,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble())); position.set(Position.KEY_HDOP, parser.nextDouble()); - position.set(Position.KEY_ODOMETER, parser.nextInt()); + position.set(Position.KEY_ODOMETER, parser.nextInt() * 1000); position.setValid(true); position.setLatitude(parser.nextCoordinate()); |