From f67973059e7bbde2af4c9e7ec9eb86543f715cf0 Mon Sep 17 00:00:00 2001 From: "Schloemicher, Thomas AVL,AT" Date: Tue, 14 Jan 2020 17:41:28 +0100 Subject: [PATCH 1/5] Move assigned_lane_id in MovingObject to VehicleClassification Signed-off-by: Pierre R. Mai --- osi_object.proto | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/osi_object.proto b/osi_object.proto index 58b00dd34..0a1a6092b 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -572,6 +572,15 @@ message MovingObject // optional Identifier trailer_id = 4; + // The IDs of the lanes that this object is assigned to. + // + // \note Might be multiple if the object is switching lanes or moving from + // one lane into another following lane. + // + // \note OSI uses singular instead of plural for repeated field names. + // + repeated Identifier assigned_lane_id = 5; + // Definition of vehicle types. // enum Type From d4eaae361a5823ee246fd5e3c940c0f5e94e6870 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Wed, 29 Apr 2020 15:46:52 +0200 Subject: [PATCH 2/5] Add assigned_lane_percentage, add deprecations Signed-off-by: Pierre R. Mai --- osi_detectedobject.proto | 6 ++++++ osi_object.proto | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/osi_detectedobject.proto b/osi_detectedobject.proto index fc5f24591..0b58e9c32 100644 --- a/osi_detectedobject.proto +++ b/osi_detectedobject.proto @@ -190,6 +190,9 @@ message DetectedMovingObject // // Percentage value of the object width in the corresponding lane. // + // \note DEPRECATED: Use assigned_lane_percentage in VehicleClassification + // instead. + // // \rules // is_greater_than_or_equal_to: 0 // is_less_than_or_equal_to: 100 @@ -201,6 +204,9 @@ message DetectedMovingObject // // Percentage value of the object width in the corresponding lane. // + // \note DEPRECATED: Use assigned_lane_percentage in VehicleClassification + // instead. + // // \rules // is_greater_than_or_equal_to: 0 // is_less_than_or_equal_to: 100 diff --git a/osi_object.proto b/osi_object.proto index 0a1a6092b..246e4966d 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -308,6 +308,9 @@ message MovingObject // // \note OSI uses singular instead of plural for repeated field names. // + // \note DEPRECATED: Use assigned_lane_id in VehicleClassification + // instead. + // repeated Identifier assigned_lane_id = 4; // Specific information about the vehicle. @@ -581,6 +584,15 @@ message MovingObject // repeated Identifier assigned_lane_id = 5; + // Percentage value of the object width in the corresponding lane. + // + // \note Might be multiple if the object is switching lanes or moving from + // one lane into another following lane. + // + // \note OSI uses singular instead of plural for repeated field names. + // + repeated double assigned_lane_percentage = 6; + // Definition of vehicle types. // enum Type From d7fab37bb276674bec454e32045add51d65b607f Mon Sep 17 00:00:00 2001 From: Habedank Clemens Date: Thu, 4 Feb 2021 08:48:31 +0100 Subject: [PATCH 3/5] Introduce MovingObjectClassification in MovingObject Add MovingObjectClassification and put assigend_lane_id and assigned_lane_percentage there to allow for filling those fields for non-vehicle moving objects Signed-off-by: Pierre R. Mai --- osi_detectedobject.proto | 4 ++-- osi_object.proto | 45 +++++++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/osi_detectedobject.proto b/osi_detectedobject.proto index 0b58e9c32..92cfe93dd 100644 --- a/osi_detectedobject.proto +++ b/osi_detectedobject.proto @@ -190,7 +190,7 @@ message DetectedMovingObject // // Percentage value of the object width in the corresponding lane. // - // \note DEPRECATED: Use assigned_lane_percentage in VehicleClassification + // \note DEPRECATED: Use assigned_lane_percentage in MovingObjectClassification // instead. // // \rules @@ -204,7 +204,7 @@ message DetectedMovingObject // // Percentage value of the object width in the corresponding lane. // - // \note DEPRECATED: Use assigned_lane_percentage in VehicleClassification + // \note DEPRECATED: Use assigned_lane_percentage in MovingObjectClassification // instead. // // \rules diff --git a/osi_object.proto b/osi_object.proto index 246e4966d..9e64e3454 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -308,7 +308,7 @@ message MovingObject // // \note OSI uses singular instead of plural for repeated field names. // - // \note DEPRECATED: Use assigned_lane_id in VehicleClassification + // \note DEPRECATED: Use assigned_lane_id in MovingObjectClassification // instead. // repeated Identifier assigned_lane_id = 4; @@ -546,6 +546,31 @@ message MovingObject } } + // + // \brief Information for the classification of moving objects regarding + // \c MovingObject (host or other). + // + message MovingObjectClassification + { + // The IDs of the lanes that this object is assigned to. + // + // \note Might be multiple if the object is switching lanes or moving from + // one lane into another following lane. + // + // \note OSI uses singular instead of plural for repeated field names. + // + repeated Identifier assigned_lane_id = 1; + + // Percentage value of the object width in the corresponding lane. + // + // \note Might be multiple if the object is switching lanes or moving from + // one lane into another following lane. + // + // \note OSI uses singular instead of plural for repeated field names. + // + repeated double assigned_lane_percentage = 2; + } + // // \brief Information for the classification of vehicles regarding // \c MovingObject (host or other). @@ -575,24 +600,6 @@ message MovingObject // optional Identifier trailer_id = 4; - // The IDs of the lanes that this object is assigned to. - // - // \note Might be multiple if the object is switching lanes or moving from - // one lane into another following lane. - // - // \note OSI uses singular instead of plural for repeated field names. - // - repeated Identifier assigned_lane_id = 5; - - // Percentage value of the object width in the corresponding lane. - // - // \note Might be multiple if the object is switching lanes or moving from - // one lane into another following lane. - // - // \note OSI uses singular instead of plural for repeated field names. - // - repeated double assigned_lane_percentage = 6; - // Definition of vehicle types. // enum Type From 373fc4151cbe842a9cf20853671f398e7486dca3 Mon Sep 17 00:00:00 2001 From: Habedank Clemens Date: Mon, 8 Feb 2021 14:18:38 +0100 Subject: [PATCH 4/5] Add MovingObjectClassification to CandidateMovingObject Signed-off-by: Pierre R. Mai --- osi_detectedobject.proto | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osi_detectedobject.proto b/osi_detectedobject.proto index 92cfe93dd..83a9ab598 100644 --- a/osi_detectedobject.proto +++ b/osi_detectedobject.proto @@ -315,6 +315,10 @@ message DetectedMovingObject // [1] Patton, K. T. & Thibodeau, G. A. (2015). Anatomy & Physiology. 9th Edition. Elsevier. Missouri, U.S.A. ISBN 978-0-323-34139-4. p. 1229. // optional Orientation3d upper_body_pose = 5; + + // Specific information about the classification of a moving object. + // + optional MovingObject.MovingObjectClassification moving_object_classification = 6; } // Definition of available reference points. Left/middle/right and From 97444fa1254f35224e5d17fcb5e5bded8d671293 Mon Sep 17 00:00:00 2001 From: Habedank Clemens Date: Mon, 8 Feb 2021 14:38:36 +0100 Subject: [PATCH 5/5] Add MovingObjectClassification to MovingObject Signed-off-by: Pierre R. Mai --- osi_object.proto | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osi_object.proto b/osi_object.proto index 9e64e3454..cb0b80b5d 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -355,6 +355,10 @@ message MovingObject // repeated StatePoint future_trajectory = 8; + // Specific information about the classification of the vehicle. + // + optional MovingObjectClassification moving_object_classification = 9; + // Definition of object types. // enum Type