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

Fixes according to review

Browse source
This commit is contained in:
PaulStets 2017-09-16 14:34:53 +03:00
parent da07e7cf2d
commit 8f2ab2d077
2 changed files with 611 additions and 614 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ public class SearchPhrase {
private Collator clt;
private static Set<String> conjunctions = new TreeSet<>();
static {
// the
conjunctions.add("the");
@ -275,7 +274,6 @@ public class SearchPhrase {
final Iterator<BinaryMapIndexReader> lit = list.iterator();
return new Iterator<BinaryMapIndexReader>() {
BinaryMapIndexReader next = null;
@Override
public boolean hasNext() {
while (lit.hasNext()) {
@ -589,7 +587,7 @@ public class SearchPhrase {
Iterator<BinaryMapIndexReader> it = indexes.iterator();
while (it.hasNext()) {
BinaryMapIndexReader r = it.next();
if (r.getFile().getName().matches(".*([0-9]+_*){3}\\.obf")) {
if (r.getFile().getName().matches("[a-zA-Z_-]+([0-9]+_*){3}[.a-z]+")) {
String currRegionName = r.getRegionName();
if (result.containsKey(currRegionName)) {
result.get(currRegionName).add(r);
@ -657,7 +655,6 @@ public class SearchPhrase {
}
}
public int getRadiusSearch(int meters) {
return (1 << (getRadiusLevel() - 1)) * meters;
}