Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Prepare to accept merge for mapcreator

Browse source
This commit is contained in:
Victor Shcherb 2016-05-07 18:01:34 +02:00
parent be4171ecda
commit b5f90b6036
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -61,23 +61,22 @@ public class BinaryInspector {
public static final int BUFFER_SIZE = 1 << 20; public static final int BUFFER_SIZE = 1 << 20;
public static final int SHIFT_ID = 6; public static final int SHIFT_ID = 6;
private VerboseInfo vInfo; private VerboseInfo vInfo;
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
BinaryInspector in = new BinaryInspector(); BinaryInspector in = new BinaryInspector();
// test cases show info // test cases show info
if(args.length == 1 && "test".equals(args[0])) { if ("test".equals(args[0])) {
in.inspector(new String[]{ in.inspector(new String[]{
// "-vpoi", // "-vpoi",
"-vmap","-vmapobjects", // "-vmapcoordinates", // "-vmap", "-vmapobjects", // "-vmapcoordinates",
"-vrouting", // "-vrouting",
// "-vaddress", "-vcities",//"-vstreetgroups", "-vaddress", "-vcities","-vstreetgroups",
// "-vstreets", "-vbuildings", "-vintersections", "-vstreets", "-vbuildings", "-vintersections",
// "-zoom=15", // "-zoom=15",
// "-bbox=1.74,51.17,1.75,51.16", // "-bbox=1.74,51.17,1.75,51.16",
// "-vstats", // "-vstats",
// "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf" // "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
// "/Users/victorshcherb/osmand/maps/Netherlands_europe_2.road.obf" // "/Users/victorshcherb/osmand/maps/Netherlands_europe_2.road.obf"
"/Users/victorshcherb/osmand/maps/C_11_03_06.obf" "/Users/victorshcherb/osmand/maps/Argentina_southamerica_2.obf"
}); });
} else { } else {
in.inspector(args); in.inspector(args);

9
OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
View file

@ -611,6 +611,7 @@ public class BinaryMapIndexReader {
return r; return r;
} }
} }
throw new IllegalArgumentException("Illegal offset " + offset); //$NON-NLS-1$ throw new IllegalArgumentException("Illegal offset " + offset); //$NON-NLS-1$
} }
@ -1961,8 +1962,8 @@ public class BinaryMapIndexReader {
private static boolean testMapSearch = false; private static boolean testMapSearch = false;
private static boolean testAddressSearch = false; private static boolean testAddressSearch = true;
private static boolean testAddressJustifySearch = true; private static boolean testAddressJustifySearch = false;
private static boolean testPoiSearch = false; private static boolean testPoiSearch = false;
private static boolean testPoiSearchOnPath = false; private static boolean testPoiSearchOnPath = false;
private static boolean testTransportSearch = false; private static boolean testTransportSearch = false;
@ -1978,7 +1979,7 @@ public class BinaryMapIndexReader {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
// File fl = new File("/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"); // File fl = new File("/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf");
File fl = new File("/Users/victorshcherb/osmand/maps/Netherlands_europe_2.road.obf"); File fl = new File("/Users/victorshcherb/osmand/maps/Argentina_southamerica_2.obf");
RandomAccessFile raf = new RandomAccessFile(fl, "r"); RandomAccessFile raf = new RandomAccessFile(fl, "r");
BinaryMapIndexReader reader = new BinaryMapIndexReader(raf, fl); BinaryMapIndexReader reader = new BinaryMapIndexReader(raf, fl);
@ -2271,7 +2272,7 @@ public class BinaryMapIndexReader {
public boolean isCancelled() { public boolean isCancelled() {
return false; return false;
} }
}, "кие"); }, "Reynaldo");
reader.searchAddressDataByName(req); reader.searchAddressDataByName(req);
} }