Headers not nested.

Author: carsten-kuebler

osi_detectedlandmark.proto

@@ -57,7 +57,7 @@ message DetectedTrafficSign
         {
             // Common information of one detected item candidate.
             //
-            optional DetectedItemHeader.CandidateItemHeader header = 1;
+            optional DetectedCandidateItemHeader header = 1;
 
             // The definition of one main sign that defines this candidate.
             //
@@ -165,7 +165,7 @@ message DetectedTrafficSign
         {
             // Common information of one detected item candidate.
             //
-            optional DetectedItemHeader.CandidateItemHeader header = 1;
+            optional DetectedCandidateItemHeader header = 1;
 
             // The definition of one of more supplementary signs that together
             // define this candidate.
@@ -218,7 +218,7 @@ message DetectedTrafficLight
         {
             // Common information of one detected item candidate.
             //
-            optional DetectedItemHeader.CandidateItemHeader header = 1;
+            optional DetectedCandidateItemHeader header = 1;
 
             // The definition of one traffic light that define this candidate.
             //
@@ -270,7 +270,7 @@ message DetectedRoadMarking
         {
             // Common information of one detected item candidate.
             //
-            optional DetectedItemHeader.CandidateItemHeader header = 1;
+            optional DetectedCandidateItemHeader header = 1;
 
             // The description of the road marking.
             //
@@ -321,7 +321,7 @@ message DetectedLandmark
         {
             // Common information of one detected item candidate.
             //
-            optional DetectedItemHeader.CandidateItemHeader header = 1;
+            optional DetectedCandidateItemHeader header = 1;
 
             // The description of the landmark.
             //

osi_detectedlane.proto

@@ -40,7 +40,7 @@ message DetectedLane
         {
             // Common information of one detected item candidate.
             //
-            optional DetectedItemHeader.CandidateItemHeader header = 1;
+            optional DetectedCandidateItemHeader header = 1;
 
             // The definition of one lane that defines this candidate.
             //
@@ -101,7 +101,7 @@ message DetectedLaneBoundary
         {
             // Common information of one detected item candidate.
             //
-            optional DetectedItemHeader.CandidateItemHeader header = 1;
+            optional DetectedCandidateItemHeader header = 1;
 
             // The definition of one lane boundary that defines this candidate.
             //

osi_detectedobject.proto

@@ -383,9 +383,10 @@ enum MeasurementState
     MEASUREMENT_STATE_PREDICTED = 3;
 }
 
-
-
-
+//
+// \brief The common information for a detected item as estimated by the
+// sensor.
+//
 message DetectedItemHeader
 {
     // Specific ID of the detected item as assigned by the sensor internally.
@@ -422,29 +423,29 @@ message DetectedItemHeader
     // \note OSI uses singular instead of plural for repeated field names.
     //
     repeated Identifier sensor_id = 4;
+}
 
+//
+// \brief The common information for a detected item's candidate as estimated
+// by the sensor.
+//
+message DetectedCandidateItemHeader
+{
+    // The estimated probability that this candidate is the true value.
+    // The sum of all \c #probability must be one.
     //
-    // \brief A candidate for a detected item as estimated by the
-    // sensor.
+    // Range: [0,1]
     //
-    message CandidateItemHeader
-    {
-        // The estimated probability that this candidate is the true value.
-        // The sum of all \c #probability must be one.
-        //
-        // Range: [0,1]
-        //
-        optional double probability = 1;
+    optional double probability = 1;
 
-        // The amount of time that this detected object has been currently
-        // observed/tracked.
-        //
-        // Unit: [s]
-        //
-        optional double age = 2;
+    // The amount of time that this detected object has been currently
+    // observed/tracked.
+    //
+    // Unit: [s]
+    //
+    optional double age = 2;
 
-        // The measurement state.
-        //
-        optional MeasurementState measurement_state = 3;
-    }
+    // The measurement state.
+    //
+    optional MeasurementState measurement_state = 3;
 }

osi_detectedoccupant.proto

@@ -47,7 +47,7 @@ message DetectedOccupant
         {
             // Common information of one detected item candidate.
             //
-            optional DetectedItemHeader.CandidateItemHeader header = 1;
+            optional DetectedCandidateItemHeader header = 1;
 
             // The detected vehicle occupant.
             //