aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/events/MotionEventHandler.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-06-16 18:44:32 +1200
committerGitHub <noreply@github.com>2017-06-16 18:44:32 +1200
commitfe4ea97dabc55c4585d8b32bd4dae32cd255add3 (patch)
tree682c24e519446f419de1f01ac5e3879f49934a93 /src/org/traccar/events/MotionEventHandler.java
parent65bec416c56715cd4a24ef69f136e4f67be56851 (diff)
parentb1d5a5cfd165d2b52cf4dcdc57a6825e0ff1db8f (diff)
downloadtrackermap-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.tar.gz
trackermap-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.tar.bz2
trackermap-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.zip
Merge pull request #3256 from Abyss777/motion_detection
Centralized motion detection
Diffstat (limited to 'src/org/traccar/events/MotionEventHandler.java')
-rw-r--r--src/org/traccar/events/MotionEventHandler.java16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index be8218985..e6fd10f3e 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -26,12 +26,6 @@ import org.traccar.model.Position;
public class MotionEventHandler extends BaseEventHandler {
- private double speedThreshold;
-
- public MotionEventHandler() {
- speedThreshold = Context.getConfig().getDouble("event.motion.speedThreshold", 0.01);
- }
-
@Override
protected Collection<Event> analyzePosition(Position position) {
@@ -43,16 +37,16 @@ public class MotionEventHandler extends BaseEventHandler {
return null;
}
- double speed = position.getSpeed();
- double oldSpeed = 0;
+ boolean motion = position.getBoolean(Position.KEY_MOTION);
+ boolean oldMotion = false;
Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
if (lastPosition != null) {
- oldSpeed = lastPosition.getSpeed();
+ oldMotion = lastPosition.getBoolean(Position.KEY_MOTION);
}
- if (speed > speedThreshold && oldSpeed <= speedThreshold) {
+ if (motion && !oldMotion) {
return Collections.singleton(
new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId()));
- } else if (speed <= speedThreshold && oldSpeed > speedThreshold) {
+ } else if (!motion && oldMotion) {
return Collections.singleton(
new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId()));
}