diff options
| author | duke2906 <philipp.prangenberg@gmail.com> | 2016-09-26 15:09:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 15:09:20 +0200 |
| commit | 960bf899414d89221e92138fdb98777c3f4f73ec (patch) | |
| tree | 87f5fd96185aa5f2fff0f84e2e2fa8be379ee837 /src/org/traccar/reports/Trips.java | |
| parent | 0d3c05a24992eeeba02032e474d3a9bbb3239f10 (diff) | |
| parent | aaec58aec04256845dc37afd713b488071b1406b (diff) | |
| download | traccar-server-960bf899414d89221e92138fdb98777c3f4f73ec.tar.gz traccar-server-960bf899414d89221e92138fdb98777c3f4f73ec.tar.bz2 traccar-server-960bf899414d89221e92138fdb98777c3f4f73ec.zip | |
Merge pull request #1 from tananaev/master
Update Changes, including version 3.7
Diffstat (limited to 'src/org/traccar/reports/Trips.java')
| -rw-r--r-- | src/org/traccar/reports/Trips.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java index 2171d5f93..f0a10edbd 100644 --- a/src/org/traccar/reports/Trips.java +++ b/src/org/traccar/reports/Trips.java @@ -53,15 +53,16 @@ public final class Trips { long tripDuration = endTrip.getFixTime().getTime() - positions.get(startIndex).getFixTime().getTime(); long deviceId = startTrip.getDeviceId(); trip.setDeviceId(deviceId); - String deviceName = Context.getDeviceManager().getDeviceById(deviceId).getName(); - trip.setDeviceName(deviceName); + trip.setDeviceName(Context.getIdentityManager().getDeviceById(deviceId).getName()); trip.setStartPositionId(startTrip.getId()); trip.setStartTime(startTrip.getFixTime()); trip.setStartAddress(startTrip.getAddress()); trip.setEndPositionId(endTrip.getId()); trip.setEndTime(endTrip.getFixTime()); trip.setEndAddress(endTrip.getAddress()); - trip.setDistance(ReportUtils.calculateDistance(startTrip, endTrip)); + boolean ignoreOdometer = Context.getDeviceManager() + .lookupConfigBoolean(deviceId, "report.ignoreOdometer", false); + trip.setDistance(ReportUtils.calculateDistance(startTrip, endTrip, !ignoreOdometer)); trip.setDuration(tripDuration); trip.setAverageSpeed(speedSum / (endIndex - startIndex)); trip.setMaxSpeed(speedMax); |