aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/events/MotionEventHandler.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-25 23:53:44 +1200
committerGitHub <noreply@github.com>2016-07-25 23:53:44 +1200
commit7e20896334f4f6927cf14c5272cf7d893efc3a05 (patch)
tree4ce04313dde4989a4c5b16816ddfeab1a6381876 /src/org/traccar/events/MotionEventHandler.java
parent8c4eb2eff9da9bf0538e413444c1e6dae981b99e (diff)
parent80847cc39a0570a91618c2d9da283767a99fd975 (diff)
downloadtrackermap-server-7e20896334f4f6927cf14c5272cf7d893efc3a05.tar.gz
trackermap-server-7e20896334f4f6927cf14c5272cf7d893efc3a05.tar.bz2
trackermap-server-7e20896334f4f6927cf14c5272cf7d893efc3a05.zip
Merge pull request #2149 from Abyss777/lastposition_reorganization
Move lastPosition update to the end of pipeline
Diffstat (limited to 'src/org/traccar/events/MotionEventHandler.java')
-rw-r--r--src/org/traccar/events/MotionEventHandler.java20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index 4a3d2f0f0..4b652a727 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -28,7 +28,7 @@ import org.traccar.model.Position;
public class MotionEventHandler extends BaseEventHandler {
- private static final double SPEED_THRESHOLD = 0.01;
+ private static final double SPEED_THRESHOLD = 0.01;
private int suppressRepeated;
public MotionEventHandler() {
@@ -42,26 +42,22 @@ public class MotionEventHandler extends BaseEventHandler {
if (device == null) {
return null;
}
- if (position.getId() != device.getPositionId() || !position.getValid()) {
+ if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
return null;
}
Collection<Event> result = null;
double speed = position.getSpeed();
- boolean valid = position.getValid();
- String motion = device.getMotion();
- if (motion == null) {
- motion = Device.STATUS_STOPPED;
+ double oldSpeed = 0;
+ Position lastPosition = Context.getDeviceManager().getLastPosition(position.getDeviceId());
+ if (lastPosition != null) {
+ oldSpeed = lastPosition.getSpeed();
}
try {
- if (valid && speed > SPEED_THRESHOLD && !motion.equals(Device.STATUS_MOVING)) {
- device.setMotion(Device.STATUS_MOVING);
- Context.getDeviceManager().updateDeviceStatus(device);
+ if (speed > SPEED_THRESHOLD && oldSpeed <= SPEED_THRESHOLD) {
result = new ArrayList<>();
result.add(new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId()));
- } else if (valid && speed < SPEED_THRESHOLD && motion.equals(Device.STATUS_MOVING)) {
- device.setMotion(Device.STATUS_STOPPED);
- Context.getDeviceManager().updateDeviceStatus(device);
+ } else if (speed <= SPEED_THRESHOLD && oldSpeed > SPEED_THRESHOLD) {
result = new ArrayList<>();
result.add(new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId()));
}