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

Fied getRegionName for diffs and added grouping by regions for search

Browse source
This commit is contained in:
PaulStets 2017-09-13 13:43:25 +03:00
parent 491d90d5e9
commit ff79bb518a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -535,9 +535,6 @@ public class SearchPhrase {
if(indexes == null) { if(indexes == null) {
indexes = new ArrayList<>(getOfflineIndexes()); indexes = new ArrayList<>(getOfflineIndexes());
} }
if (indexes.get(0).getFile().getName().matches("[a-zA-Z_-]+([0-9]+_*{3}).+[a-z]+")) {
return;
}
final LatLon ll = getLastTokenLocation(); final LatLon ll = getLastTokenLocation();
if(ll != null) { if(ll != null) {
Collections.sort(indexes, new Comparator<BinaryMapIndexReader>() { Collections.sort(indexes, new Comparator<BinaryMapIndexReader>() {
@ -545,6 +542,9 @@ public class SearchPhrase {
@Override @Override
public int compare(BinaryMapIndexReader o1, BinaryMapIndexReader o2) { public int compare(BinaryMapIndexReader o1, BinaryMapIndexReader o2) {
if (o1.getRegionName().equals(o2.getRegionName())) {
return o1.getFile().getName().compareTo(o2.getFile().getName());
}
LatLon rc1 = o1 == null ? null : getLocation(o1); LatLon rc1 = o1 == null ? null : getLocation(o1);
LatLon rc2 = o2 == null ? null : getLocation(o2); LatLon rc2 = o2 == null ? null : getLocation(o2);
double d1 = rc1 == null ? 10000000d : MapUtils.getDistance(rc1, ll); double d1 = rc1 == null ? 10000000d : MapUtils.getDistance(rc1, ll);