aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-10-25 09:26:32 +0500
committerAbyss777 <abyss@fox5.ru>2016-10-25 09:26:32 +0500
commit5c3ddc72a207bf67a7c4e4229aa1783dbb20d070 (patch)
treee4ab984ef94706a1593c9fdb8620f90f0c534c18
parent6f4a47f11f52358c6a843da775d855619e2ee4f5 (diff)
downloadtraccar-server-5c3ddc72a207bf67a7c4e4229aa1783dbb20d070.tar.gz
traccar-server-5c3ddc72a207bf67a7c4e4229aa1783dbb20d070.tar.bz2
traccar-server-5c3ddc72a207bf67a7c4e4229aa1783dbb20d070.zip
Remove default values and improve the logic
-rw-r--r--src/org/traccar/CoordinatesHandler.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/traccar/CoordinatesHandler.java b/src/org/traccar/CoordinatesHandler.java
index ad445bc28..53b33ebbc 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,11 @@ public class CoordinatesHandler extends BaseDataHandler {
@Override
protected Position handlePosition(Position position) {
Position last = getLastPosition(position.getDeviceId());
- if (last != null) {
+ if (last != null && last.getLatitude() != 0 && last.getLongitude() != 0) {
double distance = DistanceCalculator.distance(
position.getLatitude(), position.getLongitude(), last.getLatitude(), last.getLongitude());
- if (distance < coordinatesMinError || distance > coordinatesMaxError && !position.getValid()) {
+ if (coordinatesMinError != 0 && distance < coordinatesMinError
+ || coordinatesMaxError != 0 && distance > coordinatesMaxError && !position.getValid()) {
position.setLatitude(last.getLatitude());
position.setLongitude(last.getLongitude());
}