Merge branch 'master' of https://github.com/tananaev/traccar

Conflicts:
	src/org/traccar/database/DataManager.java

3 files changed, 118 insertions, 0 deletions

diff --git a/src/org/traccar/events/CommandResultEventHandler.java b/src/org/traccar/events/CommandResultEventHandler.java
new file mode 100644
index 000000000..23c62566a
--- /dev/null
+++ b/src/org/traccar/events/CommandResultEventHandler.java
@@ -0,0 +1,18 @@
+package org.traccar.events;
+
+import org.traccar.BaseEventHandler;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class CommandResultEventHandler extends BaseEventHandler {
+
+    @Override
+    protected Event analizePosition(Position position) {
+        Object commandResult = position.getAttributes().get(Position.KEY_RESULT);
+        if (commandResult != null) {
+            return new Event(Event.TYPE_COMMAND_RESULT, position.getDeviceId(), position.getId());
+        }
+        return null;
+    }
+
+}
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
new file mode 100644
index 000000000..a3b81ddc4
--- /dev/null
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -0,0 +1,55 @@
+package org.traccar.events;
+
+import java.sql.SQLException;
+
+import org.traccar.BaseEventHandler;
+import org.traccar.Context;
+import org.traccar.helper.Log;
+import org.traccar.model.Device;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class MotionEventHandler extends BaseEventHandler {
+
+    private static final double SPEED_THRESHOLD  = 0.01;
+    private int suppressRepeated;
+
+    public MotionEventHandler() {
+        suppressRepeated = Context.getConfig().getInteger("event.suppressRepeated", 60);
+    }
+
+    @Override
+    protected Event analizePosition(Position position) {
+        Event event = null;
+
+        if (!isLastPosition()) {
+            return event;
+        }
+
+        double speed = position.getSpeed();
+        boolean valid = position.getValid();
+        Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId());
+        if (device == null) {
+            return event;
+        }
+        String motion = device.getMotion();
+        if (valid && speed > SPEED_THRESHOLD && !motion.equals(Device.STATUS_MOVING)) {
+            Context.getConnectionManager().updateDevice(position.getDeviceId(), Device.STATUS_MOVING, null);
+            event = new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId());
+        } else if (valid && speed < SPEED_THRESHOLD && motion.equals(Device.STATUS_MOVING)) {
+            Context.getConnectionManager().updateDevice(position.getDeviceId(), Device.STATUS_STOPPED, null);
+            event = new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId());
+        }
+        try {
+            if (event != null && !Context.getDataManager().getLastEvents(
+                    position.getDeviceId(), event.getType(), suppressRepeated).isEmpty()) {
+                event = null;
+            }
+
+        } catch (SQLException error) {
+            Log.warning(error);
+        }
+        return event;
+    }
+
+}
diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java
new file mode 100644
index 000000000..30410ff32
--- /dev/null
+++ b/src/org/traccar/events/OverspeedEventHandler.java
@@ -0,0 +1,45 @@
+package org.traccar.events;
+
+import java.sql.SQLException;
+
+import org.traccar.BaseEventHandler;
+import org.traccar.Context;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+import org.traccar.helper.Log;
+import org.traccar.helper.UnitsConverter;
+
+public class OverspeedEventHandler extends BaseEventHandler {
+
+    private double globalSpeedLimit;
+    private int suppressRepeated;
+
+    public OverspeedEventHandler() {
+        globalSpeedLimit = UnitsConverter.knotsFromKph(Context.getConfig().getInteger("event.globalSpeedLimit", 0));
+        suppressRepeated = Context.getConfig().getInteger("event.suppressRepeated", 60);
+    }
+
+    @Override
+    protected Event analizePosition(Position position) {
+        Event event = null;
+        if (!isLastPosition()) {
+            return event;
+        }
+        double speed = position.getSpeed();
+        boolean valid = position.getValid();
+
+        if (valid && globalSpeedLimit != 0 && speed > globalSpeedLimit) {
+            try {
+                if (Context.getDataManager().getLastEvents(
+                        position.getDeviceId(), Event.TYPE_DEVICE_OVERSPEED, suppressRepeated).isEmpty()) {
+                    event = new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId());
+                }
+            } catch (SQLException error) {
+                Log.warning(error);
+            }
+
+        }
+        return event;
+    }
+
+}