diff options
author | Abyss777 <abyss@fox5.ru> | 2016-11-24 11:46:28 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-11-24 11:46:28 +0500 |
commit | 1424c2048346206f750bd68232ba6e2cbe1545e9 (patch) | |
tree | c708c8f12342c33070d5f8ee0fe0a31034aa2664 /src/org/traccar/reports | |
parent | 7113cff737831d239d30edea7d0661ad89499198 (diff) | |
download | trackermap-server-1424c2048346206f750bd68232ba6e2cbe1545e9.tar.gz trackermap-server-1424c2048346206f750bd68232ba6e2cbe1545e9.tar.bz2 trackermap-server-1424c2048346206f750bd68232ba6e2cbe1545e9.zip |
- Invert variable meaning
- Style fixes
Diffstat (limited to 'src/org/traccar/reports')
-rw-r--r-- | src/org/traccar/reports/Summary.java | 2 | ||||
-rw-r--r-- | src/org/traccar/reports/Trips.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java index 7fc064ac2..cacb4d1d6 100644 --- a/src/org/traccar/reports/Summary.java +++ b/src/org/traccar/reports/Summary.java @@ -60,7 +60,7 @@ public final class Summary { result.setMaxSpeed(position.getSpeed()); } boolean ignoreOdometer = Context.getDeviceManager() - .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, false); + .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, true); result.setDistance(ReportUtils.calculateDistance(firstPosition, previousPosition, !ignoreOdometer)); result.setAverageSpeed(speedSum / positions.size()); } diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java index 134fd4969..d4e25f5e5 100644 --- a/src/org/traccar/reports/Trips.java +++ b/src/org/traccar/reports/Trips.java @@ -80,7 +80,7 @@ public final class Trips { trip.setEndAddress(endTrip.getAddress()); boolean ignoreOdometer = Context.getDeviceManager() - .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, false); + .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, true); trip.setDistance(ReportUtils.calculateDistance(startTrip, endTrip, !ignoreOdometer)); trip.setDuration(tripDuration); trip.setAverageSpeed(speedSum / (endIndex - startIndex)); |