Skip to content

Commit dc53f90

Browse files
committed
Add Role to VehicleClassification (Issue 584)
1 parent 412521e commit dc53f90

File tree

1 file changed

+62
-17
lines changed

1 file changed

+62
-17
lines changed

osi_object.proto

Lines changed: 62 additions & 17 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"
@@ -442,7 +442,7 @@ message MovingObject
442442
// The trajectory that this moving object expects to follow in the future.
443443
//
444444
// This is not externally perceivable information, rather this is to aid
445-
// realistic simulation of traffic participants that are not under test.
445+
// realistic simulation of traffic participants that are not under test.
446446
// This information should not be made available to the stack under test.
447447
//
448448
// \note Moving objects are not required to stick to this trajectory, it is
@@ -453,7 +453,7 @@ message MovingObject
453453

454454
// Specific information about the classification of the vehicle.
455455
//
456-
optional MovingObjectClassification moving_object_classification = 9;
456+
optional MovingObjectClassification moving_object_classification = 9;
457457

458458
// Optional external reference to the moving-object source
459459
//
@@ -469,7 +469,7 @@ message MovingObject
469469
// * identifier[1] = name of Vehicle/Pedestrian in Entity
470470
//
471471
// \todo OpenSCENARIO currently does not provide an animal type.
472-
//
472+
//
473473
// \note For non-ASAM Standards, it is implementation-specific how
474474
// source_reference is resolved.
475475
//
@@ -575,9 +575,9 @@ message MovingObject
575575
//
576576
optional Vector3d bbcenter_to_front = 5;
577577

578-
// Static minimal distance or space from the lowest point of the vehicle's
578+
// Static minimal distance or space from the lowest point of the vehicle's
579579
// body to the surface plane below it under neutral load conditions. This
580-
// distance disregards, for example, driving-dynamic effects or
580+
// distance disregards, for example, driving-dynamic effects or
581581
// road-surface effects. Can be useful to approximate the clearance area
582582
// under a vehicle that a sensor can see through.
583583
// \note \c ground_clearance is included in the bounding box height.
@@ -590,7 +590,7 @@ message MovingObject
590590
//
591591
repeated WheelData wheel_data = 7;
592592

593-
// Angle of the steering wheel.
593+
// Angle of the steering wheel.
594594
// Zero means the steering wheel is in its center postion, a positive value
595595
// means the steering wheel is turned to the left and a negative value
596596
// means the steering wheel is turned to the right of the center position.
@@ -600,8 +600,8 @@ message MovingObject
600600
optional double steering_wheel_angle = 8;
601601

602602
// \brief Detailed wheel data.
603-
// The focus is on the description of a wheel regarding the perceivable
604-
// information from the outside.
603+
// The focus is on the description of a wheel regarding the perceivable
604+
// information from the outside.
605605
// It is not intended to be used for dynamic calculations, for example.
606606
//
607607
message WheelData
@@ -620,8 +620,8 @@ message MovingObject
620620
// This concept works also for twin tires.
621621
//
622622
optional uint32 index = 2;
623-
624-
// A vector pointing from the vehicle's reference system (center of bounding
623+
624+
// A vector pointing from the vehicle's reference system (center of bounding
625625
// box) to the geometric center of the wheel.
626626
//
627627
optional Vector3d position = 3;
@@ -638,7 +638,7 @@ message MovingObject
638638
// Unit: m
639639
//
640640
optional double rim_radius = 5;
641-
641+
642642
// Median width of the tire.
643643
//
644644
// Unit: m
@@ -653,7 +653,7 @@ message MovingObject
653653

654654
// Rotation rate of the wheel.
655655
// The rotation rate around the y-axis with respect to the wheel's coordinate system.
656-
//
656+
//
657657
// Unit: rad/s.
658658
//
659659
// The sign convention is defined using the right-hand rule.
@@ -664,7 +664,7 @@ message MovingObject
664664
// \note The vehicle's reference coordinate system is only used to determine the sign convention of the rotation rate.
665665
//
666666
optional double rotation_rate = 8;
667-
667+
668668
// Opaque reference of an associated 3D model of the wheel.
669669
//
670670
// \note It is implementation-specific how model_references are resolved to
@@ -696,8 +696,8 @@ message MovingObject
696696
//
697697
// \note OSI uses singular instead of plural for repeated field names.
698698
//
699-
repeated double assigned_lane_percentage = 2;
700-
699+
repeated double assigned_lane_percentage = 2;
700+
701701
}
702702

703703
//
@@ -729,6 +729,10 @@ message MovingObject
729729
//
730730
optional Identifier trailer_id = 4;
731731

732+
// The role of the vehicle.
733+
//
734+
optional Role role = 5;
735+
732736
// Definition of vehicle types.
733737
//
734738
enum Type
@@ -950,5 +954,46 @@ message MovingObject
950954
BRAKE_LIGHT_STATE_STRONG = 4;
951955
}
952956
}
957+
958+
// Definition of vehicle roles.
959+
//
960+
enum Role
961+
{
962+
// Role of vehicle is unknown (must not be used in ground truth).
963+
//
964+
ROLE_UNKNOWN = 0;
965+
966+
// Other (unspecified but known) role of vehicle.
967+
//
968+
ROLE_OTHER = 1;
969+
970+
// The vehicle role is ambulance.
971+
//
972+
ROLE_AMBULANCE = 2;
973+
974+
// The vehicle role is civil.
975+
//
976+
ROLE_CIVIL = 3;
977+
978+
// The vehicle role is fire fighting, e.g. fire engine.
979+
//
980+
ROLE_FIRE = 4;
981+
982+
// The vehicle role is military, e.g. camouflaged truck.
983+
//
984+
ROLE_MILITARY = 5;
985+
986+
// The vehicle role is police.
987+
//
988+
ROLE_POLICE = 6;
989+
990+
// The vehicle role is public transport, e.g. a school bus.
991+
//
992+
ROLE_PUBLIC_TRANSPORT = 7;
993+
994+
// The vehicle role is roadside assistance, e.g. tow truck.
995+
//
996+
ROLE_ROAD_ASSISTANCE = 8;
997+
}
953998
}
954-
}
999+
}

0 commit comments

Comments
 (0)