aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/DistanceHandler.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-11-24 16:49:54 +1300
committerGitHub <noreply@github.com>2016-11-24 16:49:54 +1300
commitebe64e810bd8e57a805a571cfd6110fbc3cd57c1 (patch)
tree90d8bb347c6081116df225d5c1e08f9469458675 /src/org/traccar/DistanceHandler.java
parent04f33e6ba29b3a73a65b081d2a8b6ac3e0e0ebee (diff)
parent03fb12d4a9453d6845198a167a70e720726df2e2 (diff)
downloadtrackermap-server-ebe64e810bd8e57a805a571cfd6110fbc3cd57c1.tar.gz
trackermap-server-ebe64e810bd8e57a805a571cfd6110fbc3cd57c1.tar.bz2
trackermap-server-ebe64e810bd8e57a805a571cfd6110fbc3cd57c1.zip
Merge pull request #2593 from Abyss777/attributes_helpers
Attributes helpers
Diffstat (limited to 'src/org/traccar/DistanceHandler.java')
-rw-r--r--src/org/traccar/DistanceHandler.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/org/traccar/DistanceHandler.java b/src/org/traccar/DistanceHandler.java
index 138fc85d6..fdf9847a7 100644
--- a/src/org/traccar/DistanceHandler.java
+++ b/src/org/traccar/DistanceHandler.java
@@ -38,9 +38,7 @@ public class DistanceHandler extends BaseDataHandler {
Position last = getLastPosition(position.getDeviceId());
if (last != null) {
- if (last.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)) {
- totalDistance = ((Number) last.getAttributes().get(Position.KEY_TOTAL_DISTANCE)).doubleValue();
- }
+ totalDistance = last.getDouble(Position.KEY_TOTAL_DISTANCE);
if (!position.getAttributes().containsKey(Position.KEY_DISTANCE)) {
distance = DistanceCalculator.distance(
@@ -49,7 +47,7 @@ public class DistanceHandler extends BaseDataHandler {
distance = BigDecimal.valueOf(distance).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
} else {
- distance = ((Number) position.getAttributes().get(Position.KEY_DISTANCE)).doubleValue();
+ distance = position.getDouble(Position.KEY_DISTANCE);
}
}
if (!position.getAttributes().containsKey(Position.KEY_DISTANCE)) {