diff options
author | Abyss777 <abyss@fox5.ru> | 2017-08-14 16:40:45 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-08-14 16:40:45 +0500 |
commit | fdc14dd2a286b7d9470ff97703d120c217a39dcb (patch) | |
tree | 70118d6bb9c4894d043d46c32cc4558f6a00bbd3 | |
parent | 8313471a752dc08e5e7a270349e9f03417672b08 (diff) | |
download | traccar-server-fdc14dd2a286b7d9470ff97703d120c217a39dcb.tar.gz traccar-server-fdc14dd2a286b7d9470ff97703d120c217a39dcb.tar.bz2 traccar-server-fdc14dd2a286b7d9470ff97703d120c217a39dcb.zip |
Rename parameter and field to "useIgnition"
-rw-r--r-- | src/org/traccar/Context.java | 2 | ||||
-rw-r--r-- | src/org/traccar/events/MotionEventHandler.java | 2 | ||||
-rw-r--r-- | src/org/traccar/reports/model/TripsConfig.java | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 61000172e..aa7e6acf9 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -257,7 +257,7 @@ public final class Context { config.getLong("report.trip.minimalParkingDuration", 300) * 1000, config.getBoolean("report.trip.greedyParking"), config.getLong("report.trip.minimalNoDataDuration", 3600) * 1000, - config.getBoolean("report.trip.stopOnIgnitionOff")); + config.getBoolean("report.trip.useIgnition")); } public static void init(String[] arguments) throws Exception { diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java index 208fd5b42..8c2d4c56c 100644 --- a/src/org/traccar/events/MotionEventHandler.java +++ b/src/org/traccar/events/MotionEventHandler.java @@ -79,7 +79,7 @@ public class MotionEventHandler extends BaseEventHandler { long motionTime = motionPosition.getFixTime().getTime(); double distance = ReportUtils.calculateDistance(motionPosition, position, false); Boolean ignition = null; - if (tripsConfig.getStopOnIgnitionOff() + if (tripsConfig.getUseIgnition() && position.getAttributes().containsKey(Position.KEY_IGNITION)) { ignition = position.getBoolean(Position.KEY_IGNITION); } diff --git a/src/org/traccar/reports/model/TripsConfig.java b/src/org/traccar/reports/model/TripsConfig.java index 039094b89..2e2403619 100644 --- a/src/org/traccar/reports/model/TripsConfig.java +++ b/src/org/traccar/reports/model/TripsConfig.java @@ -22,13 +22,13 @@ public class TripsConfig { } public TripsConfig(double minimalTripDistance, long minimalTripDuration, long minimalParkingDuration, - boolean greedyParking, long minimalNoDataDuration, boolean stopOnIgnitionOff) { + boolean greedyParking, long minimalNoDataDuration, boolean useIgnition) { this.minimalTripDistance = minimalTripDistance; this.minimalTripDuration = minimalTripDuration; this.minimalParkingDuration = minimalParkingDuration; this.greedyParking = greedyParking; this.minimalNoDataDuration = minimalNoDataDuration; - this.stopOnIgnitionOff = stopOnIgnitionOff; + this.useIgnition = useIgnition; } private double minimalTripDistance; @@ -81,14 +81,14 @@ public class TripsConfig { this.minimalNoDataDuration = minimalNoDataDuration; } - private boolean stopOnIgnitionOff; + private boolean useIgnition; - public boolean getStopOnIgnitionOff() { - return stopOnIgnitionOff; + public boolean getUseIgnition() { + return useIgnition; } - public void setStopOnIgnitionOff(boolean stopOnIgnitionOff) { - this.stopOnIgnitionOff = stopOnIgnitionOff; + public void setUseIgnition(boolean useIgnition) { + this.useIgnition = useIgnition; } } |