diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-11 23:37:16 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 23:37:16 +1200 |
| commit | 30e8409375f9992a5248f7e2597691c0ee08188c (patch) | |
| tree | ea51b7d111cfae849d23941ad82045139e87520b /src/org/traccar/reports/Trips.java | |
| parent | 3562e0d927d539a1e9730c48ed376ee84ebc2b25 (diff) | |
| parent | 26db3ccc2ed5d43a0e791a29d5cc4afca192e4b7 (diff) | |
| download | trackermap-server-30e8409375f9992a5248f7e2597691c0ee08188c.tar.gz trackermap-server-30e8409375f9992a5248f7e2597691c0ee08188c.tar.bz2 trackermap-server-30e8409375f9992a5248f7e2597691c0ee08188c.zip | |
Merge pull request #3431 from Abyss777/delayed_overspeed
Implement delayed overspeed events
Diffstat (limited to 'src/org/traccar/reports/Trips.java')
| -rw-r--r-- | src/org/traccar/reports/Trips.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java index 6b97507f4..a4dcf00f1 100644 --- a/src/org/traccar/reports/Trips.java +++ b/src/org/traccar/reports/Trips.java @@ -32,7 +32,6 @@ import org.traccar.model.Group; import org.traccar.reports.model.BaseReport; import org.traccar.reports.model.DeviceReport; import org.traccar.reports.model.TripReport; -import org.traccar.reports.model.TripsConfig; public final class Trips { @@ -42,13 +41,11 @@ public final class Trips { private static Collection<TripReport> detectTrips(long deviceId, Date from, Date to) throws SQLException { double speedThreshold = Context.getConfig().getDouble("event.motion.speedThreshold", 0.01); - TripsConfig tripsConfig = ReportUtils.initTripsConfig(); - boolean ignoreOdometer = Context.getDeviceManager() .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, true); - Collection<? extends BaseReport> result = ReportUtils.detectTripsAndStops(tripsConfig, - ignoreOdometer, speedThreshold, + Collection<? extends BaseReport> result = ReportUtils.detectTripsAndStops( + Context.getTripsConfig(), ignoreOdometer, speedThreshold, Context.getDataManager().getPositions(deviceId, from, to), true); return (Collection<TripReport>) result; |