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

Update android

Browse source
This commit is contained in:
Victor Shcherb 2016-05-21 21:26:30 +02:00
parent 0d8b19f74a
commit 4f2c9931dd
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,9 +69,9 @@ public class BinaryInspector {
// "-vpoi", // "-vpoi",
// "-vmap", "-vmapobjects", // "-vmapcoordinates", // "-vmap", "-vmapobjects", // "-vmapcoordinates",
// "-vrouting", // "-vrouting",
"-vaddress", "-vcities","-vstreetgroups", // "-vaddress", "-vcities","-vstreetgroups",
"-vstreets", "-vbuildings", "-vintersections", // "-vstreets", "-vbuildings", "-vintersections",
"/Users/victorshcherb/osmand/maps/Ukraine_europe_2.road.obf" "/Users/victorshcherb/osmand/maps/Netherlands_europe.road.obf"
}); });
} else { } else {
in.inspector(args); in.inspector(args);

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

@ -1966,9 +1966,9 @@ public class BinaryMapIndexReader {
private static boolean testMapSearch = false; private static boolean testMapSearch = false;
private static boolean testAddressSearch = true; private static boolean testAddressSearch = false;
private static boolean testAddressJustifySearch = false; private static boolean testAddressJustifySearch = false;
private static boolean testPoiSearch = false; private static boolean testPoiSearch = true;
private static boolean testPoiSearchOnPath = false; private static boolean testPoiSearchOnPath = false;
private static boolean testTransportSearch = false; private static boolean testTransportSearch = false;
private static int sleft = MapUtils.get31TileNumberX(6.3); private static int sleft = MapUtils.get31TileNumberX(6.3);
@ -1983,7 +1983,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/Argentina_southamerica_2.obf"); File fl = new File("/Users/victorshcherb/osmand/maps/Netherlands_europe_2.road.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);
@ -2130,7 +2130,7 @@ public class BinaryMapIndexReader {
private static void testPoiSearchByName(BinaryMapIndexReader reader) throws IOException { private static void testPoiSearchByName(BinaryMapIndexReader reader) throws IOException {
println("Searching by name..."); println("Searching by name...");
SearchRequest<Amenity> req = buildSearchPoiRequest(0, 0, "aBS", SearchRequest<Amenity> req = buildSearchPoiRequest(0, 0, "Belar",
0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE, null); 0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE, null);
reader.searchPoiByName(req); reader.searchPoiByName(req);
for (Amenity a : req.getSearchResults()) { for (Amenity a : req.getSearchResults()) {

4
OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
View file

@ -71,8 +71,8 @@ public class AmenityIndexRepositoryBinary implements AmenityIndexRepository {
if(mi.size() > 0) { if(mi.size() > 0) {
nm = mi.get(0).getName(); nm = mi.get(0).getName();
} }
log.debug(String.format("Search for %s done in %s ms found %s (%s).", //$NON-NLS-1$ log.debug(String.format("Search for %s done in %s ms found %s (%s) %s.", //$NON-NLS-1$
query, System.currentTimeMillis() - now, amenities.size(), nm)); //$NON-NLS-1$ query, System.currentTimeMillis() - now, amenities.size(), nm, index.getFile().getName())); //$NON-NLS-1$
} }
} catch (IOException e) { } catch (IOException e) {
log.error("Error searching amenities", e); //$NON-NLS-1$ log.error("Error searching amenities", e); //$NON-NLS-1$