Skip to content

Commit 12720ba

Browse files
pmaipmai
authored
Merge pull request OpenSimulationInterface#202 from OpenSimulationInterface/review/pre-release
Reordering / Restructuring and much more!
2 parents 62d7023 + 421b59f commit 12720ba

13 files changed

+748
-695
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,18 @@ set(OSI_PROTO_FILES
5151
osi_version.proto
5252
osi_common.proto
5353
osi_datarecording.proto
54-
osi_detectedlandmark.proto
54+
osi_detectedtrafficsign.proto
55+
osi_detectedtrafficlight.proto
56+
osi_detectedroadmarking.proto
5557
osi_detectedlane.proto
5658
osi_detectedobject.proto
5759
osi_detectedoccupant.proto
5860
osi_environment.proto
5961
osi_groundtruth.proto
6062
osi_hostvehicledata.proto
61-
osi_landmark.proto
63+
osi_trafficsign.proto
64+
osi_trafficlight.proto
65+
osi_roadmarking.proto
6266
osi_lane.proto
6367
osi_featuredata.proto
6468
osi_object.proto

‎osi_detectedlane.proto‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ message DetectedLaneBoundary
9292
// one \c #boundary_line_confidences confidence value is
9393
// specified.
9494
//
95+
// Range: [0,1]
96+
//
9597
repeated double boundary_line_confidences = 5;
9698

9799
//
@@ -117,4 +119,4 @@ message DetectedLaneBoundary
117119
//
118120
optional LaneBoundary.Classification classification = 2;
119121
}
120-
}
122+
}

‎osi_detectedroadmarking.proto‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
syntax = "proto2";
2+
3+
option optimize_for = SPEED;
4+
5+
import "osi_common.proto";
6+
import "osi_roadmarking.proto";
7+
import "osi_detectedobject.proto";
8+
9+
package osi3;
10+
11+
//
12+
// \brief A road marking in the environment as detected by the sensor.
13+
//
14+
message DetectedRoadMarking
15+
{
16+
// Common information of one detected item.
17+
//
18+
optional DetectedItemHeader header = 1;
19+
20+
// The base parameters of the road marking.
21+
//
22+
// The orientation of the bounding box \c #base
23+
// \c BaseStationary::orientation is defined as follows:
24+
// The z-axis of the \c BaseStationary::orientation is the vector from the
25+
// 'bottom' to the 'top' of the road marking's (i.e. painted traffic sign)
26+
// 2D image area.
27+
// (Normally it is in the ground truth xy-plain.)
28+
// The x-axis of the \c BaseStationary::orientation is the view normal of
29+
// the road marking's 2D image area.
30+
// Normally this x-axis points to the sky.
31+
//
32+
// \note If a valid unidirectional road marking is assigned to the host
33+
// vehicle's current lane and the driving direction of the latter roughly
34+
// matches the z-axis of the \c #base \c BaseStationary::orientation then
35+
// the road marking is of relevance to (i.e. in effect for) the host
36+
// vehicle.
37+
//
38+
optional BaseStationary base = 2;
39+
40+
// The root mean squared error of the base parameters of the detected
41+
// road marking. \c RoadMarking::base has to be identical for
42+
// all \c #candidate road markings.
43+
//
44+
optional BaseStationary base_rmse = 3;
45+
46+
// A list of candidates for this road marking as estimated by the
47+
// sensor.
48+
//
49+
// \note OSI uses singular instead of plural for repeated field names.
50+
//
51+
repeated CandidateRoadMarking candidate = 4;
52+
53+
//
54+
// \brief A candidate for a detected road marking as estimated by the
55+
// sensor.
56+
//
57+
message CandidateRoadMarking
58+
{
59+
// The estimated probability that this candidate is the true value.
60+
//
61+
// \note The sum of all \c #probability must be one. This probability is
62+
// given under the condition of
63+
// \c #DetectedItemHeader.existence_probability.
64+
//
65+
// Range: [0,1]
66+
//
67+
optional double probability = 1;
68+
69+
// The classification of the road marking.
70+
//
71+
// \note IDs, which are referenced in this message, usually
72+
// reference to \c DetectedXXX::tracking_id IDs.
73+
//
74+
optional RoadMarking.Classification classification = 2;
75+
}
76+
}

‎osi_detectedtrafficlight.proto‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
syntax = "proto2";
2+
3+
option optimize_for = SPEED;
4+
5+
import "osi_common.proto";
6+
import "osi_trafficlight.proto";
7+
import "osi_detectedobject.proto";
8+
9+
package osi3;
10+
11+
//
12+
// \brief A traffic light in the environment as detected by the sensor.
13+
//
14+
message DetectedTrafficLight
15+
{
16+
// Common information of one detected item.
17+
//
18+
optional DetectedItemHeader header = 1;
19+
20+
// The base parameters of the traffic light.
21+
//
22+
// \c BaseStationary::orientation x-axis is view normal of the traffic
23+
// light's icon.
24+
//
25+
optional BaseStationary base = 2;
26+
27+
// The root mean squared error of the base parameters of the detected
28+
// traffic light's geometry. \c TrafficLight::base has to be identical
29+
// for all \c #candidate traffic lights.
30+
//
31+
optional BaseStationary base_rmse = 3;
32+
33+
// A list of candidates for this traffic light as estimated by the
34+
// sensor.
35+
//
36+
// \note OSI uses singular instead of plural for repeated field names.
37+
//
38+
repeated CandidateTrafficLight candidate = 4;
39+
40+
//
41+
// \brief A candidate for a detected traffic light as estimated by
42+
// the sensor.
43+
//
44+
message CandidateTrafficLight
45+
{
46+
// The estimated probability that this candidate is the true value.
47+
//
48+
// \note The sum of all \c #probability must be one. This probability is
49+
// given under the condition of
50+
// \c #DetectedItemHeader.existence_probability.
51+
//
52+
// Range: [0,1]
53+
//
54+
optional double probability = 1;
55+
56+
// The classification of one traffic light that define this candidate.
57+
//
58+
// \note IDs, which are referenced in this message, usually
59+
// reference to \c DetectedXXX::tracking_id IDs.
60+
//
61+
optional TrafficLight.Classification classification = 2;
62+
}
63+
}

‎osi_detectedlandmark.proto‎ renamed to ‎osi_detectedtrafficsign.proto‎

Lines changed: 1 addition & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ syntax = "proto2";
33
option optimize_for = SPEED;
44

55
import "osi_common.proto";
6-
import "osi_landmark.proto";
6+
import "osi_trafficsign.proto";
77
import "osi_detectedobject.proto";
88

99
package osi3;
@@ -209,124 +209,3 @@ message DetectedTrafficSign
209209
}
210210
}
211211
}
212-
213-
//
214-
// \brief A traffic light in the environment as detected by the sensor.
215-
//
216-
message DetectedTrafficLight
217-
{
218-
// Common information of one detected item.
219-
//
220-
optional DetectedItemHeader header = 1;
221-
222-
// The base parameters of the traffic light.
223-
//
224-
// \c BaseStationary::orientation x-axis is view normal of the traffic
225-
// light's icon.
226-
//
227-
optional BaseStationary base = 2;
228-
229-
// The root mean squared error of the base parameters of the detected
230-
// traffic light's geometry. \c TrafficLight::base has to be identical
231-
// for all \c #candidate traffic lights.
232-
//
233-
optional BaseStationary base_rmse = 3;
234-
235-
// A list of candidates for this traffic light as estimated by the
236-
// sensor.
237-
//
238-
// \note OSI uses singular instead of plural for repeated field names.
239-
//
240-
repeated CandidateTrafficLight candidate = 4;
241-
242-
//
243-
// \brief A candidate for a detected traffic light as estimated by
244-
// the sensor.
245-
//
246-
message CandidateTrafficLight
247-
{
248-
// The estimated probability that this candidate is the true value.
249-
//
250-
// \note The sum of all \c #probability must be one. This probability is
251-
// given under the condition of
252-
// \c #DetectedItemHeader.existence_probability.
253-
//
254-
// Range: [0,1]
255-
//
256-
optional double probability = 1;
257-
258-
// The classification of one traffic light that define this candidate.
259-
//
260-
// \note IDs, which are referenced in this message, usually
261-
// reference to \c DetectedXXX::tracking_id IDs.
262-
//
263-
optional TrafficLight.Classification classification = 2;
264-
}
265-
}
266-
267-
//
268-
// \brief A road marking in the environment as detected by the sensor.
269-
//
270-
message DetectedRoadMarking
271-
{
272-
// Common information of one detected item.
273-
//
274-
optional DetectedItemHeader header = 1;
275-
276-
// The base parameters of the road marking.
277-
//
278-
// The orientation of the bounding box \c #base
279-
// \c BaseStationary::orientation is defined as follows:
280-
// The z-axis of the \c BaseStationary::orientation is the vector from the
281-
// 'bottom' to the 'top' of the road marking's (i.e. painted traffic sign)
282-
// 2D image area.
283-
// (Normally it is in the ground truth xy-plain.)
284-
// The x-axis of the \c BaseStationary::orientation is the view normal of
285-
// the road marking's 2D image area.
286-
// Normally this x-axis points to the sky.
287-
//
288-
// \note If a valid unidirectional road marking is assigned to the host
289-
// vehicle's current lane and the driving direction of the latter roughly
290-
// matches the z-axis of the \c #base \c BaseStationary::orientation then
291-
// the road marking is of relevance to (i.e. in effect for) the host
292-
// vehicle.
293-
//
294-
optional BaseStationary base = 2;
295-
296-
// The root mean squared error of the base parameters of the detected
297-
// road marking. \c RoadMarking::base has to be identical for
298-
// all \c #candidate road markings.
299-
//
300-
optional BaseStationary base_rmse = 3;
301-
302-
// A list of candidates for this road marking as estimated by the
303-
// sensor.
304-
//
305-
// \note OSI uses singular instead of plural for repeated field names.
306-
//
307-
repeated CandidateRoadMarking candidate = 4;
308-
309-
//
310-
// \brief A candidate for a detected road marking as estimated by the
311-
// sensor.
312-
//
313-
message CandidateRoadMarking
314-
{
315-
// The estimated probability that this candidate is the true value.
316-
//
317-
// \note The sum of all \c #probability must be one. This probability is
318-
// given under the condition of
319-
// \c #DetectedItemHeader.existence_probability.
320-
//
321-
// Range: [0,1]
322-
//
323-
optional double probability = 1;
324-
325-
// The classification of the road marking.
326-
//
327-
// \note IDs, which are referenced in this message, usually
328-
// reference to \c DetectedXXX::tracking_id IDs.
329-
//
330-
optional RoadMarking.Classification classification = 2;
331-
}
332-
}

0 commit comments

Comments
 (0)