aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-09-20 17:14:13 +0500
committerAbyss777 <abyss@fox5.ru>2016-09-20 17:14:13 +0500
commite0a4ed2a60fd1a38a904fa7156afba6c0aee1cdb (patch)
treebf278adae8bcf10f5b7b19a6e60c1984f0c870c0
parent411edf2fecc6f5d2cceba20f06958f729ebcca54 (diff)
downloadtrackermap-server-e0a4ed2a60fd1a38a904fa7156afba6c0aee1cdb.tar.gz
trackermap-server-e0a4ed2a60fd1a38a904fa7156afba6c0aee1cdb.tar.bz2
trackermap-server-e0a4ed2a60fd1a38a904fa7156afba6c0aee1cdb.zip
Add parameter "report.ignoreOdometer"
-rw-r--r--src/org/traccar/reports/ReportUtils.java2
-rw-r--r--src/org/traccar/reports/Summary.java14
-rw-r--r--src/org/traccar/reports/Trips.java15
3 files changed, 26 insertions, 5 deletions
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 818920ad5..c973c3ff3 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -30,6 +30,8 @@ public final class ReportUtils {
private ReportUtils() {
}
+ public static final String IGNORE_ODOMETER = "report.ignoreOdometer";
+
public static Collection<Long> getDeviceList(Collection<Long> deviceIds, Collection<Long> groupIds) {
Collection<Long> result = new ArrayList<>();
result.addAll(deviceIds);
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;
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index 2171d5f93..514c5d1c4 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -25,6 +25,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.TripReport;
import org.traccar.web.CsvBuilder;
@@ -36,6 +37,7 @@ public final class Trips {
}
private static TripReport calculateTrip(ArrayList<Position> positions, int startIndex, int endIndex) {
+ boolean ignoreOdometerConfig = Context.getConfig().getBoolean(ReportUtils.IGNORE_ODOMETER);
Position startTrip = positions.get(startIndex);
Position endTrip = positions.get(endIndex);
@@ -53,15 +55,22 @@ public final class Trips {
long tripDuration = endTrip.getFixTime().getTime() - positions.get(startIndex).getFixTime().getTime();
long deviceId = startTrip.getDeviceId();
trip.setDeviceId(deviceId);
- String deviceName = Context.getDeviceManager().getDeviceById(deviceId).getName();
- trip.setDeviceName(deviceName);
+ Device device = Context.getDeviceManager().getDeviceById(deviceId);
+ trip.setDeviceName(device.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());
- trip.setDistance(ReportUtils.calculateDistance(startTrip, endTrip));
+ boolean ignoreOdometer = false;
+ if (device.getAttributes().containsKey(ReportUtils.IGNORE_ODOMETER)) {
+ ignoreOdometer = Boolean.parseBoolean(device.getAttributes()
+ .get(ReportUtils.IGNORE_ODOMETER).toString());
+ } else {
+ ignoreOdometer = ignoreOdometerConfig;
+ }
+ trip.setDistance(ReportUtils.calculateDistance(startTrip, endTrip, !ignoreOdometer));
trip.setDuration(tripDuration);
trip.setAverageSpeed(speedSum / (endIndex - startIndex));
trip.setMaxSpeed(speedMax);