Skip to content

Commit 49b5bce

Browse files
committed
Regularize field names and move action-specific fields
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
1 parent 23a6c86 commit 49b5bce

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

osi_trafficcommand.proto

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ message StatePoint
9595
//
9696
// \note Zero time point does not need to coincide with the UNIX epoch.
9797
//
98-
optional Timestamp time_stamp = 1;
98+
optional Timestamp timestamp = 1;
9999

100100
// Position in the global coordinate system.
101101
//
@@ -133,9 +133,6 @@ message ActionHeader
133133
// \note Zero time point does not need to coincide with the UNIX epoch.
134134
//
135135
optional Timestamp start_time = 2;
136-
137-
// This boolean describes if the Orientation values in StatePoint shall be set or not: 1 = yes, 0 = no.
138-
optional bool Orientation_constrain = 3;
139136
}
140137

141138
//
@@ -157,8 +154,16 @@ message TrajectoryAction
157154
// \note OSI uses singular instead of plural for repeated field names.
158155
//
159156
repeated StatePoint trajectory_point = 2;
160-
}
161157

158+
// Constrain the orientation of the traffic participant as specified
159+
// by the trajectory points
160+
//
161+
// This boolean flag defines whether orientation values supplied in
162+
// the trajectory points shall be used to constrain the orientation
163+
// of the traffic participant or not.
164+
//
165+
optional bool constrain_orientation = 3;
166+
}
162167

163168
//
164169
// \brief The PathAction. It provides an interface to describe a path.
@@ -179,6 +184,15 @@ message PathAction
179184
// \note OSI uses singular instead of plural for repeated field names.
180185
//
181186
repeated StatePoint path_point = 2;
187+
188+
// Constrain the orientation of the traffic participant as specified
189+
// by the path points
190+
//
191+
// This boolean flag defines whether orientation values supplied in
192+
// the path points shall be used to constrain the orientation
193+
// of the traffic participant or not.
194+
//
195+
optional bool constrain_orientation = 3;
182196
}
183197

184198
//
@@ -214,8 +228,8 @@ message LaneChangeAction
214228
// Targeted lane relative to the current lane.
215229
//
216230
// Convention: +1 means to the right, -1 means to the left.
217-
//
218-
optional int32 RelativeTargetLane = 2;
231+
//
232+
optional int32 relative_target_lane = 2;
219233

220234
// Specified shape of the lane change action.
221235
//

0 commit comments

Comments
 (0)