From 916e4f4cad5b3b45cdba4ab5fdd6ed3d20f0d96d Mon Sep 17 00:00:00 2001 From: "Schloemicher, Thomas AVL,AT" Date: Fri, 5 Mar 2021 09:29:25 +0100 Subject: [PATCH 1/4] Add StationaryObjectClassification including assigned_lane_id and assigned_lane_percentage Signed-off-by: Schloemicher, Thomas AVL,AT --- osi_object.proto | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/osi_object.proto b/osi_object.proto index 3030a3311..260fad6a0 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -79,6 +79,32 @@ message StationaryObject // optional ColorDescription color_description = 6; + // Specific information about the classification of stationary objects. + // + optional StationaryObjectClassification stationary_object_classification = 7; + + // + // \brief Information for the classification of stationary objects. + // + message StationaryObjectClassification + { + // The IDs of the lanes that this object is assigned to. + // + // \note Might be multiple if the object streches over multiple lanes. + // + // \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 streches over multiple lanes. + // + // \note OSI uses singular instead of plural for repeated field names. + // + repeated double assigned_lane_percentage = 2; + } + // // \brief Classification data for a stationary object. // From f5953a62c114fec15b69f8e48af8951ef468f8b1 Mon Sep 17 00:00:00 2001 From: "Schloemicher, Thomas AVL,AT" Date: Wed, 23 Jun 2021 13:19:56 +0200 Subject: [PATCH 2/4] Move assigned_lane_id and assigned_lane_percentage under Classification message that is already available Signed-off-by: Schloemicher, Thomas AVL,AT --- osi_object.proto | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/osi_object.proto b/osi_object.proto index 260fad6a0..dcf073c6b 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -79,32 +79,6 @@ message StationaryObject // optional ColorDescription color_description = 6; - // Specific information about the classification of stationary objects. - // - optional StationaryObjectClassification stationary_object_classification = 7; - - // - // \brief Information for the classification of stationary objects. - // - message StationaryObjectClassification - { - // The IDs of the lanes that this object is assigned to. - // - // \note Might be multiple if the object streches over multiple lanes. - // - // \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 streches over multiple lanes. - // - // \note OSI uses singular instead of plural for repeated field names. - // - repeated double assigned_lane_percentage = 2; - } - // // \brief Classification data for a stationary object. // @@ -130,6 +104,22 @@ message StationaryObject // optional Color color = 4; + // The IDs of the lanes that the object is assigned to. + // + // \note Might be multiple if the object streches over multiple lanes. + // + // \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 streches over multiple lanes. + // + // \note OSI uses singular instead of plural for repeated field names. + // + repeated double assigned_lane_percentage = 6; + // The attributes of the emitting structure if stationary object is classified as such. // optional EmittingStructureAttribute emitting_structure_attribute = 5; From 9933f4cba64e8f094885ffa91bd61581a648cd3a Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Wed, 8 Sep 2021 11:18:58 +0200 Subject: [PATCH 3/4] Apply suggestions from documentation review Co-authored-by: max-rosin <62103539+max-rosin@users.noreply.github.com> Signed-off-by: Pierre R. Mai --- osi_object.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osi_object.proto b/osi_object.proto index dcf073c6b..71cd122e9 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -106,15 +106,15 @@ message StationaryObject // The IDs of the lanes that the object is assigned to. // - // \note Might be multiple if the object streches over multiple lanes. + // \note Might be multiple IDs if the object stretches over multiple lanes. // // \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. + // Percentage values of the object width in the corresponding lane. // - // \note Might be multiple if the object streches over multiple lanes. + // \note Might be multiple percentages if the object stretches over multiple lanes. // // \note OSI uses singular instead of plural for repeated field names. // From cd1fa51fdbca8340c2c2d869c3bf0297d740e860 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Wed, 8 Sep 2021 12:01:52 +0200 Subject: [PATCH 4/4] Fix field numbering conflict with master Signed-off-by: Pierre R. Mai --- osi_object.proto | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/osi_object.proto b/osi_object.proto index 71cd122e9..fb8a92536 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -104,13 +104,17 @@ message StationaryObject // optional Color color = 4; + // The attributes of the emitting structure if stationary object is classified as such. + // + optional EmittingStructureAttribute emitting_structure_attribute = 5; + // The IDs of the lanes that the object is assigned to. // // \note Might be multiple IDs if the object stretches over multiple lanes. // // \note OSI uses singular instead of plural for repeated field names. // - repeated Identifier assigned_lane_id = 5; + repeated Identifier assigned_lane_id = 6; // Percentage values of the object width in the corresponding lane. // @@ -118,11 +122,7 @@ message StationaryObject // // \note OSI uses singular instead of plural for repeated field names. // - repeated double assigned_lane_percentage = 6; - - // The attributes of the emitting structure if stationary object is classified as such. - // - optional EmittingStructureAttribute emitting_structure_attribute = 5; + repeated double assigned_lane_percentage = 7; // Definition of object types. //