reduced initial overallocation if expectedNodes is too high

Author: Peter

src/main/java/com/graphhopper/reader/OSMReader.java

@@ -21,7 +21,6 @@
 import com.graphhopper.routing.util.FastestCarCalc;
 import com.graphhopper.routing.ch.PrepareContractionHierarchies;
 import com.graphhopper.routing.util.PrepareRoutingSubnetworks;
-import com.graphhopper.routing.util.PrepareTowerNodesShortcuts;
 import com.graphhopper.routing.util.RoutingAlgorithmSpecialAreaTests;
 import com.graphhopper.storage.Directory;
 import com.graphhopper.storage.Graph;

src/main/java/com/graphhopper/reader/OSMReaderHelperDoubleParse.java

@@ -211,8 +211,8 @@ public String toString() {
      */
     @Override
     public void preProcess(InputStream osmXml) {
-        pillarLats.createNew(expectedNodes / 10);
-        pillarLons.createNew(expectedNodes / 10);
+        pillarLats.createNew(Math.max(expectedNodes / 50, 100));
+        pillarLons.createNew(Math.max(expectedNodes / 50, 100));
         if (osmXml == null)
             throw new IllegalStateException("Stream cannot be empty");
 

src/main/java/com/graphhopper/storage/GraphStorage.java

@@ -116,11 +116,10 @@ public GraphStorage setSegmentSize(int bytes) {
     }
 
     public GraphStorage createNew(int nodeCount) {
-        nodes.createNew((long) nodeCount * 4 * nodeEntrySize);
-
-        // approximative
-        edges.createNew((long) nodeCount * 4 * edgeEntrySize);
-        geometry.createNew((long) nodeCount / 10);
+        int initBytes = Math.max(nodeCount * 4 / 50, 100);
+        nodes.createNew((long) initBytes * nodeEntrySize);
+        edges.createNew((long) initBytes * edgeEntrySize);
+        geometry.createNew((long) initBytes);
         return this;
     }