Merge branch 'master' into develop

1 files changed, 11 insertions, 5 deletions

diff --git a/src/main/java/org/traccar/handler/MotionHandler.java b/src/main/java/org/traccar/handler/MotionHandler.java
index e8051dd75..10312f9b3 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 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,19 +19,25 @@ package org.traccar.handler;
 import io.netty.channel.ChannelHandler;
 import org.traccar.BaseDataHandler;
 import org.traccar.model.Position;
+import org.traccar.reports.common.TripsConfig;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
 @ChannelHandler.Sharable
 public class MotionHandler extends BaseDataHandler {
 
-    private double speedThreshold;
+    private final double speedThreshold;
 
-    public MotionHandler(double speedThreshold) {
-        this.speedThreshold = speedThreshold;
+    @Inject
+    public MotionHandler(TripsConfig tripsConfig) {
+        speedThreshold = tripsConfig.getSpeedThreshold();
     }
 
     @Override
     protected Position handlePosition(Position position) {
-        if (!position.getAttributes().containsKey(Position.KEY_MOTION)) {
+        if (!position.hasAttribute(Position.KEY_MOTION)) {
             position.set(Position.KEY_MOTION, position.getSpeed() > speedThreshold);
         }
         return position;