Skip to content

Commit

Permalink
Corrected missing BaseStationary in DetectedLandmarks
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdsika
jdsika committed Mar 29, 2018
1 parent abcc95a commit 1c6213a
Show file tree
Hide file tree
Showing 3 changed files with 170 additions and 145 deletions.
51 changes: 39 additions & 12 deletions osi_detectedlandmark.proto
View file
Expand Up @@ -218,20 +218,27 @@ message DetectedTrafficLight
// Common information of one detected item.
//
optional DetectedItemHeader header = 1;

// A list of candidates for this traffic light as estimated by the
// sensor.

// The base parameters of the traffic light.
//
// \note OSI uses singular instead of plural for repeated field names.
// \c BaseStationary::orientation x-axis is view normal of the traffic
// light's icon.
//
repeated CandidateTrafficLight candidate = 2;

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.
Expand Down Expand Up @@ -265,20 +272,40 @@ message DetectedRoadMarking
// Common information of one detected item.
//
optional DetectedItemHeader header = 1;

// A list of candidates for this road marking as estimated by the
// sensor.

// The base parameters of the road marking.
//
// \note OSI uses singular instead of plural for repeated field names.
// 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.
//
repeated CandidateRoadMarking candidate = 2;

// \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.
Expand Down
262 changes: 131 additions & 131 deletions osi_landmark.proto
View file
Expand Up @@ -6,6 +6,127 @@ import "osi_common.proto";

package osi3;

//
// \brief Additional value associated with a traffic sign or road marking
// and its unit.
//
message TrafficSignValue
{
// Additional value associated with a traffic sign or road marking,
// e.g. value of a speed limit.
//
optional double value = 1;

// Unit for additional value.
//
optional Unit value_unit = 2;

// Unit for values on traffic sign
//
enum Unit
{
// Unit of the sign's value is unknown (must not be used in ground
// truth).
//
UNIT_UNKNOWN = 0;

// Other (unspecified but known) unit of the sign's value.
//
UNIT_OTHER = 1;

// Value without
// unit.
//
// Unit: []
//
UNIT_NO_UNIT = 2;

// Velocity.
// Kilometers per hour.
//
// Unit: [km/h]
//
UNIT_KILOMETER_PER_HOUR = 3;

// Velocity .
// Miles per hour.
//
// Unit: [mph]
//
UNIT_MILE_PER_HOUR = 4;

// Length.
// Meter.
//
// Unit: [m]
//
UNIT_METER = 5;

// Length.
// Kilometer.
//
// Unit: [km]
//
UNIT_KILOMETER = 6;

// Length.
// Feet.
//
// Unit: [ft]
//
UNIT_FEET = 7;

// Length.
// Mile.
//
// Unit: [mile]
//
UNIT_MILE = 8;

// Weight.
// Ton.
//
// Unit: [t]
//
UNIT_METRIC_TON = 9;

// Weight.
// Long ton UK 1,016.047 [kg].
//
// Unit: [tn. l.]
//
UNIT_LONG_TON = 10;

// Weight.
// Short ton USA 907.1847 [kg].
//
// Unit: [tn. sh.]
//
UNIT_SHORT_TON = 11;

// Time of day.
// Hour since midnight.
//
// Unit: [min]
//
UNIT_MINUTES = 12;

// Day of the week.
// Days since Monday. Monday = 0; Tuesday = 1; ...
//
// Unit: []
//
UNIT_DAY = 13;

// Percentage.
// .
//
// Unit: [%]
//
UNIT_PERCENTAGE = 14;
}
}

//
// \brief A traffic sign.
//
Expand All @@ -29,28 +150,6 @@ message TrafficSign
//
repeated SupplementarySign supplementary_sign = 3;

// Definition of the variability of a traffic sign.
//
enum Variability
{
// Variability type of sign is unknown (must not be used in ground
// truth).
//
VARIABILITY_UNKNOWN = 0;

// Other (unspecified but known) variability.
//
VARIABILITY_OTHER = 1;

// Fixed sign, i.e. always present.
//
VARIABILITY_FIXED = 2;

// Temporary or variable sign, e.g. on a sign bridge.
//
VARIABILITY_VARIABLE = 3;
}

//
// \brief Main sign of the traffic sign.
//
Expand Down Expand Up @@ -990,126 +1089,27 @@ message TrafficSign
}
}
}
}

//
// \brief Additional value associated with a traffic sign or road marking
// and its unit.
//
message TrafficSignValue
{
// Additional value associated with a traffic sign or road marking,
// e.g. value of a speed limit.
//
optional double value = 1;

// Unit for additional value.
//
optional Unit value_unit = 2;

// Unit for values on traffic sign
// Definition of the variability of a traffic sign.
//
enum Unit
enum Variability
{
// Unit of the sign's value is unknown (must not be used in ground
// Variability type of sign is unknown (must not be used in ground
// truth).
//
UNIT_UNKNOWN = 0;

// Other (unspecified but known) unit of the sign's value.
//
UNIT_OTHER = 1;

// Value without
// unit.
//
// Unit: []
//
UNIT_NO_UNIT = 2;

// Velocity.
// Kilometers per hour.
//
// Unit: [km/h]
//
UNIT_KILOMETER_PER_HOUR = 3;

// Velocity .
// Miles per hour.
//
// Unit: [mph]
//
UNIT_MILE_PER_HOUR = 4;

// Length.
// Meter.
//
// Unit: [m]
//
UNIT_METER = 5;

// Length.
// Kilometer.
//
// Unit: [km]
//
UNIT_KILOMETER = 6;

// Length.
// Feet.
//
// Unit: [ft]
//
UNIT_FEET = 7;

// Length.
// Mile.
//
// Unit: [mile]
//
UNIT_MILE = 8;

// Weight.
// Ton.
//
// Unit: [t]
//
UNIT_METRIC_TON = 9;

// Weight.
// Long ton UK 1,016.047 [kg].
//
// Unit: [tn. l.]
//
UNIT_LONG_TON = 10;

// Weight.
// Short ton USA 907.1847 [kg].
//
// Unit: [tn. sh.]
//
UNIT_SHORT_TON = 11;
VARIABILITY_UNKNOWN = 0;

// Time of day.
// Hour since midnight.
//
// Unit: [min]
// Other (unspecified but known) variability.
//
UNIT_MINUTES = 12;
VARIABILITY_OTHER = 1;

// Day of the week.
// Days since Monday. Monday = 0; Tuesday = 1; ...
//
// Unit: []
// Fixed sign, i.e. always present.
//
UNIT_DAY = 13;
VARIABILITY_FIXED = 2;

// Percentage.
// .
//
// Unit: [%]
// Temporary or variable sign, e.g. on a sign bridge.
//
UNIT_PERCENTAGE = 14;
VARIABILITY_VARIABLE = 3;
}
}

Expand Down
2 changes: 0 additions & 2 deletions osi_sensorspecific.proto
View file
Expand Up @@ -2,8 +2,6 @@ syntax = "proto2";

option optimize_for = SPEED;

import "osi_common.proto";

package osi3;

//
Expand Down

0 comments on commit 1c6213a

Please sign in to comment.