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

Change return type of attachTurnLanesData to void

Browse source
This commit is contained in:
Saikrishna Arcot 2014-10-06 12:43:50 -04:00
parent a11e5bb9e6
commit 3ef0a4f9a8
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -578,7 +578,7 @@ public class RouteResultPreparation {
if (t != null && lanes != null) { if (t != null && lanes != null) {
t.setLanes(lanes); t.setLanes(lanes);
t = attachTurnLanesData(leftSide, prevSegm, t); attachTurnLanesData(leftSide, prevSegm, t);
} }
return t; return t;
} }
@ -608,29 +608,27 @@ public class RouteResultPreparation {
} }
} }
private TurnType attachTurnLanesData(boolean leftSide, RouteSegmentResult prevSegm, TurnType t) { private void attachTurnLanesData(boolean leftSide, RouteSegmentResult prevSegm, TurnType t) {
int lanes = prevSegm.getObject().getLanes(); int lanes = prevSegm.getObject().getLanes();
String turnLanes = getTurnLanesString(prevSegm); String turnLanes = getTurnLanesString(prevSegm);
if (turnLanes == null) { if (turnLanes == null) {
return t; return;
} }
String[] splitLaneOptions = turnLanes.split("\\|", -1); String[] splitLaneOptions = turnLanes.split("\\|", -1);
if (splitLaneOptions.length != lanes) { if (splitLaneOptions.length != lanes) {
// Error in data or missing data // Error in data or missing data
return t; return;
} }
if (t.getLanes().length != lanes) { if (t.getLanes().length != lanes) {
// The turn:lanes don't easily match up to the target road. // The turn:lanes don't easily match up to the target road.
// TODO: Add support for lanes that can go in multiple directions // TODO: Add support for lanes that can go in multiple directions
return t; return;
} }
assignTurns(splitLaneOptions, t); assignTurns(splitLaneOptions, t);
return t;
} }
private void assignTurns(String[] splitLaneOptions, TurnType t) { private void assignTurns(String[] splitLaneOptions, TurnType t) {