Move LogicalLaneAssignment to Classification

Signed-off-by: Thomas Bleher <[email protected]>

Author: tbleher

osi_object.proto

@@ -79,10 +79,6 @@ message StationaryObject
     //
     optional ColorDescription color_description = 6;
 
-    // Assignment of this object to logical lanes
-    //
-    repeated LogicalLaneAssignment logical_lane_assignment = 7;
-
     //
     // \brief Classification data for a stationary object.
     //
@@ -128,6 +124,12 @@ message StationaryObject
         //
         repeated double assigned_lane_percentage = 7;
 
+        // Assignment of this object to logical lanes.
+        //
+        // \note OSI uses singular instead of plural for repeated field names.
+        //
+        repeated LogicalLaneAssignment logical_lane_assignment = 8;
+
         // Definition of object types.
         //
         enum Type
@@ -487,10 +489,6 @@ message MovingObject
     //
     optional ColorDescription color_description = 11;
 
-    // Assignment of this object to logical lanes
-    //
-    repeated LogicalLaneAssignment logical_lane_assignment = 12;
-
     // Definition of object types.
     //
     enum Type
@@ -704,8 +702,13 @@ message MovingObject
         //
         // \note OSI uses singular instead of plural for repeated field names.
         //
-        repeated double assigned_lane_percentage = 2;        
-        
+        repeated double assigned_lane_percentage = 2;
+
+        // Assignment of this object to logical lanes.
+        //
+        // \note OSI uses singular instead of plural for repeated field names.
+        //
+        repeated LogicalLaneAssignment logical_lane_assignment = 3;
     }
 
     //

osi_roadmarking.proto

@@ -90,10 +90,6 @@ message RoadMarking
     //
     optional ColorDescription color_description = 5;
 
-    // Assignment of this object to logical lanes
-    //
-    repeated LogicalLaneAssignment logical_lane_assignment = 6;
-
     //
     // \brief \c Classification data for a road surface marking.
     //
@@ -260,6 +256,12 @@ message RoadMarking
         //
         optional string sub_code = 11;
 
+        // Assignment of this object to logical lanes.
+        //
+        // \note OSI uses singular instead of plural for repeated field names.
+        //
+        repeated LogicalLaneAssignment logical_lane_assignment = 12;
+
         // Definition of road marking types.
         //
         enum Type

osi_trafficlight.proto

@@ -71,10 +71,6 @@ message TrafficLight
     //
     optional ColorDescription color_description = 6;
 
-    // Assignment of this object to logical lanes
-    //
-    repeated LogicalLaneAssignment logical_lane_assignment = 7;
-
     //
     // \brief \c Classification data for a traffic light.
     //
@@ -131,6 +127,12 @@ message TrafficLight
         //
         optional bool is_out_of_service = 6;
 
+        // Assignment of this object to logical lanes.
+        //
+        // \note OSI uses singular instead of plural for repeated field names.
+        //
+        repeated LogicalLaneAssignment logical_lane_assignment = 7;
+
         // Definition of semantic colors for traffic lights.
         //
         // \note The color types represent the semantic classification of a traffic light

osi_trafficsign.proto

@@ -214,10 +214,6 @@ message TrafficSign
         //
         optional string model_reference = 3;
 
-        // Assignment of this object to logical lanes
-        //
-        repeated LogicalLaneAssignment logical_lane_assignment = 4;
-
         //
         // \brief \c Classification data for a traffic sign.
         //
@@ -381,6 +377,13 @@ message TrafficSign
             //
             optional string sub_code = 11;
 
+            // Assignment of this object to logical lanes.
+            //
+            // \note OSI uses singular instead of plural for repeated field
+            // names.
+            //
+            repeated LogicalLaneAssignment logical_lane_assignment = 12;
+
             // Definition of traffic sign types.
             // Numbers are given according to German StVO.
             //
@@ -5573,10 +5576,6 @@ message TrafficSign
         //
         optional string model_reference = 3;
 
-        // Assignment of this object to logical lanes
-        //
-        repeated LogicalLaneAssignment logical_lane_assignment = 4;
-
         //
         // \brief \c Classification data for a supplementary traffic sign.
         //
@@ -5706,6 +5705,13 @@ message TrafficSign
             //
             optional string sub_code = 11;
 
+            // Assignment of this object to logical lanes.
+            //
+            // \note OSI uses singular instead of plural for repeated field
+            // names.
+            //
+            repeated LogicalLaneAssignment logical_lane_assignment = 12;
+
             // Definition of supplementary sign types.
             //
             // For general supplementary signs use \c #TYPE_TEXT.