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

Fix #6053

Browse source
This commit is contained in:
crimean 2018-10-05 19:22:52 +03:00
parent 35cf4dd5ff
commit 16dc788efa
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
View file

@ -500,6 +500,7 @@ public class SearchCoreFactory {
private static final int LIMIT = 10000; private static final int LIMIT = 10000;
private static final int BBOX_RADIUS = 500 * 1000; private static final int BBOX_RADIUS = 500 * 1000;
private static final int BBOX_RADIUS_INSIDE = 10000 * 1000; // to support city search for basemap private static final int BBOX_RADIUS_INSIDE = 10000 * 1000; // to support city search for basemap
private static final int FIRST_WORD_MIN_LENGTH = 3;
private SearchAmenityTypesAPI searchAmenityTypesAPI; private SearchAmenityTypesAPI searchAmenityTypesAPI;
public SearchAmenityByNameAPI(SearchAmenityTypesAPI searchAmenityTypesAPI) { public SearchAmenityByNameAPI(SearchAmenityTypesAPI searchAmenityTypesAPI) {
@ -519,12 +520,24 @@ public class SearchCoreFactory {
final BinaryMapIndexReader[] currentFile = new BinaryMapIndexReader[1]; final BinaryMapIndexReader[] currentFile = new BinaryMapIndexReader[1];
Iterator<BinaryMapIndexReader> offlineIterator = phrase.getRadiusOfflineIndexes(BBOX_RADIUS, Iterator<BinaryMapIndexReader> offlineIterator = phrase.getRadiusOfflineIndexes(BBOX_RADIUS,
SearchPhraseDataType.POI); SearchPhraseDataType.POI);
final NameStringMatcher nm = phrase.getNameStringMatcher(); String searchWord = phrase.getUnknownSearchWord();
if (searchWord.length() < FIRST_WORD_MIN_LENGTH && phrase.getUnknownSearchWords().size() > 0) {
for (String unknownSearchWord : phrase.getUnknownSearchWords()) {
if (unknownSearchWord.length() >= FIRST_WORD_MIN_LENGTH) {
searchWord = unknownSearchWord;
break;
}
}
}
if (searchWord.length() < FIRST_WORD_MIN_LENGTH) {
return false;
}
final NameStringMatcher nm = phrase.getNameStringMatcher(searchWord, phrase.isUnknownSearchWordComplete());
QuadRect bbox = phrase.getRadiusBBoxToSearch(BBOX_RADIUS_INSIDE); QuadRect bbox = phrase.getRadiusBBoxToSearch(BBOX_RADIUS_INSIDE);
final Set<String> ids = new HashSet<String>(); final Set<String> ids = new HashSet<String>();
SearchRequest<Amenity> req = BinaryMapIndexReader.buildSearchPoiRequest( SearchRequest<Amenity> req = BinaryMapIndexReader.buildSearchPoiRequest(
(int)bbox.centerX(), (int)bbox.centerY(), (int)bbox.centerX(), (int)bbox.centerY(),
phrase.getUnknownSearchWord(), searchWord,
(int)bbox.left, (int)bbox.right, (int)bbox.left, (int)bbox.right,
(int)bbox.top, (int)bbox.bottom, (int)bbox.top, (int)bbox.bottom,
new ResultMatcher<Amenity>() { new ResultMatcher<Amenity>() {
@ -593,7 +606,9 @@ public class SearchCoreFactory {
if (p.hasObjectType(ObjectType.POI_TYPE)) { if (p.hasObjectType(ObjectType.POI_TYPE)) {
return -1; return -1;
} }
if (p.getUnknownSearchWordLength() >= 3 || p.getRadiusLevel() > 1) { if (p.getUnknownSearchWordLength() >= FIRST_WORD_MIN_LENGTH
|| p.getUnknownSearchWords().size() > 0
|| p.getRadiusLevel() > 1) {
return SEARCH_AMENITY_BY_NAME_API_PRIORITY_IF_3_CHAR; return SEARCH_AMENITY_BY_NAME_API_PRIORITY_IF_3_CHAR;
} }
return -1; return -1;