Add mini_roundabout #21007
Add mini_roundabout #21007
Conversation
| @@ -1456,6 +1447,34 @@ private TurnType processRoundaboutTurn(List<RouteSegmentResult> result, int i, b | |||
| } | |||
| return t; | |||
| } | |||
|
|
|||
| private TurnType processMiniRoundaboutTurn(List<RouteSegmentResult> result, int i, boolean leftSide) { | |||
There was a problem hiding this comment.
Time to move new code to separate class > 2000 lines already in this class
There was a problem hiding this comment.
Create 2 new classes RoadSplitStructure and RoundaboutTurn
| @@ -702,6 +701,47 @@ public boolean roundabout() { | |||
| return false; | |||
| } | |||
|
|
|||
| public boolean miniRoundabout() { | |||
There was a problem hiding this comment.
why do we need these in generic class if they could be implemented as
public String getFirstPointTypeByTag(String tag)
There was a problem hiding this comment.
Removed as redundant
| @@ -1280,6 +1268,9 @@ private TurnType getTurnInfo(List<RouteSegmentResult> result, int i, boolean lef | |||
| if (rr.getObject().roundabout()) { | |||
| return processRoundaboutTurn(result, i, leftSide, prev, rr); | |||
| } | |||
| if (rr.getObject().miniRoundabout() && prev.getObject().miniRoundabout()) { | |||
There was a problem hiding this comment.
We check full method for roundabout ? Where is iteration point by point to test which point exactly is roundabout. What if there are 2 roundabouts on the way, roundabout in the middle.
Code looks suspiciously wrong
There was a problem hiding this comment.
Realised in new class RoundaboutTurn isMiniRoundabout
int[] prevTypes = prev.getObject().getPointTypes(prev.getEndPointIndex());
int[] currentTypes = current.getObject().getPointTypes(current.getStartPointIndex());
| int[] prevTypes = prev.getObject().getPointTypes(prev.getEndPointIndex()); | ||
| int[] currentTypes = current.getObject().getPointTypes(current.getStartPointIndex()); | ||
| if (prevTypes != null && currentTypes != null) { | ||
| Integer miniType = prev.getObject().region.decodingRules.get("highway#mini_roundabout"); |
There was a problem hiding this comment.
RouteRegion.searchRouteEncodingRule
|
To issue #20417