Merge branch 'master' of github.com:tananaev/traccar

2 files changed, 20 insertions, 7 deletions

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 83207b91f..aba568de6 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -36,6 +36,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
     private final ReverseGeocoder reverseGeocoder;
     private FilterHandler filterHandler;
     private Integer resetDelay;
+    private Boolean processInvalidPositions;
 
     /**
      * Open channel handler
@@ -100,6 +101,12 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (enableFilter != null && Boolean.valueOf(enableFilter)) {
             filterHandler = new FilterHandler(serverManager);
         }
+
+        if (reverseGeocoder != null) {
+            // Default behavior is to process invalid positions (i.e., the "null" case)
+            String invalidPositions = serverManager.getProperties().getProperty("geocode.processInvalidPositions");
+            processInvalidPositions = (invalidPositions == null || Boolean.valueOf(invalidPositions));
+        }
     }
 
     protected DataManager getDataManager() {
@@ -123,7 +130,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
             pipeline.addLast("filter", filterHandler);
         }
         if (reverseGeocoder != null) {
-            pipeline.addLast("geocoder", new ReverseGeocoderHandler(reverseGeocoder));
+            pipeline.addLast("geocoder", new ReverseGeocoderHandler(reverseGeocoder, processInvalidPositions));
         }
         pipeline.addLast("handler", new TrackerEventHandler(dataManager));
         return pipeline;
diff --git a/src/org/traccar/ReverseGeocoderHandler.java b/src/org/traccar/ReverseGeocoderHandler.java
index 8bdd7ebfc..7a3372dff 100644
--- a/src/org/traccar/ReverseGeocoderHandler.java
+++ b/src/org/traccar/ReverseGeocoderHandler.java
@@ -18,7 +18,6 @@ package org.traccar;
 import java.util.List;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
 import org.traccar.geocode.ReverseGeocoder;
 import org.traccar.model.Position;
@@ -26,9 +25,11 @@ import org.traccar.model.Position;
 public class ReverseGeocoderHandler extends OneToOneDecoder {
 
     private final ReverseGeocoder geocoder;
+    private final boolean processInvalidPositions;
 
-    public ReverseGeocoderHandler(ReverseGeocoder geocoder) {
+    public ReverseGeocoderHandler(ReverseGeocoder geocoder, boolean processInvalidPositions ) {
         this.geocoder = geocoder;
+        this.processInvalidPositions = processInvalidPositions;
     }
 
     @Override
@@ -39,13 +40,18 @@ public class ReverseGeocoderHandler extends OneToOneDecoder {
         if (geocoder != null) {
             if (msg instanceof Position) {
                 Position position = (Position) msg;
-                position.setAddress(geocoder.getAddress(
-                        position.getLatitude(), position.getLongitude()));
+                
+                if (processInvalidPositions || position.getValid()) {
+                    position.setAddress(geocoder.getAddress(
+                            position.getLatitude(), position.getLongitude()));
+                }
             } else if (msg instanceof List) {
                 List<Position> positions = (List<Position>) msg;
                 for (Position position : positions) {
-                    position.setAddress(geocoder.getAddress(
-                            position.getLatitude(), position.getLongitude()));
+                    if (processInvalidPositions || position.getValid()) {
+                        position.setAddress(geocoder.getAddress(
+                                position.getLatitude(), position.getLongitude()));
+                    }
                 }
             }
         }