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

Fix non-transitive comparision https://github.com/osmandapp/OsmAnd/issues/10626

Browse source
This commit is contained in:
Victor Shcherb 2021-01-21 18:42:40 +01:00
parent d7828b4bf0
commit 6906b04a53
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -954,17 +954,15 @@ public class SearchUICore {
break;
}
case COMPARE_AMENITY_TYPE_ADDITIONAL: {
if(o1.object instanceof AbstractPoiType && o2.object instanceof AbstractPoiType ) {
boolean additional1 = ((AbstractPoiType) o1.object).isAdditional();
boolean additional2 = ((AbstractPoiType) o2.object).isAdditional();
if (additional1 != additional2) {
// -1 - means 1st is less than 2nd
return additional1 ? 1 : -1;
}
boolean additional1 = o1.object instanceof AbstractPoiType && ((AbstractPoiType) o1.object).isAdditional();
boolean additional2 = o2.object instanceof AbstractPoiType && ((AbstractPoiType) o2.object).isAdditional();
if (additional1 != additional2) {
// -1 - means 1st is less than 2nd
return additional1 ? 1 : -1;
}
break;
}
case COMPARE_DISTANCE_TO_PARENT_SEARCH_RESULT:
case COMPARE_DISTANCE_TO_PARENT_SEARCH_RESULT:
double ps1 = o1.parentSearchResult == null ? 0 : o1.parentSearchResult.getSearchDistance(c.loc);
double ps2 = o2.parentSearchResult == null ? 0 : o2.parentSearchResult.getSearchDistance(c.loc);
if (ps1 != ps2) {
@ -1042,12 +1040,17 @@ public class SearchUICore {
@Override
public int compare(SearchResult o1, SearchResult o2) {
for(ResultCompareStep step : ResultCompareStep.values()) {
List<ResultCompareStep> steps = new ArrayList<>();
for (ResultCompareStep step : ResultCompareStep.values()) {
int r = step.compare(o1, o2, this);
if(r != 0) {
steps.add(step);
if (r != 0) {
// debug crashes and identify non-transitive comparision
// LOG.debug(String.format("%d: %s o1='%s' o2='%s'", r, steps, o1, o2));
return r;
}
}
// LOG.debug(String.format("EQUAL: o1='%s' o2='%s'", o1, o2));
return 0;
}