diff options
author | Anton Tananaev <anton@traccar.org> | 2023-05-24 15:37:04 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2023-05-24 15:37:04 -0700 |
commit | 886efe231e79255aa86a0056e7bf912fff6069fb (patch) | |
tree | 74652c5077fa2849a08f8bc4569715c04fe96b36 /src/main/java/org/traccar/reports/common/ReportUtils.java | |
parent | d304c74cfc870d23718cb7aabfd6038492aade8b (diff) | |
download | trackermap-server-886efe231e79255aa86a0056e7bf912fff6069fb.tar.gz trackermap-server-886efe231e79255aa86a0056e7bf912fff6069fb.tar.bz2 trackermap-server-886efe231e79255aa86a0056e7bf912fff6069fb.zip |
Query positions in report utils
Diffstat (limited to 'src/main/java/org/traccar/reports/common/ReportUtils.java')
-rw-r--r-- | src/main/java/org/traccar/reports/common/ReportUtils.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/traccar/reports/common/ReportUtils.java b/src/main/java/org/traccar/reports/common/ReportUtils.java index 6c2d5cd72..a930f9439 100644 --- a/src/main/java/org/traccar/reports/common/ReportUtils.java +++ b/src/main/java/org/traccar/reports/common/ReportUtils.java @@ -58,7 +58,6 @@ import java.io.OutputStream; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; -import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Locale; @@ -291,14 +290,15 @@ public class ReportUtils { return positions.get(index).getBoolean(Position.KEY_MOTION); } - public <T extends BaseReportItem> Collection<T> detectTripsAndStops( - Device device, List<Position> positions, boolean ignoreOdometer, - Class<T> reportClass) throws StorageException { + public <T extends BaseReportItem> List<T> detectTripsAndStops( + Device device, Date from, Date to, Class<T> reportClass) throws StorageException { - Collection<T> result = new ArrayList<>(); + List<T> result = new ArrayList<>(); TripsConfig tripsConfig = new TripsConfig( new AttributeUtil.StorageProvider(config, storage, permissionsService, device)); + boolean ignoreOdometer = config.getBoolean(Keys.REPORT_IGNORE_ODOMETER); + var positions = PositionUtil.getPositions(storage, device.getId(), from, to); if (!positions.isEmpty()) { boolean trips = reportClass.equals(TripReportItem.class); |