Skip to content

Commit f8ed6db

Browse files
committed
Update Doxygen documentation
1 parent a618020 commit f8ed6db

File tree

3 files changed

+52
-28
lines changed

3 files changed

+52
-28
lines changed

osi_common.proto

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,10 @@ message LogicalLaneAssignment
357357
{
358358
// ID of the LogicalLane the object is assigned to.
359359
//
360+
// \rules
361+
// refers_to: LogicalLane
362+
// \endrules
363+
//
360364
optional Identifier assigned_lane_id = 1;
361365

362366
// S position of the object reference point on the lane, in the ST

osi_logicallane.proto

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import "osi_lane.proto";
77

88
package osi3;
99

10+
//
11+
// \brief Boundary line of a LogicalLane
12+
//
1013
// Similar to a LaneBoundary, but with a reference and ST positions.
1114
//
1215
// A logical lane boundary describes the boundary between two logical lanes. As
@@ -58,11 +61,13 @@ message LogicalLaneBoundary
5861
// line. So S positions should increase along the line. Note that S
5962
// positions will not always increase strictly monotonically.
6063
// Example:
64+
// <pre>
6165
// |---------\
6266
// | \
63-
// /---boundary--| \------------
67+
// /---boundary--| \\------------
6468
// /
6569
// ---------- reference line --------------
70+
// </pre>
6671
// At the place where the boundary suddenly increases, two points will have
6772
// the same S coordinate.
6873
//
@@ -120,10 +125,12 @@ message LogicalLaneBoundary
120125
// LogicalLaneBoundary which references them, but must never be shorter.
121126
//
122127
// Example:
123-
// Lane 1
124-
// --------a------------------ - - - -c- - - - ---->
125-
// - - - -b- - - -
126-
// Lane -1
128+
// <pre>
129+
// Lane 1
130+
// --------a------------------ - - - -c- - - - ----&gt;
131+
// \- - - -b- - - -
132+
// Lane -1
133+
// </pre>
127134
//
128135
// This shows the boundary between lane 1 and lane -1, with the reference
129136
// line going from left to right. First there is a solid-broken line (a and
@@ -157,9 +164,11 @@ message LogicalLaneBoundary
157164
//
158165
repeated ExternalReference source_reference = 6;
159166

160-
// A point on the boundary
161167
//
162-
message LogicalBoundaryPoint {
168+
// \brief A point on the boundary
169+
//
170+
message LogicalBoundaryPoint
171+
{
163172

164173
// The position of the \c LaneBoundaryPoint.
165174
//
@@ -176,13 +185,15 @@ message LogicalLaneBoundary
176185
optional double t_position = 3;
177186
}
178187

179-
// Passing rule of the LogicalLaneBoundary.
188+
//
189+
// \brief Passing rule of the LogicalLaneBoundary.
180190
//
181191
// This describes how vehicles may move across the LogicalLaneBoundary. The
182192
// PassingRule is determined solely based on the road, not on any signs
183193
// (i.e. it may be overridden by signs).
184194
//
185-
enum PassingRule {
195+
enum PassingRule
196+
{
186197
// Passing rule is unknown (must not be used in ground truth).
187198
//
188199
PASSING_RULE_UNKNOWN = 0;
@@ -299,11 +310,13 @@ message LogicalLane
299310
// condition, etc..
300311
//
301312
// TODO Should this be a repeated field? Imagine the following scenario:
313+
// <pre>
302314
// ---------------------------------
303315
// l1 l2
304316
// ---------- l3 ---------
305317
// l4 l5
306318
// ---------------------------------
319+
// </pre>
307320
//
308321
// In this case, we have five physical lanes: l1, l2, l4 and l5 where a
309322
// lane marking is present. And l3 is one lane covering the whole road
@@ -452,10 +465,11 @@ message LogicalLane
452465
//
453466
repeated LaneConnection successor_lane = 15;
454467

455-
// Connection to another lane (predecessor or successor)
456468
//
457-
message LaneConnection {
458-
469+
// \brief Connection to another lane (predecessor or successor)
470+
//
471+
message LaneConnection
472+
{
459473
// Id of the other logical lane that is connected
460474
//
461475
// \rules
@@ -471,10 +485,11 @@ message LogicalLane
471485

472486
}
473487

474-
// Relation of this lane to another logical lane
475488
//
476-
message LaneRelation {
477-
489+
// \brief Relation of this lane to another logical lane
490+
//
491+
message LaneRelation
492+
{
478493
// Id of the other logical lane
479494
//
480495
// \rules

osi_referenceline.proto

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,17 @@ message ReferenceLine
8282
// A point is "before" the reference line, if its s coordinate is < sStart.
8383
// A point is "after" the reference line, if its s coordinate is > sEnd.
8484
//
85-
// To describe points that are not directly on the polyline, a T
86-
// coordinate is added. T is the signed 2D distance (i.e. hypot(A.X-B.X,
87-
// A.Y-B.Y), if A and B are the two points) between the point to describe
88-
// and the nearest point on the polyline (this point might either be on a
89-
// line segment or at an edge between two line segments). The distance is
90-
// positive if the point is left of the polyline (in definition direction),
91-
// negative if it is right of it. Note that the "nearest point on the
92-
// polyline" is calculated in 3D, in order to choose the correct point for
93-
// 3D curves (think reference lines for roads in parking decks). If there
94-
// are several "nearest points", the one with the smallest S coordinate on
95-
// the polyline is chosen.
85+
// To describe points that are not directly on the polyline, a T coordinate
86+
// is added. T is the signed 2D distance (i.e. <code>hypot(A.X-B.X,
87+
// A.Y-B.Y)</code>, if A and B are the two points) between the point to
88+
// describe and the nearest point on the polyline (this point might either
89+
// be on a line segment or at an edge between two line segments). The
90+
// distance is positive if the point is left of the polyline (in definition
91+
// direction), negative if it is right of it. Note that the "nearest point
92+
// on the polyline" is calculated in 3D, in order to choose the correct
93+
// point for 3D curves (think reference lines for roads in parking decks).
94+
// If there are several "nearest points", the one with the smallest S
95+
// coordinate on the polyline is chosen.
9696
//
9797
// Sometimes an angle to a reference line is needed. This shall be defined
9898
// as follows:
@@ -129,12 +129,17 @@ message ReferenceLine
129129
//
130130
repeated ReferenceLinePoint poly_line = 2;
131131

132-
// A point on the reference line
133-
message ReferenceLinePoint {
132+
//
133+
// \brief A point on the reference line
134+
//
135+
message ReferenceLinePoint
136+
{
134137
// A world position
138+
//
135139
optional Vector3d world_position = 1;
136140

137141
// S position on the reference line
142+
//
138143
optional double s_position = 2;
139144
}
140145
}

0 commit comments

Comments
 (0)