From 70d830ed95beabc0388adc31fb815219976393bb Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Fri, 3 May 2024 09:21:38 +0200 Subject: [PATCH 1/3] Add rules according to notes in the documentation Signed-off-by: ClemensLinnhoff --- osi_common.proto | 6 +++++- osi_detectedobject.proto | 12 ++++++++++++ osi_route.proto | 1 + osi_trafficcommand.proto | 5 +++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/osi_common.proto b/osi_common.proto index 7db75ca7a..c820790b2 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -235,7 +235,7 @@ message ExternalReference // The type of the external references. // - // Mandatory value describing the type of the original source. + // Value describing the type of the original source. // // For OpenX/ASAM standards it is specified as follows: // - net.asam.opendrive @@ -245,6 +245,10 @@ message ExternalReference // reverse domain name notation with lower-case type field // is recommended to guarantee unique and interoperable identification. // + // \rules + // is_set + // \endrules + // optional string type = 2; // The external identifier reference value. diff --git a/osi_detectedobject.proto b/osi_detectedobject.proto index fb4e4e62b..3ea53c4e0 100644 --- a/osi_detectedobject.proto +++ b/osi_detectedobject.proto @@ -325,6 +325,10 @@ message DetectedMovingObject // \note This field is mandatory if the \c CandidateMovingObject::type // is \c MovingObject::TYPE_VEHICLE . // + // \rules + // check_if this.type is_equal_to 2 else do_check is_set + // \endrules + // optional MovingObject.VehicleClassification vehicle_classification = 3; // Pedestrian head pose for behavior prediction. Describes the head @@ -339,6 +343,10 @@ message DetectedMovingObject // \note This field is mandatory if the \c CandidateMovingObject.type is // \c MovingObject::TYPE_PEDESTRIAN // + // \rules + // check_if this.type is_equal_to 3 else do_check is_set + // \endrules + // // \par Reference: // // [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. @@ -358,6 +366,10 @@ message DetectedMovingObject // \note This field is mandatory if the \c CandidateMovingObject::type // is \c MovingObject::TYPE_PEDESTRIAN // + // \rules + // check_if this.type is_equal_to 3 else do_check is_set + // \endrules + // // \par Reference: // [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. // diff --git a/osi_route.proto b/osi_route.proto index 794c6bb20..21b478ff3 100644 --- a/osi_route.proto +++ b/osi_route.proto @@ -42,6 +42,7 @@ message Route // // \rules // is_set + // is_globally_unique // \endrules // optional Identifier route_id = 1; diff --git a/osi_trafficcommand.proto b/osi_trafficcommand.proto index 61c62a9b6..fc0e5b866 100644 --- a/osi_trafficcommand.proto +++ b/osi_trafficcommand.proto @@ -142,6 +142,11 @@ message TrafficAction // \note This id must be unique within all traffic command // messages exchanged with one traffic participant. // + // \rules + // is_set + // is_globally_unique + // \endrules + // optional Identifier action_id = 1; } From 6d61dce5cf0866b0b6873e4e296c86ebd8229fed Mon Sep 17 00:00:00 2001 From: Clemens Linnhoff Date: Mon, 6 May 2024 09:51:08 +0200 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Pierre R. Mai Signed-off-by: Clemens Linnhoff --- osi_common.proto | 2 +- osi_route.proto | 1 - osi_trafficcommand.proto | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/osi_common.proto b/osi_common.proto index c820790b2..804c39805 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -235,7 +235,7 @@ message ExternalReference // The type of the external references. // - // Value describing the type of the original source. + // Mandatory value describing the type of the original source. // // For OpenX/ASAM standards it is specified as follows: // - net.asam.opendrive diff --git a/osi_route.proto b/osi_route.proto index 21b478ff3..794c6bb20 100644 --- a/osi_route.proto +++ b/osi_route.proto @@ -42,7 +42,6 @@ message Route // // \rules // is_set - // is_globally_unique // \endrules // optional Identifier route_id = 1; diff --git a/osi_trafficcommand.proto b/osi_trafficcommand.proto index fc0e5b866..d8763b430 100644 --- a/osi_trafficcommand.proto +++ b/osi_trafficcommand.proto @@ -144,7 +144,6 @@ message TrafficAction // // \rules // is_set - // is_globally_unique // \endrules // optional Identifier action_id = 1; From de45ac8eb76a7f92bd394c5405c717b753a1c988 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 6 May 2024 10:11:42 +0200 Subject: [PATCH 3/3] Remove spaces at end of line Signed-off-by: ClemensLinnhoff --- osi_common.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_common.proto b/osi_common.proto index 804c39805..a4e62071a 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -249,7 +249,7 @@ message ExternalReference // is_set // \endrules // - optional string type = 2; + optional string type = 2; // The external identifier reference value. //