diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2020-10-06 14:23:35 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2020-10-06 14:23:35 -0700 |
| commit | 87e9932ff6eec10dec78300cd9fb2532d1bfa538 (patch) | |
| tree | 6a178241d476cb96386f1590b5acf9490b6b654f /src/main/java/org/traccar/reports/ReportUtils.java | |
| parent | aefc503d5fe01b7ec92bd4af7a57c45bc922aaa1 (diff) | |
| download | traccar-server-87e9932ff6eec10dec78300cd9fb2532d1bfa538.tar.gz traccar-server-87e9932ff6eec10dec78300cd9fb2532d1bfa538.tar.bz2 traccar-server-87e9932ff6eec10dec78300cd9fb2532d1bfa538.zip | |
Remove legacy code
Diffstat (limited to 'src/main/java/org/traccar/reports/ReportUtils.java')
| -rw-r--r-- | src/main/java/org/traccar/reports/ReportUtils.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/main/java/org/traccar/reports/ReportUtils.java b/src/main/java/org/traccar/reports/ReportUtils.java index c60c6ba1e..9a22b5f9b 100644 --- a/src/main/java/org/traccar/reports/ReportUtils.java +++ b/src/main/java/org/traccar/reports/ReportUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 2020 Anton Tananaev (anton@traccar.org) * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -263,21 +263,10 @@ public final class ReportUtils { stop.setDuration(stopDuration); stop.setSpentFuel(calculateFuel(startStop, endStop)); - long engineHours = 0; if (startStop.getAttributes().containsKey(Position.KEY_HOURS) && endStop.getAttributes().containsKey(Position.KEY_HOURS)) { - engineHours = endStop.getLong(Position.KEY_HOURS) - startStop.getLong(Position.KEY_HOURS); - } else if (Context.getConfig().getBoolean("processing.engineHours.enable")) { - // Temporary fallback for old data, to be removed in May 2019 - for (int i = startIndex + 1; i <= endIndex; i++) { - if (positions.get(i).getBoolean(Position.KEY_IGNITION) - && positions.get(i - 1).getBoolean(Position.KEY_IGNITION)) { - engineHours += positions.get(i).getFixTime().getTime() - - positions.get(i - 1).getFixTime().getTime(); - } - } + stop.setEngineHours(endStop.getLong(Position.KEY_HOURS) - startStop.getLong(Position.KEY_HOURS)); } - stop.setEngineHours(engineHours); if (!ignoreOdometer && startStop.getDouble(Position.KEY_ODOMETER) != 0 |