diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java b/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java index ed25fd8..dc7191e 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java @@ -20,7 +20,7 @@ public final class DirectWeaver extends ByteDataWriter private int size = 0; - public DirectWeaver( StatCoderContext bc, DataBuffers dataBuffers, int lonIdx, int latIdx, int divisor, TagValueValidator wayValidator, WaypointMatcher waypointMatcher, OsmNodesMap hollowNodes ) throws Exception + public DirectWeaver( StatCoderContext bc, DataBuffers dataBuffers, int lonIdx, int latIdx, int divisor, TagValueValidator wayValidator, WaypointMatcher waypointMatcher, OsmNodesMap hollowNodes ) { super( null ); int cellsize = 1000000 / divisor; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java index bf03490..f2c481b 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java @@ -35,7 +35,7 @@ final class OsmFile private int ncaches; private int indexsize; - public OsmFile( PhysicalFile rafile, int lonDegree, int latDegree, DataBuffers dataBuffers ) throws Exception + public OsmFile( PhysicalFile rafile, int lonDegree, int latDegree, DataBuffers dataBuffers ) throws IOException { this.lonDegree = lonDegree; this.latDegree = latDegree; @@ -111,7 +111,7 @@ final class OsmFile return idx == -1 ? indexsize : posIdx[idx]; } - public int getDataInputForSubIdx( int subIdx, byte[] iobuffer ) throws Exception + public int getDataInputForSubIdx( int subIdx, byte[] iobuffer ) throws IOException { int startPos = getPosIdx( subIdx - 1 ); int endPos = getPosIdx( subIdx ); @@ -128,7 +128,7 @@ final class OsmFile } public MicroCache createMicroCache( int lonIdx, int latIdx, DataBuffers dataBuffers, TagValueValidator wayValidator, - WaypointMatcher waypointMatcher, boolean reallyDecode, OsmNodesMap hollowNodes ) throws Exception + WaypointMatcher waypointMatcher, boolean reallyDecode, OsmNodesMap hollowNodes ) throws IOException { int subIdx = ( latIdx - divisor * latDegree ) * divisor + ( lonIdx - divisor * lonDegree ); diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java index 1c378e0..1798fd3 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java @@ -31,13 +31,12 @@ final public class PhysicalFile { MicroCache.debug = true; - String message = checkFileIntegrity( new File( args[0] ) ); - - if ( message != null ) - { - System.out.println( "************************************" ); - System.out.println( message ); - System.out.println( "************************************" ); + try { + checkFileIntegrity( new File( args[0] ) ); + } catch (IOException e) { + System.err.println( "************************************" ); + e.printStackTrace(); + System.err.println( "************************************" ); } } @@ -46,7 +45,7 @@ final public class PhysicalFile * * @return the error message if file corrupt, else null */ - public static String checkFileIntegrity( File f ) + public static String checkFileIntegrity( File f ) throws IOException { PhysicalFile pf = null; try @@ -66,14 +65,6 @@ final public class PhysicalFile } } } - catch (IllegalArgumentException iae) - { - return iae.getMessage(); - } - catch (Exception e) - { - return e.toString(); - } finally { if ( pf != null ) @@ -88,7 +79,7 @@ final public class PhysicalFile return null; } - public PhysicalFile( File f, DataBuffers dataBuffers, int lookupVersion, int lookupMinorVersion ) throws Exception + public PhysicalFile( File f, DataBuffers dataBuffers, int lookupVersion, int lookupMinorVersion ) throws IOException { fileName = f.getName(); byte[] iobuffer = dataBuffers.iobuffer; @@ -102,7 +93,7 @@ final public class PhysicalFile short readVersion = (short)(lv >> 48); if ( i == 0 && lookupVersion != -1 && readVersion != lookupVersion ) { - throw new IllegalArgumentException( "lookup version mismatch (old rd5?) lookups.dat=" + throw new IOException( "lookup version mismatch (old rd5?) lookups.dat=" + lookupVersion + " " + f. getAbsolutePath() + "=" + readVersion ); } fileIndex[i] = lv & 0xffffffffffffL;