Move speedThreshold to TripsConfig

6 files changed, 22 insertions, 15 deletions

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index ac1d450c5..771ab8acb 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -153,7 +153,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
                     Context.getConfig().getBoolean("geolocation.processInvalidPositions"));
         }
 
-        motionHandler = new MotionHandler(Context.getConfig().getDouble("event.motion.speedThreshold", 0.01));
+        motionHandler = new MotionHandler(Context.getTripsConfig().getSpeedThreshold());
 
         if (Context.getConfig().hasKey("location.latitudeHemisphere")
                 || Context.getConfig().hasKey("location.longitudeHemisphere")) {
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index cf857178f..3b24c6460 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -259,7 +259,8 @@ public final class Context {
                 config.getLong("report.trip.minimalParkingDuration", 300) * 1000,
                 config.getLong("report.trip.minimalNoDataDuration", 3600) * 1000,
                 config.getBoolean("report.trip.useIgnition"),
-                config.getBoolean("event.motion.processInvalidPositions"));
+                config.getBoolean("event.motion.processInvalidPositions"),
+                config.getDouble("event.motion.speedThreshold", 0.01));
     }
 
     public static void init(String[] arguments) throws Exception {
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 5f718feac..f6f386e99 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -253,8 +253,7 @@ public final class ReportUtils {
         }
     }
 
-    private static boolean isMoving(ArrayList<Position> positions, int index,
-            TripsConfig tripsConfig, double speedThreshold) {
+    private static boolean isMoving(ArrayList<Position> positions, int index, TripsConfig tripsConfig) {
         if (tripsConfig.getMinimalNoDataDuration() > 0) {
             boolean beforeGap = index < positions.size() - 1
                     && positions.get(index + 1).getFixTime().getTime() - positions.get(index).getFixTime().getTime()
@@ -270,12 +269,12 @@ public final class ReportUtils {
                 && positions.get(index).getAttributes().get(Position.KEY_MOTION) instanceof Boolean) {
             return positions.get(index).getBoolean(Position.KEY_MOTION);
         } else {
-            return positions.get(index).getSpeed() > speedThreshold;
+            return positions.get(index).getSpeed() > tripsConfig.getSpeedThreshold();
         }
     }
 
     public static <T extends BaseReport> Collection<T> detectTripsAndStops(Collection<Position> positionCollection,
-            TripsConfig tripsConfig, boolean ignoreOdometer, double speedThreshold, Class<T> reportClass) {
+            TripsConfig tripsConfig, boolean ignoreOdometer, Class<T> reportClass) {
         Collection<T> result = new ArrayList<>();
 
         ArrayList<Position> positions = new ArrayList<>(positionCollection);
@@ -283,12 +282,12 @@ public final class ReportUtils {
             boolean trips = reportClass.equals(TripReport.class);
             MotionEventHandler  motionHandler = new MotionEventHandler(tripsConfig);
             DeviceState deviceState = new DeviceState();
-            deviceState.setMotionState(isMoving(positions, 0, tripsConfig, speedThreshold));
+            deviceState.setMotionState(isMoving(positions, 0, tripsConfig));
             int startEventIndex = trips == deviceState.getMotionState() ? 0 : -1;
             int startNoEventIndex = -1;
             for (int i = 0; i < positions.size(); i++) {
                 Map<Event, Position> event = motionHandler.updateMotionState(deviceState, positions.get(i),
-                        isMoving(positions, i, tripsConfig, speedThreshold));
+                        isMoving(positions, i, tripsConfig));
                 if (startEventIndex == -1
                         && (trips != deviceState.getMotionState() && deviceState.getMotionPosition() != null
                         || trips == deviceState.getMotionState() && event != null)) {
diff --git a/src/org/traccar/reports/Stops.java b/src/org/traccar/reports/Stops.java
index 1e72cc927..14b3a2437 100644
--- a/src/org/traccar/reports/Stops.java
+++ b/src/org/traccar/reports/Stops.java
@@ -39,14 +39,12 @@ public final class Stops {
     }
 
     private static Collection<StopReport> detectStops(long deviceId, Date from, Date to) throws SQLException {
-        double speedThreshold = Context.getConfig().getDouble("event.motion.speedThreshold", 0.01);
-
         boolean ignoreOdometer = Context.getDeviceManager()
                 .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, true);
 
         Collection<StopReport> result = ReportUtils.detectTripsAndStops(
                 Context.getDataManager().getPositions(deviceId, from, to),
-                Context.getTripsConfig(), ignoreOdometer, speedThreshold, StopReport.class);
+                Context.getTripsConfig(), ignoreOdometer, StopReport.class);
 
         return result;
     }
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index 1ee62e87c..696defa94 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -38,14 +38,12 @@ public final class Trips {
     }
 
     private static Collection<TripReport> detectTrips(long deviceId, Date from, Date to) throws SQLException {
-        double speedThreshold = Context.getConfig().getDouble("event.motion.speedThreshold", 0.01);
-
         boolean ignoreOdometer = Context.getDeviceManager()
                 .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, true);
 
         Collection<TripReport> result = ReportUtils.detectTripsAndStops(
                 Context.getDataManager().getPositions(deviceId, from, to),
-                Context.getTripsConfig(), ignoreOdometer, speedThreshold, TripReport.class);
+                Context.getTripsConfig(), ignoreOdometer, TripReport.class);
 
         return result;
     }
diff --git a/src/org/traccar/reports/model/TripsConfig.java b/src/org/traccar/reports/model/TripsConfig.java
index ca361a466..0f0c615d3 100644
--- a/src/org/traccar/reports/model/TripsConfig.java
+++ b/src/org/traccar/reports/model/TripsConfig.java
@@ -22,13 +22,14 @@ public class TripsConfig {
     }
 
     public TripsConfig(double minimalTripDistance, long minimalTripDuration, long minimalParkingDuration,
-            long minimalNoDataDuration, boolean useIgnition, boolean processInvalidPositions) {
+            long minimalNoDataDuration, boolean useIgnition, boolean processInvalidPositions, double speedThreshold) {
         this.minimalTripDistance = minimalTripDistance;
         this.minimalTripDuration = minimalTripDuration;
         this.minimalParkingDuration = minimalParkingDuration;
         this.minimalNoDataDuration = minimalNoDataDuration;
         this.useIgnition = useIgnition;
         this.processInvalidPositions = processInvalidPositions;
+        this.speedThreshold = speedThreshold;
     }
 
     private double minimalTripDistance;
@@ -91,4 +92,14 @@ public class TripsConfig {
         this.processInvalidPositions = processInvalidPositions;
     }
 
+    private double speedThreshold;
+
+    public double getSpeedThreshold() {
+        return speedThreshold;
+    }
+
+    public void setSpeedThreshold(double speedThreshold) {
+        this.speedThreshold = speedThreshold;
+    }
+
 }