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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-10-19 11:33:05 +02:00
commit 8dd54dffea
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,7 @@ public class SearchUICore {
searchResults.add(addedResult); searchResults.add(addedResult);
} }
j++; j++;
i = searchResults.size();
continue; continue;
} }
SearchResult existingResult = searchResults.get(i); SearchResult existingResult = searchResults.get(i);
@ -118,6 +119,7 @@ public class SearchUICore {
int compare = cmp.compare(existingResult, addedResult); int compare = cmp.compare(existingResult, addedResult);
if(compare == 0) { if(compare == 0) {
// existingResult == addedResult // existingResult == addedResult
this.searchResults.add(addedResults.get(j));
j++; j++;
} else if(compare > 0) { } else if(compare > 0) {
// existingResult > addedResult // existingResult > addedResult
@ -526,17 +528,10 @@ public class SearchUICore {
if(cmp != 0) { if(cmp != 0) {
return cmp; return cmp;
} }
if (o1.object instanceof Amenity && o2.object instanceof Amenity) {
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 // here 2 points are amenity
Amenity a1 = (Amenity) o1.object;
Amenity a2 = (Amenity) o2.object;
String type1 = a1.getType().getKeyName(); String type1 = a1.getType().getKeyName();
String type2 = a2.getType().getKeyName(); String type2 = a2.getType().getKeyName();
String subType1 = a1.getSubType(); String subType1 = a1.getSubType();