Skip to content

Commit e26b3df

Browse files
Merge branch 'master' into feature/tp/traffic-command-backchannel
2 parents 9ffc693 + b289970 commit e26b3df

39 files changed

+2061
-142
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ set(OSI_PROTO_FILES
7474
osi_trafficlight.proto
7575
osi_trafficupdate.proto
7676
osi_trafficcommand.proto
77+
osi_referenceline.proto
7778
osi_roadmarking.proto
7879
osi_lane.proto
80+
osi_logicallane.proto
7981
osi_featuredata.proto
8082
osi_logicaldetectiondata.proto
8183
osi_object.proto

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Install `pip3` and missing python packages:
9191
```bash
9292
$ sudo apt-get install python3-pip python3-setuptools
9393
```
94-
Install `protobuf` 3.0.0:
94+
Install `protobuf`:
9595
```bash
9696
$ sudo apt-get install libprotobuf-dev protobuf-compiler
9797
```

doc/architecture/architecture_overview.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ The `HostVehicleData` interface describes the measured internal states of a traf
2929
OSI currently provides only limited support for data structures that describe measured internal states of traffic participants.
3030
Actuator intentions are currently not covered by OSI and must be handled using a different data description format.
3131

32-
All fields in an interface are set to `optional`.
32+
NOTE: OSI uses singular instead of plural for `repeated` field names.
33+
34+
NOTE: All fields in an interface are set to `optional`.
3335
`required` is not used.
36+
3437
This has been done to allow backward-compatible changes in the field.
3538
Additionally, this is the default behavior in Protocol Buffer version 3 that no longer has the `required` type.
3639
Setting all fields to `optional` thus ensures update compatibility.
3740
However, this does not mean that it is optional to fill the field.
3841
For the purpose of providing a complete interface, all existing fields should be set, unless not setting a field carries a specific meaning, as indicated in the accompanying comment.
3942

40-
All field numbers equal to or greater than 10000 are available for user-specific extensions via custom fields.
43+
NOTE: All field numbers equal to or greater than 10000 are available for user-specific extensions via custom fields.
4144
No future evolution of OSI will therefore use field numbers equal to or greater than 10000.

doc/architecture/reference_points_coordinate_systems.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= Coordinate systems and reference points
1+
= Coordinate systems, reference points and coordinate transformation
22

33
OSI uses DIN ISO 8855:2013-11 cite:[iso8855] for coordinate systems and transformations between coordinate systems.
44
OSI uses three coordinate systems:

doc/images/OSI_LogicalLane1.png

17.1 KB
Loading

doc/images/OSI_LogicalLane2.png

9.2 KB
Loading

doc/images/OSI_ReferenceLine1.svg

Lines changed: 256 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)