aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/events
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-09-22 14:22:01 +1200
committerGitHub <noreply@github.com>2017-09-22 14:22:01 +1200
commita6fa965fd1d7fc55c891f9bba4913fcfe68b086c (patch)
treef840a542096c653d7dafc6df37645893d423d9d1 /src/org/traccar/events
parent76639c6b2284a5dfc4b45c17e533788dd739bcf1 (diff)
parent36ad4ac525b8eb25ac1c2eed8c05d690754399c5 (diff)
downloadtrackermap-server-a6fa965fd1d7fc55c891f9bba4913fcfe68b086c.tar.gz
trackermap-server-a6fa965fd1d7fc55c891f9bba4913fcfe68b086c.tar.bz2
trackermap-server-a6fa965fd1d7fc55c891f9bba4913fcfe68b086c.zip
Merge pull request #3540 from Abyss777/check_valid_optional
Make check for valid in MotionEventHandler optional
Diffstat (limited to 'src/org/traccar/events')
-rw-r--r--src/org/traccar/events/FuelDropEventHandler.java2
-rw-r--r--src/org/traccar/events/MotionEventHandler.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/events/FuelDropEventHandler.java b/src/org/traccar/events/FuelDropEventHandler.java
index 4fc512162..2ee3e1a58 100644
--- a/src/org/traccar/events/FuelDropEventHandler.java
+++ b/src/org/traccar/events/FuelDropEventHandler.java
@@ -35,7 +35,7 @@ public class FuelDropEventHandler extends BaseEventHandler {
if (device == null) {
return null;
}
- if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
+ if (!Context.getIdentityManager().isLatestPosition(position)) {
return null;
}
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index ae64c10ea..0c1c4848f 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -109,7 +109,8 @@ public class MotionEventHandler extends BaseEventHandler {
if (device == null) {
return null;
}
- if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
+ if (!Context.getIdentityManager().isLatestPosition(position)
+ || !tripsConfig.getProcessInvalidPositions() && !position.getValid()) {
return null;
}