Merge pull request #2206 from Abyss777/ignition

Ignition and Motor Hours

4 files changed, 73 insertions, 5 deletions

diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java
index a0291dcfa..6126331bd 100644
--- a/src/org/traccar/events/GeofenceEventHandler.java
+++ b/src/org/traccar/events/GeofenceEventHandler.java
@@ -40,7 +40,7 @@ public class GeofenceEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
+        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java
new file mode 100644
index 000000000..e241e450b
--- /dev/null
+++ b/src/org/traccar/events/IgnitionEventHandler.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.events;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.traccar.BaseEventHandler;
+import org.traccar.Context;
+import org.traccar.model.Device;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class IgnitionEventHandler extends BaseEventHandler {
+
+    @Override
+    protected Collection<Event> analyzePosition(Position position) {
+        Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId());
+        if (device == null) {
+            return null;
+        }
+        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
+            return null;
+        }
+
+        Collection<Event> result = null;
+
+        boolean ignition = false;
+        Object ignitionObject = position.getAttributes().get(Position.KEY_IGNITION);
+        if (ignitionObject != null && ignitionObject instanceof Boolean) {
+            ignition = (Boolean) ignitionObject;
+        }
+
+        boolean oldIgnition = false;
+        Object oldIgnitionObject = null;
+        Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
+        if (lastPosition != null) {
+            oldIgnitionObject = lastPosition.getAttributes().get(Position.KEY_IGNITION);
+        }
+        if (oldIgnitionObject != null && oldIgnitionObject instanceof Boolean) {
+            oldIgnition = (Boolean) oldIgnitionObject;
+        }
+
+        if (ignition && !oldIgnition) {
+            result = new ArrayList<>();
+            result.add(new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId()));
+        } else if (!ignition && oldIgnition) {
+            result = new ArrayList<>();
+            result.add(new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId()));
+        }
+        return result;
+    }
+
+}
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index ddb99185f..7178f7036 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -35,14 +35,14 @@ public class MotionEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
+        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
         Collection<Event> result = null;
         double speed = position.getSpeed();
         double oldSpeed = 0;
-        Position lastPosition = Context.getDeviceManager().getLastPosition(position.getDeviceId());
+        Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
         if (lastPosition != null) {
             oldSpeed = lastPosition.getSpeed();
         }
diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java
index dbdb01ffb..c739348eb 100644
--- a/src/org/traccar/events/OverspeedEventHandler.java
+++ b/src/org/traccar/events/OverspeedEventHandler.java
@@ -42,7 +42,7 @@ public class OverspeedEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
+        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
@@ -58,7 +58,7 @@ public class OverspeedEventHandler extends BaseEventHandler {
         }
         double oldSpeed = 0;
         if (notRepeat) {
-            Position lastPosition = Context.getDeviceManager().getLastPosition(position.getDeviceId());
+            Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
             if (lastPosition != null) {
                 oldSpeed = lastPosition.getSpeed();
             }