Merge pull request #3449 from Abyss777/load_position

Map correct position to delayed event notification

1 files changed, 4 insertions, 5 deletions

diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 6a5370d15..46aea0757 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -46,6 +46,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.TimeZone;
 
 public final class ReportUtils {
@@ -281,7 +282,7 @@ public final class ReportUtils {
             int startEventIndex = trips == deviceState.getMotionState() ? 0 : -1;
             int startNoEventIndex = -1;
             for (int i = 0; i < positions.size(); i++) {
-                Event event = motionHandler.updateMotionState(deviceState, positions.get(i),
+                Map<Event, Position> event = motionHandler.updateMotionState(deviceState, positions.get(i),
                         isMoving(positions, i, tripsConfig, speedThreshold));
                 if (deviceState.getMotionPosition() != null && startEventIndex == -1
                         && trips != deviceState.getMotionState()) {
@@ -302,12 +303,10 @@ public final class ReportUtils {
                     startEventIndex = -1;
                 }
             }
-            if (startEventIndex != -1) {
-                if (startNoEventIndex != -1 || !trips) {
-                    result.add(calculateTripOrStop(positions, startEventIndex,
+            if (startEventIndex != -1 && (startNoEventIndex != -1 || !trips)) {
+                result.add(calculateTripOrStop(positions, startEventIndex,
                             startNoEventIndex != -1 ? startNoEventIndex : positions.size() - 1,
                             ignoreOdometer, reportClass));
-                }
             }
         }
         return result;