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

Fix search issue

Browse source
This commit is contained in:
Victor Shcherb 2017-04-17 19:43:49 +03:00
parent db0ed47f96
commit 9032333643
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -684,7 +684,7 @@ public class BinaryMapAddressReaderAdapter {
codedIS.seek(contOffset); codedIS.seek(contOffset);
int len = codedIS.readRawVarint32(); int len = codedIS.readRawVarint32();
int old = codedIS.pushLimit(len); int old = codedIS.pushLimit(len);
obj = readCityHeader(null, contOffset, null); obj = readCityHeader(null, contOffset, reg.attributeTagsTable);
codedIS.popLimit(old); codedIS.popLimit(old);
} }
if (obj != null) { if (obj != null) {

6
OsmAnd-java/src/net/osmand/search/core/SearchPhrase.java
View file

@ -614,6 +614,12 @@ public class SearchPhrase {
} }
} }
} }
if(!sr.firstUnknownWordMatches) {
sr.firstUnknownWordMatches = localeName.equals(getUnknownSearchWord()) ||
getNameStringMatcher().matches(localeName) ||
getNameStringMatcher().matches(otherNames);
}
} }
public int getRadiusSearch(int meters) { public int getRadiusSearch(int meters) {
return (1 << (getRadiusLevel() - 1)) * meters; return (1 << (getRadiusLevel() - 1)) * meters;