From e0a4ed2a60fd1a38a904fa7156afba6c0aee1cdb Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 20 Sep 2016 17:14:13 +0500
Subject: Add parameter "report.ignoreOdometer"

---
 src/org/traccar/reports/Summary.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/reports/Summary.java')

diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
index 44fb1dd4c..79e1a7c05 100644
--- a/src/org/traccar/reports/Summary.java
+++ b/src/org/traccar/reports/Summary.java
@@ -24,6 +24,7 @@ import javax.json.Json;
 import javax.json.JsonArrayBuilder;
 
 import org.traccar.Context;
+import org.traccar.model.Device;
 import org.traccar.model.Position;
 import org.traccar.reports.model.SummaryReport;
 import org.traccar.web.CsvBuilder;
@@ -35,9 +36,11 @@ public final class Summary {
     }
 
     private static SummaryReport calculateSummaryResult(long deviceId, Date from, Date to) throws SQLException {
+        boolean ignoreOdometerConfig = Context.getConfig().getBoolean(ReportUtils.IGNORE_ODOMETER);
         SummaryReport result = new SummaryReport();
+        Device device = Context.getDeviceManager().getDeviceById(deviceId);
         result.setDeviceId(deviceId);
-        result.setDeviceName(Context.getDeviceManager().getDeviceById(deviceId).getName());
+        result.setDeviceName(device.getName());
         Collection<Position> positions = Context.getDataManager().getPositions(deviceId, from, to);
         if (positions != null && !positions.isEmpty()) {
             Position firstPosition = null;
@@ -60,7 +63,14 @@ public final class Summary {
                 speedSum += position.getSpeed();
                 result.setMaxSpeed(position.getSpeed());
             }
-            result.setDistance(ReportUtils.calculateDistance(firstPosition, previousPosition));
+            boolean ignoreOdometer = false;
+            if (device.getAttributes().containsKey(ReportUtils.IGNORE_ODOMETER)) {
+                ignoreOdometer = Boolean.parseBoolean(device.getAttributes()
+                        .get(ReportUtils.IGNORE_ODOMETER).toString());
+            } else {
+                ignoreOdometer = ignoreOdometerConfig;
+            }
+            result.setDistance(ReportUtils.calculateDistance(firstPosition, previousPosition, !ignoreOdometer));
             result.setAverageSpeed(speedSum / positions.size());
         }
         return result;
-- 
cgit v1.2.3