From fbe0190e65ee0646f6521cfca31ecfa3efa10472 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 21 Sep 2016 14:10:58 +0500
Subject: Implement lookup attribute helpers for primitives

---
 src/org/traccar/reports/Summary.java | 10 +++-------
 src/org/traccar/reports/Trips.java   | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/org/traccar/reports')

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());
         }
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index c4a7f2c8f..f0a10edbd 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -53,19 +53,15 @@ public final class Trips {
         long tripDuration = endTrip.getFixTime().getTime() - positions.get(startIndex).getFixTime().getTime();
         long deviceId = startTrip.getDeviceId();
         trip.setDeviceId(deviceId);
-        trip.setDeviceName(Context.getDeviceManager().getDeviceById(deviceId).getName());
+        trip.setDeviceName(Context.getIdentityManager().getDeviceById(deviceId).getName());
         trip.setStartPositionId(startTrip.getId());
         trip.setStartTime(startTrip.getFixTime());
         trip.setStartAddress(startTrip.getAddress());
         trip.setEndPositionId(endTrip.getId());
         trip.setEndTime(endTrip.getFixTime());
         trip.setEndAddress(endTrip.getAddress());
-        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);
         trip.setDistance(ReportUtils.calculateDistance(startTrip, endTrip, !ignoreOdometer));
         trip.setDuration(tripDuration);
         trip.setAverageSpeed(speedSum / (endIndex - startIndex));
-- 
cgit v1.2.3