Merge pull request #2593 from Abyss777/attributes_helpers

Attributes helpers

2 files changed, 5 insertions, 16 deletions

diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java
index b52083f57..3086adb13 100644
--- a/src/org/traccar/events/IgnitionEventHandler.java
+++ b/src/org/traccar/events/IgnitionEventHandler.java
@@ -39,20 +39,12 @@ public class IgnitionEventHandler extends BaseEventHandler {
 
         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 ignition = position.getBoolean(Position.KEY_IGNITION);
 
         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;
+            oldIgnition = lastPosition.getBoolean(Position.KEY_IGNITION);
         }
 
         if (ignition && !oldIgnition) {
diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java
index 466e0b617..f423e035b 100644
--- a/src/org/traccar/events/MaintenanceEventHandler.java
+++ b/src/org/traccar/events/MaintenanceEventHandler.java
@@ -50,13 +50,10 @@ public class MaintenanceEventHandler extends BaseEventHandler {
         double newTotalDistance = 0.0;
 
         Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-        if (lastPosition != null && lastPosition.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)) {
-            oldTotalDistance = ((Number) lastPosition.getAttributes().get(Position.KEY_TOTAL_DISTANCE)).doubleValue();
-        }
-
-        if (position.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)) {
-            newTotalDistance = ((Number) position.getAttributes().get(Position.KEY_TOTAL_DISTANCE)).doubleValue();
+        if (lastPosition != null) {
+            oldTotalDistance = lastPosition.getDouble(Position.KEY_TOTAL_DISTANCE);
         }
+        newTotalDistance = position.getDouble(Position.KEY_TOTAL_DISTANCE);
 
         oldTotalDistance -= maintenanceStart;
         newTotalDistance -= maintenanceStart;