From b1d5a5cfd165d2b52cf4dcdc57a6825e0ff1db8f Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Fri, 16 Jun 2017 11:42:35 +0500
Subject: Remove intermediate functions

---
 src/org/traccar/DistanceHandler.java | 8 ++------
 src/org/traccar/MotionHandler.java   | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/org')

diff --git a/src/org/traccar/DistanceHandler.java b/src/org/traccar/DistanceHandler.java
index fdf9847a7..0ab2d9048 100644
--- a/src/org/traccar/DistanceHandler.java
+++ b/src/org/traccar/DistanceHandler.java
@@ -31,7 +31,8 @@ public class DistanceHandler extends BaseDataHandler {
         return null;
     }
 
-    public Position calculateDistance(Position position) {
+    @Override
+    protected Position handlePosition(Position position) {
 
         double distance = 0.0;
         double totalDistance = 0.0;
@@ -59,9 +60,4 @@ public class DistanceHandler extends BaseDataHandler {
         return position;
     }
 
-    @Override
-    protected Position handlePosition(Position position) {
-        return calculateDistance(position);
-    }
-
 }
diff --git a/src/org/traccar/MotionHandler.java b/src/org/traccar/MotionHandler.java
index fa3d51858..901965dd5 100644
--- a/src/org/traccar/MotionHandler.java
+++ b/src/org/traccar/MotionHandler.java
@@ -26,16 +26,12 @@ public class MotionHandler extends BaseDataHandler {
         this.speedThreshold = speedThreshold;
     }
 
-    public Position calculateMotion(Position position) {
+    @Override
+    protected Position handlePosition(Position position) {
         if (!position.getAttributes().containsKey(Position.KEY_MOTION)) {
             position.set(Position.KEY_MOTION, position.getSpeed() > speedThreshold);
         }
         return position;
     }
 
-    @Override
-    protected Position handlePosition(Position position) {
-        return calculateMotion(position);
-    }
-
 }
-- 
cgit v1.2.3