diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-16 23:14:36 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 23:14:36 +1200 |
| commit | e8739edc4e2b3a945c2b0eeec6286f7ef59037cf (patch) | |
| tree | 4f804a49c612c38f73fab724e1ce982261238e78 /src/org/traccar/reports/Trips.java | |
| parent | 7820541530ea9891c001cbd8c53cc6340380a077 (diff) | |
| parent | 5d3eb5136b96c8667021ef4d9452b4008ff40e42 (diff) | |
| download | trackermap-server-e8739edc4e2b3a945c2b0eeec6286f7ef59037cf.tar.gz trackermap-server-e8739edc4e2b3a945c2b0eeec6286f7ef59037cf.tar.bz2 trackermap-server-e8739edc4e2b3a945c2b0eeec6286f7ef59037cf.zip | |
Merge pull request #3447 from Abyss777/new_trips_detector
Reimplement trips detector using MotionEventHandler
Diffstat (limited to 'src/org/traccar/reports/Trips.java')
| -rw-r--r-- | src/org/traccar/reports/Trips.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java index a4dcf00f1..1ee62e87c 100644 --- a/src/org/traccar/reports/Trips.java +++ b/src/org/traccar/reports/Trips.java @@ -29,7 +29,6 @@ import org.apache.poi.ss.util.WorkbookUtil; import org.traccar.Context; import org.traccar.model.Device; import org.traccar.model.Group; -import org.traccar.reports.model.BaseReport; import org.traccar.reports.model.DeviceReport; import org.traccar.reports.model.TripReport; @@ -44,11 +43,11 @@ public final class Trips { boolean ignoreOdometer = Context.getDeviceManager() .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, true); - Collection<? extends BaseReport> result = ReportUtils.detectTripsAndStops( - Context.getTripsConfig(), ignoreOdometer, speedThreshold, - Context.getDataManager().getPositions(deviceId, from, to), true); + Collection<TripReport> result = ReportUtils.detectTripsAndStops( + Context.getDataManager().getPositions(deviceId, from, to), + Context.getTripsConfig(), ignoreOdometer, speedThreshold, TripReport.class); - return (Collection<TripReport>) result; + return result; } public static Collection<TripReport> getObjects(long userId, Collection<Long> deviceIds, Collection<Long> groupIds, |