Introduce on_ramp and off_ramp, deprecate ramp

This commit is contained in:
Moritz Kobitzsch
2016-05-03 13:37:41 +02:00
committed by Patrick Niklaus
parent 1e6888c0d3
commit 6018fcf490
12 changed files with 153 additions and 118 deletions
@@ -54,7 +54,7 @@ TurnType IntersectionHandler::findBasicTurnType(const EdgeID via_edge,
bool onto_ramp = isRampClass(out_data.road_classification.road_class);
if (!on_ramp && onto_ramp)
return TurnType::Ramp;
return TurnType::OnRamp;
if (in_data.name_id == out_data.name_id && in_data.name_id != INVALID_NAME_ID)
{
@@ -73,9 +73,9 @@ TurnInstruction IntersectionHandler::getInstructionForObvious(const std::size_t
// handle travel modes:
const auto in_mode = node_based_graph.GetEdgeData(via_edge).travel_mode;
const auto out_mode = node_based_graph.GetEdgeData(road.turn.eid).travel_mode;
if (type == TurnType::Ramp)
if (type == TurnType::OnRamp)
{
return {TurnType::Ramp, getTurnDirection(road.turn.angle)};
return {TurnType::OnRamp, getTurnDirection(road.turn.angle)};
}
if (angularDeviation(road.turn.angle, 0) < 0.01)