diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-21 18:33:38 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-21 18:33:38 +1300 |
commit | 48f83827701d06c3c2eab7d051a5f011cc42f65d (patch) | |
tree | 8bdfcc28e5ff7644d8c00ba045cbe4520f04521d /src/org/traccar/events | |
parent | da094cc974c545424c843d44d27711ac014d533d (diff) | |
parent | 40b74ef0eb357c51034d38fd6ff135f28f5406a9 (diff) | |
download | traccar-server-48f83827701d06c3c2eab7d051a5f011cc42f65d.tar.gz traccar-server-48f83827701d06c3c2eab7d051a5f011cc42f65d.tar.bz2 traccar-server-48f83827701d06c3c2eab7d051a5f011cc42f65d.zip |
Merge pull request #2719 from Abyss777/additional_event_attributes
Add attributes to overspeed and maintenance events
Diffstat (limited to 'src/org/traccar/events')
-rw-r--r-- | src/org/traccar/events/MaintenanceEventHandler.java | 4 | ||||
-rw-r--r-- | src/org/traccar/events/OverspeedEventHandler.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java index 4d0d93080..86836f6af 100644 --- a/src/org/traccar/events/MaintenanceEventHandler.java +++ b/src/org/traccar/events/MaintenanceEventHandler.java @@ -58,7 +58,9 @@ public class MaintenanceEventHandler extends BaseEventHandler { newTotalDistance -= maintenanceStart; if ((long) (oldTotalDistance / maintenanceInterval) < (long) (newTotalDistance / maintenanceInterval)) { - return Collections.singleton(new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId())); + Event event = new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId()); + event.set(Position.KEY_TOTAL_DISTANCE, newTotalDistance); + return Collections.singleton(event); } return null; diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java index 67aa0e758..00c3845d2 100644 --- a/src/org/traccar/events/OverspeedEventHandler.java +++ b/src/org/traccar/events/OverspeedEventHandler.java @@ -59,8 +59,10 @@ public class OverspeedEventHandler extends BaseEventHandler { } } if (speed > speedLimit && oldSpeed <= speedLimit) { - return Collections.singleton( - new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId())); + Event event = new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId()); + event.set("speed", speed); + event.set(ATTRIBUTE_SPEED_LIMIT, speedLimit); + return Collections.singleton(event); } return null; } |