aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/CoordinatesHandler.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/org/traccar/CoordinatesHandler.java b/src/org/traccar/CoordinatesHandler.java
index 53b33ebbc..703361ecf 100644
--- a/src/org/traccar/CoordinatesHandler.java
+++ b/src/org/traccar/CoordinatesHandler.java
@@ -39,11 +39,12 @@ public class CoordinatesHandler extends BaseDataHandler {
@Override
protected Position handlePosition(Position position) {
Position last = getLastPosition(position.getDeviceId());
- if (last != null && last.getLatitude() != 0 && last.getLongitude() != 0) {
+ if (last != null && last.getValid() && last.getLatitude() != 0 && last.getLongitude() != 0) {
double distance = DistanceCalculator.distance(
position.getLatitude(), position.getLongitude(), last.getLatitude(), last.getLongitude());
- if (coordinatesMinError != 0 && distance < coordinatesMinError
- || coordinatesMaxError != 0 && distance > coordinatesMaxError && !position.getValid()) {
+ boolean satisfiesMin = coordinatesMinError == 0 || distance > coordinatesMinError;
+ boolean satisfiesMax = coordinatesMaxError == 0 || distance < coordinatesMaxError || position.getValid();
+ if (!(satisfiesMin && satisfiesMax)) {
position.setLatitude(last.getLatitude());
position.setLongitude(last.getLongitude());
}