starting on conflict resolution

This commit is contained in:
Moritz Kobitzsch
2016-03-01 15:26:13 +01:00
committed by Patrick Niklaus
parent 383c9619ec
commit 74fe0beef6
3 changed files with 53 additions and 14 deletions
+6 -1
View File
@@ -125,7 +125,7 @@ struct TurnInstruction
static TurnInstruction NO_TURN()
{
return TurnInstruction(TurnType::NoTurn, DirectionModifier::Straight);
return TurnInstruction(TurnType::NoTurn, DirectionModifier::UTurn);
}
static TurnInstruction REMAIN_ROUNDABOUT(const DirectionModifier modifier)
@@ -142,6 +142,11 @@ struct TurnInstruction
{
return TurnInstruction(TurnType::ExitRoundabout, modifier);
}
static TurnInstruction SUPPRESSED(const DirectionModifier modifier)
{
return TurnInstruction{TurnType::Suppressed,modifier};
}
};
inline bool operator!=(const TurnInstruction lhs, const TurnInstruction rhs)