From f6333c73fe8bdd0027bb16a715193e1587b934a2 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 25 Jul 2016 08:59:36 +0500
Subject: - Move lastPosition update to the end of pipeline

- Optimize MotionEventHandler to do not use Device.motion
- Remove Device.motion from model and database
- some optimizations
---
 src/org/traccar/events/OverspeedEventHandler.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/org/traccar/events/OverspeedEventHandler.java')

diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java
index fd005e170..6c9b523f4 100644
--- a/src/org/traccar/events/OverspeedEventHandler.java
+++ b/src/org/traccar/events/OverspeedEventHandler.java
@@ -44,15 +44,14 @@ public class OverspeedEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (position.getId() != device.getPositionId() || !position.getValid()) {
+        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
         Collection<Event> events = new ArrayList<>();
         double speed = position.getSpeed();
-        boolean valid = position.getValid();
 
-        if (valid && globalSpeedLimit != 0 && speed > globalSpeedLimit) {
+        if (globalSpeedLimit != 0 && speed > globalSpeedLimit) {
             try {
                 if (Context.getDataManager().getLastEvents(
                         position.getDeviceId(), Event.TYPE_DEVICE_OVERSPEED, suppressRepeated).isEmpty()) {
-- 
cgit v1.2.3