1 files changed, 64 insertions, 11 deletions

diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index ed81176a8..9168d0fd8 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -21,11 +21,60 @@ import java.util.Collections;
 import org.traccar.BaseEventHandler;
 import org.traccar.Context;
 import org.traccar.model.Device;
+import org.traccar.model.DeviceState;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
+import org.traccar.reports.ReportUtils;
+import org.traccar.reports.model.TripsConfig;
 
 public class MotionEventHandler extends BaseEventHandler {
 
+    private TripsConfig tripsConfig;
+
+    public MotionEventHandler() {
+        if (Context.getConfig() != null) {
+            tripsConfig = ReportUtils.initTripsConfig();
+        }
+    }
+
+    public static Event updateMotionState(DeviceState deviceState, Position position, TripsConfig tripsConfig) {
+        Event result = null;
+        Boolean oldMotion = deviceState.getMotionState();
+
+        long currentTime = position.getFixTime().getTime();
+        boolean newMotion = position.getBoolean(Position.KEY_MOTION);
+        if (newMotion != oldMotion) {
+            if (deviceState.getMotionPosition() == null) {
+                deviceState.setMotionPosition(position);
+            }
+        } else {
+            deviceState.setMotionPosition(null);
+        }
+
+        Position potentialPosition = deviceState.getMotionPosition();
+        if (potentialPosition != null) {
+            long potentialTime = potentialPosition.getFixTime().getTime();
+            double distance = ReportUtils.calculateDistance(potentialPosition, position, false);
+            if (newMotion) {
+                if (potentialTime + tripsConfig.getMinimalTripDuration() <= currentTime
+                        || distance >= tripsConfig.getMinimalTripDistance()) {
+                    result = new Event(Event.TYPE_DEVICE_MOVING, potentialPosition.getDeviceId(),
+                            potentialPosition.getId());
+                    deviceState.setMotionState(true);
+                    deviceState.setMotionPosition(null);
+                }
+            } else {
+                if (potentialTime + tripsConfig.getMinimalParkingDuration() <= currentTime) {
+                    result = new Event(Event.TYPE_DEVICE_STOPPED, potentialPosition.getDeviceId(),
+                            potentialPosition.getId());
+                    deviceState.setMotionState(false);
+                    deviceState.setMotionPosition(null);
+                }
+            }
+        }
+        return result;
+    }
+
     @Override
     protected Collection<Event> analyzePosition(Position position) {
 
@@ -37,18 +86,22 @@ public class MotionEventHandler extends BaseEventHandler {
             return null;
         }
 
-        boolean motion = position.getBoolean(Position.KEY_MOTION);
-        boolean oldMotion = false;
-        Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-        if (lastPosition != null) {
-            oldMotion = lastPosition.getBoolean(Position.KEY_MOTION);
+        Event result = null;
+
+        long deviceId = position.getDeviceId();
+        DeviceState deviceState = Context.getDeviceManager().getDeviceState(deviceId);
+
+        if (deviceState == null) {
+            deviceState = new DeviceState();
+            deviceState.setMotionState(position.getBoolean(Position.KEY_MOTION));
+        } else if (deviceState.getMotionState() == null) {
+            deviceState.setMotionState(position.getBoolean(Position.KEY_MOTION));
+        } else {
+            result = updateMotionState(deviceState, position, tripsConfig);
         }
-        if (motion && !oldMotion) {
-            return Collections.singleton(
-                    new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId()));
-        } else if (!motion && oldMotion) {
-            return Collections.singleton(
-                    new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId()));
+        Context.getDeviceManager().setDeviceState(deviceId, deviceState);
+        if (result != null) {
+            return Collections.singleton(result);
         }
         return null;
     }