From 6906b04a537f781f2dacd73e9e7c339510871081 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 21 Jan 2021 18:42:40 +0100
Subject: [PATCH] Fix non-transitive comparision
 https://github.com/osmandapp/OsmAnd/issues/10626

---
 .../java/net/osmand/search/SearchUICore.java  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
index 37c16393fa..0e542891d8 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
@@ -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;
 		}