aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports/Summary.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-09-21 14:10:58 +0500
committerAbyss777 <abyss@fox5.ru>2016-09-21 14:10:58 +0500
commitfbe0190e65ee0646f6521cfca31ecfa3efa10472 (patch)
treef645e0e2eecfcd385bfebeb224fc66092ec5c20c /src/org/traccar/reports/Summary.java
parentd0ce4c7e8069fc4663e2d04f942d8f8989be2998 (diff)
downloadtrackermap-server-fbe0190e65ee0646f6521cfca31ecfa3efa10472.tar.gz
trackermap-server-fbe0190e65ee0646f6521cfca31ecfa3efa10472.tar.bz2
trackermap-server-fbe0190e65ee0646f6521cfca31ecfa3efa10472.zip
Implement lookup attribute helpers for primitives
Diffstat (limited to 'src/org/traccar/reports/Summary.java')
-rw-r--r--src/org/traccar/reports/Summary.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
index 763ddb600..d4171f644 100644
--- a/src/org/traccar/reports/Summary.java
+++ b/src/org/traccar/reports/Summary.java
@@ -37,7 +37,7 @@ public final class Summary {
private static SummaryReport calculateSummaryResult(long deviceId, Date from, Date to) throws SQLException {
SummaryReport result = new SummaryReport();
result.setDeviceId(deviceId);
- result.setDeviceName(Context.getDeviceManager().getDeviceById(deviceId).getName());
+ result.setDeviceName(Context.getIdentityManager().getDeviceById(deviceId).getName());
Collection<Position> positions = Context.getDataManager().getPositions(deviceId, from, to);
if (positions != null && !positions.isEmpty()) {
Position firstPosition = null;
@@ -60,12 +60,8 @@ public final class Summary {
speedSum += position.getSpeed();
result.setMaxSpeed(position.getSpeed());
}
- boolean ignoreOdometer = false;
- String ignoreOdometerAttribute = Context.getDeviceManager()
- .lookupConfigAttribute(deviceId, "report.ignoreOdometer");
- if (ignoreOdometerAttribute != null) {
- ignoreOdometer = Boolean.parseBoolean(ignoreOdometerAttribute);
- }
+ boolean ignoreOdometer = Context.getDeviceManager()
+ .lookupConfigBoolean(deviceId, "report.ignoreOdometer", false);
result.setDistance(ReportUtils.calculateDistance(firstPosition, previousPosition, !ignoreOdometer));
result.setAverageSpeed(speedSum / positions.size());
}