2 files changed, 54 insertions, 22 deletions

diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index 228b43c0f..ed21d7b83 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -77,7 +77,8 @@ public class MotionEventHandler extends BaseEventHandler {
     @Override
     protected Collection<Event> analyzePosition(Position position) {
 
-        Device device = Context.getIdentityManager().getById(position.getDeviceId());
+        long deviceId = position.getDeviceId();
+        Device device = Context.getIdentityManager().getById(deviceId);
         if (device == null) {
             return null;
         }
@@ -86,14 +87,9 @@ public class MotionEventHandler extends BaseEventHandler {
         }
 
         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) {
+        if (deviceState.getMotionState() == null) {
             deviceState.setMotionState(position.getBoolean(Position.KEY_MOTION));
         } else {
             result = updateMotionState(deviceState, position, tripsConfig);
diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java
index 795892f40..3b91fed4d 100644
--- a/src/org/traccar/events/OverspeedEventHandler.java
+++ b/src/org/traccar/events/OverspeedEventHandler.java
@@ -21,6 +21,7 @@ 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;
 
@@ -29,15 +30,51 @@ public class OverspeedEventHandler extends BaseEventHandler {
     public static final String ATTRIBUTE_SPEED_LIMIT = "speedLimit";
 
     private boolean notRepeat;
+    private long minimalDuration;
 
     public OverspeedEventHandler() {
         notRepeat = Context.getConfig().getBoolean("event.overspeed.notRepeat");
+        minimalDuration = Context.getConfig().getLong("event.overspeed.minimalDuration") * 1000;
+    }
+
+    public static Event updateOverspeedState(DeviceState deviceState, Position position, double speedLimit,
+            long minimalOverspeedDuration, boolean notRepeat) {
+        Event result = null;
+
+        Boolean oldOverspeed = deviceState.getOverspeedState();
+
+        long currentTime = position.getFixTime().getTime();
+        boolean newOverspeed = position.getSpeed() > speedLimit;
+        if (newOverspeed && !oldOverspeed) {
+            if (deviceState.getOverspeedPosition() == null) {
+                deviceState.setOverspeedPosition(position);
+            }
+        } else if (oldOverspeed && !newOverspeed) {
+            deviceState.setOverspeedState(false);
+            deviceState.setOverspeedPosition(null);
+        } else {
+            deviceState.setOverspeedPosition(null);
+        }
+        Position overspeedPosition = deviceState.getOverspeedPosition();
+        if (overspeedPosition != null) {
+            long overspeedTime = overspeedPosition.getFixTime().getTime();
+            if (newOverspeed && overspeedTime + minimalOverspeedDuration <= currentTime) {
+                result = new Event(Event.TYPE_DEVICE_OVERSPEED, overspeedPosition.getDeviceId(),
+                        overspeedPosition.getId());
+                result.set("speed", overspeedPosition.getSpeed());
+                result.set(ATTRIBUTE_SPEED_LIMIT, speedLimit);
+                deviceState.setOverspeedState(notRepeat);
+                deviceState.setOverspeedPosition(null);
+            }
+        }
+        return result;
     }
 
     @Override
     protected Collection<Event> analyzePosition(Position position) {
 
-        Device device = Context.getIdentityManager().getById(position.getDeviceId());
+        long deviceId = position.getDeviceId();
+        Device device = Context.getIdentityManager().getById(deviceId);
         if (device == null) {
             return null;
         }
@@ -45,24 +82,23 @@ public class OverspeedEventHandler extends BaseEventHandler {
             return null;
         }
 
-        double speed = position.getSpeed();
-        double speedLimit = Context.getDeviceManager()
-                .lookupAttributeDouble(device.getId(), ATTRIBUTE_SPEED_LIMIT, 0, false);
+        double speedLimit = Context.getDeviceManager().lookupAttributeDouble(deviceId, ATTRIBUTE_SPEED_LIMIT, 0, false);
         if (speedLimit == 0) {
             return null;
         }
-        double oldSpeed = 0;
-        if (notRepeat) {
-            Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-            if (lastPosition != null) {
-                oldSpeed = lastPosition.getSpeed();
-            }
+
+        Event result = null;
+        DeviceState deviceState = Context.getDeviceManager().getDeviceState(deviceId);
+
+        if (deviceState.getOverspeedState() == null) {
+            deviceState.setOverspeedState(position.getSpeed() > speedLimit);
+        } else {
+            result = updateOverspeedState(deviceState, position, speedLimit, minimalDuration, notRepeat);
         }
-        if (speed > speedLimit && oldSpeed <= speedLimit) {
-            Event event = new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId());
-            event.set("speed", speed);
-            event.set(ATTRIBUTE_SPEED_LIMIT, speedLimit);
-            return Collections.singleton(event);
+
+        Context.getDeviceManager().setDeviceState(deviceId, deviceState);
+        if (result != null) {
+            return Collections.singleton(result);
         }
         return null;
     }