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

Add small fixes

Browse source
This commit is contained in:
Alexander Sytnyk 2017-10-24 16:03:54 +03:00
parent be21c20bbe
commit 0eff2e7850
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
View file

@ -214,6 +214,8 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
clearPreviousZoom();
} else if (radius < distanceToSearchValues.length) {
distanceInd = radius;
} else {
distanceInd = distanceToSearchValues.length - 1;
}
List<Amenity> amenityList = searchAmenities(lat, lon, matcher);
MapUtils.sortListOfMapObject(amenityList, lat, lon);

9
OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java
View file

@ -39,7 +39,8 @@ public class QuickSearchHelper implements ResourceListener {
public static final int SEARCH_WPT_OBJECT_PRIORITY = 52;
public static final int SEARCH_HISTORY_API_PRIORITY = 50;
public static final int SEARCH_HISTORY_OBJECT_PRIORITY = 53;
public static final int SEARCH_ONLINE_PRIORITY = 53;
public static final int SEARCH_ONLINE_AMENITY_PRIORITY = 700;
public static final int SEARCH_ONLINE_ADDRESS_PRIORITY = 500;
private OsmandApplication app;
private SearchUICore core;
private SearchResultCollection resultCollection;
@ -302,15 +303,11 @@ public class QuickSearchHelper implements ResourceListener {
SearchResult sr = new SearchResult(phrase);
sr.localeName = amenity.getName();
sr.object = amenity;
sr.priority = SEARCH_ONLINE_PRIORITY + (p++);
sr.priority = poi ? SEARCH_ONLINE_AMENITY_PRIORITY : SEARCH_ONLINE_ADDRESS_PRIORITY + (p++);
sr.objectType = poi ? ObjectType.POI : ObjectType.POI; // todo
sr.location = amenity.getLocation();
sr.preferredZoom = 17;
if (phrase.getUnknownSearchWordLength() <= 1 && phrase.isNoSelectedType()) {
matcher.publish(sr);
} else if (phrase.getNameStringMatcher().matches(sr.localeName)) {
matcher.publish(sr);
}
}
}
}