Skip to content

Commit b5bd541

Browse files
author
Ludwig Friedmann
authored
Merge branch 'master' into Moving-Objects-relative-velocity-definition
2 parents 7a5252a + 9c9756c commit b5bd541

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

.clang-format

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
IndentWidth: 4
2+
ColumnLimit: 80
3+
BasedOnStyle: Google
4+
UseTab: Never
5+
BreakBeforeBraces: Allman
6+
MaxEmptyLinesToKeep: 1
7+
ReflowComments: true

osi_lane.proto

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ message Lane
5454

5555
// The lane's center line (as a list of segments).
5656
//
57-
// This is the line, that a typical vehicle is supposed to follow. Thus,
58-
// if the road narrows (e.g. at a construction site) this line is
59-
// supposed to describe the trajectory that the vehicle should follow.
60-
// The intended direction of travel on the lane is given by the
61-
// direction defined by the sequence of points forming the center line.
57+
// The center line describes the middle of the lane.
6258
//
6359
// \image html highway_exit.png "Center lines as yellow dotted lines."
6460
//
@@ -71,9 +67,19 @@ message Lane
7167
// \image html line_approximation_error.png "Approximation error as
7268
// green line."
7369
//
70+
// \note The center line is the line that a typical vehicle follows more
71+
// or less (depending on the situation, a little more to the left or
72+
// right of the center line). The intended direction of travel on the
73+
// lane is given by the direction defined by the sequence of points
74+
// forming the \c #centerline w.r.t. \c #centerline_is_driving_direction.
75+
//
7476
// \note The \c #centerline is defined only for \c #type =
7577
// \c #TYPE_DRIVING and one \c #lane_pairing pair.
7678
//
79+
// \note Intersections and non-driving lanes do not have a center line.
80+
// A vehicle must calculate this individually and depending on the
81+
// situation.
82+
//
7783
repeated Vector3d centerline = 3;
7884

7985
// Definition of the intended driving direction.

0 commit comments

Comments
 (0)