From 15391c102f2c7d98a8aac22aad716b95e7e1764a Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Thu, 22 Mar 2018 15:25:08 +0100 Subject: [PATCH 1/4] Remove Remove RelevantLane and RelevantDirection. Relevant lanes and directions are defined in Candidate... assigned_lanes and traffic light's icons. --- osi_detectedlandmark.proto | 69 -------------------------------------- 1 file changed, 69 deletions(-) diff --git a/osi_detectedlandmark.proto b/osi_detectedlandmark.proto index cfb7012c4..49e6da44b 100644 --- a/osi_detectedlandmark.proto +++ b/osi_detectedlandmark.proto @@ -53,10 +53,6 @@ message DetectedTrafficSign // traffic sign. // optional BaseStationary rmse = 9; - - // Links to the corresponding lanes. - // - repeated RelevantLane relevant_lane = 10; // A list of sensors which detected this detected entity. // @@ -202,14 +198,6 @@ message DetectedTrafficLight // optional BaseStationary rmse = 5; - // Determines for which directions the traffic light applies. - // - repeated RelevantDirection relevant_direction = 6; - - // Links to the corresponding lanes. - // - repeated RelevantLane relevant_lane = 7; - // The estimated probability that this traffic light really exists, not // based on history. // @@ -232,45 +220,6 @@ message DetectedTrafficLight // the sensors (their IDs) to which these detections belong. // repeated Identifier sensor_id = 10; - - // - // \brief Further specifies the relevant directions of the traffic light. - // - message RelevantDirection - { - // The direction the traffic light corresponds to. - // - optional Direction direction = 1; - - // Relevance probability. Range [0,1]. - // - optional double relevance_probability = 2; - - // Specifies the different directions. - // - enum Direction - { - // Direction is unknown (must not be used in ground truth). - // - DIRECTION_UNKNOWN = 0; - - // Other (unspecified but known) direction. - // - DIRECTION_OTHER = 1; - - // Direction is straight. - // - DIRECTION_STRAIGHT = 2; - - // Direction is left. - // - DIRECTION_LEFT = 3; - - // Direction is right. - // - DIRECTION_RIGHT = 4; - } - } } // @@ -289,20 +238,6 @@ message CandidateTrafficLight optional double candidate_probability = 2; } -// -// \brief Further specifies the relevant lane of a detected object. -// -message RelevantLane -{ - // Tracking ID of the lane segment. - // - optional Identifier lane_id = 1; - - // Relevance probability. Range [0,1]. - // - optional double relevance_probability = 2; -} - // // \brief A road marking in the environment as detected by the sensor. // @@ -331,10 +266,6 @@ message DetectedRoadMarking // optional double existence_probability = 5; - // Links to the corresponding lanes. - // - repeated RelevantLane relevant_lane = 6; - // The measurement state. // optional MeasurementState measurement_state = 7; From be0fe486a3f893971ede356c7036f5955e1c80c3 Mon Sep 17 00:00:00 2001 From: Carlo van Driesten Date: Wed, 28 Mar 2018 10:12:24 +0200 Subject: [PATCH 2/4] Removed tabs --- osi_landmark.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osi_landmark.proto b/osi_landmark.proto index 349c053a6..8daa3de28 100644 --- a/osi_landmark.proto +++ b/osi_landmark.proto @@ -217,7 +217,7 @@ message TrafficSign // optional DirectionScope direction_scope = 5; - // The IDs of the lanes that the sign is assigned to. + // The IDs of the lanes that the sign is assigned to. // May be multiple if the sign is valid for multiple lanes. // // \note OSI uses singular instead of plural for repeated field names. @@ -965,7 +965,7 @@ message TrafficSign // optional Unit value_4_unit = 9; - // The IDs of the lanes that the sign is assigned to. + // The IDs of the lanes that the sign is assigned to. // May be multiple if the sign is valid for multiple lanes. // // \note OSI uses singular instead of plural for repeated field names. From 45a263a296e24247a453d529fdfd2852f2cb6289 Mon Sep 17 00:00:00 2001 From: Carlo van Driesten Date: Wed, 28 Mar 2018 10:26:30 +0200 Subject: [PATCH 3/4] changed index to retrigger build --- osi_detectedlandmark.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_detectedlandmark.proto b/osi_detectedlandmark.proto index ae0408f1d..310937873 100644 --- a/osi_detectedlandmark.proto +++ b/osi_detectedlandmark.proto @@ -54,7 +54,7 @@ message DetectedTrafficSign // // \note OSI uses singular instead of plural for repeated field names. // - repeated Identifier sensor_id = 11; + repeated Identifier sensor_id = 8; // // \brief Candidates for a detected sign as estimated by the sensor. From e172686f1ab8a5b3b7099816bee94994d5121962 Mon Sep 17 00:00:00 2001 From: Carlo van Driesten Date: Wed, 28 Mar 2018 10:30:57 +0200 Subject: [PATCH 4/4] removed tabs --- osi_landmark.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osi_landmark.proto b/osi_landmark.proto index 8daa3de28..e6c7dec27 100644 --- a/osi_landmark.proto +++ b/osi_landmark.proto @@ -216,7 +216,7 @@ message TrafficSign // intentionally unmounted and, hence, not be in effect. // optional DirectionScope direction_scope = 5; - + // The IDs of the lanes that the sign is assigned to. // May be multiple if the sign is valid for multiple lanes. // @@ -964,7 +964,7 @@ message TrafficSign // Unit for fourth optional value. // optional Unit value_4_unit = 9; - + // The IDs of the lanes that the sign is assigned to. // May be multiple if the sign is valid for multiple lanes. //