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

Fix #2918 (turn lanes)

Browse source
This commit is contained in:
Victor Shcherb 2016-08-11 01:17:25 +02:00
parent aee6579745
commit 64142d34a6
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -977,6 +977,7 @@ public class RouteResultPreparation {
Set<String> addedTurns = new TreeSet<String>();
// if we have information increase number of roads per each turn direction
int diffTurnRoads = roads;
int increaseTurnRoads = 0;
for(int[] li : lanesInfo) {
TIntHashSet set = new TIntHashSet();
if(li != null) {
@ -984,7 +985,7 @@ public class RouteResultPreparation {
TurnType.collectTurnTypes(li[k], set);
}
}
diffTurnRoads += Math.max(set.size() - 1, 0);
increaseTurnRoads = Math.max(set.size() - 1, 0);
}
for (int i = 0; i < rawLanes.length; i++) {
@ -1012,9 +1013,11 @@ public class RouteResultPreparation {
// we already found slight turn others are turn in different direction
lookupSlightTurn = false;
}
if (lanes < 0 || diffTurnRoads < 0) {
if (lanes < 0 || diffTurnRoads + increaseTurnRoads < 0) {
activeStartIndex = ind;
break;
} else if(diffTurnRoads < 0 && activeStartIndex < 0) {
activeStartIndex = ind;
}
}
return activeStartIndex;