Move assigned_lane_id in osi_object.proto to VehicleClassification

Author: 0815-code

osi_object.proto

@@ -291,36 +291,27 @@ message MovingObject
     //
     optional Type type = 3;
 
-    // The IDs of the lanes that this object is assigned to.
-    //
-    // \note Might be multiple if the object is switching lanes or moving from
-    // one lane into another following lane.
-    //
-    // \note OSI uses singular instead of plural for repeated field names.
-    //
-    repeated Identifier assigned_lane_id = 4;
-
     // Specific information about the vehicle.
     //
     // \note This field is mandatory if the \c #type is
     // #TYPE_VEHICLE .
     //
-    optional VehicleAttributes vehicle_attributes = 5;
+    optional VehicleAttributes vehicle_attributes = 4;
 
     // Specific information about the classification of the vehicle.
     //
     //
     // \note This field is mandatory if the \c #type is
     // #TYPE_VEHICLE .
     //
-    optional VehicleClassification vehicle_classification = 6;
+    optional VehicleClassification vehicle_classification = 5;
 
     // Opaque reference of an associated 3D model of the moving object.
     //
     // \note It is implementation-specific how model_references are resolved to
     // 3d models.
     //
-    optional string model_reference = 7;
+    optional string model_reference = 6;
 
     // Definition of object types.
     //
@@ -441,6 +432,15 @@ message MovingObject
         //
         optional Identifier trailer_id = 4;
 
+        // The IDs of the lanes that this object is assigned to.
+        //
+        // \note Might be multiple if the object is switching lanes or moving from
+        // one lane into another following lane.
+        //
+        // \note OSI uses singular instead of plural for repeated field names.
+        //
+        repeated Identifier assigned_lane_id = 5;
+
         // Definition of vehicle types.
         //
         enum Type