aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/CoordinatesHandler.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-06-20 13:44:35 +0500
committerAbyss777 <abyss@fox5.ru>2017-06-20 13:46:21 +0500
commit9129b6f4eb6ab58a83107e47c888bb4a3bbf0f90 (patch)
tree825c03638ad5f3fb73016035c35c97523edc8784 /src/org/traccar/CoordinatesHandler.java
parent6f569b6d62b110c2679772c4a56122db6a614ed9 (diff)
downloadtrackermap-server-9129b6f4eb6ab58a83107e47c888bb4a3bbf0f90.tar.gz
trackermap-server-9129b6f4eb6ab58a83107e47c888bb4a3bbf0f90.tar.bz2
trackermap-server-9129b6f4eb6ab58a83107e47c888bb4a3bbf0f90.zip
- Combine 'DistanceHandler' and 'CoordinatesHandler'
- Move 'DistanceHandler' closer to beginning of pipeline - Use KEY_DISTANCE instead of distance recalculation
Diffstat (limited to 'src/org/traccar/CoordinatesHandler.java')
-rw-r--r--src/org/traccar/CoordinatesHandler.java55
1 files changed, 0 insertions, 55 deletions
diff --git a/src/org/traccar/CoordinatesHandler.java b/src/org/traccar/CoordinatesHandler.java
deleted file mode 100644
index 80a423da1..000000000
--- a/src/org/traccar/CoordinatesHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar;
-
-import org.traccar.helper.DistanceCalculator;
-import org.traccar.model.Position;
-
-public class CoordinatesHandler extends BaseDataHandler {
-
- private final int coordinatesMinError;
- private final int coordinatesMaxError;
-
- public CoordinatesHandler() {
- Config config = Context.getConfig();
- coordinatesMinError = config.getInteger("coordinates.minError");
- coordinatesMaxError = config.getInteger("coordinates.maxError");
- }
-
- private Position getLastPosition(long deviceId) {
- if (Context.getIdentityManager() != null) {
- return Context.getIdentityManager().getLastPosition(deviceId);
- }
- return null;
- }
-
- @Override
- protected Position handlePosition(Position position) {
- Position last = getLastPosition(position.getDeviceId());
- if (last != null && last.getValid() && last.getLatitude() != 0 && last.getLongitude() != 0) {
- double distance = DistanceCalculator.distance(
- position.getLatitude(), position.getLongitude(), last.getLatitude(), last.getLongitude());
- 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());
- }
- }
- return position;
- }
-
-}