Add hemisphere options to config (fix #1669)

2 files changed, 74 insertions, 1 deletions

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 00d4a5f1a..a41e59778 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
     private DistanceHandler distanceHandler;
     private ReverseGeocoderHandler reverseGeocoderHandler;
     private LocationProviderHandler locationProviderHandler;
+    private HemisphereHandler hemisphereHandler;
 
     private static final class OpenChannelHandler extends SimpleChannelHandler {
 
@@ -111,6 +112,11 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (Context.getConfig().getBoolean("distance.enable")) {
             distanceHandler = new DistanceHandler();
         }
+
+        if (Context.getConfig().hasKey("location.latitudeHemisphere")
+                || Context.getConfig().hasKey("location.longitudeHemisphere")) {
+            hemisphereHandler = new HemisphereHandler();
+        }
     }
 
     protected abstract void addSpecificHandlers(ChannelPipeline pipeline);
@@ -128,6 +134,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
 
         addSpecificHandlers(pipeline);
 
+        if (hemisphereHandler != null) {
+            pipeline.addLast("hemisphere", hemisphereHandler);
+        }
         if (distanceHandler != null) {
             pipeline.addLast("distance", distanceHandler);
         }
diff --git a/src/org/traccar/HemisphereHandler.java b/src/org/traccar/HemisphereHandler.java
new file mode 100644
index 000000000..b46d0791c
--- /dev/null
+++ b/src/org/traccar/HemisphereHandler.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar;
+
+import org.jboss.netty.channel.Channel;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+
+public class HemisphereHandler extends ExtendedObjectDecoder {
+
+    private int latitudeFactor;
+    private int longitudeFactor;
+
+    public HemisphereHandler() {
+        String latitudeHemisphere = Context.getConfig().getString("location.latitudeHemisphere");
+        if (latitudeHemisphere != null) {
+            if (latitudeHemisphere.equalsIgnoreCase("N")) {
+                latitudeFactor = 1;
+            } else if (latitudeHemisphere.equalsIgnoreCase("S")) {
+                latitudeFactor = -1;
+            }
+        }
+        String longitudeHemisphere = Context.getConfig().getString("location.longitudeHemisphere");
+        if (longitudeHemisphere != null) {
+            if (longitudeHemisphere.equalsIgnoreCase("E")) {
+                longitudeFactor = 1;
+            } else if (longitudeHemisphere.equalsIgnoreCase("W")) {
+                longitudeFactor = -1;
+            }
+        }
+    }
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        if (msg instanceof Position) {
+            Position position = (Position) msg;
+            if (latitudeFactor != 0) {
+                position.setLatitude(Math.abs(position.getLatitude()) * latitudeFactor);
+            }
+            if (longitudeFactor != 0) {
+                position.setLongitude(Math.abs(position.getLongitude()) * longitudeFactor);
+            }
+        }
+
+        return msg;
+    }
+
+}