Skip to content

Commit fc20c92

Browse files
committed
fix(docs): Doc review
Signed-off-by: Maximilian Rosin <[email protected]>
1 parent 40b41b4 commit fc20c92

8 files changed

+84
-86
lines changed

osi_common.proto

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,52 +215,56 @@ message Identifier
215215
optional uint64 value = 1;
216216
}
217217

218-
// \brief References to external objects
218+
// \brief References to external objects.
219219
//
220220
// The external reference is an optional recommendation to refer to objects defined outside of OSI.
221221
// This could be other OpenX standards, 3rd-party standards or user-defined objects.
222222
// simulation environments.
223223
//
224-
// \note The ExternalReference is an optional value and can be left empty.
224+
// \note ExternalReference is optional and can be left empty.
225225
//
226226
message ExternalReference
227227
{
228-
// The source of the external references
228+
// The source of the external references.
229229
//
230230
// Defines the original source of an object as uniquely identifiable reference.
231231
// In case of using \c GroundTruth::map_reference or
232232
// \c GroundTruth::model_reference, the reference can be left empty.
233-
// If not otherwise required, an URI is suggested and should follow the syntax according to
233+
// If not otherwise required, an URI is suggested. The syntax should follow
234234
// \link https://tools.ietf.org/html/rfc3986 RFC 3986\endlink.
235235
//
236236
//
237237
optional string reference = 1;
238238

239-
// The type of the external references
239+
// The type of the external references.
240240
//
241-
// Must be used to describe the type of the original source.
241+
// Mandatory value describing the type of the original source.
242242
//
243243
// For OpenX/ASAM standards it is specified as follows:
244244
// - net.asam.opendrive
245245
// - net.asam.openscenario
246246
//
247-
// For third-party standards and user-defined objects the
248-
// Reverse Domain Name Notation, with lower case type field,
249-
// is suggested, to guarantee unique and interoperable identifications.
247+
// For third-party standards and user-defined objects,
248+
// reverse domain name notation with lower-case type field
249+
// is recommended to guarantee unique and interoperable identification.
250250
//
251251
optional string type = 2;
252252

253253
// The external identifier reference value.
254254
//
255-
// For a common description of the external identifier, where a wide range
256-
// of identification types could be represented, the repeated string is chosen.
255+
// The repeated string is chosen as a common description of the external
256+
// identifier, because a variety of identificatier types could be
257+
// involved .
257258
//
258-
// E.g. referencing a unique lane in OpenDRIVE
259-
// (RoadId --> String, S-Value of LaneSection --> Double, LaneId --> Int)
259+
// For example, referencing a unique lane in OpenDRIVE requires the
260+
// following identifiers:
261+
// * RoadId: String
262+
// * S-Value of LaneSection: Double
263+
// * LaneId: Int
260264
//
261265
// \note The detailed description of the identifiers and how they are
262-
// used for referencing external objects are given in the individual
263-
// messages, where it is deployed.
266+
// used for referencing external objects is given in the individual
267+
// messages where the external identifier is used.
264268
//
265269
// \see EnvironmentalConditions::source_reference
266270
// \see Lane::source_reference

osi_environment.proto

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ message EnvironmentalConditions
8888
//
8989
optional Fog fog = 7;
9090

91-
// Optional external Reference to the Environmental Condition Sources
91+
// Optional external reference to the environmental condition sources.
9292
//
9393
// \note For OpenDRIVE and OpenSECNARIO there is no direct counterpart.
9494
//
95-
// \note For non-ASAM Standards, it is implementation-specific how
95+
// \note For non-ASAM standards, it is implementation-specific how
9696
// source_reference is resolved.
9797
//
98-
// \note The value has to be repeated, as it cannot guarantee, that one
99-
// object is derived from only one origin source, like from one
100-
// scernario file and from the sensors.
98+
// \note The value has to be repeated because one object may be derived
99+
// from more than one origin source, for example, from a scenario file
100+
// and from sensors.
101101
//
102102
repeated ExternalReference source_reference = 9;
103103

osi_lane.proto

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ message Lane
5050
//
5151
optional Classification classification = 2;
5252

53-
// Optional external Reference to the Lane Source
53+
// Optional external reference to the lane source.
5454
//
55-
// The ExternalReference point to the source of the lane, if it is derived
56-
// from one or more objects or external references. An example here is the
57-
// reference to the lane defined in a OpenDRIVE map.
55+
// The external reference points to the source of the lane, if it is derived
56+
// from one or more objects or external references.
5857
//
59-
// For OpenDRIVE the items should be set as following:
58+
// For example, to reference a lane defined in an OpenDRIVE map
59+
// the items should be set as following:
6060
// * reference = URI to map, can remain empty if identical with definiton
6161
// in \c GroundTruth::map_reference
6262
// * type = "net.asam.opendrive"
@@ -68,10 +68,9 @@ message Lane
6868
// \note For non-ASAM Standards, it is implementation-specific how
6969
// source_reference is resolved.
7070
//
71-
// \note The value has to be repeated, as it cannot guarantee, that one
72-
// Lane-Segment is derived from only one origin segment. It is also
73-
// possible, that multiple sources (map, sensor) should be added as
74-
// reference.
71+
// \note The value has to be repeated, because one lane segment may be
72+
// derived from more than one origin segment. Multiple sources
73+
// may be added as reference as well, for example, a map and sensors.
7574
//
7675
repeated ExternalReference source_reference = 3;
7776

@@ -750,17 +749,17 @@ message LaneBoundary
750749
//
751750
optional Classification classification = 3;
752751

753-
// Optional external Reference to the Lane Boundary Source
752+
// Optional external reference to the lane boundary source.
754753
//
755-
// \note For OpenDRIVE there is no direct possibility to reference the
754+
// \note For OpenDRIVE, there is no direct possibility to reference the
756755
// RoadMark, as there is no unique identifier in this sub-object.
757756
//
758757
// \note For non-ASAM Standards, it is implementation-specific how
759758
// source_reference is resolved.
760759
//
761-
// \note The value has to be repeated, as it cannot guarantee, that one
762-
// object is derived from only one origin source, like from one
763-
// scernario file and and from the sensors.
760+
// \note The value has to be repeated because one object may be derived
761+
// from more than one origin source, for example, from a scenario file
762+
// and from sensors.
764763
//
765764
repeated ExternalReference source_reference = 4;
766765

osi_object.proto

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,36 @@ message StationaryObject
4040
//
4141
optional string model_reference = 4;
4242

43-
// External Reference to the StationaryObject Source
43+
// External reference to the stationary-object source.
4444
//
45-
// The ExternalReference point to the source of an stationary object, if it
45+
// The external reference points to the source of a stationary object, if it
4646
// is derived from an external sources like OpenDRIVE or OpenSCENARIO.
4747
//
48-
// For OpenDRIVE the objects should be set as following:
48+
// For OpenDRIVE, references to objects should be set as following:
4949
// * reference = URI to map, can remain empty if identical with definiton
5050
// in \c GroundTruth::map_reference
5151
// * type = "net.asam.opendrive"
5252
// * identifier[0] = "object" for t_road_objects_object and
5353
// "bridge" for t_road_objects_bridge
5454
// * identifier[1] = id of t_road_objects_object or t_road_objects_bridge
5555
//
56-
// For OpenSCENARIO the entities of the type MiscObject, which describes
57-
// partly stationary objects should be set as following:
56+
// For OpenSCENARIO, references to entities of the type MiscObject, which
57+
// describes partly stationary objects, should be set as following:
5858
// * reference = URI to the OpenSCENARIO File
5959
// * type = "net.asam.openscenario"
6060
// * identifier[0] = Entity-Type ("MiscObject")
6161
// * identifier[1] = name of MiscObject in Entity
6262
//
63-
// \note The following rule, described in OpenDRIVE, should also apply here:
63+
// \note The following rule, described in OpenDRIVE, also applies:
6464
// * Objects derived from OpenSCENARIO shall not be mixed with objects
6565
// described in OpenDRIVE.
6666
//
6767
// \note For non-ASAM Standards, it is implementation-specific how
6868
// source_reference is resolved.
6969
//
70-
// \note The value has to be repeated, as it cannot guarantee, that one
71-
// object is derived from only one origin source, like from one
72-
// scenario file and and from the sensors.
70+
// \note The value has to be repeated because one object may be derived
71+
// from more than one origin source, for example, from a scenario file
72+
// and from sensors.
7373
//
7474
repeated ExternalReference source_reference = 5;
7575

@@ -392,13 +392,13 @@ message MovingObject
392392
//
393393
optional MovingObjectClassification moving_object_classification = 9;
394394

395-
// Optional external Reference to the MovingObject Source
395+
// Optional external reference to the moving-object source
396396
//
397-
// The ExternalReference point to the source of an moving object, if it
397+
// The external reference points to the source of an moving object, if it
398398
// is derived from an external sources like OpenSCENARIO.
399399
//
400-
// For OpenSCENARIO the entities of the type Vehicle or Pedestrian,
401-
// which describes moving objecs should be set as following:
400+
// For OpenSCENARIO, references to entities of the type Vehicle or
401+
// Pedestrian, which describe moving objects, should be set as following:
402402
// * reference = URI to the OpenSCENARIO File
403403
// * type = "net.asam.openscenario"
404404
// * identifier[0] = Entity-Type ("Vehicle" or "Pedestrian")
@@ -409,9 +409,9 @@ message MovingObject
409409
// \note For non-ASAM Standards, it is implementation-specific how
410410
// source_reference is resolved.
411411
//
412-
// \note The value has to be repeated, as it cannot guarantee, that one
413-
// object is derived from only one origin source, like from one map
414-
// and from the sensors.
412+
// \note The value has to be repeated because one object may be derived
413+
// from more than one origin source, for example, from a scenario file
414+
// and from sensors.
415415
//
416416
repeated ExternalReference source_reference = 10;
417417

osi_occupant.proto

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ message Occupant
2323
//
2424
optional Classification classification = 2;
2525

26-
// External Reference to the Occupant Source
26+
// External reference to the occupant source.
2727
//
28-
// \note For OpenDRIVE and OpenSCENARIO there is no no direct counterpart.
28+
// \note For OpenDRIVE and OpenSCENARIO there is no direct counterpart.
2929
//
3030
// \note For non-ASAM Standards, it is implementation-specific how
3131
// source_reference is resolved.
3232
//
33-
// \note The value has to be repeated, as it cannot guarantee, that one
34-
// object is derived from only one origin source, like from one
35-
// scernario file and and from the sensors.
33+
// \note The value has to be repeated because one object may be derived
34+
// from more than one origin source, for example, from a scenario file
35+
// and from sensors.
3636
//
3737
repeated ExternalReference source_reference = 3;
3838

osi_roadmarking.proto

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ message RoadMarking
5555
//
5656
optional Classification classification = 3;
5757

58-
// Optional external Reference to the Roadmarking Source
58+
// Optional external reference to the road-marking source.
5959
//
60-
// The ExternalReference point to the source of the surface marking, if it
60+
// The external reference points to the source of the surface marking, if it
6161
// is derived from one or more objects or external references. An example
6262
// here is the reference to the signal defined in a OpenDRIVE map.
6363
//
@@ -67,20 +67,17 @@ message RoadMarking
6767
// * type = "net.asam.opendrive"
6868
// * identifier[0] = id of t_road_signals_signal
6969
//
70-
// \note In OpenDRIVE there is also the possibility to define surface
71-
// markings as an object. In this case, the associated object is
72-
// usually referenced within OpenDRIVE using the reference
73-
// t_road_signals_signal_reference, which allows it to be
74-
// identifiable.
70+
// \note With OpenDRIVE, surface markings can also be defined as objects.
71+
// In this case, the associated object is usually referenced within
72+
// OpenDRIVE using the reference t_road_signals_signal_reference.
7573
// An additional reference to the object is therefore not necessary.
7674
//
7775
// \note For non-ASAM Standards, it is implementation-specific how
7876
// source_reference is resolved.
7977
//
80-
// \note The value has to be repeated, as it cannot guarantee, that one
81-
// Lane-Segment is derived from only one origin segment. It is also
82-
// possible, that multiple sources (map, sensor) should be added as
83-
// reference.
78+
// \note The value has to be repeated, because one lane segment may be
79+
// derived from more than one origin segment. Multiple sources
80+
// may be added as reference as well, for example, a map and sensors.
8481
//
8582
repeated ExternalReference source_reference = 4;
8683

osi_trafficlight.proto

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,24 @@ message TrafficLight
4242
//
4343
optional string model_reference = 4;
4444

45-
// Optional external Reference to the Traffic Light Source
45+
// Optional external reference to the traffic light source.
4646
//
47-
// The ExternalReference point to the source of the traffic light, if it is
48-
// derived from one or more objects or external references. An example here
49-
// is the reference to the signal defined in a OpenDRIVE map.
47+
// The external reference points to the source of the traffic light, if it
48+
// is derived from one or more objects or external references.
5049
//
51-
// For OpenDRIVE the items should be set as following:
52-
// * reference = URI to map, can remain empty if identical with definiton
50+
// For example, to reference a signal defined in an OpenDRIVE map
51+
// the items should be set as following:
52+
// * reference = URI to map, can remain empty if identical with definition
5353
// in \c GroundTruth::map_reference
5454
// * type = "net.asam.opendrive"
5555
// * identifier[0] = id of t_road_signals_signal
5656
//
5757
// \note For non-ASAM Standards, it is implementation-specific how
5858
// source_reference is resolved.
5959
//
60-
// \note The value has to be repeated, as it cannot guarantee, that one
61-
// Lane-Segment is derived from only one origin segment. It is also
62-
// possible, that multiple sources (map, sensor) should be added as
63-
// reference.
60+
// \note The value has to be repeated, because one lane segment may be
61+
// derived from more than one origin segment. Multiple sources
62+
// may be added as reference as well, for example, a map and sensors.
6463
//
6564
repeated ExternalReference source_reference = 5;
6665

osi_trafficsign.proto

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,13 @@ message TrafficSign
157157
repeated SupplementarySign supplementary_sign = 3;
158158

159159

160-
// Optional external Reference to the Traffic Sign Source
160+
// Optional external reference to the traffic sign source.
161161
//
162-
// The ExternalReference point to the source of the traffic sign, if it is
163-
// derived from one or more objects or external references. An example here
164-
// is the reference to the signal defined in a OpenDRIVE map.
162+
// The external reference point to the source of the traffic sign, if it is
163+
// derived from one or more objects or external references.
165164
//
166-
// For OpenDRIVE the items should be set as following:
165+
// For example, to reference a signal defined in an OpenDRIVE map
166+
// the items should be set as following:
167167
// * reference = URI to map, can remain empty if identical with definition
168168
// in \c GroundTruth::map_reference
169169
// * type = "net.asam.opendrive"
@@ -173,13 +173,12 @@ message TrafficSign
173173
// source_reference is resolved.
174174
//
175175
// \note If an individual identification of MainSign and SupplementarySign
176-
// is be necessary, this sould be defined via multiple individual
176+
// is necessary, this should be done via multiple individual
177177
// entries of this source_reference.
178178
//
179-
// \note The value has to be repeated, as it cannot guarantee, that one
180-
// Lane-Segment is derived from only one origin segment. It is also
181-
// possible, that multiple sources (map, sensor) should be added as
182-
// reference.
179+
// \note The value has to be repeated, because one lane segment may be
180+
// derived from more than one origin segment. Multiple sources
181+
// may be added as reference as well, for example, a map and sensors.
183182
//
184183
repeated ExternalReference source_reference = 4;
185184

0 commit comments

Comments
 (0)