Skip to content

Commit 50a0b3a

Browse files
Habedank Clemenspmai
authored andcommitted
Proposal for LaneChangeAction as discussed in UAP 2.1.5. Suitable to OpenSCENARIO 1.0. Deleted 'One of' keyword
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
1 parent c0e32a2 commit 50a0b3a

File tree

1 file changed

+44
-12
lines changed

1 file changed

+44
-12
lines changed

osi_trafficcommand.proto

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,23 @@ message TrafficCommand
5858
//
5959
message TrafficAction
6060
{
61-
oneof Action {
62-
63-
// A TrafficAction
64-
//
65-
TrajectoryAction trajectory_action = 1;
61+
// Only one of the TrafficActions is supposed to be chosen. Pending, if the proto-keyword "One of" can be used.
62+
63+
// A TrafficAction
64+
//
65+
optional TrajectoryAction trajectory_action = 1;
6666

67-
// A PathAction
68-
//
69-
PathAction path_action = 2;
67+
// A PathAction
68+
//
69+
optional PathAction path_action = 2;
7070

71-
// An AcquireGlobalPositionAction
72-
//
73-
AcquireGlobalPositionAction acquire_global_position_action = 3;
74-
}
71+
// An AcquireGlobalPositionAction
72+
//
73+
optional AcquireGlobalPositionAction acquire_global_position_action = 3;
74+
75+
// A LaneChangeAction
76+
//
77+
optional LaneChangeAction lane_change_action = 4;
7578
}
7679

7780

@@ -206,3 +209,32 @@ message AcquireGlobalPositionAction
206209
//
207210
optional Orientation3d orientation = 3;
208211
}
212+
213+
message LaneChangeAction
214+
{
215+
// The action_header
216+
//
217+
//
218+
optional ActionHeader action_header = 1;
219+
220+
// Required field for this Action. Targeted Lane relative to the current lane. Convention: +1 means to the right, -1 means to the left.
221+
optional int32 RelativeTargetLane = 2;
222+
223+
// Enum definition
224+
optional DynamicsShape dynamics_shape = 3;
225+
226+
// in seconds
227+
optional double LC_duration = 4;
228+
229+
// in meters
230+
optional double LC_distance = 5;
231+
232+
enum DynamicsShape
233+
{
234+
UNDEFINED = 1;
235+
LINEAR = 2;
236+
CUBIC = 3;
237+
SINUSOIDAL = 4;
238+
STEP = 5;
239+
}
240+
}

0 commit comments

Comments
 (0)