Merge branch 'master' into master

1 files changed, 91 insertions, 18 deletions

diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index e6fd10f3e..0c1c4848f 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -1,5 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,42 +16,114 @@
  */
 package org.traccar.events;
 
-import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 
 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(TripsConfig tripsConfig) {
+        this.tripsConfig = tripsConfig;
+    }
+
+    private Map<Event, Position> newEvent(DeviceState deviceState, boolean newMotion) {
+        String eventType = newMotion ? Event.TYPE_DEVICE_MOVING : Event.TYPE_DEVICE_STOPPED;
+        Position position = deviceState.getMotionPosition();
+        Event event = new Event(eventType, position.getDeviceId(), position.getId());
+        deviceState.setMotionState(newMotion);
+        deviceState.setMotionPosition(null);
+        return Collections.singletonMap(event, position);
+    }
+
+    public Map<Event, Position> updateMotionState(DeviceState deviceState) {
+        Map<Event, Position> result = null;
+        if (deviceState.getMotionState() != null && deviceState.getMotionPosition() != null) {
+            boolean newMotion = !deviceState.getMotionState();
+            Position motionPosition = deviceState.getMotionPosition();
+            long currentTime = System.currentTimeMillis();
+            long motionTime = motionPosition.getFixTime().getTime()
+                    + (newMotion ? tripsConfig.getMinimalTripDuration() : tripsConfig.getMinimalParkingDuration());
+            if (motionTime <= currentTime) {
+                result = newEvent(deviceState, newMotion);
+            }
+        }
+        return result;
+    }
+
+    public Map<Event, Position> updateMotionState(DeviceState deviceState, Position position) {
+        return updateMotionState(deviceState, position, position.getBoolean(Position.KEY_MOTION));
+    }
+
+    public Map<Event, Position> updateMotionState(DeviceState deviceState, Position position, boolean newMotion) {
+        Map<Event, Position> result = null;
+        Boolean oldMotion = deviceState.getMotionState();
+
+        long currentTime = position.getFixTime().getTime();
+        if (newMotion != oldMotion) {
+            if (deviceState.getMotionPosition() == null) {
+                deviceState.setMotionPosition(position);
+            }
+        } else {
+            deviceState.setMotionPosition(null);
+        }
+
+        Position motionPosition = deviceState.getMotionPosition();
+        if (motionPosition != null) {
+            long motionTime = motionPosition.getFixTime().getTime();
+            double distance = ReportUtils.calculateDistance(motionPosition, position, false);
+            Boolean ignition = null;
+            if (tripsConfig.getUseIgnition()
+                    && position.getAttributes().containsKey(Position.KEY_IGNITION)) {
+                ignition = position.getBoolean(Position.KEY_IGNITION);
+            }
+            if (newMotion) {
+                if (motionTime + tripsConfig.getMinimalTripDuration() <= currentTime
+                        || distance >= tripsConfig.getMinimalTripDistance()) {
+                    result = newEvent(deviceState, newMotion);
+                }
+            } else {
+                if (motionTime + tripsConfig.getMinimalParkingDuration() <= currentTime
+                        || ignition != null && !ignition) {
+                    result = newEvent(deviceState, newMotion);
+                }
+            }
+        }
+        return result;
+    }
+
     @Override
-    protected Collection<Event> analyzePosition(Position position) {
+    protected Map<Event, Position> analyzePosition(Position position) {
 
-        Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId());
+        long deviceId = position.getDeviceId();
+        Device device = Context.getIdentityManager().getById(deviceId);
         if (device == null) {
             return null;
         }
-        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
+        if (!Context.getIdentityManager().isLatestPosition(position)
+                || !tripsConfig.getProcessInvalidPositions() && !position.getValid()) {
             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);
-        }
-        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()));
+        Map<Event, Position> result = null;
+        DeviceState deviceState = Context.getDeviceManager().getDeviceState(deviceId);
+
+        if (deviceState.getMotionState() == null) {
+            deviceState.setMotionState(position.getBoolean(Position.KEY_MOTION));
+        } else {
+            result = updateMotionState(deviceState, position);
         }
-        return null;
+        Context.getDeviceManager().setDeviceState(deviceId, deviceState);
+        return result;
     }
 
 }