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

Fix #2420 (tests included

Browse source
This commit is contained in:
Roman Inflianskas 2016-04-05 21:59:05 +03:00
parent e1d1289396
commit ddb9ba266b
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,10 +60,13 @@ public class RouteResultPreparation {
TurnType t = result.get(i).getTurnType();
// justify turn
if (t != null) {
TurnType jt = justifyUTurn(leftSide, result, i, t);
if (jt != null) {
result.get(i).setTurnType(jt);
next = i + 2;
boolean turnOnSameStreet = result.get(i).getObject().id == result.get(next).getObject().id;
if (turnOnSameStreet) {
TurnType jt = justifyUTurn(leftSide, result, i, t);
if (jt != null) {
result.get(i).setTurnType(jt);
next = i + 2;
}
}
}
}

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

@ -215,10 +215,41 @@
},
"expectedResults": {
"14418": "TL, +TL, C, C, TR"
}
},
{
"testName": "11.Graaf Lodewijkstraat to Graaf Lodewijkstraat u-turn",
"startPoint": {
"latitude": 52.076116774796496,
"longitude": 4.821222126483946
},
"endPoint": {
"latitude": 52.075488682963716,
"longitude": 4.821018278598814
},
"expectedResults": {
"7352195": null,
"7352546": "+TL;TR"
}
},
{
"testName": "12.Rembrandtlaan to Rubensstraat u-turn",
"startPoint": {
"latitude": 45.69849708250879,
"longitude": 35.64191635632511
},
"endPoint": {
"latitude": 45.699958273396,
"longitude": 35.642077288866005
},
"expectedResults": {
"7351364": null,
"7351365": "+TL",
"7351445": "+TL"
}
},
{
"testName": "11.Figure 8 TL",
"testName": "12.Figure 8 TL",
"startPoint": {
"latitude": 45.69816447596442,
"longitude": 35.74885922431952