diff --git a/README.md b/README.md index 2ed0d6c96..61746b18e 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ The Open Simulation Interface [[1]](https://www.hot.ei.tum.de/forschung/aut As the complexity of automated driving functions rapidly increases, the requirements for test and development methods are growing. Testing in virtual environments offers the advantage of completely controlled and reproducible environment conditions. -For more information on OSI see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/) or the [official reference documentation](https://opensimulationinterface.github.io/open-simulation-interface/) for defined protobuf messages. +For more information on OSI see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/) or the [official reference documentation](https://opensimulationinterface.github.io/open-simulation-interface/) for defined protobuf messages. -[1] Hanke, T., Hirsenkorn, N., van-Driesten, C., Garcia-Ramos, P., Schiementz, M., Schneider, S. & Biebl, E. (2017, February 03). *A generic interface for the environment perception of automated driving functions in virtual scenarios.* Retrieved January 25, 2020, from https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/ +[1] Hanke, T., Hirsenkorn, N., van-Driesten, C., Garcia-Ramos, P., Schiementz, M., Schneider, S. & Biebl, E. (2017, February 03). *A generic interface for the environment perception of automated driving functions in virtual scenarios.* Retrieved January 25, 2020, from https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/ ## Usage ##### Example of generating OSI messages in `Python` @@ -30,7 +30,7 @@ def main(): sv_ground_truth = sensorview.global_ground_truth sv_ground_truth.version.version_major = 3 - sv_ground_truth.version.version_minor = 4 + sv_ground_truth.version.version_minor = 5 sv_ground_truth.version.version_patch = 0 sv_ground_truth.timestamp.seconds = 0 @@ -39,7 +39,7 @@ def main(): moving_object = sv_ground_truth.moving_object.add() moving_object.id.value = 42 - # Generate 1000 OSI messages for a duration of 10 seconds + # Generate 1000 OSI messages for a duration of 10 seconds for i in range(1000): # Increment the time diff --git a/VERSION b/VERSION index 1edb9a12b..46ae539ab 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ VERSION_MAJOR = 3 -VERSION_MINOR = 4 +VERSION_MINOR = 5 VERSION_PATCH = 0 diff --git a/osi_object.proto b/osi_object.proto index fc73e5941..fe01eefbc 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -216,6 +216,21 @@ message StationaryObject // in the environment, like street lights. // TYPE_EMITTING_STRUCTURE = 18; + + // Landmarks corresponding to barrel in the + // in the environment. + // + TYPE_BARREL = 19; + + // Landmarks corresponding to guide post in the + // in the environment. + // + TYPE_GUIDE_POST = 20; + + // Landmarks corresponding to tunnel in the + // in the environment. + // + TYPE_TUNNEL = 21; } // Definition of material types. diff --git a/setup.py b/setup.py index dcc8ba688..44ba7ba10 100644 --- a/setup.py +++ b/setup.py @@ -45,34 +45,35 @@ def find_protoc(): return protoc osi_files = ( - 'osi_version.proto', 'osi_common.proto', 'osi_datarecording.proto', - 'osi_detectedtrafficsign.proto', - 'osi_detectedtrafficlight.proto', - 'osi_detectedroadmarking.proto', + 'osi_detectedlane.proto', 'osi_detectedobject.proto', 'osi_detectedoccupant.proto', - 'osi_detectedlane.proto', + 'osi_detectedroadmarking.proto', + 'osi_detectedtrafficlight.proto', + 'osi_detectedtrafficsign.proto', 'osi_environment.proto', + 'osi_featuredata.proto', 'osi_groundtruth.proto', 'osi_hostvehicledata.proto', - 'osi_trafficsign.proto', - 'osi_trafficlight.proto', - 'osi_trafficupdate.proto', - 'osi_trafficcommand.proto', - 'osi_roadmarking.proto', - 'osi_featuredata.proto', + 'osi_lane.proto', 'osi_logicaldetectiondata.proto', + 'osi_logicallane.proto', 'osi_object.proto', 'osi_occupant.proto', - 'osi_lane.proto', - 'osi_logicallane.proto', 'osi_referenceline.proto', + 'osi_roadmarking.proto', 'osi_sensordata.proto', - 'osi_sensorviewconfiguration.proto', 'osi_sensorspecific.proto', - 'osi_sensorview.proto') + 'osi_sensorview.proto', + 'osi_sensorviewconfiguration.proto', + 'osi_trafficcommand.proto', + 'osi_trafficcommandupdate.proto', + 'osi_trafficlight.proto', + 'osi_trafficsign.proto', + 'osi_trafficupdate.proto', + 'osi_version.proto') """ Generate Protobuf Messages """