- Combine 'DistanceHandler' and 'CoordinatesHandler'

- Move 'DistanceHandler' closer to beginning of pipeline
- Use KEY_DISTANCE instead of distance recalculation

1 files changed, 8 insertions, 1 deletions

diff --git a/test/org/traccar/DistanceHandlerTest.java b/test/org/traccar/DistanceHandlerTest.java
index 66b2f3d1c..c97135074 100644
--- a/test/org/traccar/DistanceHandlerTest.java
+++ b/test/org/traccar/DistanceHandlerTest.java
@@ -10,13 +10,20 @@ public class DistanceHandlerTest {
     @Test
     public void testCalculateDistance() throws Exception {
 
-        DistanceHandler distanceHandler = new DistanceHandler();
+        DistanceHandler distanceHandler = new DistanceHandler(false, 0, 0);
 
         Position position = distanceHandler.handlePosition(new Position());
 
         assertEquals(0.0, position.getAttributes().get(Position.KEY_DISTANCE));
         assertEquals(0.0, position.getAttributes().get(Position.KEY_TOTAL_DISTANCE));
 
+        position.set(Position.KEY_DISTANCE, 100);
+
+        position = distanceHandler.handlePosition(position);
+
+        assertEquals(100.0, position.getAttributes().get(Position.KEY_DISTANCE));
+        assertEquals(100.0, position.getAttributes().get(Position.KEY_TOTAL_DISTANCE));
+
     }
 
 }