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

Fix crash with search navigation

Browse source
This commit is contained in:
Victor Shcherb 2021-01-19 16:44:57 +01:00
parent 2efb0ac6af
commit d416ef0a6a
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd-java/src/main/java/net/osmand/data/Building.java
View file

@ -182,10 +182,10 @@ public class Building extends MapObject {
@Override
public String toString() {
if(interpolationInterval !=0){
return name+"-"+name2 +" (+"+interpolationInterval+") ";
} else if(interpolationType != null) {
return name+"-"+name2 +" ("+interpolationType+") ";
if (interpolationInterval != 0) {
return name + "-" + name2 + " (+" + interpolationInterval + ") ";
} else if (interpolationType != null) {
return name + "-" + name2 + " (" + interpolationType + ") ";
}
return name;
}

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

@ -1004,17 +1004,12 @@ public class SearchUICore {
String subType2 = a2.getSubType() == null ? "" : a2.getSubType();
int cmp = 0;
if (FILTER_DUPLICATE_POI_SUBTYPE.contains(subType1)) {
cmp = 1;
} else if (FILTER_DUPLICATE_POI_SUBTYPE.contains(subType2)) {
cmp = -1;
}
if (cmp != 0) {
return cmp;
boolean subtypeFilter1 = FILTER_DUPLICATE_POI_SUBTYPE.contains(subType1);
boolean subtypeFilter2 = FILTER_DUPLICATE_POI_SUBTYPE.contains(subType2);
if (subtypeFilter1 != subtypeFilter2) {
// to filter second
return subtypeFilter1 ? 1 : -1;
}
cmp = c.collator.compare(type1, type2);
if (cmp != 0) {
return cmp;