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

Test fix

Browse source
This commit is contained in:
Victor Shcherb 2020-02-27 15:47:37 +02:00
parent fa77b30a13
commit 3485dc86c7
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -888,15 +888,20 @@ public class SearchUICore {
} }
double s1 = o1.getSearchDistance(loc, 1); double s1 = o1.getSearchDistance(loc, 1);
double s2 = o2.getSearchDistance(loc, 1); double s2 = o2.getSearchDistance(loc, 1);
if (o1.parentSearchResult != null && o2.parentSearchResult != null) { double ps1 = o1.parentSearchResult == null ? 0 : o1.parentSearchResult.getSearchDistance(loc);
if (o1.parentSearchResult == o2.parentSearchResult) { double ps2 = o2.parentSearchResult == null ? 0 : o2.parentSearchResult.getSearchDistance(loc);
int cmp = collator.compare(localeName1, localeName2); if (ps1 != ps2) {
if (cmp != 0) { return Double.compare(ps1, ps2);
return cmp;
}
}
return Double.compare(s1, s2);
} }
// if (o1.parentSearchResult != null && o2.parentSearchResult != null) {
// if (o1.parentSearchResult == o2.parentSearchResult) {
// int cmp = collator.compare(localeName1, localeName2);
// if (cmp != 0) {
// return cmp;
// }
// }
// return Double.compare(s1, s2);
// }
int cmp = collator.compare(localeName1, localeName2); int cmp = collator.compare(localeName1, localeName2);
if (cmp != 0) { if (cmp != 0) {
return cmp; return cmp;