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/GeofenceEventHandler.java  |  2 +-
 src/org/traccar/events/MotionEventHandler.java    | 18 +++++++-----------
 src/org/traccar/events/OverspeedEventHandler.java |  5 ++---
 3 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/org/traccar/events')

diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java
index 1ea7aee41..a9bed6f82 100644
--- a/src/org/traccar/events/GeofenceEventHandler.java
+++ b/src/org/traccar/events/GeofenceEventHandler.java
@@ -47,7 +47,7 @@ public class GeofenceEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (position.getId() != device.getPositionId() || !position.getValid()) {
+        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index 4a3d2f0f0..7957f3570 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -42,26 +42,22 @@ public class MotionEventHandler 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> result = null;
         double speed = position.getSpeed();
-        boolean valid = position.getValid();
-        String motion = device.getMotion();
-        if (motion == null) {
-            motion = Device.STATUS_STOPPED;
+        double oldSpeed = 0;
+        Position lastPosition = Context.getDeviceManager().getLastPosition(position.getDeviceId());
+        if (lastPosition != null) {
+            oldSpeed = lastPosition.getSpeed();
         }
         try {
-            if (valid && speed > SPEED_THRESHOLD && !motion.equals(Device.STATUS_MOVING)) {
-                device.setMotion(Device.STATUS_MOVING);
-                Context.getDeviceManager().updateDeviceStatus(device);
+            if (speed > SPEED_THRESHOLD && oldSpeed <= SPEED_THRESHOLD) {
                 result = new ArrayList<>();
                 result.add(new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId()));
-            } else if (valid && speed < SPEED_THRESHOLD && motion.equals(Device.STATUS_MOVING)) {
-                device.setMotion(Device.STATUS_STOPPED);
-                Context.getDeviceManager().updateDeviceStatus(device);
+            } else if (speed <= SPEED_THRESHOLD && oldSpeed > SPEED_THRESHOLD) {
                 result = new ArrayList<>();
                 result.add(new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId()));
             }
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