aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-10-25 20:44:24 +1300
committerGitHub <noreply@github.com>2016-10-25 20:44:24 +1300
commit968e77c5c4a8f79f1069dde4fe19a1b86f8c9a6c (patch)
treecf8b07ae54c707f01aebda44c1f076cb04d35a86
parent607d7229c7d6fee9e97fd1204016b6dda59f9be6 (diff)
parent55ec26e048eb9cd635bedf07726ab206e8b8536f (diff)
downloadtraccar-server-968e77c5c4a8f79f1069dde4fe19a1b86f8c9a6c.tar.gz
traccar-server-968e77c5c4a8f79f1069dde4fe19a1b86f8c9a6c.tar.bz2
traccar-server-968e77c5c4a8f79f1069dde4fe19a1b86f8c9a6c.zip
Merge pull request #2481 from Abyss777/coordinates
Add exclusion for valid positions to CoordinatesHandler
-rw-r--r--src/org/traccar/CoordinatesHandler.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/org/traccar/CoordinatesHandler.java b/src/org/traccar/CoordinatesHandler.java
index 7d1c43284..b9c33dc2b 100644
--- a/src/org/traccar/CoordinatesHandler.java
+++ b/src/org/traccar/CoordinatesHandler.java
@@ -25,8 +25,8 @@ public class CoordinatesHandler extends BaseDataHandler {
public CoordinatesHandler() {
Config config = Context.getConfig();
- coordinatesMinError = config.getInteger("coordinates.minError", 50);
- coordinatesMaxError = config.getInteger("coordinates.maxError", 1000000);
+ coordinatesMinError = config.getInteger("coordinates.minError");
+ coordinatesMaxError = config.getInteger("coordinates.maxError");
}
private Position getLastPosition(long deviceId) {
@@ -39,10 +39,12 @@ public class CoordinatesHandler extends BaseDataHandler {
@Override
protected Position handlePosition(Position position) {
Position last = getLastPosition(position.getDeviceId());
- if (last != null) {
+ if (last != null && last.getValid() && last.getLatitude() != 0 && last.getLongitude() != 0) {
double distance = DistanceCalculator.distance(
position.getLatitude(), position.getLongitude(), last.getLatitude(), last.getLongitude());
- if (distance < coordinatesMinError || distance > coordinatesMaxError) {
+ 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());
}