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

Fix small issues

Browse source
This commit is contained in:
Victor Shcherb 2015-01-15 03:17:26 +01:00
parent 1756e39616
commit 660ee62f71
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
View file

@ -518,10 +518,10 @@ public class RouteResultPreparation {
} }
} else { } else {
// next turn is get through (take out the left and the right turn) // next turn is get through (take out the left and the right turn)
if (target.originalLanes.length >= active.activeLen) { if (target.activeLen < active.activeLen) {
float ratio = (target.originalLanes.length / (float) active.activeLen); float ratio = (active.activeLen - target.activeLen) / 2f;
active.activeEndIndex = (int) Math.ceil(target.activeEndIndex * ratio); active.activeEndIndex = (int) Math.ceil(active.activeEndIndex - ratio);
active.activeStartIndex = (int) Math.floor(target.activeStartIndex / ratio); active.activeStartIndex = (int) Math.floor(active.activeStartIndex + ratio);
changed = true; changed = true;
} }
} }
@ -1064,7 +1064,18 @@ public class RouteResultPreparation {
// Checking to see that there is only one unique turn // Checking to see that there is only one unique turn
if (possibleTurns.size() == 1) { if (possibleTurns.size() == 1) {
return possibleTurns.iterator().next(); int infer = possibleTurns.iterator().next();
for(int i = 0; i < oLanes.length; i++) {
if(TurnType.getSecondaryTurn(oLanes[i]) == infer) {
int pt = TurnType.getPrimaryTurn(oLanes[i]);
int en = oLanes[i] & 1;
TurnType.setPrimaryTurnAndReset(oLanes, i, infer);
oLanes[i] |= en;
TurnType.setSecondaryTurn(oLanes, i, pt);
}
}
return infer;
} }
return 0; return 0;