diff options
| author | Abyss777 <abyss@fox5.ru> | 2017-08-14 15:34:48 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2017-08-15 15:01:47 +0500 |
| commit | f1ee1017d62ec0d1b6b1ca56c297537870f1d32b (patch) | |
| tree | 7a45608db55264fe7048c8097698717d235deabe /src/org/traccar/reports/Trips.java | |
| parent | 30e8409375f9992a5248f7e2597691c0ee08188c (diff) | |
| download | trackermap-server-f1ee1017d62ec0d1b6b1ca56c297537870f1d32b.tar.gz trackermap-server-f1ee1017d62ec0d1b6b1ca56c297537870f1d32b.tar.bz2 trackermap-server-f1ee1017d62ec0d1b6b1ca56c297537870f1d32b.zip | |
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..bb39cf493 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.detectTrips( + Context.getDataManager().getPositions(deviceId, from, to), + Context.getTripsConfig(), ignoreOdometer, speedThreshold); - return (Collection<TripReport>) result; + return result; } public static Collection<TripReport> getObjects(long userId, Collection<Long> deviceIds, Collection<Long> groupIds, |