Fixing issue 218: Autoexpanding search for nodes around a GPS coordinate, bug fix in SpatialKeyAlgo, Bresenham, and avoid the trap graphhopper#232

Author: JohannesPelzer

.gitignore

@@ -27,4 +27,5 @@ debug.sh
 core/TODO*.txt
 srtmprovider/
 core/docs/
-.*#
+.*#
+cgiarprovider/

config-example.properties

@@ -4,12 +4,6 @@
 # graph.dataaccess=MMAP_STORE_SYNC
 graph.dataaccess=RAM_STORE
 
-# The high-resolution index is bigger and slightly slower but a lot more precise. see #17.
-# Resolution is in meter, decrease from 1000 to 500 in order to speed up queries (but will increase size)
-#index.highResolution=-1
-index.highResolution=500
-
-
 # use contraction hierarchies to speed things up. requires more RAM/disc space for holding the graph
 # uncomment this if you need more control of you algorithm. then use graphhopper.chShortcuts(false, false)
 prepare.chShortcuts=fastest
@@ -39,4 +33,7 @@ osmreader.acceptWay=car
 # If you have a slow disk or plenty of RAM change the default MMAP to
 # graph.elevation.dataaccess=RAM_STORE
 
-
+# Location index lookup. Advanced customization. Resolution is in meter, the search specifies the 'radius' in number of tiles.
+# E.g. decrease resolution for a faster lookup and increase region search for a more dynamic search and less 'location not found' results
+# index.highResolution=300
+# index.maxRegionSearch=4

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -76,8 +76,8 @@ public static void main( String[] strs ) throws Exception
     private boolean simplifyRequest = true;
     // for index
     private LocationIndex locationIndex;
-    private int preciseIndexResolution = 500;
-    private boolean searchRegion = true;
+    private int preciseIndexResolution = 300;
+    private int maxRegionSearch = 4;
     // for prepare
     private int minNetworkSize = 200;
     // for CH prepare
@@ -538,6 +538,7 @@ public GraphHopper init( CmdArgs args )
 
         // index
         preciseIndexResolution = args.getInt("index.highResolution", preciseIndexResolution);
+        maxRegionSearch = args.getInt("index.maxRegionSearch", maxRegionSearch);
         return this;
     }
 
@@ -863,24 +864,15 @@ else if (algoStr.equals("astarbi"))
     protected LocationIndex createLocationIndex( Directory dir )
     {
         LocationIndex tmpIndex;
-        if (preciseIndexResolution > 0)
+        if (graph instanceof LevelGraph)
         {
-            LocationIndexTree tmpNIndex;
-            if (graph instanceof LevelGraph)
-            {
-                tmpNIndex = new LocationIndexTreeSC((LevelGraph) graph, dir);
-            } else
-            {
-                tmpNIndex = new LocationIndexTree(graph, dir);
-            }
-            tmpNIndex.setResolution(preciseIndexResolution);
-            tmpNIndex.setSearchRegion(searchRegion);
-            tmpIndex = tmpNIndex;
+            tmpIndex = new LocationIndexTreeSC((LevelGraph) graph, dir);
         } else
         {
-            tmpIndex = new Location2IDQuadtree(graph, dir);
-            tmpIndex.setResolution(Helper.calcIndexSize(graph.getBounds()));
+            tmpIndex = new LocationIndexTree(graph, dir);
         }
+        tmpIndex.setResolution(preciseIndexResolution);
+        ((LocationIndexTree) tmpIndex).setMaxRegionSearch(maxRegionSearch);
 
         if (!tmpIndex.loadExisting())
             tmpIndex.prepareIndex();
@@ -908,7 +900,7 @@ protected void optimize()
         logger.info("finished optimize (" + Helper.getMemInfo() + ")");
 
         // Later: move this into the GraphStorage.optimize method
-        // Or: Doing it after preparation to optimize shortcuts too. But not possible yet https://github.com/graphhopper/graphhopper/issues/12
+        // Or: Doing it after preparation to optimize shortcuts too. But not possible yet #12
         if (sortGraph)
         {
             if (graph instanceof LevelGraph && isPrepared())

core/src/main/java/com/graphhopper/geohash/SpatialKeyAlgo.java

@@ -162,13 +162,13 @@ public final long encode( double lat, double lon )
             if (minLatTmp < maxLatTmp)
             {
                 double midLat = (minLatTmp + maxLatTmp) / 2;
-                if (lat > midLat)
+                if (lat < midLat)
                 {
-                    hash |= 1;
-                    minLatTmp = midLat;
+                    maxLatTmp = midLat;
                 } else
                 {
-                    maxLatTmp = midLat;
+                    hash |= 1;
+                    minLatTmp = midLat;
                 }
             }
             i++;
@@ -182,13 +182,13 @@ public final long encode( double lat, double lon )
             if (minLonTmp < maxLonTmp)
             {
                 double midLon = (minLonTmp + maxLonTmp) / 2;
-                if (lon > midLon)
+                if (lon < midLon)
                 {
-                    hash |= 1;
-                    minLonTmp = midLon;
+                    maxLonTmp = midLon;
                 } else
                 {
-                    maxLonTmp = midLon;
+                    hash |= 1;
+                    minLonTmp = midLon;
                 }
             }
             i++;

core/src/main/java/com/graphhopper/routing/util/RoutingAlgorithmSpecialAreaTests.java

@@ -81,7 +81,7 @@ void testAlgos()
 
         for (Entry<AlgorithmPreparation, LocationIndex> entry : prepares)
         {
-            AlgorithmPreparation prepare = entry.getKey();            
+            AlgorithmPreparation prepare = entry.getKey();
             int failed = testCollector.errors.size();
 
             OneRun or = new OneRun(50.0314, 10.5105, 50.0303, 10.5070, 571, 22);
@@ -118,12 +118,12 @@ public static Collection<Entry<AlgorithmPreparation, LocationIndex>> createAlgos
     {
         // List<Entry<AlgorithmPreparation, LocationIndex>> prepare = new ArrayList<Entry<AlgorithmPreparation, LocationIndex>>();
         List<Entry<AlgorithmPreparation, LocationIndex>> prepare = new ArrayList<Entry<AlgorithmPreparation, LocationIndex>>();
-//        prepare.add(new ME(createAlgoPrepare(g, "astar", encoder, weighting), idx));
-//        // prepare.add(new ME(createAlgoPrepare(g, "dijkstraOneToMany", encoder, weighting), idx));
-//        prepare.add(new ME(createAlgoPrepare(g, "astarbi", encoder, weighting), idx));
-//        prepare.add(new ME(createAlgoPrepare(g, "dijkstraNativebi", encoder, weighting), idx));
+        prepare.add(new ME(createAlgoPrepare(g, "astar", encoder, weighting), idx));
+        // prepare.add(new ME(createAlgoPrepare(g, "dijkstraOneToMany", encoder, weighting), idx));
+        prepare.add(new ME(createAlgoPrepare(g, "astarbi", encoder, weighting), idx));
+        prepare.add(new ME(createAlgoPrepare(g, "dijkstraNativebi", encoder, weighting), idx));
         prepare.add(new ME(createAlgoPrepare(g, "dijkstrabi", encoder, weighting), idx));
-//        prepare.add(new ME(createAlgoPrepare(g, "dijkstra", encoder, weighting), idx));
+        prepare.add(new ME(createAlgoPrepare(g, "dijkstra", encoder, weighting), idx));
 
         if (withCh)
         {

core/src/main/java/com/graphhopper/routing/util/TestAlgoCollector.java

@@ -192,9 +192,9 @@ public void setDistance( int index, double dist )
         public List<QueryResult> getList( LocationIndex idx, EdgeFilter edgeFilter )
         {
             List<QueryResult> qr = new ArrayList<QueryResult>();
-            for (AssumptionPerPath or : assumptions)
+            for (AssumptionPerPath p : assumptions)
             {
-                qr.add(idx.findClosest(or.lat, or.lon, edgeFilter));
+                qr.add(idx.findClosest(p.lat, p.lon, edgeFilter));
             }
             return qr;
         }