Refactor engine hours handler

1 files changed, 22 insertions, 0 deletions

diff --git a/src/org/traccar/MainModule.java b/src/org/traccar/MainModule.java
index 0c3c5be51..cd5f2568e 100644
--- a/src/org/traccar/MainModule.java
+++ b/src/org/traccar/MainModule.java
@@ -44,7 +44,9 @@ import org.traccar.geolocation.MozillaGeolocationProvider;
 import org.traccar.geolocation.OpenCellIdGeolocationProvider;
 import org.traccar.geolocation.UnwiredGeolocationProvider;
 import org.traccar.handler.DistanceHandler;
+import org.traccar.handler.EngineHoursHandler;
 import org.traccar.handler.FilterHandler;
+import org.traccar.handler.GeocoderHandler;
 import org.traccar.handler.GeolocationHandler;
 import org.traccar.handler.HemisphereHandler;
 import org.traccar.handler.MotionHandler;
@@ -211,10 +213,30 @@ public class MainModule extends AbstractModule {
 
     @Singleton
     @Provides
+    public static GeocoderHandler provideGeocoderHandler(
+            Config config, @Nullable Geocoder geocoder, IdentityManager identityManager,
+            StatisticsManager statisticsManager) {
+        if (geocoder != null) {
+            return new GeocoderHandler(config, geocoder, identityManager, statisticsManager);
+        }
+        return null;
+    }
+
+    @Singleton
+    @Provides
     public static MotionHandler provideMotionHandler(TripsConfig tripsConfig) {
         return new MotionHandler(tripsConfig.getSpeedThreshold());
     }
 
+    @Singleton
+    @Provides
+    public static EngineHoursHandler provideEngineHoursHandler(Config config, IdentityManager identityManager) {
+        if (config.getBoolean(Keys.PROCESSING_ENGINE_HOURS_ENABLE)) {
+            return new EngineHoursHandler(identityManager);
+        }
+        return null;
+    }
+
     @Override
     protected void configure() {
         binder().requireExplicitBindings();