From 5c3ddc72a207bf67a7c4e4229aa1783dbb20d070 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 25 Oct 2016 09:26:32 +0500 Subject: Remove default values and improve the logic --- src/org/traccar/CoordinatesHandler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/org/traccar/CoordinatesHandler.java') 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()); } -- cgit v1.2.3