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

Fix #3151

Browse source
This commit is contained in:
Alexey Kulish 2016-10-18 15:19:26 +03:00
parent 1219c064b2
commit f1ec77cb72
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
OsmAnd-java/src/net/osmand/search/SearchUICore.java
View file

@ -526,6 +526,31 @@ public class SearchUICore {
if(cmp != 0) { if(cmp != 0) {
return cmp; return cmp;
} }
Amenity a1 = null;
if(o1.object instanceof Amenity) {
a1 = (Amenity) o1.object;
}
Amenity a2 = null;
if(o2.object instanceof Amenity) {
a2 = (Amenity) o2.object;
}
if (a1 != null && a2 != null) {
// here 2 points are amenity
String type1 = a1.getType().getKeyName();
String type2 = a2.getType().getKeyName();
String subType1 = a1.getSubType();
String subType2 = a2.getSubType();
cmp = collator.compare(type1, type2);
if(cmp != 0) {
return cmp;
}
cmp = collator.compare(subType1, subType2);
if(cmp != 0) {
return cmp;
}
}
s1 = o1.getSearchDistance(loc, 1); s1 = o1.getSearchDistance(loc, 1);
s2 = o2.getSearchDistance(loc, 1); s2 = o2.getSearchDistance(loc, 1);
return Double.compare(s1, s2); return Double.compare(s1, s2);