Skip to content

Commit fbe6362

Browse files
committed
Fix proto syntax and formatting
Signed-off-by: Pierre R. Mai <[email protected]>
1 parent 02d086a commit fbe6362

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

osi_route.proto

+14-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
syntax = "proto3";
1+
syntax = "proto2";
22

33
option optimize_for = SPEED;
44

@@ -33,7 +33,6 @@ package osi3;
3333
//
3434
message Route
3535
{
36-
3736
// The unique id of the route.
3837
//
3938
// \note This field is mandatory.
@@ -53,12 +52,12 @@ message Route
5352
//
5453
// \brief A segment of a logical lane.
5554
//
56-
// \note The #LogicalLaneSegment allows that #start_s > #end_s.
57-
// If #start_s < #end_s, then the traffic agent should traverse the
58-
// segment in the logical lane's reference line definition direction.
59-
// If #end_s > #start_s, then the traffic agent should traverse the
60-
// segment in the opposite of the logical lane's reference line
61-
// definition direction.
55+
// \note The LogicalLaneSegment allows that start_s > end_s.
56+
// If start_s < end_s, then the traffic agent should traverse the
57+
// segment in the logical lane's reference line definition direction.
58+
// If end_s > start_s, then the traffic agent should traverse the
59+
// segment in the opposite of the logical lane's reference line
60+
// definition direction.
6261
//
6362
message LogicalLaneSegment
6463
{
@@ -87,16 +86,16 @@ message Route
8786
//
8887
// Each time there is a successor-predecessor relation between the logical
8988
// lanes along the route (i.e. a logical lane ends, and is continued by another
90-
// logical lane, e.g. at a junction border), a new #RouteSegment starts. The
91-
// #RouteSegment then lists the logical lane segments that can be used to
89+
// logical lane, e.g. at a junction border), a new RouteSegment starts. The
90+
// RouteSegment then lists the logical lane segments that can be used to
9291
// travel through this space of the road.
9392
//
9493
// Together, the listed logical lane segments should form a continuous area,
9594
// where the traffic agent can move freely. These will mostly be parallel
9695
// lanes, though lanes may overlap (e.g. if one lane splits into two on a
97-
// junction). In general, the logical lane segments in a #RouteSegment will
98-
// have the same length, though there are exceptions (e.g. if a lane widening
99-
// occurs, the newly appearing lane will have a shorter length).
96+
// junction). In general, the logical lane segments in a RouteSegment will
97+
// have the same length, though there are exceptions (e.g. if a lane
98+
// widening occurs, the newly appearing lane will have a shorter length).
10099
//
101100
// Typically a route segment will be either
102101
// - a set of parallel lanes between two junctions, or
@@ -127,12 +126,9 @@ message Route
127126
// Logical lane segments that form a route segment.
128127
//
129128
// The logical lane segments of a route segment should be connected without
130-
// gaps, meaning that, together, the lane segments should form a
131-
// continuous area.
129+
// gaps, meaning that, together, the lane segments should form a continuous
130+
// area.
132131
//
133132
repeated LogicalLaneSegment lane_segment = 1;
134-
135133
}
136-
137-
138134
}

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def find_protoc():
7373
"osi_occupant.proto",
7474
"osi_referenceline.proto",
7575
"osi_roadmarking.proto",
76-
'osi_route.proto',
76+
"osi_route.proto",
7777
"osi_sensordata.proto",
7878
"osi_sensorspecific.proto",
7979
"osi_sensorview.proto",

0 commit comments

Comments
 (0)