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

Fix filter poi by name

Browse source
This commit is contained in:
Victor Shcherb 2016-07-24 11:30:12 +02:00
parent 282287e821
commit b7378c0c61
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -556,10 +556,6 @@ public class SearchCoreFactory {
SearchResult res = new SearchResult(phrase); SearchResult res = new SearchResult(phrase);
res.localeName = object.getName(phrase.getSettings().getLang(), true); res.localeName = object.getName(phrase.getSettings().getLang(), true);
res.otherNames = object.getAllNames(true); res.otherNames = object.getAllNames(true);
if (!Algorithms.isEmpty(phrase.getLastWord())
&& !(ns.matches(res.localeName) || ns.matches(res.otherNames))) {
return false;
}
if (Algorithms.isEmpty(res.localeName)) { if (Algorithms.isEmpty(res.localeName)) {
AbstractPoiType st = types.getAnyPoiTypeByKey(object.getSubType()); AbstractPoiType st = types.getAnyPoiTypeByKey(object.getSubType());
if (st != null) { if (st != null) {
@ -568,6 +564,11 @@ public class SearchCoreFactory {
res.localeName = object.getSubType(); res.localeName = object.getSubType();
} }
} }
if (!Algorithms.isEmpty(phrase.getLastWord())
&& !(ns.matches(res.localeName) || ns.matches(res.otherNames))) {
return false;
}
res.object = object; res.object = object;
res.preferredZoom = 17; res.preferredZoom = 17;
res.file = selected[0]; res.file = selected[0];