diff options
author | Abyss777 <abyss@fox5.ru> | 2017-08-17 10:10:05 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-08-17 10:10:05 +0500 |
commit | 1324c00d0ece6e20545fb75f7775a2c6cee2a391 (patch) | |
tree | 775ad2a42ebba160d1e36be38c59384cd1da5a1e /src/org/traccar/events/IgnitionEventHandler.java | |
parent | 9476e6be8fae228cda5867750bc4d102b1f9497d (diff) | |
download | trackermap-server-1324c00d0ece6e20545fb75f7775a2c6cee2a391.tar.gz trackermap-server-1324c00d0ece6e20545fb75f7775a2c6cee2a391.tar.bz2 trackermap-server-1324c00d0ece6e20545fb75f7775a2c6cee2a391.zip |
Pass Map<Event, Position> to notifications
Diffstat (limited to 'src/org/traccar/events/IgnitionEventHandler.java')
-rw-r--r-- | src/org/traccar/events/IgnitionEventHandler.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java index 5519135bf..cc53b216c 100644 --- a/src/org/traccar/events/IgnitionEventHandler.java +++ b/src/org/traccar/events/IgnitionEventHandler.java @@ -16,8 +16,8 @@ */ package org.traccar.events; -import java.util.Collection; import java.util.Collections; +import java.util.Map; import org.traccar.BaseEventHandler; import org.traccar.Context; @@ -28,13 +28,13 @@ import org.traccar.model.Position; public class IgnitionEventHandler extends BaseEventHandler { @Override - protected Collection<Event> analyzePosition(Position position) { + protected Map<Event, Position> analyzePosition(Position position) { Device device = Context.getIdentityManager().getById(position.getDeviceId()); if (device == null || !Context.getIdentityManager().isLatestPosition(position)) { return null; } - Collection<Event> result = null; + Map<Event, Position> result = null; if (position.getAttributes().containsKey(Position.KEY_IGNITION)) { boolean ignition = position.getBoolean(Position.KEY_IGNITION); @@ -44,11 +44,11 @@ public class IgnitionEventHandler extends BaseEventHandler { boolean oldIgnition = lastPosition.getBoolean(Position.KEY_IGNITION); if (ignition && !oldIgnition) { - result = Collections.singleton( - new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId())); + result = Collections.singletonMap( + new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId()), position); } else if (!ignition && oldIgnition) { - result = Collections.singleton( - new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId())); + result = Collections.singletonMap( + new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId()), position); } } } |