Skip to content

Commit c63cb1f

Browse files
carsten-kueblercarsten-kuebler
committed
Merge branch 'improvement/harmonize-detectedobjects' of https://github.com/OpenSimulationInterface/open-simulation-interface into improvement/harmonize-detectedobjects
2 parents 6097eac + e752523 commit c63cb1f

8 files changed

+58
-58
lines changed

‎osi_common.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ message Spherical3d
248248
//
249249
// All coordinates and orientations from ground truth objects are relative to
250250
// the global ground truth frame. All coordinates and orientations
251-
// from detected objects are relative to the host vehicle frame (see:
251+
// from detected objects are relative to the host vehicle frame (see:
252252
// \c MovingObject.Vehicle vehicle reference point).
253253
//
254254
message BaseStationary
@@ -303,7 +303,7 @@ message BaseStationary
303303
//
304304
// All coordinates and orientations from ground truth objects are relative to
305305
// the global ground truth frame. All coordinates and orientations
306-
// from detected objects are relative to the host vehicle frame
306+
// from detected objects are relative to the host vehicle frame
307307
// (see: \c MovingObject.Vehicle vehicle reference point).
308308
//
309309
message BaseMoving

‎osi_detectedlandmark.proto‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ message DetectedTrafficSign
5656
message CandidateMainSign
5757
{
5858
// The estimated probability that this candidate is the true value.
59-
//
59+
//
6060
// \note The sum of all \c #probability must be one. This probability is
6161
// given under the condition of
6262
// \c #DetectedItemHeader.existence_probability.
@@ -162,7 +162,7 @@ message DetectedTrafficSign
162162
message CandidateSupplementarySign
163163
{
164164
// The estimated probability that this candidate is the true value.
165-
//
165+
//
166166
// \note The sum of all \c #probability must be one. This probability is
167167
// given under the condition of
168168
// \c #DetectedItemHeader.existence_probability.
@@ -211,7 +211,7 @@ message DetectedTrafficLight
211211
message CandidateTrafficLight
212212
{
213213
// The estimated probability that this candidate is the true value.
214-
//
214+
//
215215
// \note The sum of all \c #probability must be one. This probability is
216216
// given under the condition of
217217
// \c #DetectedItemHeader.existence_probability.
@@ -258,7 +258,7 @@ message DetectedRoadMarking
258258
message CandidateRoadMarking
259259
{
260260
// The estimated probability that this candidate is the true value.
261-
//
261+
//
262262
// \note The sum of all \c #probability must be one. This probability is
263263
// given under the condition of
264264
// \c #DetectedItemHeader.existence_probability.

‎osi_detectedlane.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ message DetectedLane
2929
message CandidateLane
3030
{
3131
// The estimated probability that this candidate is the true value.
32-
//
32+
//
3333
// \note The sum of all \c #probability must be one. This probability is
3434
// given under the condition of
3535
// \c #DetectedItemHeader.existence_probability.
@@ -85,7 +85,7 @@ message DetectedLaneBoundary
8585
message CandidateLaneBoundary
8686
{
8787
// The estimated probability that this candidate is the true value.
88-
//
88+
//
8989
// \note The sum of all \c #probability must be one. This probability is
9090
// given under the condition of
9191
// \c #DetectedItemHeader.existence_probability.

‎osi_detectedobject.proto‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ message DetectedItemHeader
3535
// Range: [0,1]
3636
//
3737
optional double existence_probability = 3;
38-
38+
3939
// The amount of time that this detected object has been continuously
4040
// observed/tracked.
4141
//
@@ -45,7 +45,7 @@ message DetectedItemHeader
4545
// Unit: [s]
4646
//
4747
optional double age = 4;
48-
48+
4949
// The measurement state.
5050
//
5151
optional MeasurementState measurement_state = 5;
@@ -63,7 +63,7 @@ message DetectedItemHeader
6363
// \note OSI uses singular instead of plural for repeated field names.
6464
//
6565
repeated Identifier sensor_id = 6;
66-
66+
6767
// Definition of measurement states.
6868
//
6969
enum MeasurementState
@@ -97,14 +97,14 @@ message DetectedMovingObject
9797
// Common information of one detected item.
9898
//
9999
optional DetectedItemHeader header = 1;
100-
100+
101101
// A list of candidates for this moving object as estimated by the
102102
// sensor (e.g. pedestrian, car).
103103
//
104104
// \note OSI uses singular instead of plural for repeated field names.
105105
//
106106
repeated CandidateMovingObject candidate = 2;
107-
107+
108108
// Reference point location specification of the sensor measurement
109109
// (required to decouple sensor measurement, position and bounding box
110110
// estimation) as used by the sensor (model).
@@ -164,7 +164,7 @@ message DetectedMovingObject
164164
// sensor.
165165
//
166166
optional UltrasonicSpecificObjectData ultrasonic_specifics = 103;
167-
167+
168168
// Additional internal data and state flags required and used by the
169169
// sensor-models, should not be used by subscribers to \c SensorData.
170170
// Generally this field should be cleared after internal processing.
@@ -181,7 +181,7 @@ message DetectedMovingObject
181181
message CandidateMovingObject
182182
{
183183
// The estimated probability that this candidate is the true value.
184-
//
184+
//
185185
// \note The sum of all \c #probability must be one. This probability is
186186
// given under the condition of
187187
// \c #DetectedItemHeader.existence_probability.
@@ -337,7 +337,7 @@ message DetectedStationaryObject
337337
message CandidateStationaryObject
338338
{
339339
// The estimated probability that this candidate is the true value.
340-
//
340+
//
341341
// \note The sum of all \c #probability must be one. This probability is
342342
// given under the condition of
343343
// \c #DetectedItemHeader.existence_probability.

‎osi_detectedoccupant.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ message DetectedOccupant
3030
message CandidateOccupant
3131
{
3232
// The estimated probability that this candidate is the true value.
33-
//
33+
//
3434
// \note The sum of all \c #probability must be one. This probability is
3535
// given under the condition of
3636
// \c #DetectedItemHeader.existence_probability.

‎osi_landmark.proto‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ message TrafficSign
141141
// See e.g.: https://www.dvr.de/bilder/stvo/gt/101.png
142142
//
143143
TYPE_DANGER_SPOT = 2;
144-
144+
145145
// "Right before left" rule at the next intersection
146146
// (StVO 102).
147147
//
@@ -190,7 +190,7 @@ message TrafficSign
190190
// See e.g.: https://www.dvr.de/bilder/stvo/gt/110-12.png
191191
//
192192
TYPE_HILL_UPWARDS = 9;
193-
193+
194194
// Warning for road narrowing
195195
// (StVO 120).
196196
//
@@ -211,7 +211,7 @@ message TrafficSign
211211
// See e.g.: https://www.dvr.de/bilder/stvo/gt/121-10.png
212212
//
213213
TYPE_WARNING_ROAD_NARROWING_RIGHT = 12;
214-
214+
215215
// Road works sign
216216
// (StVO 123)
217217
//
@@ -246,7 +246,7 @@ message TrafficSign
246246
// See e.g.: https://www.dvr.de/bilder/stvo/gt/206.png
247247
//
248248
TYPE_STOP = 17;
249-
249+
250250
// Priority must be given to vehicles from the opposite direction
251251
// (StVO 208). Or: #TYPE_PRIORITY_OVER_OPPOSITE_DIRECTION
252252
//
@@ -365,17 +365,17 @@ message TrafficSign
365365
// See e.g.: https://www.dvr.de/bilder/stvo/gt/245.png
366366
//
367367
TYPE_BUS_LANE = 34;
368-
369-
// Bus only lane begin ().
368+
369+
// Bus only lane begin ().
370370
// End: #TYPE_BUS_LANE_END
371-
//
371+
//
372372
TYPE_BUS_LANE_BEGIN = 35;
373373

374-
// Bus only lane end ().
374+
// Bus only lane end ().
375375
// Begin: #TYPE_BUS_LANE_BEGIN
376376
//
377377
TYPE_BUS_LANE_END = 36;
378-
378+
379379
// Entry prohibited for all vehicle types
380380
// (StVO 250).
381381
//
@@ -431,7 +431,7 @@ message TrafficSign
431431
// See e.g.: https://www.dvr.de/bilder/stvo/gt/267.png
432432
//
433433
TYPE_DO_NOT_ENTER = 44;
434-
434+
435435
// Start of area without traffic to reduce harmful air pollution
436436
// (StVO 270.1). End: #TYPE_ENVIRONMENTAL_ZONE_END
437437
//
@@ -453,7 +453,7 @@ message TrafficSign
453453
//
454454
TYPE_NO_U_TURN_LEFT = 47;
455455

456-
// No U turn right ().
456+
// No U turn right ().
457457
// Left: #TYPE_NO_U_TURN_LEFT
458458
//
459459
TYPE_NO_U_TURN_RIGHT = 48;
@@ -467,14 +467,14 @@ message TrafficSign
467467
// Left: #TYPE_PRESCRIBED_U_TURN_LEFT
468468
//
469469
TYPE_PRESCRIBED_U_TURN_RIGHT = 50;
470-
470+
471471
// Minimum safety distance for trucks (StVO 273).
472472
// \c TrafficSignValue::value and \c TrafficSignValue::value_unit .
473473
//
474474
// See e.g.: https://www.dvr.de/bilder/stvo/gt/273.png
475475
//
476476
TYPE_MINIMUM_DISTANCE_FOR_TRUCKS = 51;
477-
477+
478478
// Start of speed limit (StVO 274) \c TrafficSignValue::value and
479479
// \c TrafficSignValue::value_unit . End: #TYPE_SPEED_LIMIT_END
480480
//
@@ -530,7 +530,7 @@ message TrafficSign
530530
// See e.g.: https://www.dvr.de/bilder/stvo/gt/279.png
531531
//
532532
TYPE_MINIMUM_SPEED_END = 59;
533-
533+
534534
// End of overtaking ban
535535
// (StVO 280). Begin: #TYPE_OVERTAKING_BAN_BEGIN
536536
//
@@ -600,7 +600,7 @@ message TrafficSign
600600
// See e.g.: https://www.dvr.de/bilder/stvo/gt/307.png
601601
//
602602
TYPE_RIGHT_OF_WAY_END = 69;
603-
603+
604604
// Traffic has priority over vehicles from the opposite direction
605605
// (StVO 308). Or: #TYPE_PRIORITY_TO_OPPOSITE_DIRECTION
606606
//
@@ -628,14 +628,14 @@ message TrafficSign
628628
// See e.g.: https://www.dvr.de/bilder/stvo/gt/311.png
629629
//
630630
TYPE_TOWN_END = 73;
631-
631+
632632
// Parking space
633633
// (StVO 314).
634634
//
635635
// See e.g.: https://www.dvr.de/bilder/stvo/gt/314.png
636636
//
637637
TYPE_CAR_PARKING = 74;
638-
638+
639639
// Begin of parking zone
640640
// (StVO 314.1). End: #TYPE_CAR_PARKING_ZONE_END
641641
//
@@ -651,21 +651,21 @@ message TrafficSign
651651
TYPE_CAR_PARKING_ZONE_END = 76;
652652

653653
// Start of area with calmed / reduced traffic
654-
// (verkehrsberuhigter Bereich - StVO 325.1).
654+
// (verkehrsberuhigter Bereich - StVO 325.1).
655655
// End: #TYPE_TRAFFIC_CALMED_DISTRICT_END
656656
//
657657
// See e.g.: https://www.dvr.de/bilder/stvo/gt/325.1.png
658658
//
659659
TYPE_TRAFFIC_CALMED_DISTRICT_BEGIN = 77;
660660

661661
// End of area with calmed / reduced traffic
662-
// (verkehrsberuhigter Bereich - StVO 325.2).
662+
// (verkehrsberuhigter Bereich - StVO 325.2).
663663
// Begin: #TYPE_TRAFFIC_CALMED_DISTRICT_BEGIN
664664
//
665665
// See e.g.: https://www.dvr.de/bilder/stvo/gt/325.2.png
666666
//
667667
TYPE_TRAFFIC_CALMED_DISTRICT_END = 78;
668-
668+
669669
// Tunnel ahead
670670
// (StVO 327).
671671
//
@@ -700,7 +700,7 @@ message TrafficSign
700700
// See e.g.: https://www.dvr.de/bilder/stvo/gt/330.2.png
701701
//
702702
TYPE_HIGHWAY_END = 83;
703-
703+
704704
// Begin of expressway for motor vehicles
705705
// (StVO 331.1). End: #TYPE_EXPRESSWAY_END
706706
//
@@ -728,7 +728,7 @@ message TrafficSign
728728
// See e.g.: https://www.dvr.de/bilder/stvo/gt/350-10.png
729729
//
730730
TYPE_PEDESTRIAN_CROSSING_INFO = 87;
731-
731+
732732
// Pole indicating highways exit in e.g. 100m (StVO 450).
733733
// \c TrafficSignValue::value and \c TrafficSignValue::value_unit .
734734
//

‎osi_lane.proto‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,12 @@ message LaneBoundary
316316
// The color of the lane boundary in case of lane markings.
317317
//
318318
optional Color color = 4;
319-
320-
// The ids of \c StationaryObjects which limit the corresponding lane.
321-
// This field must be set if the \c LaneBoundary.type is set to
322-
// # TYPE_STRUCTURE
323-
//
324-
repeated Identifier limiting_structure_id = 5;
319+
320+
// The ids of \c StationaryObjects which limit the corresponding lane.
321+
// This field must be set if the \c LaneBoundary.type is set to
322+
// # TYPE_STRUCTURE
323+
//
324+
repeated Identifier limiting_structure_id = 5;
325325

326326
// The lane boundary type.
327327
// There is no special representation for double lines, e.g. solid / solid
@@ -365,18 +365,18 @@ message LaneBoundary
365365
// surface.
366366
//
367367
TYPE_SNOW_EDGE = 7;
368-
369-
// A lane boundary covered by grass.
370-
//
371-
TYPE_GRASS_EDGE = 8;
372-
373-
// A lane boundary covered by gravel.
374-
//
375-
TYPE_GRAVEL_EDGE = 9;
376-
377-
// A lane boundary covered by soil.
378-
//
379-
TYPE_SOIL_EDGE = 10;
368+
369+
// A lane boundary covered by grass.
370+
//
371+
TYPE_GRASS_EDGE = 8;
372+
373+
// A lane boundary covered by gravel.
374+
//
375+
TYPE_GRAVEL_EDGE = 9;
376+
377+
// A lane boundary covered by soil.
378+
//
379+
TYPE_SOIL_EDGE = 10;
380380

381381
// A guard rail.
382382
//

‎osi_sensorviewconfiguration.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ message CameraSensorViewConfiguration
605605
CHANNEL_FORMAT_UNKNOWN = 0;
606606

607607
// Unspecified but known channel format.
608-
// Consider proposing an additional format if using
608+
// Consider proposing an additional format if using
609609
// \c #CHANNEL_FORMAT_OTHER.
610610
//
611611
CHANNEL_FORMAT_OTHER = 1;

0 commit comments

Comments
 (0)