Skip to content

Remove RelevantLane and RelevantDirection in Detected... #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
9 commits merged into from
Mar 28, 2018
Merged

Remove RelevantLane and RelevantDirection in Detected... #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
15391c1
Remove
carsten-kuebler Mar 22, 2018
413aae2
Merge branch 'master' into Suggestion/Remove_Relevant_Lane_and_Direction
carsten-kuebler Mar 23, 2018
4263e30
Merge branch 'master' into Suggestion/Remove_Relevant_Lane_and_Direction
jdsika Mar 26, 2018
43d08d7
Merge branch 'master' into Suggestion/Remove_Relevant_Lane_and_Direction
jdsika Mar 27, 2018
9fa5675
resolved conflict with master and added assigned_lane_id in MainSign …
jdsika Mar 28, 2018
1bb4c6f
Merge branch 'master' into Suggestion/Remove_Relevant_Lane_and_Direction
jdsika Mar 28, 2018
be0fe48
Removed tabs
jdsika Mar 28, 2018
45a263a
changed index to retrigger build
jdsika Mar 28, 2018
e172686
removed tabs
jdsika Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 1 addition & 81 deletions osi_detectedlandmark.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ message DetectedTrafficSign
//
optional double existence_probability = 7;

// Links to the corresponding lanes.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated RelevantLane relevant_lane_id = 10;

// A list of sensors which detected this detected entity.
//
// If \c SensorData has detected entities and all detections are missing,
Expand All @@ -60,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.
Expand Down Expand Up @@ -262,18 +256,6 @@ message DetectedTrafficLight
//
optional EstimatedTrafficLight traffic_light = 4;

// Determines for which directions the traffic light applies.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated RelevantDirection relevant_direction = 6;

// Links to the corresponding lanes.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated RelevantLane relevant_lane = 7;

// The estimated probability that this traffic light really exists, not
// based on history.
//
Expand Down Expand Up @@ -346,62 +328,6 @@ message DetectedTrafficLight
optional MeasurementState measurement_state = 4;
}
}

//
// \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;
}
}
}

//
// \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;
}

//
Expand Down Expand Up @@ -432,12 +358,6 @@ message DetectedRoadMarking
//
optional double existence_probability = 5;

// Links to the corresponding lanes.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated RelevantLane relevant_lane = 6;

// A list of sensors which detected this detected entity.
//
// If \c SensorData has detected entities and all detections are missing,
Expand Down
22 changes: 14 additions & 8 deletions osi_landmark.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ message TrafficSign
//
repeated SupplementarySign supplementary_sign = 8;

// The IDs of the lanes that the traffic sign is assigned to.
// May be multiple if the traffic sign is valid for multiple lanes.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated Identifier assigned_lane_id = 9;

// Definition of the variability of the traffic sign.
//
enum Variability
Expand All @@ -62,7 +55,6 @@ message TrafficSign
VARIABILITY_VARIABLE = 3;
}


// Unit for values on traffic sign
//
enum Unit
Expand Down Expand Up @@ -225,6 +217,13 @@ message TrafficSign
//
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.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated Identifier assigned_lane_id = 6;

// Definition of traffic sign types.
// Numbers are given according to German StVO.
//
Expand Down Expand Up @@ -966,6 +965,13 @@ message TrafficSign
//
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.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated Identifier assigned_lane_id = 10;

// Definition of supplementary sign types.
// See \c TrafficSign::Type for further information.
//
Expand Down