aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/traccar/config/Keys.java2
-rw-r--r--src/main/java/org/traccar/handler/MotionHandler.java16
-rw-r--r--src/main/java/org/traccar/reports/common/TripsConfig.java12
-rw-r--r--src/test/java/org/traccar/handler/MotionHandlerTest.java16
-rw-r--r--src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java6
-rw-r--r--src/test/java/org/traccar/reports/ReportUtilsTest.java16
6 files changed, 36 insertions, 32 deletions
diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java
index c69289403..f0e0bf2b6 100644
--- a/src/main/java/org/traccar/config/Keys.java
+++ b/src/main/java/org/traccar/config/Keys.java
@@ -380,7 +380,7 @@ public final class Keys {
*/
public static final ConfigKey<Double> EVENT_MOTION_SPEED_THRESHOLD = new DoubleConfigKey(
"event.motion.speedThreshold",
- List.of(KeyType.CONFIG),
+ List.of(KeyType.CONFIG, KeyType.DEVICE),
0.01);
/**
diff --git a/src/main/java/org/traccar/handler/MotionHandler.java b/src/main/java/org/traccar/handler/MotionHandler.java
index 10312f9b3..297527b4d 100644
--- a/src/main/java/org/traccar/handler/MotionHandler.java
+++ b/src/main/java/org/traccar/handler/MotionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2023 Anton Tananaev (anton@traccar.org)
* Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,10 @@ package org.traccar.handler;
import io.netty.channel.ChannelHandler;
import org.traccar.BaseDataHandler;
+import org.traccar.config.Keys;
+import org.traccar.helper.model.AttributeUtil;
import org.traccar.model.Position;
-import org.traccar.reports.common.TripsConfig;
+import org.traccar.session.cache.CacheManager;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -28,17 +30,19 @@ import javax.inject.Singleton;
@ChannelHandler.Sharable
public class MotionHandler extends BaseDataHandler {
- private final double speedThreshold;
+ private final CacheManager cacheManager;
@Inject
- public MotionHandler(TripsConfig tripsConfig) {
- speedThreshold = tripsConfig.getSpeedThreshold();
+ public MotionHandler(CacheManager cacheManager) {
+ this.cacheManager = cacheManager;
}
@Override
protected Position handlePosition(Position position) {
if (!position.hasAttribute(Position.KEY_MOTION)) {
- position.set(Position.KEY_MOTION, position.getSpeed() > speedThreshold);
+ double threshold = AttributeUtil.lookup(
+ cacheManager, Keys.EVENT_MOTION_SPEED_THRESHOLD, position.getDeviceId());
+ position.set(Position.KEY_MOTION, position.getSpeed() > threshold);
}
return position;
}
diff --git a/src/main/java/org/traccar/reports/common/TripsConfig.java b/src/main/java/org/traccar/reports/common/TripsConfig.java
index 52db97b74..841d9c652 100644
--- a/src/main/java/org/traccar/reports/common/TripsConfig.java
+++ b/src/main/java/org/traccar/reports/common/TripsConfig.java
@@ -33,20 +33,18 @@ public class TripsConfig {
config.getLong(Keys.REPORT_TRIP_MINIMAL_PARKING_DURATION) * 1000,
config.getLong(Keys.REPORT_TRIP_MINIMAL_NO_DATA_DURATION) * 1000,
config.getBoolean(Keys.REPORT_TRIP_USE_IGNITION),
- config.getBoolean(Keys.EVENT_MOTION_PROCESS_INVALID_POSITIONS),
- config.getDouble(Keys.EVENT_MOTION_SPEED_THRESHOLD));
+ config.getBoolean(Keys.EVENT_MOTION_PROCESS_INVALID_POSITIONS));
}
public TripsConfig(
double minimalTripDistance, long minimalTripDuration, long minimalParkingDuration,
- long minimalNoDataDuration, boolean useIgnition, boolean processInvalidPositions, double speedThreshold) {
+ long minimalNoDataDuration, boolean useIgnition, boolean processInvalidPositions) {
this.minimalTripDistance = minimalTripDistance;
this.minimalTripDuration = minimalTripDuration;
this.minimalParkingDuration = minimalParkingDuration;
this.minimalNoDataDuration = minimalNoDataDuration;
this.useIgnition = useIgnition;
this.processInvalidPositions = processInvalidPositions;
- this.speedThreshold = speedThreshold;
}
private final double minimalTripDistance;
@@ -85,10 +83,4 @@ public class TripsConfig {
return processInvalidPositions;
}
- private final double speedThreshold;
-
- public double getSpeedThreshold() {
- return speedThreshold;
- }
-
}
diff --git a/src/test/java/org/traccar/handler/MotionHandlerTest.java b/src/test/java/org/traccar/handler/MotionHandlerTest.java
index 2a7af23ba..10cdf6a90 100644
--- a/src/test/java/org/traccar/handler/MotionHandlerTest.java
+++ b/src/test/java/org/traccar/handler/MotionHandlerTest.java
@@ -1,10 +1,15 @@
package org.traccar.handler;
import org.junit.jupiter.api.Test;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
+import org.traccar.model.Device;
import org.traccar.model.Position;
-import org.traccar.reports.common.TripsConfig;
+import org.traccar.session.cache.CacheManager;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -13,10 +18,13 @@ public class MotionHandlerTest {
@Test
public void testCalculateMotion() {
- TripsConfig tripsConfig = mock(TripsConfig.class);
- when(tripsConfig.getSpeedThreshold()).thenReturn(0.01);
+ var cacheManager = mock(CacheManager.class);
+ when(cacheManager.getObject(eq(Device.class), anyLong())).thenReturn(mock(Device.class));
+ var config = mock(Config.class);
+ when(config.getString(Keys.EVENT_MOTION_SPEED_THRESHOLD.getKey())).thenReturn("0.01");
+ when(cacheManager.getConfig()).thenReturn(config);
- MotionHandler motionHandler = new MotionHandler(tripsConfig);
+ MotionHandler motionHandler = new MotionHandler(cacheManager);
Position position = motionHandler.handlePosition(new Position());
diff --git a/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java b/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
index f2d858656..2be3f4647 100644
--- a/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
+++ b/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
@@ -36,7 +36,7 @@ public class MotionEventHandlerTest extends BaseTest {
@Test
public void testMotionWithPosition() throws ParseException {
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, false, false);
MotionState state = new MotionState();
@@ -63,7 +63,7 @@ public class MotionEventHandlerTest extends BaseTest {
@Test
public void testMotionFluctuation() throws ParseException {
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, false, false);
MotionState state = new MotionState();
@@ -94,7 +94,7 @@ public class MotionEventHandlerTest extends BaseTest {
@Test
public void testStopWithPositionIgnition() throws ParseException {
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, true, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, true, false);
MotionState state = new MotionState();
state.setMotionStreak(true);
diff --git a/src/test/java/org/traccar/reports/ReportUtilsTest.java b/src/test/java/org/traccar/reports/ReportUtilsTest.java
index 09e5b3e27..e116f24b4 100644
--- a/src/test/java/org/traccar/reports/ReportUtilsTest.java
+++ b/src/test/java/org/traccar/reports/ReportUtilsTest.java
@@ -101,7 +101,7 @@ public class ReportUtilsTest extends BaseTest {
position("2016-01-01 00:15:00.000", 0, 3000),
position("2016-01-01 00:25:00.000", 0, 3000));
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false, false);
ReportUtils reportUtils = new ReportUtils(
mock(Config.class), storage, mock(PermissionsService.class),
tripsConfig, mock(VelocityEngine.class), null);
@@ -156,7 +156,7 @@ public class ReportUtilsTest extends BaseTest {
data.get(5).set(Position.KEY_IGNITION, false);
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, true, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, true, false);
ReportUtils reportUtils = new ReportUtils(
mock(Config.class), storage, mock(PermissionsService.class),
tripsConfig, mock(VelocityEngine.class), null);
@@ -227,7 +227,7 @@ public class ReportUtilsTest extends BaseTest {
position("2016-01-01 00:19:00.000", 0, 7000),
position("2016-01-01 00:29:00.000", 0, 7000));
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false, false);
ReportUtils reportUtils = new ReportUtils(
mock(Config.class), storage, mock(PermissionsService.class),
tripsConfig, mock(VelocityEngine.class), null);
@@ -278,7 +278,7 @@ public class ReportUtilsTest extends BaseTest {
position("2016-01-01 00:04:00.000", 1, 0),
position("2016-01-01 00:05:00.000", 0, 0));
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false);
ReportUtils reportUtils = new ReportUtils(
mock(Config.class), storage, mock(PermissionsService.class),
tripsConfig, mock(VelocityEngine.class), null);
@@ -307,7 +307,7 @@ public class ReportUtilsTest extends BaseTest {
position("2016-01-01 00:04:00.000", 1, 0),
position("2016-01-01 00:05:00.000", 2, 0));
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false);
ReportUtils reportUtils = new ReportUtils(
mock(Config.class), storage, mock(PermissionsService.class),
tripsConfig, mock(VelocityEngine.class), null);
@@ -336,7 +336,7 @@ public class ReportUtilsTest extends BaseTest {
position("2016-01-01 00:22:00.000", 0, 0),
position("2016-01-01 00:32:00.000", 0, 0));
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false);
ReportUtils reportUtils = new ReportUtils(
mock(Config.class), storage, mock(PermissionsService.class),
tripsConfig, mock(VelocityEngine.class), null);
@@ -365,7 +365,7 @@ public class ReportUtilsTest extends BaseTest {
position("2016-01-01 00:04:00.000", 5, 0),
position("2016-01-01 00:05:00.000", 5, 0));
- TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false);
ReportUtils reportUtils = new ReportUtils(
mock(Config.class), storage, mock(PermissionsService.class),
tripsConfig, mock(VelocityEngine.class), null);
@@ -390,7 +390,7 @@ public class ReportUtilsTest extends BaseTest {
position("2016-01-01 00:24:00.000", 5, 800),
position("2016-01-01 00:25:00.000", 5, 900));
- TripsConfig tripsConfig = new TripsConfig(500, 200000, 200000, 900000, false, false, 0.01);
+ TripsConfig tripsConfig = new TripsConfig(500, 200000, 200000, 900000, false, false);
ReportUtils reportUtils = new ReportUtils(
mock(Config.class), storage, mock(PermissionsService.class),
tripsConfig, mock(VelocityEngine.class), null);