From a8566c997d27bf22ee0debad7b9b8c2db9325a43 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 24 Feb 2019 12:12:19 -0800
Subject: Refactor hemisphere handler

---
 src/org/traccar/BasePipelineFactory.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/org/traccar/BasePipelineFactory.java')

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index b993e0741..082d666ac 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -39,6 +39,7 @@ import org.traccar.handler.CopyAttributesHandler;
 import org.traccar.handler.DistanceHandler;
 import org.traccar.handler.FilterHandler;
 import org.traccar.handler.GeolocationHandler;
+import org.traccar.handler.HemisphereHandler;
 import org.traccar.handler.NetworkMessageHandler;
 import org.traccar.handler.OpenChannelHandler;
 import org.traccar.handler.RemoteAddressHandler;
@@ -56,7 +57,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
     private EngineHoursHandler engineHoursHandler;
     private MotionHandler motionHandler;
     private GeocoderHandler geocoderHandler;
-    private HemisphereHandler hemisphereHandler;
     private CopyAttributesHandler copyAttributesHandler;
     private ComputedAttributesHandler computedAttributesHandler;
 
@@ -90,11 +90,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
             engineHoursHandler = new EngineHoursHandler();
         }
 
-        if (Context.getConfig().hasKey("location.latitudeHemisphere")
-                || Context.getConfig().hasKey("location.longitudeHemisphere")) {
-            hemisphereHandler = new HemisphereHandler();
-        }
-
         if (Context.getConfig().getBoolean("processing.copyAttributes.enable")) {
             copyAttributesHandler = new CopyAttributesHandler();
         }
@@ -166,7 +161,7 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
         addHandlers(
                 pipeline,
                 Main.getInjector().getInstance(GeolocationHandler.class),
-                hemisphereHandler,
+                Main.getInjector().getInstance(HemisphereHandler.class),
                 Main.getInjector().getInstance(DistanceHandler.class),
                 Main.getInjector().getInstance(RemoteAddressHandler.class));
 
-- 
cgit v1.2.3