Relocate color description fields

Signed-off-by: Thomas Sedlmayer <tsedlmayer@pmsfit.de>

Author: thomassedlmayer

osi_detectedlane.proto

@@ -4,6 +4,7 @@ option optimize_for = SPEED;
 
 import "osi_lane.proto";
 import "osi_detectedobject.proto";
+import "osi_common.proto";
 
 package osi3;
 
@@ -104,6 +105,14 @@ message DetectedLaneBoundary
     //
     repeated double boundary_line_confidences = 5;
 
+    // The visual color of the material of the lane boundary.
+    //
+    // \note This does not represent the semantic classification but the visual
+    // appearance. For semantic classification of the lane boundary use the color
+    // field in \c CandidateLaneBoundary::classification.
+    //
+    optional ColorDescription color_description = 6;
+
     //
     // \brief A candidate for a detected lane boundary as estimated by the
     // sensor.

osi_detectedobject.proto

@@ -120,6 +120,10 @@ message DetectedStationaryObject
     //
     repeated CandidateStationaryObject candidate = 4;
 
+    // The dominating color of the material of the structure.
+    //
+    optional ColorDescription color_description = 5;
+
     //
     // \brief A candidate for a detected stationary object as estimated
     // by the sensor.
@@ -221,6 +225,10 @@ message DetectedMovingObject
     //
     repeated CandidateMovingObject candidate = 8;
 
+    // The dominating color of the material of the moving object.
+    //
+    optional ColorDescription color_description = 9;
+
     // Additional data that is specific to radar sensors.
     //
     // \note Field needs not to be set if simulated sensor is not a radar

osi_detectedroadmarking.proto

@@ -59,6 +59,14 @@ message DetectedRoadMarking
     //
     repeated CandidateRoadMarking candidate = 4;
 
+    // The visual color of the material of the road marking.
+    //
+    // \note This does not represent the semantic classification but the visual
+    // appearance. For semantic classification of the road marking use the color
+    // field in \c CandidateRoadMarking::classification.
+    //
+    optional ColorDescription color_description = 5;
+
     //
     // \brief A candidate for a detected road marking as estimated by the
     // sensor.

osi_detectedtrafficlight.proto

@@ -43,6 +43,14 @@ message DetectedTrafficLight
     //
     repeated CandidateTrafficLight candidate = 4;
 
+    // The visual color of the traffic light.
+    //
+    // \note This does not represent the semantic classification but the visual
+    // appearance.  For semantic classification of the traffic light use the color
+    // field in \c CandidateTrafficLight::classification.
+    //
+    optional ColorDescription color_description = 5;
+
     //
     // \brief A candidate for a detected traffic light as estimated by
     // the sensor.

osi_lane.proto

@@ -763,6 +763,14 @@ message LaneBoundary
     //
     repeated ExternalReference source_reference = 4;
 
+    // The visual color of the material of the lane boundary.
+    //
+    // \note This does not represent the semantic classification but the visual
+    // appearance. For semantic classification of the lane boundary use the color
+    // field in \c Classification.
+    //
+    optional ColorDescription color_description = 5;
+
     //
     // \brief A single point of a lane boundary.
     //
@@ -922,12 +930,6 @@ message LaneBoundary
         //
         repeated Identifier limiting_structure_id = 3;
 
-        //
-        // The visual color of the material of the lane boundary. This does not
-        // represent the semantic classification but the visual appearance.
-        //
-        optional ColorDescription color_description = 4;
-
         // The lane boundary type.
         // There is no special representation for double lines, e.g. solid /
         // solid or dashed / solid. In such cases, each lane will define its own

osi_object.proto

@@ -75,6 +75,10 @@ message StationaryObject
     //
     repeated ExternalReference source_reference = 5;
 
+    // The dominating color of the material of the structure.
+    //
+    optional ColorDescription color_description = 6;
+
     //
     // \brief Classification data for a stationary object.
     //
@@ -95,20 +99,15 @@ message StationaryObject
         // The dominating color of the material of the structure.
         //
         // \attention DEPRECATED: This color enum will be removed in version
-        // 4.0.0. Use the field \c #color_description (\c ColorDescription)
-        // instead.
+        // 4.0.0. Use the field \c #color_description (\c ColorDescription) of
+        // \c StationaryObject instead.
         //
         optional Color color = 4;
 
         // The attributes of the emitting structure if stationary object is classified as such.
         //
         optional EmittingStructureAttribute emitting_structure_attribute = 5;
 
-        //
-        // The dominating color of the material of the structure.
-        //
-        optional ColorDescription color_description = 6;
-
         // Definition of object types.
         //
         enum Type
@@ -464,6 +463,10 @@ message MovingObject
     //
     repeated ExternalReference source_reference = 10;
 
+    // The dominating color of the material of the moving object.
+    //
+    optional ColorDescription color_description = 11;
+
     // Definition of object types.
     //
     enum Type
@@ -679,10 +682,6 @@ message MovingObject
         //
         repeated double assigned_lane_percentage = 2;        
 
-        //
-        // The dominating color of the material of the moving object.
-        //
-        optional ColorDescription color_description = 3;
     }
 
     //

osi_roadmarking.proto

@@ -82,6 +82,14 @@ message RoadMarking
     //
     repeated ExternalReference source_reference = 4;
 
+    // The visual color of the material of the road marking.
+    //
+    // \note This does not represent the semantic classification but the visual
+    // appearance. For semantic classification of the road marking use the color
+    // field in \c Classification.
+    //
+    optional ColorDescription color_description = 5;
+
     //
     // \brief \c Classification data for a road surface marking.
     //
@@ -248,12 +256,6 @@ message RoadMarking
         //
         optional string sub_code = 11;
 
-        //
-        // The visual color of the material of the road marking. This does not
-        // represent the semantic classification but the visual appearance.
-        //
-        optional ColorDescription color_description = 12;
-
         // Definition of road marking types.
         //
         enum Type

osi_trafficlight.proto

@@ -63,6 +63,14 @@ message TrafficLight
     //
     repeated ExternalReference source_reference = 5;
 
+    // The visual color of the traffic light.
+    //
+    // \note This does not represent the semantic classification but the visual
+    // appearance.  For semantic classification of the traffic light use the color
+    // field in \c Classification.
+    //
+    optional ColorDescription color_description = 6;
+
     //
     // \brief \c Classification data for a traffic light.
     //
@@ -119,12 +127,6 @@ message TrafficLight
         //
         optional bool is_out_of_service = 6;
 
-        //
-        // The visual color of the traffic light. This does not represent the semantic
-        // classification but the visual appearance.
-        //
-        optional ColorDescription color_description = 7;
-
         // Definition of semantic colors for traffic lights.
         //
         // \note The color types represent the semantic classification of a traffic light