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

Speed up address search by name (use coordinates)

Browse source
This commit is contained in:
Victor Shcherb 2016-07-02 23:55:05 +02:00
parent a088e115ea
commit ba9fe34f0f
2 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
View file

@ -709,12 +709,25 @@ public class BinaryMapAddressReaderAdapter {
TIntArrayList[] refsContainer, int fp) throws IOException {
TIntArrayList toAdd = null;
TIntArrayList toAddCity = null;
int shiftindex = 0;
int shiftcityindex = 0;
boolean add = true;
while (true) {
if (req.isCancelled()) {
return;
}
int t = codedIS.readTag();
int tag = WireFormat.getTagFieldNumber(t);
if(tag == 0 || tag == AddressNameIndexDataAtom.SHIFTTOINDEX_FIELD_NUMBER) {
if (toAdd != null && add) {
if(shiftindex != 0) {
toAdd.add(shiftindex);
}
if(shiftcityindex != 0) {
toAddCity.add(shiftcityindex);
}
}
}
switch (tag) {
case 0:
return;
@ -726,13 +739,17 @@ public class BinaryMapAddressReaderAdapter {
break;
case AddressNameIndexDataAtom.SHIFTTOCITYINDEX_FIELD_NUMBER:
if (toAddCity != null) {
toAddCity.add(fp - codedIS.readInt32());
shiftcityindex = fp - codedIS.readInt32();
}
break;
case AddressNameIndexDataAtom.XY16_FIELD_NUMBER:
int in32 = codedIS.readInt32();
int x16 = (in32 >>> 16) << 15;
int y16 = (in32 & ((1 << 16) - 1)) << 15;
add = !req.isBboxSpecified() || req.contains(x16, y16, x16, y16);
break;
case AddressNameIndexDataAtom.SHIFTTOINDEX_FIELD_NUMBER:
if (toAdd != null) {
toAdd.add(fp - codedIS.readInt32());
}
shiftindex = fp - codedIS.readInt32();
break;
case AddressNameIndexDataAtom.TYPE_FIELD_NUMBER:
int type = codedIS.readInt32();

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

@ -1686,6 +1686,19 @@ public class BinaryMapIndexReader {
return (x << SearchRequest.ZOOM_TO_SEARCH_POI) | y;
}
public void setBBoxRadius(double lat, double lon, int radiusMeters) {
double dx = MapUtils.getTileNumberX(16, lon);
double half16t = MapUtils.getDistance(lat, MapUtils.getLongitudeFromTile(16, ((int) dx) + 0.5),
lat, MapUtils.getLongitudeFromTile(16, (int) dx));
double cf31 = ((double) radiusMeters / (half16t * 2)) * (1 << 15);
int y31 = MapUtils.get31TileNumberY(lat);
int x31 = MapUtils.get31TileNumberX(lon);
left = (int) (x31 - cf31);
right = (int) (x31 + cf31);
top = (int) (y31 - cf31);
bottom = (int) (y31 + cf31);
}
public boolean publish(T obj) {
if (resultMatcher == null || resultMatcher.publish(obj)) {
@ -1773,6 +1786,10 @@ public class BinaryMapIndexReader {
numberOfReadSubtrees = 0;
numberOfAcceptedSubtrees = 0;
}
public boolean isBboxSpecified() {
return left != 0 || right != 0;
}
}
@ -2019,7 +2036,7 @@ public class BinaryMapIndexReader {
public static void main(String[] args) throws IOException {
// File fl = new File(System.getProperty("maps") + /Synthetic_test_rendering.obf");
File fl = new File(System.getProperty("maps") + "/Netherlands_noord-holland_europe.obf");
File fl = new File(System.getProperty("maps") + "/Netherlands_noord-holland_europe_merge.obf");
RandomAccessFile raf = new RandomAccessFile(fl, "r");
BinaryMapIndexReader reader = new BinaryMapIndexReader(raf, fl);
@ -2170,6 +2187,7 @@ public class BinaryMapIndexReader {
println("Searching by name...");
SearchRequest<Amenity> req = buildSearchPoiRequest(0, 0, "Belar",
0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE, null);
reader.searchPoiByName(req);
for (Amenity a : req.getSearchResults()) {
println(a.getType().getTranslation() +
@ -2304,7 +2322,8 @@ public class BinaryMapIndexReader {
public boolean isCancelled() {
return false;
}
}, "Logger", StringMatcherMode.CHECK_ONLY_STARTS_WITH);
}, "Benelux", StringMatcherMode.CHECK_ONLY_STARTS_WITH);
// req.setBBoxRadius(52.276142, 4.8608723, 15000);
reader.searchAddressDataByName(req);
}