Skip to content

Commit 014501f

Browse files
Habedank Clemenspmai
authored andcommitted
propose new definition for StatePoint analogue to AcquirePositionAction, also based on Pierres critics regarding overspecification
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
1 parent 50a0b3a commit 014501f

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

osi_trafficcommand.proto

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ message TrafficCommand
5858
//
5959
message TrafficAction
6060
{
61-
// Only one of the TrafficActions is supposed to be chosen. Pending, if the proto-keyword "One of" can be used.
61+
// Only one of the TrafficActions is supposed to be chosen. Pending, if the proto-keyword "One of" can be used.
6262

6363
// A TrafficAction
6464
//
@@ -72,8 +72,8 @@ message TrafficAction
7272
//
7373
optional AcquireGlobalPositionAction acquire_global_position_action = 3;
7474

75-
// A LaneChangeAction
76-
//
75+
// A LaneChangeAction
76+
//
7777
optional LaneChangeAction lane_change_action = 4;
7878
}
7979

@@ -99,11 +99,17 @@ message StatePoint
9999
optional Timestamp time_stamp = 1;
100100

101101

102-
// BaseMoving to describe a state
102+
// Offset position relative to the global coordinate system in [m].
103+
// The position refers to the center (x,y,z) of the bounding box.
103104
//
104-
// \note OSI uses singular instead of plural for repeated field names.
105+
// \note Remark: The definition of the reference point follows the
106+
// specification of the \c BaseMoving message.
107+
//
108+
optional Vector3d position = 2;
109+
110+
// Orientation offset relative to the global coordinate system in [rad].
105111
//
106-
optional BaseMoving state = 2;
112+
optional Orientation3d orientation = 3;
107113
}
108114

109115
//
@@ -201,11 +207,15 @@ message AcquireGlobalPositionAction
201207
//
202208
optional ActionHeader action_header = 1;
203209

204-
// Offset position relative to the global coordinate system.
210+
// Offset position relative to the global coordinate system in [m].
211+
// The position refers to the center (x,y,z) of the bounding box.
212+
//
213+
// \note Remark: The definition of the reference point follows the
214+
// specification of the \c BaseMoving message.
205215
//
206216
optional Vector3d position = 2;
207217

208-
// Orientation offset relative to the global coordinate system.
218+
// Orientation offset relative to the global coordinate system in [rad].
209219
//
210220
optional Orientation3d orientation = 3;
211221
}
@@ -217,16 +227,16 @@ message LaneChangeAction
217227
//
218228
optional ActionHeader action_header = 1;
219229

220-
// Required field for this Action. Targeted Lane relative to the current lane. Convention: +1 means to the right, -1 means to the left.
230+
// Required field for this Action. Targeted Lane relative to the current lane. Convention: +1 means to the right, -1 means to the left.
221231
optional int32 RelativeTargetLane = 2;
222232

223-
// Enum definition
233+
// Enum definition
224234
optional DynamicsShape dynamics_shape = 3;
225235

226-
// in seconds
236+
// in seconds
227237
optional double LC_duration = 4;
228238

229-
// in meters
239+
// in meters
230240
optional double LC_distance = 5;
231241

232242
enum DynamicsShape
@@ -237,4 +247,4 @@ message LaneChangeAction
237247
SINUSOIDAL = 4;
238248
STEP = 5;
239249
}
240-
}
250+
}

0 commit comments

Comments
 (0)