aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar
diff options
context:
space:
mode:
authorlukasha12 <66280366+lukasha12@users.noreply.github.com>2020-10-12 23:06:48 +0200
committerGitHub <noreply@github.com>2020-10-12 23:06:48 +0200
commitc92e60e464da718bf65638bfe514d0fa0192769a (patch)
tree673f01d303712b079937a1afb847efbaba722585 /src/main/java/org/traccar
parent852c87ba428274772ffc29cfe4ec9920184f4c38 (diff)
parent5f33f3d5848bb764fd5a676b83f882b78a636d09 (diff)
downloadtrackermap-server-c92e60e464da718bf65638bfe514d0fa0192769a.tar.gz
trackermap-server-c92e60e464da718bf65638bfe514d0fa0192769a.tar.bz2
trackermap-server-c92e60e464da718bf65638bfe514d0fa0192769a.zip
Merge pull request #1 from lukasha12/lukasha12-patch-1
FIX distance calculation.
Diffstat (limited to 'src/main/java/org/traccar')
-rw-r--r--src/main/java/org/traccar/reports/ReportUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/reports/ReportUtils.java b/src/main/java/org/traccar/reports/ReportUtils.java
index 9a22b5f9b..af686ba20 100644
--- a/src/main/java/org/traccar/reports/ReportUtils.java
+++ b/src/main/java/org/traccar/reports/ReportUtils.java
@@ -97,7 +97,7 @@ public final class ReportUtils {
double firstOdometer = firstPosition.getDouble(Position.KEY_ODOMETER);
double lastOdometer = lastPosition.getDouble(Position.KEY_ODOMETER);
- if (useOdometer && (firstOdometer != 0.0 || lastOdometer != 0.0)) {
+ if (useOdometer && firstOdometer != 0.0 && lastOdometer != 0.0) {
distance = lastOdometer - firstOdometer;
} else if (firstPosition.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)
&& lastPosition.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)) {