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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-07-03 01:13:37 +02:00
commit e18d251da5
2 changed files with 6 additions and 4 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

@ -504,7 +504,7 @@ public class RouteResultPreparation {
if (currentTurn == null || currentTurn.getLanes() == null) {
// skip
} else {
boolean changed = false;
boolean merged = false;
if (nextSegment != null) {
String hw = currentSegment.getObject().getHighway();
double mergeDistance = 200;
@ -512,10 +512,11 @@ public class RouteResultPreparation {
mergeDistance = 400;
}
if (dist < mergeDistance) {
changed = mergeTurnLanes(leftside, currentSegment, nextSegment);
mergeTurnLanes(leftside, currentSegment, nextSegment);
merged = true;
}
}
if (!changed) {
if (!merged) {
TurnType tt = currentSegment.getTurnType();
inferActiveTurnLanesFromTurn(tt, TurnType.C);
}

3
OsmAnd-java/test/resources/test_turn_lanes.json
View file

@ -423,7 +423,8 @@
"longitude": 35.63232659539227
},
"expectedResults": {
"202493001": "+C,TL|TR"
"202493001": "+TL,C|TR",
"339767384": "+TL,C"
}
},
{