aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/DistanceHandler.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-05-26 10:02:37 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2016-05-26 10:02:37 -0700
commitd3e34416e9825833fa1db02112c56981999df039 (patch)
treed21b4414b532bfc53c9a905f3caa09f70b43b59e /src/org/traccar/DistanceHandler.java
parentac2405f0d57fac51fe95aa755f90fe82f26f73bc (diff)
parentaa12e5c750e771016545269ffa39409b06b47eee (diff)
downloadtrackermap-server-d3e34416e9825833fa1db02112c56981999df039.tar.gz
trackermap-server-d3e34416e9825833fa1db02112c56981999df039.tar.bz2
trackermap-server-d3e34416e9825833fa1db02112c56981999df039.zip
Merge pull request #1978 from Abyss777/master
Simplification of the models hierarchy
Diffstat (limited to 'src/org/traccar/DistanceHandler.java')
-rw-r--r--src/org/traccar/DistanceHandler.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/org/traccar/DistanceHandler.java b/src/org/traccar/DistanceHandler.java
index c26ac786f..b22815033 100644
--- a/src/org/traccar/DistanceHandler.java
+++ b/src/org/traccar/DistanceHandler.java
@@ -17,7 +17,6 @@
package org.traccar;
import org.traccar.helper.DistanceCalculator;
-import org.traccar.model.Event;
import org.traccar.model.Position;
import java.math.BigDecimal;
@@ -38,8 +37,8 @@ public class DistanceHandler extends BaseDataHandler {
Position last = getLastPosition(position.getDeviceId());
if (last != null) {
- if (last.getAttributes().containsKey(Event.KEY_DISTANCE)) {
- distance = ((Number) last.getAttributes().get(Event.KEY_DISTANCE)).doubleValue();
+ if (last.getAttributes().containsKey(Position.KEY_DISTANCE)) {
+ distance = ((Number) last.getAttributes().get(Position.KEY_DISTANCE)).doubleValue();
}
if (position.getValid()) {
@@ -51,7 +50,7 @@ public class DistanceHandler extends BaseDataHandler {
}
}
- position.set(Event.KEY_DISTANCE, distance);
+ position.set(Position.KEY_DISTANCE, distance);
return position;
}