make it more robust for big data sets

Author: Peter

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

@@ -118,6 +118,8 @@ public static OSMReader osm2Graph(final CmdArgs args) throws IOException {
         }
 
         int size = (int) args.getLong("osmreader.size", 10 * 1000);
+        if (size < 1)
+            throw new IllegalArgumentException("Invalid osmreader.size value " + size);
         GraphStorage storage;
         String dataAccess = args.get("osmreader.dataaccess", "inmemory+save");
         Directory dir;

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

@@ -33,9 +33,8 @@
  */
 public abstract class OSMReaderHelper {
 
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-    protected int counter = 0;
-    protected int zeroCounter = 0;
+    private final Logger logger = LoggerFactory.getLogger(getClass());    
+    protected long zeroCounter = 0;
     protected final Graph g;
     protected final int expectedNodes;
     private DistanceCalc callback = new DistanceCalc();
@@ -96,7 +95,7 @@ int addEdge(int fromIndex, int toIndex, PointList pointList, int flags) {
     }
 
     String getInfo() {
-        return "Found " + zeroCounter + " zero and " + counter + " negative distances.";
+        return "Found " + zeroCounter + " zero distances.";
     }
 
     String getStorageInfo(GraphStorage storage) {

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

@@ -236,7 +236,7 @@ public void preProcess(InputStream osmXml) {
         XMLStreamReader sReader = null;
         try {
             sReader = factory.createXMLStreamReader(osmXml, "UTF-8");
-            int tmpCounter = 1;
+            long tmpCounter = 1;
             for (int event = sReader.next(); event != XMLStreamConstants.END_DOCUMENT;
                     event = sReader.next(), tmpCounter++) {
                 if (tmpCounter % 20000000 == 0)