aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/Context.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-08-15 16:04:41 +0500
committerAbyss777 <abyss@fox5.ru>2017-08-15 16:04:41 +0500
commit4d7805f783f00914a289b2447521a2f467de87bc (patch)
tree819d1a56dbbdd9c3badb379337da16d9dd487a54 /src/org/traccar/Context.java
parent9b9c715cf0d9604be71a35e5e6e5428a3a891ba9 (diff)
parent5606c72b19568ddf50e2fa35f35e05358bb671e4 (diff)
downloadtrackermap-server-4d7805f783f00914a289b2447521a2f467de87bc.tar.gz
trackermap-server-4d7805f783f00914a289b2447521a2f467de87bc.tar.bz2
trackermap-server-4d7805f783f00914a289b2447521a2f467de87bc.zip
Merge remote-tracking branch 'upstream/master' into new_trips_detector
Diffstat (limited to 'src/org/traccar/Context.java')
-rw-r--r--src/org/traccar/Context.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 0d2a05b7a..10fdd9f29 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -255,7 +255,8 @@ public final class Context {
config.getLong("report.trip.minimalTripDistance", 500),
config.getLong("report.trip.minimalTripDuration", 300) * 1000,
config.getLong("report.trip.minimalParkingDuration", 300) * 1000,
- config.getLong("report.trip.minimalNoDataDuration", 3600) * 1000);
+ config.getLong("report.trip.minimalNoDataDuration", 3600) * 1000,
+ config.getBoolean("report.trip.useIgnition"));
}
public static void init(String[] arguments) throws Exception {