aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/traccar/reports/CombinedReportProvider.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/reports/CombinedReportProvider.java b/src/main/java/org/traccar/reports/CombinedReportProvider.java
index afe146e91..923fd12b4 100644
--- a/src/main/java/org/traccar/reports/CombinedReportProvider.java
+++ b/src/main/java/org/traccar/reports/CombinedReportProvider.java
@@ -31,10 +31,13 @@ import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
+import java.util.Set;
import java.util.stream.Collectors;
public class CombinedReportProvider {
+ private static final Set<String> EXCLUDE_TYPES = Set.of(Event.TYPE_DEVICE_MOVING);
+
private final ReportUtils reportUtils;
private final Storage storage;
@@ -64,7 +67,7 @@ public class CombinedReportProvider {
new Condition.Between("eventTime", "from", from, "to", to)),
new Order("eventTime")));
item.setEvents(events.stream()
- .filter(p -> p.getPositionId() > 0)
+ .filter(e -> e.getPositionId() > 0 && !EXCLUDE_TYPES.contains(e.getType()))
.collect(Collectors.toList()));
var eventPositions = events.stream()
.map(Event::getPositionId)