aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports/ReportUtils.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-08-23 11:03:31 +0500
committerAbyss777 <abyss@fox5.ru>2016-08-23 11:03:31 +0500
commit16ae4c2e1b03c38f9f21791d844959764892f8d0 (patch)
tree217530ae767235624a6f8ff37c27e6d470086aa2 /src/org/traccar/reports/ReportUtils.java
parent6c6b62351aadd68928b9bd3e39e2bf96d78695e8 (diff)
downloadtrackermap-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/reports/ReportUtils.java')
-rw-r--r--src/org/traccar/reports/ReportUtils.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 34f04ac87..67d577904 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -48,8 +48,7 @@ public final class ReportUtils {
if (useOdometer && firstPosition.getAttributes().containsKey(Position.KEY_ODOMETER)
&& lastPosition.getAttributes().containsKey(Position.KEY_ODOMETER)) {
distance = (((Number) lastPosition.getAttributes().get(Position.KEY_ODOMETER)).doubleValue()
- - ((Number) firstPosition.getAttributes().get(Position.KEY_ODOMETER)).doubleValue())
- * 1000;
+ - ((Number) firstPosition.getAttributes().get(Position.KEY_ODOMETER)).doubleValue());
} else if (firstPosition.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)
&& lastPosition.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)) {
distance = ((Number) lastPosition.getAttributes().get(Position.KEY_TOTAL_DISTANCE)).doubleValue()