From 2b9c96966ef90ab009804527786175402cac2d47 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 24 Nov 2014 20:24:47 -0500 Subject: [PATCH] Update to call new methods. --- .../router/.RouteResultPreparation.java.swp | Bin 0 -> 57344 bytes .../osmand/router/RouteResultPreparation.java | 16 +++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 OsmAnd-java/src/net/osmand/router/.RouteResultPreparation.java.swp diff --git a/OsmAnd-java/src/net/osmand/router/.RouteResultPreparation.java.swp b/OsmAnd-java/src/net/osmand/router/.RouteResultPreparation.java.swp new file mode 100644 index 0000000000000000000000000000000000000000..3e3bfac96ffe10af9db6f6f4baf586a946dee4f8 GIT binary patch literal 57344 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 literal 0 HcmV?d00001 diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java index 102aa43177..8a018d6ef5 100644 --- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java @@ -462,8 +462,15 @@ public class RouteResultPreparation { for (int i = matchingIndex; i - matchingIndex < nextSegment.getTurnType().getLanes().length; i++) { lanes[i] |= nextSegment.getTurnType().getLanes()[i - matchingIndex] & 1; } - currentSegment.getTurnType().setLanes(lanes); - currentSegment.setTurnType(inferTurnFromLanes(currentSegment.getTurnType(), leftSide)); + TurnType t = currentSegment.getTurnType(); + t.setLanes(lanes); + int turn = inferTurnFromLanes(lanes); + if (turn != 0 && turn != t.getValue()) { + TurnType newTurnType = TurnType.valueOf(turn, leftSide); + newTurnType.setLanes(lanes); + newTurnType.setSkipToSpeak(t.isSkipToSpeak()); + currentSegment.setTurnType(newTurnType); + } } } @@ -696,13 +703,12 @@ public class RouteResultPreparation { t.setSkipToSpeak(true); // When going straight, the lanes have to be calculated from the previous segment, not the current/next segment. - int prevLanes = countLanes(prevSegm); + int prevLanes = countLanesMinOne(prevSegm); if (prevLanes <= 0) { prevLanes = 1; } - t.setLanes(new int[prevLanes]); - t = attachTurnLanesData(leftSide, prevSegm, t); + t.setLanes(attachTurnLanesData(prevSegm, new int[prevLanes])); // Manually set the allowed lanes based on the turn type for (int i = 0; i < t.getLanes().length; i++) {