aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-24 11:17:49 +0500
committerAbyss777 <abyss@fox5.ru>2016-11-24 11:17:49 +0500
commit7113cff737831d239d30edea7d0661ad89499198 (patch)
tree61ecefcefa066fb40f017c05e969bc4efe1f8d4c /src/org/traccar/reports
parent3e1a25b54ab342bedc8d688bb6ccb3c2d6c60d0c (diff)
downloadtrackermap-server-7113cff737831d239d30edea7d0661ad89499198.tar.gz
trackermap-server-7113cff737831d239d30edea7d0661ad89499198.tar.bz2
trackermap-server-7113cff737831d239d30edea7d0661ad89499198.zip
Combine lookupAttribute helpers
Diffstat (limited to 'src/org/traccar/reports')
-rw-r--r--src/org/traccar/reports/Summary.java2
-rw-r--r--src/org/traccar/reports/Trips.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
index 4d6446017..7fc064ac2 100644
--- a/src/org/traccar/reports/Summary.java
+++ b/src/org/traccar/reports/Summary.java
@@ -60,7 +60,7 @@ public final class Summary {
result.setMaxSpeed(position.getSpeed());
}
boolean ignoreOdometer = Context.getDeviceManager()
- .lookupConfigBoolean(deviceId, "report.ignoreOdometer", false);
+ .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, false);
result.setDistance(ReportUtils.calculateDistance(firstPosition, previousPosition, !ignoreOdometer));
result.setAverageSpeed(speedSum / positions.size());
}
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index 1c2ba3fe3..134fd4969 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -80,7 +80,7 @@ public final class Trips {
trip.setEndAddress(endTrip.getAddress());
boolean ignoreOdometer = Context.getDeviceManager()
- .lookupConfigBoolean(deviceId, "report.ignoreOdometer", false);
+ .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, false);
trip.setDistance(ReportUtils.calculateDistance(startTrip, endTrip, !ignoreOdometer));
trip.setDuration(tripDuration);
trip.setAverageSpeed(speedSum / (endIndex - startIndex));