aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/events/MotionEventHandler.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-30 12:07:43 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-30 12:07:43 +0500
commit80119f59a0d4b89396f5d7d57ba2d80257a8da79 (patch)
treef8a55519dac687f9d9f1518f16c148310a915353 /src/org/traccar/events/MotionEventHandler.java
parent6e00239038002aa383cce39be7f53b85f3d03a94 (diff)
downloadtrackermap-server-80119f59a0d4b89396f5d7d57ba2d80257a8da79.tar.gz
trackermap-server-80119f59a0d4b89396f5d7d57ba2d80257a8da79.tar.bz2
trackermap-server-80119f59a0d4b89396f5d7d57ba2d80257a8da79.zip
- Style fixes (use lower camel case in all cases)
- Added TYPE_prefix for event.type strings - Removed commented code - Removed "database.selectLastEvents" because it is not cross-database. Do the same via code.
Diffstat (limited to 'src/org/traccar/events/MotionEventHandler.java')
-rw-r--r--src/org/traccar/events/MotionEventHandler.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index d4dd12a39..a3b81ddc4 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -12,10 +12,10 @@ import org.traccar.model.Position;
public class MotionEventHandler extends BaseEventHandler {
private static final double SPEED_THRESHOLD = 0.01;
- private long suppressRepeated;
+ private int suppressRepeated;
public MotionEventHandler() {
- suppressRepeated = Context.getConfig().getLong("event.suppressrepeated", 60);
+ suppressRepeated = Context.getConfig().getInteger("event.suppressRepeated", 60);
}
@Override
@@ -35,10 +35,10 @@ public class MotionEventHandler extends BaseEventHandler {
String motion = device.getMotion();
if (valid && speed > SPEED_THRESHOLD && !motion.equals(Device.STATUS_MOVING)) {
Context.getConnectionManager().updateDevice(position.getDeviceId(), Device.STATUS_MOVING, null);
- event = new Event(Event.DEVICE_MOVING, position.getDeviceId(), position.getId());
+ event = new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId());
} else if (valid && speed < SPEED_THRESHOLD && motion.equals(Device.STATUS_MOVING)) {
Context.getConnectionManager().updateDevice(position.getDeviceId(), Device.STATUS_STOPPED, null);
- event = new Event(Event.DEVICE_STOPPED, position.getDeviceId(), position.getId());
+ event = new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId());
}
try {
if (event != null && !Context.getDataManager().getLastEvents(