From 6ab8d0aaa66f0ea0b4533db47123dc3c8e8ec5b8 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 25 Jan 2017 18:08:44 +0500
Subject: Rise ignition events only if both positions has ignition attribute

---
 src/org/traccar/events/IgnitionEventHandler.java | 29 ++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

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

diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java
index 8464c3aef..187b7ce73 100644
--- a/src/org/traccar/events/IgnitionEventHandler.java
+++ b/src/org/traccar/events/IgnitionEventHandler.java
@@ -39,20 +39,21 @@ public class IgnitionEventHandler extends BaseEventHandler {
 
         Collection<Event> result = null;
 
-        boolean ignition = position.getBoolean(Position.KEY_IGNITION);
-
-        boolean oldIgnition = false;
-        Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-        if (lastPosition != null) {
-            oldIgnition = lastPosition.getBoolean(Position.KEY_IGNITION);
-        }
-
-        if (ignition && !oldIgnition) {
-            result = Collections.singleton(
-                    new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId()));
-        } else if (!ignition && oldIgnition) {
-            result = Collections.singleton(
-                    new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId()));
+        if (position.getAttributes().containsKey(Position.KEY_IGNITION)) {
+            boolean ignition = position.getBoolean(Position.KEY_IGNITION);
+
+            Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
+            if (lastPosition != null && lastPosition.getAttributes().containsKey(Position.KEY_IGNITION)) {
+                boolean oldIgnition = lastPosition.getBoolean(Position.KEY_IGNITION);
+
+                if (ignition && !oldIgnition) {
+                    result = Collections.singleton(
+                            new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId()));
+                } else if (!ignition && oldIgnition) {
+                    result = Collections.singleton(
+                            new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId()));
+                }
+            }
         }
         return result;
     }
-- 
cgit v1.2.3