From 2f3d3bce533b5fe7f5b4f530fa5360db2ba2262d Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 18 Dec 2016 10:28:51 +1300 Subject: Include data directly into events --- src/org/traccar/events/MotionEventHandler.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/org/traccar/events/MotionEventHandler.java') diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java index db19535a0..be8218985 100644 --- a/src/org/traccar/events/MotionEventHandler.java +++ b/src/org/traccar/events/MotionEventHandler.java @@ -15,8 +15,8 @@ */ package org.traccar.events; -import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import org.traccar.BaseEventHandler; import org.traccar.Context; @@ -43,7 +43,6 @@ public class MotionEventHandler extends BaseEventHandler { return null; } - Collection result = null; double speed = position.getSpeed(); double oldSpeed = 0; Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId()); @@ -51,13 +50,13 @@ public class MotionEventHandler extends BaseEventHandler { oldSpeed = lastPosition.getSpeed(); } if (speed > speedThreshold && oldSpeed <= speedThreshold) { - result = new ArrayList<>(); - result.add(new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId())); + return Collections.singleton( + new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId())); } else if (speed <= speedThreshold && oldSpeed > speedThreshold) { - result = new ArrayList<>(); - result.add(new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId())); + return Collections.singleton( + new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId())); } - return result; + return null; } } -- cgit v1.2.3