Destination ref vs exit ref

osmandapp · Nov 29, 2024 · 1446edb · 1446edb
1 parent 01b0d91
commit 1446edb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/ExitInfo.java b/OsmAnd-java/src/main/java/net/osmand/router/ExitInfo.java
@@ -22,4 +22,8 @@ public String getExitStreetName() {
     public void setExitStreetName(String exitStreetName) {
         this.exitStreetName = exitStreetName;
     }
+
+    public boolean isEmpty() {
+        return ref == null && exitStreetName == null;
+    }
 }
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
@@ -459,7 +459,7 @@ private static List<RouteSegmentResult> convertVectorResult(List<RouteDirectionI
 						exitInfo.setRef(current.getObject().getExitRef());
 						exitInfo.setExitStreetName(current.getObject().getExitName());
 						info.setExitInfo(exitInfo);
-						if (routeInd > 0 && (exitInfo.getRef() != null || exitInfo.getExitStreetName() != null)) {
+						if (!exitInfo.isEmpty() && info.getDestinationRef() == null && routeInd > 0) {
 							// set ref and road name (or shield icon) from previous segment because exit point is not consist of highway ref
 							RouteSegmentResult previous;
 							previous = list.get(routeInd - 1);