Skip to content

Commit cd1fa51

Browse files
committed
Fix field numbering conflict with master
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
1 parent 9933f4c commit cd1fa51

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

osi_object.proto

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,25 +104,25 @@ message StationaryObject
104104
//
105105
optional Color color = 4;
106106

107+
// The attributes of the emitting structure if stationary object is classified as such.
108+
//
109+
optional EmittingStructureAttribute emitting_structure_attribute = 5;
110+
107111
// The IDs of the lanes that the object is assigned to.
108112
//
109113
// \note Might be multiple IDs if the object stretches over multiple lanes.
110114
//
111115
// \note OSI uses singular instead of plural for repeated field names.
112116
//
113-
repeated Identifier assigned_lane_id = 5;
117+
repeated Identifier assigned_lane_id = 6;
114118

115119
// Percentage values of the object width in the corresponding lane.
116120
//
117121
// \note Might be multiple percentages if the object stretches over multiple lanes.
118122
//
119123
// \note OSI uses singular instead of plural for repeated field names.
120124
//
121-
repeated double assigned_lane_percentage = 6;
122-
123-
// The attributes of the emitting structure if stationary object is classified as such.
124-
//
125-
optional EmittingStructureAttribute emitting_structure_attribute = 5;
125+
repeated double assigned_lane_percentage = 7;
126126

127127
// Definition of object types.
128128
//

0 commit comments

Comments
 (0)