Skip to content

Commit

Permalink
Merge pull request OpenSimulationInterface#202 from OpenSimulationInt…
Browse files Browse the repository at this point in the history
…erface/review/pre-release

Reordering / Restructuring and much more!
  • Loading branch information
pmai authored Mar 29, 2018
2 parents 62d7023 + 421b59f commit 12720ba
Show file tree
Hide file tree
Showing 13 changed files with 748 additions and 695 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,18 @@ set(OSI_PROTO_FILES
osi_version.proto
osi_common.proto
osi_datarecording.proto
osi_detectedlandmark.proto
osi_detectedtrafficsign.proto
osi_detectedtrafficlight.proto
osi_detectedroadmarking.proto
osi_detectedlane.proto
osi_detectedobject.proto
osi_detectedoccupant.proto
osi_environment.proto
osi_groundtruth.proto
osi_hostvehicledata.proto
osi_landmark.proto
osi_trafficsign.proto
osi_trafficlight.proto
osi_roadmarking.proto
osi_lane.proto
osi_featuredata.proto
osi_object.proto
Expand Down
4 changes: 3 additions & 1 deletion osi_detectedlane.proto
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ message DetectedLaneBoundary
// one \c #boundary_line_confidences confidence value is
// specified.
//
// Range: [0,1]
//
repeated double boundary_line_confidences = 5;

//
Expand All @@ -117,4 +119,4 @@ message DetectedLaneBoundary
//
optional LaneBoundary.Classification classification = 2;
}
}
}
76 changes: 76 additions & 0 deletions osi_detectedroadmarking.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
syntax = "proto2";

option optimize_for = SPEED;

import "osi_common.proto";
import "osi_roadmarking.proto";
import "osi_detectedobject.proto";

package osi3;

//
// \brief A road marking in the environment as detected by the sensor.
//
message DetectedRoadMarking
{
// Common information of one detected item.
//
optional DetectedItemHeader header = 1;

// The base parameters of the road marking.
//
// The orientation of the bounding box \c #base
// \c BaseStationary::orientation is defined as follows:
// The z-axis of the \c BaseStationary::orientation is the vector from the
// 'bottom' to the 'top' of the road marking's (i.e. painted traffic sign)
// 2D image area.
// (Normally it is in the ground truth xy-plain.)
// The x-axis of the \c BaseStationary::orientation is the view normal of
// the road marking's 2D image area.
// Normally this x-axis points to the sky.
//
// \note If a valid unidirectional road marking is assigned to the host
// vehicle's current lane and the driving direction of the latter roughly
// matches the z-axis of the \c #base \c BaseStationary::orientation then
// the road marking is of relevance to (i.e. in effect for) the host
// vehicle.
//
optional BaseStationary base = 2;

// The root mean squared error of the base parameters of the detected
// road marking. \c RoadMarking::base has to be identical for
// all \c #candidate road markings.
//
optional BaseStationary base_rmse = 3;

// A list of candidates for this road marking as estimated by the
// sensor.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated CandidateRoadMarking candidate = 4;

//
// \brief A candidate for a detected road marking as estimated by the
// sensor.
//
message CandidateRoadMarking
{
// The estimated probability that this candidate is the true value.
//
// \note The sum of all \c #probability must be one. This probability is
// given under the condition of
// \c #DetectedItemHeader.existence_probability.
//
// Range: [0,1]
//
optional double probability = 1;

// The classification of the road marking.
//
// \note IDs, which are referenced in this message, usually
// reference to \c DetectedXXX::tracking_id IDs.
//
optional RoadMarking.Classification classification = 2;
}
}
63 changes: 63 additions & 0 deletions osi_detectedtrafficlight.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
syntax = "proto2";

option optimize_for = SPEED;

import "osi_common.proto";
import "osi_trafficlight.proto";
import "osi_detectedobject.proto";

package osi3;

//
// \brief A traffic light in the environment as detected by the sensor.
//
message DetectedTrafficLight
{
// Common information of one detected item.
//
optional DetectedItemHeader header = 1;

// The base parameters of the traffic light.
//
// \c BaseStationary::orientation x-axis is view normal of the traffic
// light's icon.
//
optional BaseStationary base = 2;

// The root mean squared error of the base parameters of the detected
// traffic light's geometry. \c TrafficLight::base has to be identical
// for all \c #candidate traffic lights.
//
optional BaseStationary base_rmse = 3;

// A list of candidates for this traffic light as estimated by the
// sensor.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated CandidateTrafficLight candidate = 4;

//
// \brief A candidate for a detected traffic light as estimated by
// the sensor.
//
message CandidateTrafficLight
{
// The estimated probability that this candidate is the true value.
//
// \note The sum of all \c #probability must be one. This probability is
// given under the condition of
// \c #DetectedItemHeader.existence_probability.
//
// Range: [0,1]
//
optional double probability = 1;

// The classification of one traffic light that define this candidate.
//
// \note IDs, which are referenced in this message, usually
// reference to \c DetectedXXX::tracking_id IDs.
//
optional TrafficLight.Classification classification = 2;
}
}
123 changes: 1 addition & 122 deletions osi_detectedlandmark.proto → osi_detectedtrafficsign.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ syntax = "proto2";
option optimize_for = SPEED;

import "osi_common.proto";
import "osi_landmark.proto";
import "osi_trafficsign.proto";
import "osi_detectedobject.proto";

package osi3;
Expand Down Expand Up @@ -209,124 +209,3 @@ message DetectedTrafficSign
}
}
}

//
// \brief A traffic light in the environment as detected by the sensor.
//
message DetectedTrafficLight
{
// Common information of one detected item.
//
optional DetectedItemHeader header = 1;

// The base parameters of the traffic light.
//
// \c BaseStationary::orientation x-axis is view normal of the traffic
// light's icon.
//
optional BaseStationary base = 2;

// The root mean squared error of the base parameters of the detected
// traffic light's geometry. \c TrafficLight::base has to be identical
// for all \c #candidate traffic lights.
//
optional BaseStationary base_rmse = 3;

// A list of candidates for this traffic light as estimated by the
// sensor.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated CandidateTrafficLight candidate = 4;

//
// \brief A candidate for a detected traffic light as estimated by
// the sensor.
//
message CandidateTrafficLight
{
// The estimated probability that this candidate is the true value.
//
// \note The sum of all \c #probability must be one. This probability is
// given under the condition of
// \c #DetectedItemHeader.existence_probability.
//
// Range: [0,1]
//
optional double probability = 1;

// The classification of one traffic light that define this candidate.
//
// \note IDs, which are referenced in this message, usually
// reference to \c DetectedXXX::tracking_id IDs.
//
optional TrafficLight.Classification classification = 2;
}
}

//
// \brief A road marking in the environment as detected by the sensor.
//
message DetectedRoadMarking
{
// Common information of one detected item.
//
optional DetectedItemHeader header = 1;

// The base parameters of the road marking.
//
// The orientation of the bounding box \c #base
// \c BaseStationary::orientation is defined as follows:
// The z-axis of the \c BaseStationary::orientation is the vector from the
// 'bottom' to the 'top' of the road marking's (i.e. painted traffic sign)
// 2D image area.
// (Normally it is in the ground truth xy-plain.)
// The x-axis of the \c BaseStationary::orientation is the view normal of
// the road marking's 2D image area.
// Normally this x-axis points to the sky.
//
// \note If a valid unidirectional road marking is assigned to the host
// vehicle's current lane and the driving direction of the latter roughly
// matches the z-axis of the \c #base \c BaseStationary::orientation then
// the road marking is of relevance to (i.e. in effect for) the host
// vehicle.
//
optional BaseStationary base = 2;

// The root mean squared error of the base parameters of the detected
// road marking. \c RoadMarking::base has to be identical for
// all \c #candidate road markings.
//
optional BaseStationary base_rmse = 3;

// A list of candidates for this road marking as estimated by the
// sensor.
//
// \note OSI uses singular instead of plural for repeated field names.
//
repeated CandidateRoadMarking candidate = 4;

//
// \brief A candidate for a detected road marking as estimated by the
// sensor.
//
message CandidateRoadMarking
{
// The estimated probability that this candidate is the true value.
//
// \note The sum of all \c #probability must be one. This probability is
// given under the condition of
// \c #DetectedItemHeader.existence_probability.
//
// Range: [0,1]
//
optional double probability = 1;

// The classification of the road marking.
//
// \note IDs, which are referenced in this message, usually
// reference to \c DetectedXXX::tracking_id IDs.
//
optional RoadMarking.Classification classification = 2;
}
}
Loading

0 comments on commit 12720ba

Please sign in to comment.