Move DetectedObjectHeader to SensorData

As discussed, I moved DetectedObjectHeader to Sensor Data.

I didn't number consecutively (easier to merge).
We have to renumber at the end...

Author: carsten-kuebler

osi_detectedlandmark.proto

@@ -13,41 +13,40 @@ package osi;
 //
 message DetectedTrafficSign
 {
-    // Header attributes of detected traffic sign.
-    //
-    optional DetectedObjectHeader header = 1;
-
-    // Specific ID of the traffic sign as assigned by the sensor internally. Need not match with ground_truth_id.
-    //
+    // Specific ID of the traffic sign as assigned by the sensor internally.
+    // Need not match with ground_truth_id.
     optional Identifier tracking_id = 2;
 
     // The ID of the original traffic sign in the ground truth.
-    // In case of a ghost sign (no corresponding ground truth), this field should be unset.
+    // In case of a ghost sign (no corresponding ground truth), this field
+    // should be unset.
     optional Identifier ground_truth_id = 3;
 
     // A list of candidates for this traffic sign as estimated by the sensor.
     //    
     repeated CandidateSign candidate_sign = 4;
 
-    // A list of candidates for (a) possible supplementary sign(s) as estimated by the sensor.
-    //    
+    // A list of candidates for (a) possible supplementary sign(s) as estimated
+    //     by the sensor.
     repeated CandidateSupplementarySign candidate_supplementary_sign = 5;
 
     // The detected geometry of the traffic sign.
     //    
     optional Geometry geometry = 6;
 
-    // The estimated probability that this traffic sign really exists, not based on history.
+    // The estimated probability that this traffic sign really exists, not based
+    // on history.
     //
-    // \note Use as confidence measure where a low value means less confidence and a high value indicates
-    // strong confidence.
+    // \note Use as confidence measure where a low value means less confidence
+    // and a high value indicates strong confidence.
     optional double existence_probability = 7;
 
     // The measurement state.
     //
     optional MeasurementState measurement_state = 8;
-    // The root mean squared error of the base parameters of the detected traffic sign.
-    //
+    
+    // The root mean squared error of the base parameters of the detected
+    // traffic sign.
     optional BaseStationary rmse = 9;
 
     // Links to the corresponding lanes.
@@ -68,8 +67,8 @@ message DetectedTrafficSign
     //
     enum Geometry
     {
-        // Geometry of the traffic sign is unknown (must not be used in ground truth).
-        //    
+        // Geometry of the traffic sign is unknown (must not be used in ground
+        // truth).
         GEOMETRY_UNKNOWN = 0;
 
         // Geometry of the traffic sign is unspecified (but known).
@@ -128,12 +127,12 @@ message DetectedTrafficSign
 message CandidateSign
 {
     // The definition of the candidate's properties.
-    // The sign.id values of all CandidateSigns within one DetectedTrafficSign correspond to the tracking ID and must
-    // be identical.
+    // The sign.id values of all \c CandidateSign within one
+    // \c DetectedTrafficSign correspond to the tracking ID and must be identical.
     optional TrafficSign sign = 1;
 
-    // The estimated probability that this candidate is the true value. Range [0,1].
-    // The sum of all candidate_probabilities must be one.
+    // The estimated probability that this candidate is the true value.
+    // Range [0,1]. The sum of all candidate_probabilities must be one.
     optional double candidate_probability = 2;
 
     // The amount of time that this detected object has been currently 
@@ -144,16 +143,16 @@ message CandidateSign
 }
 
 //
-// \brief A candidate for (a) detected supplementary sign(s) as estimated by the sensor.
-//
+// \brief A candidate for (a) detected supplementary sign(s) as estimated by the
+// sensor.
 message CandidateSupplementarySign
 {
-    // The definition of one of more supplementary signs that together define this candidate.
-    //
+    // The definition of one of more supplementary signs that together define
+    // this candidate.
     repeated SupplementarySign sign = 1;
 
-    // The estimated probability that this candidate is the true value. Range [0,1].
-    // The sum of all candidate_probabilities must be one.
+    // The estimated probability that this candidate is the true value.
+    // Range [0,1]. The sum of all candidate_probabilities must be one.
     optional double candidate_probability = 2;
 
     // The amount of time that this detected object has been currently 
@@ -168,16 +167,13 @@ message CandidateSupplementarySign
 //
 message DetectedTrafficLight
 {
-    // Header attributes of detected traffic light.
-    //
-    optional DetectedObjectHeader header = 1;
-
-    // Specific ID of the traffic light as assigned by the sensor internally. Need not match with ground_truth_id.
-    //
+    // Specific ID of the traffic light as assigned by the sensor internally.
+    // Need not match with ground_truth_id.
     optional Identifier tracking_id = 2;
 
     // The ID of the original traffic light in the ground truth.
-    // In case of a ghost detection (no corresponding ground truth), this field should be unset.
+    // In case of a ghost detection (no corresponding ground truth), this field
+    // should be unset.
     optional Identifier ground_truth_id = 3;
 
     // Description of the detected traffic light.
@@ -192,18 +188,19 @@ message DetectedTrafficLight
     //
     repeated RelevantLane relevant_lane = 6;
 
-    // The estimated probability that this traffic light really exists, not based on history.
+    // The estimated probability that this traffic light really exists, not
+    // based on history.
     //
-    // \note Use as confidence measure where a low value means less confidence and a high value indicates
-    // strong confidence.
+    // \note Use as confidence measure where a low value means less confidence
+    // and a high value indicates strong confidence.
     optional double existence_probability = 7;
 
     // The measurement state.
     //
     optional MeasurementState measurement_state = 8;
 
-    // The root mean squared error of the base parameters of the detected traffic light.
-    //
+    // The root mean squared error of the base parameters of the detected
+    // traffic light.
     optional BaseStationary rmse = 9;
 
     // A list of sensors which detected this detected entity.
@@ -271,26 +268,24 @@ message RelevantLane
 //
 message DetectedRoadMarking
 {
-    // Header attributes of detected road marking.
-    //
-    optional DetectedObjectHeader header = 1;
-
-    // Specific ID of the road marking as assigned by the sensor internally. Need not match with ground_truth_id.
-    //
+    // Specific ID of the road marking as assigned by the sensor internally.
+    // Need not match with ground_truth_id.
     optional Identifier tracking_id = 2;
 
     // The ID of the original road marking in the ground truth.
-    // In case of a ghost detection (no corresponding ground truth), this field should be unset.
+    // In case of a ghost detection (no corresponding ground truth), this field
+    // should be unset.
     optional Identifier ground_truth_id = 3;
 
     // A list of candidates for this road marking as estimated by the sensor.
     //
     repeated CandidateRoadMarking candidate_road_marking = 4;
 
-    // The estimated probability that this road marking really exists, not based on history.
+    // The estimated probability that this road marking really exists, not based
+    // on history.
     //
-    // \note Use as confidence measure where a low value means less confidence and a high value indicates
-    // strong confidence.
+    // \note Use as confidence measure where a low value means less confidence
+    // and a high value indicates strong confidence.
     optional double existence_probability = 5;
 
     // Links to the corresponding lanes.
@@ -301,8 +296,8 @@ message DetectedRoadMarking
     //
     optional MeasurementState measurement_state = 7;
 
-    // The root mean squared error of the base parameters of the detected road marking.
-    //
+    // The root mean squared error of the base parameters of the detected road
+    // marking.
     optional BaseStationary rmse = 8;
 
     // A list of sensors which detected this detected entity.
@@ -325,8 +320,8 @@ message CandidateRoadMarking
     //
     optional RoadMarking road_marking = 1;
 
-    // The estimated probability that this candidate is the true value. Range [0,1].
-    // The sum of all candidate_probabilities must be one.
+    // The estimated probability that this candidate is the true value.
+    // Range [0,1]. The sum of all candidate_probabilities must be one.
     optional double candidate_probability = 2;
 
     // The amount of time that this detected object has been currently 

osi_detectedlane.proto

@@ -13,17 +13,14 @@ package osi;
 //
 message DetectedLane
 {
-    // Header attributes of detected lane.
-    //
-    optional DetectedObjectHeader header = 1;
-
-    // Specific ID of the detected lane as assigned by the sensor internally. Need not match with ground_truth_id.
-    //
+    // Specific ID of the detected lane as assigned by the sensor internally.
+    // Need not match with ground_truth_id.
     optional Identifier tracking_id = 2;
 
     // The ID of the original lane in the ground truth.
-    // Multiple entries if the detected lane is a merge of multiple lanes in ground truth (as lane segment definitions
-    // may vary between sensor and ground truth).
+    // Multiple entries if the detected lane is a merge of multiple lanes in
+    // ground truth (as lane segment definitions may vary between sensor and
+    // ground truth).
     repeated Identifier ground_truth_id = 3;
 
     // The amount of time that this detected object has been currently 
@@ -40,10 +37,11 @@ message DetectedLane
     //
     optional Lane lane = 4;
 
-    // The estimated probability that this lane really exists, not based on history.
+    // The estimated probability that this lane really exists, not based on
+    // history.
     //
-    // \note Use as confidence measure where a low value means less confidence and a high value indicates
-    // strong confidence.
+    // \note Use as confidence measure where a low value means less confidence
+    // and a high value indicates strong confidence.
     optional double existence_probability = 5;
 
     // A list of sensors which detected this detected entity.
@@ -62,12 +60,8 @@ message DetectedLane
 //
 message DetectedLaneBoundary
 {
-    // Header attributes of detected lane boundary.
-    //
-    optional DetectedObjectHeader header = 1;
-
-    // Specific ID of the detected lane boundary as assigned by the sensor internally. Need not match with ground_truth_id.
-    //
+    // Specific ID of the detected lane boundary as assigned by the sensor
+    // internally. Need not match with ground_truth_id.
     optional Identifier tracking_id = 2;
 
     // The ID of the original LaneBoundary in the ground truth.
@@ -82,8 +76,8 @@ message DetectedLaneBoundary
     // Unit: [s]
     optional double age = 1000;
 
-    // State of the measurement. Lane boundary measured in the current image or Lane boundary predicted (no measurement in current image).
-    //
+    // State of the measurement. Lane boundary measured in the current image or
+    // lane boundary predicted (no measurement in current image).
     optional MeasurementState measurement_state = 5;
 
     // The basic measured lane boundary.