Allow querying for arbitrary geometry in location index (graphhopper#2890)

Author: easbar

core/src/main/java/com/graphhopper/storage/index/LineIntIndex.java

@@ -159,8 +159,12 @@ private void fillIDs(long keyPart, IntConsumer consumer) {
     }
 
     public void query(BBox queryShape, final LocationIndex.Visitor function) {
+        query(LocationIndex.createBBoxTileFilter(queryShape), function);
+    }
+
+    public void query(LocationIndex.TileFilter tileFilter, final LocationIndex.Visitor function) {
         final IntHashSet set = new IntHashSet();
-        query(START_POINTER, queryShape,
+        query(START_POINTER, tileFilter,
                 bounds.minLat, bounds.minLon, bounds.maxLat - bounds.minLat, bounds.maxLon - bounds.minLon,
                 new LocationIndex.Visitor() {
                     @Override
@@ -181,7 +185,7 @@ public void onEdge(int edgeId) {
                 }, 0);
     }
 
-    private void query(int intPointer, BBox queryBBox,
+    private void query(int intPointer, LocationIndex.TileFilter tileFilter,
                        double minLat, double minLon,
                        double deltaLatPerDepth, double deltaLonPerDepth,
                        LocationIndex.Visitor function, int depth) {
@@ -213,14 +217,14 @@ private void query(int intPointer, BBox queryBBox,
             double tmpMinLon = minLon + deltaLonPerDepth * pixelXY[0];
             double tmpMinLat = minLat + deltaLatPerDepth * pixelXY[1];
 
-            BBox bbox = (queryBBox != null || function.isTileInfo()) ? new BBox(tmpMinLon, tmpMinLon + deltaLonPerDepth, tmpMinLat, tmpMinLat + deltaLatPerDepth) : null;
+            BBox bbox = (tileFilter != null || function.isTileInfo()) ? new BBox(tmpMinLon, tmpMinLon + deltaLonPerDepth, tmpMinLat, tmpMinLat + deltaLatPerDepth) : null;
             if (function.isTileInfo())
                 function.onTile(bbox, depth);
-            if (queryBBox == null || queryBBox.contains(bbox)) {
+            if (tileFilter == null || tileFilter.acceptAll(bbox)) {
                 // fill without a restriction!
                 query(nextIntPointer, null, tmpMinLat, tmpMinLon, deltaLatPerDepth, deltaLonPerDepth, function, depth + 1);
-            } else if (queryBBox.intersects(bbox)) {
-                query(nextIntPointer, queryBBox, tmpMinLat, tmpMinLon, deltaLatPerDepth, deltaLonPerDepth, function, depth + 1);
+            } else if (tileFilter.acceptPartially(bbox)) {
+                query(nextIntPointer, tileFilter, tmpMinLat, tmpMinLon, deltaLatPerDepth, deltaLonPerDepth, function, depth + 1);
             }
         }
     }

core/src/main/java/com/graphhopper/storage/index/LocationIndex.java

@@ -51,10 +51,44 @@ public interface LocationIndex {
      * and limited by the queryBBox. Also (a few) more edges slightly outside of queryBBox could be
      * returned that you can avoid via doing an explicit BBox check of the coordinates.
      */
-    void query(BBox queryBBox, Visitor function);
+    default void query(BBox queryBBox, Visitor function) {
+        query(createBBoxTileFilter(queryBBox), function);
+    }
+
+    void query(TileFilter tileFilter, Visitor function);
 
     void close();
 
+
+    interface TileFilter {
+
+        /**
+         * @return true if all edges within the given bounding box shall be accepted
+         */
+        boolean acceptAll(BBox tile);
+
+        /**
+         * @return true if edges within the given bounding box shall potentially be accepted. In this
+         * case the tile filter will be applied again for smaller bounding boxes on a lower level.
+         * If this is the lowest level already simply all edges will be accepted.
+         */
+        boolean acceptPartially(BBox tile);
+    }
+
+    static TileFilter createBBoxTileFilter(BBox queryBBox) {
+        return queryBBox == null ? null : new TileFilter() {
+            @Override
+            public boolean acceptAll(BBox tile) {
+                return queryBBox.contains(tile);
+            }
+
+            @Override
+            public boolean acceptPartially(BBox tile) {
+                return queryBBox.intersects(tile);
+            }
+        };
+    }
+
     /**
      * This interface allows to visit edges stored in the LocationIndex.
      */

core/src/main/java/com/graphhopper/storage/index/LocationIndexTree.java

@@ -309,8 +309,8 @@ public Snap findClosest(final double queryLat, final double queryLon, final Edge
     }
 
     @Override
-    public void query(BBox queryBBox, Visitor function) {
-        lineIntIndex.query(queryBBox, function);
+    public void query(TileFilter tileFilter, Visitor function) {
+        lineIntIndex.query(tileFilter, function);
     }
 
     public interface EdgeCheck {