Skip to content

Commit cf58c60

Browse files
adrianschultzpmai
authored andcommitted
Add Role to VehicleClassification (Issue 584)
Signed-off-by: Adrian Vernickel <adrian.vernickel@hexagon.com> Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
1 parent b95feb6 commit cf58c60

File tree

1 file changed

+59
-14
lines changed

1 file changed

+59
-14
lines changed

osi_object.proto

Lines changed: 59 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ message StationaryObject
5555
// * identifier[1] = id of t_road_objects_object or t_road_objects_bridge
5656
//
5757
// For example, to reference OpenSCENARIO entities of the type MiscObject,
58-
// which describe partly stationary objects, the items should be set as
58+
// which describe partly stationary objects, the items should be set as
5959
// follows:
6060
// * reference = URI to the OpenSCENARIO File
6161
// * type = "net.asam.openscenario"
@@ -446,7 +446,7 @@ message MovingObject
446446
// The trajectory that this moving object expects to follow in the future.
447447
//
448448
// This is not externally perceivable information, rather this is to aid
449-
// realistic simulation of traffic participants that are not under test.
449+
// realistic simulation of traffic participants that are not under test.
450450
// This information should not be made available to the stack under test.
451451
//
452452
// \note Moving objects are not required to stick to this trajectory, it is
@@ -457,7 +457,7 @@ message MovingObject
457457

458458
// Specific information about the classification of the vehicle.
459459
//
460-
optional MovingObjectClassification moving_object_classification = 9;
460+
optional MovingObjectClassification moving_object_classification = 9;
461461

462462
// Optional external reference to the moving-object source
463463
//
@@ -473,7 +473,7 @@ message MovingObject
473473
// * identifier[1] = name of Vehicle/Pedestrian in Entity
474474
//
475475
// \todo OpenSCENARIO currently does not provide an animal type.
476-
//
476+
//
477477
// \note For non-ASAM Standards, it is implementation-specific how
478478
// source_reference is resolved.
479479
//
@@ -579,9 +579,9 @@ message MovingObject
579579
//
580580
optional Vector3d bbcenter_to_front = 5;
581581

582-
// Static minimal distance or space from the lowest point of the vehicle's
582+
// Static minimal distance or space from the lowest point of the vehicle's
583583
// body to the surface plane below it under neutral load conditions. This
584-
// distance disregards, for example, driving-dynamic effects or
584+
// distance disregards, for example, driving-dynamic effects or
585585
// road-surface effects. Can be useful to approximate the clearance area
586586
// under a vehicle that a sensor can see through.
587587
// \note \c ground_clearance is included in the bounding box height.
@@ -594,7 +594,7 @@ message MovingObject
594594
//
595595
repeated WheelData wheel_data = 7;
596596

597-
// Angle of the steering wheel.
597+
// Angle of the steering wheel.
598598
// Zero means the steering wheel is in its center postion, a positive value
599599
// means the steering wheel is turned to the left and a negative value
600600
// means the steering wheel is turned to the right of the center position.
@@ -604,8 +604,8 @@ message MovingObject
604604
optional double steering_wheel_angle = 8;
605605

606606
// \brief Detailed wheel data.
607-
// The focus is on the description of a wheel regarding the perceivable
608-
// information from the outside.
607+
// The focus is on the description of a wheel regarding the perceivable
608+
// information from the outside.
609609
// It is not intended to be used for dynamic calculations, for example.
610610
//
611611
message WheelData
@@ -624,8 +624,8 @@ message MovingObject
624624
// This concept works also for twin tires.
625625
//
626626
optional uint32 index = 2;
627-
628-
// A vector pointing from the vehicle's reference system (center of bounding
627+
628+
// A vector pointing from the vehicle's reference system (center of bounding
629629
// box) to the geometric center of the wheel.
630630
//
631631
optional Vector3d position = 3;
@@ -642,7 +642,7 @@ message MovingObject
642642
// Unit: m
643643
//
644644
optional double rim_radius = 5;
645-
645+
646646
// Median width of the tire.
647647
//
648648
// Unit: m
@@ -657,7 +657,7 @@ message MovingObject
657657

658658
// Rotation rate of the wheel.
659659
// The rotation rate around the y-axis with respect to the wheel's coordinate system.
660-
//
660+
//
661661
// Unit: rad/s.
662662
//
663663
// The sign convention is defined using the right-hand rule.
@@ -668,7 +668,7 @@ message MovingObject
668668
// \note The vehicle's reference coordinate system is only used to determine the sign convention of the rotation rate.
669669
//
670670
optional double rotation_rate = 8;
671-
671+
672672
// Opaque reference of an associated 3D model of the wheel.
673673
//
674674
// \note It is implementation-specific how model_references are resolved to
@@ -749,6 +749,10 @@ message MovingObject
749749
//
750750
optional Identifier trailer_id = 4;
751751

752+
// The role of the vehicle.
753+
//
754+
optional Role role = 5;
755+
752756
// Definition of vehicle types.
753757
//
754758
// \note OSI provides a richer set of vehicle types than is supported by some
@@ -1005,5 +1009,46 @@ message MovingObject
10051009
BRAKE_LIGHT_STATE_STRONG = 4;
10061010
}
10071011
}
1012+
1013+
// Definition of vehicle roles.
1014+
//
1015+
enum Role
1016+
{
1017+
// Role of vehicle is unknown (must not be used in ground truth).
1018+
//
1019+
ROLE_UNKNOWN = 0;
1020+
1021+
// Other (unspecified but known) role of vehicle.
1022+
//
1023+
ROLE_OTHER = 1;
1024+
1025+
// The vehicle role is ambulance.
1026+
//
1027+
ROLE_AMBULANCE = 2;
1028+
1029+
// The vehicle role is civil.
1030+
//
1031+
ROLE_CIVIL = 3;
1032+
1033+
// The vehicle role is fire fighting, e.g. fire engine.
1034+
//
1035+
ROLE_FIRE = 4;
1036+
1037+
// The vehicle role is military, e.g. camouflaged truck.
1038+
//
1039+
ROLE_MILITARY = 5;
1040+
1041+
// The vehicle role is police.
1042+
//
1043+
ROLE_POLICE = 6;
1044+
1045+
// The vehicle role is public transport, e.g. a school bus.
1046+
//
1047+
ROLE_PUBLIC_TRANSPORT = 7;
1048+
1049+
// The vehicle role is roadside assistance, e.g. tow truck.
1050+
//
1051+
ROLE_ROAD_ASSISTANCE = 8;
1052+
}
10081053
}
10091054
}

0 commit comments

Comments
 (0)