Skip to content

Commit 1c6213a

Browse files
jdsikajdsika
committed
Corrected missing BaseStationary in DetectedLandmarks
1 parent abcc95a commit 1c6213a

File tree

3 files changed

+170
-145
lines changed

3 files changed

+170
-145
lines changed

‎osi_detectedlandmark.proto‎

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -218,20 +218,27 @@ message DetectedTrafficLight
218218
// Common information of one detected item.
219219
//
220220
optional DetectedItemHeader header = 1;
221-
222-
// A list of candidates for this traffic light as estimated by the
223-
// sensor.
221+
222+
// The base parameters of the traffic light.
224223
//
225-
// \note OSI uses singular instead of plural for repeated field names.
224+
// \c BaseStationary::orientation x-axis is view normal of the traffic
225+
// light's icon.
226226
//
227-
repeated CandidateTrafficLight candidate = 2;
228-
227+
optional BaseStationary base = 2;
228+
229229
// The root mean squared error of the base parameters of the detected
230230
// traffic light's geometry. \c TrafficLight::base has to be identical
231231
// for all \c #candidate traffic lights.
232232
//
233233
optional BaseStationary base_rmse = 3;
234234

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+
235242
//
236243
// \brief A candidate for a detected traffic light as estimated by
237244
// the sensor.
@@ -265,20 +272,40 @@ message DetectedRoadMarking
265272
// Common information of one detected item.
266273
//
267274
optional DetectedItemHeader header = 1;
268-
269-
// A list of candidates for this road marking as estimated by the
270-
// sensor.
275+
276+
// The base parameters of the road marking.
271277
//
272-
// \note OSI uses singular instead of plural for repeated field names.
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.
273287
//
274-
repeated CandidateRoadMarking candidate = 2;
275-
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+
276296
// The root mean squared error of the base parameters of the detected
277297
// road marking. \c RoadMarking::base has to be identical for
278298
// all \c #candidate road markings.
279299
//
280300
optional BaseStationary base_rmse = 3;
281301

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+
282309
//
283310
// \brief A candidate for a detected road marking as estimated by the
284311
// sensor.

‎osi_landmark.proto‎

Lines changed: 131 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,127 @@ import "osi_common.proto";
66

77
package osi3;
88

9+
//
10+
// \brief Additional value associated with a traffic sign or road marking
11+
// and its unit.
12+
//
13+
message TrafficSignValue
14+
{
15+
// Additional value associated with a traffic sign or road marking,
16+
// e.g. value of a speed limit.
17+
//
18+
optional double value = 1;
19+
20+
// Unit for additional value.
21+
//
22+
optional Unit value_unit = 2;
23+
24+
// Unit for values on traffic sign
25+
//
26+
enum Unit
27+
{
28+
// Unit of the sign's value is unknown (must not be used in ground
29+
// truth).
30+
//
31+
UNIT_UNKNOWN = 0;
32+
33+
// Other (unspecified but known) unit of the sign's value.
34+
//
35+
UNIT_OTHER = 1;
36+
37+
// Value without
38+
// unit.
39+
//
40+
// Unit: []
41+
//
42+
UNIT_NO_UNIT = 2;
43+
44+
// Velocity.
45+
// Kilometers per hour.
46+
//
47+
// Unit: [km/h]
48+
//
49+
UNIT_KILOMETER_PER_HOUR = 3;
50+
51+
// Velocity .
52+
// Miles per hour.
53+
//
54+
// Unit: [mph]
55+
//
56+
UNIT_MILE_PER_HOUR = 4;
57+
58+
// Length.
59+
// Meter.
60+
//
61+
// Unit: [m]
62+
//
63+
UNIT_METER = 5;
64+
65+
// Length.
66+
// Kilometer.
67+
//
68+
// Unit: [km]
69+
//
70+
UNIT_KILOMETER = 6;
71+
72+
// Length.
73+
// Feet.
74+
//
75+
// Unit: [ft]
76+
//
77+
UNIT_FEET = 7;
78+
79+
// Length.
80+
// Mile.
81+
//
82+
// Unit: [mile]
83+
//
84+
UNIT_MILE = 8;
85+
86+
// Weight.
87+
// Ton.
88+
//
89+
// Unit: [t]
90+
//
91+
UNIT_METRIC_TON = 9;
92+
93+
// Weight.
94+
// Long ton UK 1,016.047 [kg].
95+
//
96+
// Unit: [tn. l.]
97+
//
98+
UNIT_LONG_TON = 10;
99+
100+
// Weight.
101+
// Short ton USA 907.1847 [kg].
102+
//
103+
// Unit: [tn. sh.]
104+
//
105+
UNIT_SHORT_TON = 11;
106+
107+
// Time of day.
108+
// Hour since midnight.
109+
//
110+
// Unit: [min]
111+
//
112+
UNIT_MINUTES = 12;
113+
114+
// Day of the week.
115+
// Days since Monday. Monday = 0; Tuesday = 1; ...
116+
//
117+
// Unit: []
118+
//
119+
UNIT_DAY = 13;
120+
121+
// Percentage.
122+
// .
123+
//
124+
// Unit: [%]
125+
//
126+
UNIT_PERCENTAGE = 14;
127+
}
128+
}
129+
9130
//
10131
// \brief A traffic sign.
11132
//
@@ -29,28 +150,6 @@ message TrafficSign
29150
//
30151
repeated SupplementarySign supplementary_sign = 3;
31152

32-
// Definition of the variability of a traffic sign.
33-
//
34-
enum Variability
35-
{
36-
// Variability type of sign is unknown (must not be used in ground
37-
// truth).
38-
//
39-
VARIABILITY_UNKNOWN = 0;
40-
41-
// Other (unspecified but known) variability.
42-
//
43-
VARIABILITY_OTHER = 1;
44-
45-
// Fixed sign, i.e. always present.
46-
//
47-
VARIABILITY_FIXED = 2;
48-
49-
// Temporary or variable sign, e.g. on a sign bridge.
50-
//
51-
VARIABILITY_VARIABLE = 3;
52-
}
53-
54153
//
55154
// \brief Main sign of the traffic sign.
56155
//
@@ -990,126 +1089,27 @@ message TrafficSign
9901089
}
9911090
}
9921091
}
993-
}
9941092

995-
//
996-
// \brief Additional value associated with a traffic sign or road marking
997-
// and its unit.
998-
//
999-
message TrafficSignValue
1000-
{
1001-
// Additional value associated with a traffic sign or road marking,
1002-
// e.g. value of a speed limit.
1003-
//
1004-
optional double value = 1;
1005-
1006-
// Unit for additional value.
1007-
//
1008-
optional Unit value_unit = 2;
1009-
1010-
// Unit for values on traffic sign
1093+
// Definition of the variability of a traffic sign.
10111094
//
1012-
enum Unit
1095+
enum Variability
10131096
{
1014-
// Unit of the sign's value is unknown (must not be used in ground
1097+
// Variability type of sign is unknown (must not be used in ground
10151098
// truth).
10161099
//
1017-
UNIT_UNKNOWN = 0;
1018-
1019-
// Other (unspecified but known) unit of the sign's value.
1020-
//
1021-
UNIT_OTHER = 1;
1022-
1023-
// Value without
1024-
// unit.
1025-
//
1026-
// Unit: []
1027-
//
1028-
UNIT_NO_UNIT = 2;
1029-
1030-
// Velocity.
1031-
// Kilometers per hour.
1032-
//
1033-
// Unit: [km/h]
1034-
//
1035-
UNIT_KILOMETER_PER_HOUR = 3;
1036-
1037-
// Velocity .
1038-
// Miles per hour.
1039-
//
1040-
// Unit: [mph]
1041-
//
1042-
UNIT_MILE_PER_HOUR = 4;
1043-
1044-
// Length.
1045-
// Meter.
1046-
//
1047-
// Unit: [m]
1048-
//
1049-
UNIT_METER = 5;
1050-
1051-
// Length.
1052-
// Kilometer.
1053-
//
1054-
// Unit: [km]
1055-
//
1056-
UNIT_KILOMETER = 6;
1057-
1058-
// Length.
1059-
// Feet.
1060-
//
1061-
// Unit: [ft]
1062-
//
1063-
UNIT_FEET = 7;
1064-
1065-
// Length.
1066-
// Mile.
1067-
//
1068-
// Unit: [mile]
1069-
//
1070-
UNIT_MILE = 8;
1071-
1072-
// Weight.
1073-
// Ton.
1074-
//
1075-
// Unit: [t]
1076-
//
1077-
UNIT_METRIC_TON = 9;
1078-
1079-
// Weight.
1080-
// Long ton UK 1,016.047 [kg].
1081-
//
1082-
// Unit: [tn. l.]
1083-
//
1084-
UNIT_LONG_TON = 10;
1085-
1086-
// Weight.
1087-
// Short ton USA 907.1847 [kg].
1088-
//
1089-
// Unit: [tn. sh.]
1090-
//
1091-
UNIT_SHORT_TON = 11;
1100+
VARIABILITY_UNKNOWN = 0;
10921101

1093-
// Time of day.
1094-
// Hour since midnight.
1095-
//
1096-
// Unit: [min]
1102+
// Other (unspecified but known) variability.
10971103
//
1098-
UNIT_MINUTES = 12;
1104+
VARIABILITY_OTHER = 1;
10991105

1100-
// Day of the week.
1101-
// Days since Monday. Monday = 0; Tuesday = 1; ...
1102-
//
1103-
// Unit: []
1106+
// Fixed sign, i.e. always present.
11041107
//
1105-
UNIT_DAY = 13;
1108+
VARIABILITY_FIXED = 2;
11061109

1107-
// Percentage.
1108-
// .
1109-
//
1110-
// Unit: [%]
1110+
// Temporary or variable sign, e.g. on a sign bridge.
11111111
//
1112-
UNIT_PERCENTAGE = 14;
1112+
VARIABILITY_VARIABLE = 3;
11131113
}
11141114
}
11151115

‎osi_sensorspecific.proto‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ syntax = "proto2";
22

33
option optimize_for = SPEED;
44

5-
import "osi_common.proto";
6-
75
package osi3;
86

97
//

0 commit comments

Comments
 (0)