Skip to content

Commit 931e0ca

Browse files
Additional clang reformating
Additional reformating of the proto files.
1 parent 3338034 commit 931e0ca

10 files changed

+226
-195
lines changed

osi_detectedlane.proto

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,13 @@ message DetectedLaneBoundary
7070
// attribute has to be set for each instance. All other values will be
7171
// reused from the previous \c BoundaryPoint in the sequence or set to
7272
// default values if there is none or it was never set. For dashed lines,
73-
// one \c LaneBoundary::BoundaryPoint has to be at the start and another at the end
74-
// of each dashed line segment. For Botts' dots lines, one
75-
// \c LaneBoundary::BoundaryPoint position has to define each Botts' dot.
73+
// one \c LaneBoundary::BoundaryPoint has to be at the start and another at
74+
// the end of each dashed line segment. For Botts' dots lines, one \c
75+
// LaneBoundary::BoundaryPoint position has to define each Botts' dot.
7676
//
77-
// \attention For \c LaneBoundary::BoundaryPoint the same rules regarding maximum
78-
// distance and approximation error apply as for \c Lane::Classification::centerline.
77+
// \attention For \c LaneBoundary::BoundaryPoint the same rules regarding
78+
// maximum distance and approximation error apply as for \c
79+
// Lane::Classification::centerline.
7980
//
8081
repeated LaneBoundary.BoundaryPoint boundary_line = 3;
8182

osi_detectedtrafficsign.proto

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ message DetectedTrafficSign
3131

3232
//
3333
// \brief Candidates for a detected main sign as estimated by the sensor.
34-
//
35-
// \image html OSI_DetectedMainTrafficSign.jpg
34+
//
35+
// \image html OSI_DetectedMainTrafficSign.jpg
3636
//
3737
message DetectedMainSign
3838
{
@@ -159,8 +159,8 @@ message DetectedTrafficSign
159159
//
160160
// \brief Candidates for all detected supplementary signs of one traffic
161161
// sign as estimated by the sensor.
162-
//
163-
// \image html OSI_DetectedSuppSign.jpg
162+
//
163+
// \image html OSI_DetectedSuppSign.jpg
164164
//
165165
message DetectedSupplementarySign
166166
{

osi_environment.proto

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@ message EnvironmentalConditions
109109
// contrast of a distant object against its background.
110110
//
111111
// \par References:
112-
// - [2] SHEPARD, Frank D. Reduced visibility due to fog on the highway. Transportation Research Board, 1996.
113-
// - [3] [StVO 17 chapter 3](https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung)
114-
// - [4] [Homepage of the Meteorological Office](http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility)
112+
// - [2] SHEPARD, Frank D. Reduced visibility due to fog on the highway.
113+
// Transportation Research Board, 1996.
114+
// - [3] [StVO 17 chapter
115+
// 3](https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung)
116+
// - [4] [Homepage of the Meteorological
117+
// Office](http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility)
115118
//
116119
enum Fog
117120
{
@@ -175,11 +178,17 @@ message EnvironmentalConditions
175178
// [6] and standards for required lighting levels on roads [6, 7, 8, 9].
176179
//
177180
// \par References:
178-
// - [5] [The NIST Reference on Constants, Units, and Uncertainty](https://physics.nist.gov/cuu/Units/units.html)
179-
// - [6] [National Optical Astronomy Observatory](https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf)
180-
// - [7] [Standards for required street lighting in the USA](http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf)
181-
// - [8] [Canadian IES-RP-8 standards for road lighting - municipality of Saint-Gedeon-de-. Beauce](http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf)
182-
// - [9] [European standards for road lighting](http://courtneystrong.com/wp-content/uploads/2017/07/css-sl1-class-and-quality-of-street-lighting.pdf)
181+
// - [5] [The NIST Reference on Constants, Units, and
182+
// Uncertainty](https://physics.nist.gov/cuu/Units/units.html)
183+
// - [6] [National Optical Astronomy
184+
// Observatory](https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf)
185+
// - [7] [Standards for required street lighting in the
186+
// USA](http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf)
187+
// - [8] [Canadian IES-RP-8 standards for road lighting - municipality of
188+
// Saint-Gedeon-de-.
189+
// Beauce](http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf)
190+
// - [9] [European standards for road
191+
// lighting](http://courtneystrong.com/wp-content/uploads/2017/07/css-sl1-class-and-quality-of-street-lighting.pdf)
183192
//
184193
enum AmbientIllumination
185194
{
@@ -194,8 +203,8 @@ message EnvironmentalConditions
194203
// Level 1 illumination in ]0.001, 0.01[ [lx]
195204
// E.g. Night with no artificial light.
196205
//
197-
// \note Use \c #AMBIENT_ILLUMINATION_LEVEL1 if illumination is less than
198-
// 0.001 [lx]
206+
// \note Use \c #AMBIENT_ILLUMINATION_LEVEL1 if illumination is less
207+
// than 0.001 [lx]
199208
//
200209
AMBIENT_ILLUMINATION_LEVEL1 = 2;
201210

@@ -242,8 +251,8 @@ message EnvironmentalConditions
242251
// Level 9 illumination in [10000, 120000[ [lx]
243252
// E.g. Full daylight to intense sunlight.
244253
//
245-
// \note Use \c #AMBIENT_ILLUMINATION_LEVEL9 if illumination is more than
246-
// 120000 [lx]
254+
// \note Use \c #AMBIENT_ILLUMINATION_LEVEL9 if illumination is more
255+
// than 120000 [lx]
247256
//
248257
AMBIENT_ILLUMINATION_LEVEL9 = 10;
249258
}

osi_groundtruth.proto

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ message GroundTruth
125125
// Unit: []
126126
//
127127
// \par References:
128-
// - [1] [International Standard ISO 3166-1: Codes for the representation of names of countries and their subdivisions - Part 1: Country codes, third ed., 2013] (https://www.iso.org/obp/ui/)
128+
// - [1] [International Standard ISO 3166-1: Codes for the representation of
129+
// names of countries and their subdivisions - Part 1: Country codes, third
130+
// ed., 2013] (https://www.iso.org/obp/ui/)
129131
// - [2] [Wikipedia ISO 3166/1] (https://en.wikipedia.org/wiki/ISO_3166-1)
130132
//
131133
optional uint32 country_code = 13;

osi_lane.proto

Lines changed: 67 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ message Lane
4545
// Example: \c #type = \c #TYPE_DRIVING (see reference picture)
4646
//
4747
optional Type type = 1;
48-
48+
4949
// Indicates that the host vehicle travels on this particular lane.
5050
// The host vehicle may travel on more than one lane at once. This does
5151
// also apply for the \c CanditateLane in the \c DetectedLane .
@@ -54,21 +54,22 @@ 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, if
58-
// the road narrows (e.g. at a construction site) this line is supposed to
59-
// describe the trajectory that the vehicle should follow. The intended
60-
// direction of travel on the lane is given by the direction defined by the
61-
// sequence of points forming the center line.
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.
6262
//
6363
// \image html highway_exit.png "Center lines as yellow dotted lines."
6464
//
6565
// \attention The points describing the center line might be set at
66-
// arbitrary distances. When the points are pairwise linearly connected, the
67-
// lateral distance to the real ideal line (as used by the simulation
68-
// environment internally) must not exceed 5cm. As shown in the following
69-
// image:
66+
// arbitrary distances. When the points are pairwise linearly connected,
67+
// the lateral distance to the real ideal line (as used by the
68+
// simulation environment internally) must not exceed 5cm. As shown in
69+
// the following image:
7070
//
71-
// \image html line_approximation_error.png "Approximation error as green line."
71+
// \image html line_approximation_error.png "Approximation error as
72+
// green line."
7273
//
7374
// \note The \c #centerline is defined only for \c #type =
7475
// \c #TYPE_DRIVING and one \c #lane_pairing pair.
@@ -78,23 +79,23 @@ message Lane
7879
// Definition of the intended driving direction.
7980
//
8081
// Defined and used for driving lanes.
81-
// true means driving direction is according to ascending storage order of
82-
// center line points.
83-
// false means driving direction is according to descending storage order of
84-
// center line points.
82+
// true means driving direction is according to ascending storage order
83+
// of center line points. false means driving direction is according to
84+
// descending storage order of center line points.
8585
//
86-
// \note The \c #centerline_is_driving_direction is defined for \c #type =
87-
// \c #TYPE_DRIVING .
86+
// \note The \c #centerline_is_driving_direction is defined for \c #type
87+
// = \c #TYPE_DRIVING .
8888
//
8989
optional bool centerline_is_driving_direction = 4;
9090

91-
// List of IDs of all lane segments that are directly adjacent to the lane
92-
// on the left side (w.r.t. intended driving direction). Note that lengths
93-
// of lane segments are not synchronized and therefore there are multiple
94-
// adjacent segments if there is a split/merge point in the adjacent lane.
91+
// List of IDs of all lane segments that are directly adjacent to the
92+
// lane on the left side (w.r.t. intended driving direction). Note that
93+
// lengths of lane segments are not synchronized and therefore there are
94+
// multiple adjacent segments if there is a split/merge point in the
95+
// adjacent lane.
9596
//
96-
// Example: The lane ID 2 is the only left adjacent lane for lane ID 3 in
97-
// the reference picture.
97+
// Example: The lane ID 2 is the only left adjacent lane for lane ID 3
98+
// in the reference picture.
9899
//
99100
// \note The \c #left_adjacent_lane_id is undefined for \c #type =
100101
// \c #TYPE_INTERSECTION .
@@ -103,14 +104,14 @@ message Lane
103104
//
104105
repeated Identifier left_adjacent_lane_id = 5;
105106

106-
// List of IDs of all lane segments that are directly adjacent to the lane
107-
// on the right side (w.r.t. intended driving direction). Note that lengths
108-
// of lane segments are not synchronized and therefore there are multiple
109-
// adjacent segments if there is a split/merge point in the adjacent lane.
110-
// Example: The lane IDs 4 and 7 are the right adjacent lane segments for
111-
// lane ID 3 in the reference picture due to the lane split. Lane ID 6 is
112-
// not a right adjacent lane to lane ID 3 as they are separated by lane ID
113-
// 7.
107+
// List of IDs of all lane segments that are directly adjacent to the
108+
// lane on the right side (w.r.t. intended driving direction). Note that
109+
// lengths of lane segments are not synchronized and therefore there are
110+
// multiple adjacent segments if there is a split/merge point in the
111+
// adjacent lane. Example: The lane IDs 4 and 7 are the right adjacent
112+
// lane segments for lane ID 3 in the reference picture due to the lane
113+
// split. Lane ID 6 is not a right adjacent lane to lane ID 3 as they
114+
// are separated by lane ID 7.
114115
//
115116
// \note The \c #right_adjacent_lane_id is undefined for \c #type =
116117
// \c #TYPE_INTERSECTION .
@@ -120,20 +121,19 @@ message Lane
120121
repeated Identifier right_adjacent_lane_id = 6;
121122

122123
// The antecessor/successor lane pairings of this lane. There can be
123-
// multiple pairings with the same antecessor and different successor lanes
124-
// and vice versa.
125-
// The antecessor lanes end in the same point that this lane starts from.
126-
// The successor lanes start in the same point that this lane ends in.
127-
// Example:
124+
// multiple pairings with the same antecessor and different successor
125+
// lanes and vice versa. The antecessor lanes end in the same point that
126+
// this lane starts from. The successor lanes start in the same point
127+
// that this lane ends in. Example:
128128
//
129129
// \note OSI uses singular instead of plural for repeated field names.
130130
//
131131
repeated LanePairing lane_pairing = 7;
132132

133-
// The right adjacent lane boundaries \c #right_lane_boundary_id may only be
134-
// shared with/as the left adjacent lane boundaries
135-
// \c #left_lane_boundary_id of the nearest right adjacent lane
136-
// \c #right_adjacent_lane_id.
133+
// The right adjacent lane boundaries \c #right_lane_boundary_id may
134+
// only be shared with/as the left adjacent lane boundaries \c
135+
// #left_lane_boundary_id of the nearest right adjacent lane \c
136+
// #right_adjacent_lane_id.
137137
//
138138
// \note Empty for intersections.
139139
//
@@ -144,10 +144,10 @@ message Lane
144144
//
145145
repeated Identifier right_lane_boundary_id = 8;
146146

147-
// The left adjacent lane boundaries \c #left_lane_boundary_id may only be
148-
// shared with/as the right adjacent lane boundaries
149-
// \c #right_lane_boundary_id of the nearest left adjacent lane
150-
// \c #left_adjacent_lane_id.
147+
// The left adjacent lane boundaries \c #left_lane_boundary_id may only
148+
// be shared with/as the right adjacent lane boundaries \c
149+
// #right_lane_boundary_id of the nearest left adjacent lane \c
150+
// #left_adjacent_lane_id.
151151
//
152152
// \note Empty for intersections.
153153
//
@@ -184,7 +184,8 @@ message Lane
184184
TYPE_OTHER = 1;
185185

186186
// A normal lane.
187-
// Example: lanes with IDs 1, 2, 3, 4 and 7 of the highway_exit image.
187+
// Example: lanes with IDs 1, 2, 3, 4 and 7 of the highway_exit
188+
// image.
188189
//
189190
TYPE_DRIVING = 2;
190191

@@ -227,10 +228,10 @@ message Lane
227228
//
228229
optional double surface_ice = 4;
229230

230-
// The coefficient representing the roughness or unevenness of the road.
231-
// International Roughness Index (IRI) [1] values range from 0 = smooth
232-
// ground (equivalent to driving on a plate of glass) up to > 20 mm/m
233-
// (a very rough road).
231+
// The coefficient representing the roughness or unevenness of the
232+
// road. International Roughness Index (IRI) [1] values range from 0
233+
// = smooth ground (equivalent to driving on a plate of glass) up to
234+
// > 20 mm/m (a very rough road).
234235
//
235236
// Estimated value ranges (IRI):
236237
// 0.0 [mm/m] absolutely perfect evenness
@@ -265,9 +266,10 @@ message Lane
265266
// The surface texture or fine roughness
266267
//
267268
// Whereas the IRI-based roughness or unevenness measure only takes
268-
// into account road wavelengths around 0.5m - 100m, the surface texture
269-
// or fine roughness [2] measures only wavelengths below 0.5m.
270-
// It is given as the standard height deviation of fine roughness
269+
// into account road wavelengths around 0.5m - 100m, the surface
270+
// texture or fine roughness [2] measures only wavelengths below
271+
// 0.5m. It is given as the standard height deviation of fine
272+
// roughness
271273
//
272274
// Unit: [m]
273275
//
@@ -315,13 +317,13 @@ message LaneBoundary
315317
// Since a \c BoundaryPoint is part of a sequence, only the position
316318
// attribute has to be set for each instance. All other values will be
317319
// reused from the previous \c BoundaryPoint in the sequence or set to
318-
// default values if there is none or it was never set.
320+
// default values if there is none or it was never set.
319321
//
320322
// \note For dashed lines, one \c BoundaryPoint has to be at the start and
321-
// another at the end of each dashed line segment. The first
323+
// another at the end of each dashed line segment. The first
322324
// \c BoundaryPoint defines the beginning of the first dashed lane marking.
323-
// The last \c BoundaryPoint defines the end of the last dashed lane
324-
// marking. For example, the area between the second and third
325+
// The last \c BoundaryPoint defines the end of the last dashed lane
326+
// marking. For example, the area between the second and third
325327
// \c BoundaryPoint has no lane marking, and so on.
326328
// \note For Botts' dots lines, one \c BoundaryPoint position has to define
327329
// each Botts' dot.
@@ -383,9 +385,9 @@ message LaneBoundary
383385
repeated Identifier limiting_structure_id = 3;
384386

385387
// The lane boundary type.
386-
// There is no special representation for double lines, e.g. solid / solid
387-
// or dashed / solid. In such cases, each lane will define its own side of
388-
// the lane boundary.
388+
// There is no special representation for double lines, e.g. solid /
389+
// solid or dashed / solid. In such cases, each lane will define its own
390+
// side of the lane boundary.
389391
//
390392
enum Type
391393
{
@@ -451,21 +453,22 @@ message LaneBoundary
451453
}
452454

453455
// The color of the lane boundary in case of a lane markings.
454-
// Lane markings that alternate in color must be represented by individual
455-
// \c LaneBoundary segments.
456+
// Lane markings that alternate in color must be represented by
457+
// individual \c LaneBoundary segments.
456458
//
457459
enum Color
458460
{
459-
// Color of marking is unknown. Value must not be used in ground truth.
461+
// Color of marking is unknown. Value must not be used in ground
462+
// truth.
460463
//
461464
COLOR_UNKNOWN = 0;
462465

463466
// Other (unspecified but known) color.
464467
//
465468
COLOR_OTHER = 1;
466469

467-
// Marking without color. Used to represent logical boundaries without
468-
// actual physical markings at the respective position.
470+
// Marking without color. Used to represent logical boundaries
471+
// without actual physical markings at the respective position.
469472
// Value may be used in ground truth only.
470473
//
471474
COLOR_NONE = 2;

osi_occupant.proto

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ message Occupant
106106
//
107107
STEERING_CONTROL_NO_HAND = 2;
108108

109-
// One hand is on the steering wheel. Whether it is the left or right
110-
// hand is unspecified or unknown.
109+
// One hand is on the steering wheel. Whether it is the left or
110+
// right hand is unspecified or unknown.
111111
//
112-
// \note If there is no differentiation between one or both hands on the
113-
// steering wheel, this value should be used.
112+
// \note If there is no differentiation between one or both hands on
113+
// the steering wheel, this value should be used.
114114
//
115115
STEERING_CONTROL_ONE_HAND = 3;
116116

0 commit comments

Comments
 (0)