aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/events
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-23 17:34:25 +0500
committerAbyss777 <abyss@fox5.ru>2016-11-23 17:34:25 +0500
commite89bbb8ee9dd1dd1f19fb33f1f9291c6ae5f43db (patch)
tree51376f73260c9bbc89064ba2b5f2a428b6d46785 /src/org/traccar/events
parentdbbe99269140f057d3f72acca557730a6b10e902 (diff)
downloadtraccar-server-e89bbb8ee9dd1dd1f19fb33f1f9291c6ae5f43db.tar.gz
traccar-server-e89bbb8ee9dd1dd1f19fb33f1f9291c6ae5f43db.tar.bz2
traccar-server-e89bbb8ee9dd1dd1f19fb33f1f9291c6ae5f43db.zip
Implement attributes helpers
Diffstat (limited to 'src/org/traccar/events')
-rw-r--r--src/org/traccar/events/IgnitionEventHandler.java12
-rw-r--r--src/org/traccar/events/MaintenanceEventHandler.java9
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;