Skip to content

Commit 0f243cd

Browse files
feat: shift motion control to moving object since it distinction makes also sense for other moving objects such as pedestrians.
Signed-off-by: Christoph Glasmacher <christoph.glasmacher@ika.rwth-aachen.de>
1 parent dbee0de commit 0f243cd

1 file changed

Lines changed: 49 additions & 49 deletions

File tree

osi_object.proto

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,55 @@ message MovingObject
554554
//
555555
optional PedestrianAttributes pedestrian_attributes = 12;
556556

557+
enum MotionControlType
558+
{
559+
// Type of motion control is unknown.
560+
//
561+
TYPE_UNKNOWN = 0;
562+
563+
// Other (unspecified but known) type of controller for moving object.
564+
//
565+
TYPE_OTHER = 1;
566+
567+
// Real world regular person controls movement.
568+
//
569+
TYPE_REGULAR_PERSON = 2;
570+
571+
// Real world professional (e.g. safety driver) controls movement.
572+
//
573+
TYPE_PROFESSIONAL_PERSON = 3;
574+
575+
// Object is controlled by ADAS function but human is responsible.
576+
//
577+
TYPE_ADAS = 4;
578+
579+
// Object is controlled by AD function (no responsibility but possibility for human (if there are any) to takeover).
580+
//
581+
TYPE_AD = 5;
582+
583+
// Object is controlled by an everyday driving model
584+
// Definition: A model that includes the behaviour of a road user in uncritical traffic situations, including interaction with the infrastructure (Bärgman et al., "Guidelines for the development, quality, and use of models of road-user behaviour and models for in-crash simulations in virtual safety assessment", 2025)
585+
//
586+
TYPE_EVERYDAY_TRAFFIC_INTERACTION_MODEL = 6;
587+
588+
// Object is controlled by a critical event model
589+
// Definition: A model that describes a road user’s responses to the unfolding of a critical event (Bärgman et al., "Guidelines for the development, quality, and use of models of road-user behaviour and models for in-crash simulations in virtual safety assessment", 2025)
590+
//
591+
TYPE_CRITICAL_EVENT_MODEL = 7;
592+
593+
// Object is controlled by another model
594+
//
595+
TYPE_MODEL_OTHER = 8;
596+
597+
// Object is controlled remotely.
598+
//
599+
TYPE_REMOTE = 9;
600+
}
601+
602+
// The type of controller moving the object.
603+
//
604+
optional MotionControlType motion_control_type = 0;
605+
557606
//
558607
// \brief The vehicle attributes for \c MovingObject (host or other).
559608
//
@@ -599,55 +648,6 @@ message MovingObject
599648
//
600649
optional double radius_wheel = 2;
601650

602-
enum MotionControlType
603-
{
604-
// Type of motion control is unknown.
605-
//
606-
TYPE_UNKNOWN = 0;
607-
608-
// Other (unspecified but known) type of controller for moving object.
609-
//
610-
TYPE_OTHER = 1;
611-
612-
// Real world regular person controls vheicle.
613-
//
614-
TYPE_REGULAR_DRIVER = 2;
615-
616-
// Real world professional driver (e.g. safety driver) controls vehicle.
617-
//
618-
TYPE_PROFESSIONAL_DRIVER = 3;
619-
620-
// Object is controlled by ADAS function but driver is in responsible.
621-
//
622-
TYPE_ADAS = 4;
623-
624-
// Object is controlled by AD function (no responsibility but possibility for passenger (if there are any) to takeover).
625-
//
626-
TYPE_AD = 5;
627-
628-
// Object is controlled by an everyday driving model
629-
// Definition: A model that includes the behaviour of a road user in uncritical traffic situations, including interaction with the infrastructure (Bärgman et al., "Guidelines for the development, quality, and use of models of road-user behaviour and models for in-crash simulations in virtual safety assessment", 2025)
630-
//
631-
TYPE_EVERYDAY_TRAFFIC_INTERACTION_MODEL = 6;
632-
633-
// Object is controlled by a critical event model
634-
// Definition: A model that describes a road user’s responses to the unfolding of a critical event (Bärgman et al., "Guidelines for the development, quality, and use of models of road-user behaviour and models for in-crash simulations in virtual safety assessment", 2025)
635-
//
636-
TYPE_CRITICAL_EVENT_MODEL = 7;
637-
638-
// Object is controlled by another model
639-
//
640-
TYPE_MODEL_OTHER = 8;
641-
642-
// Object is controlled remotely.
643-
//
644-
TYPE_REMOTE = 9;
645-
}
646-
647-
// The type of controller moving the object.
648-
//
649-
optional MotionControlType motion_control_type = 0;
650-
651651
// Number of independent wheels.
652652
//
653653
// \rules

0 commit comments

Comments
 (0)