Merge pull request #368 from OpenSimulationInterface/bugfix/osi_object

Move assigned_lane_id/assigned_lane_percentage in osi_object.proto to new MovingObjectClassification

Author: pmai

osi_detectedobject.proto

@@ -190,6 +190,9 @@ message DetectedMovingObject
     //
     // Percentage value of the object width in the corresponding lane.
     //
+    // \note DEPRECATED: Use assigned_lane_percentage in MovingObjectClassification
+    // instead.
+    //
     // \rules
     // is_greater_than_or_equal_to: 0
     // is_less_than_or_equal_to: 100
@@ -201,6 +204,9 @@ message DetectedMovingObject
     //
     // Percentage value of the object width in the corresponding lane.
     //
+    // \note DEPRECATED: Use assigned_lane_percentage in MovingObjectClassification
+    // instead.
+    //
     // \rules
     // is_greater_than_or_equal_to: 0
     // is_less_than_or_equal_to: 100
@@ -309,6 +315,10 @@ message DetectedMovingObject
         // [1] Patton, K. T. & Thibodeau, G. A. (2015). <em>Anatomy & Physiology</em>. 9th Edition. Elsevier. Missouri, U.S.A. ISBN 978-0-323-34139-4. p. 1229.
         //
         optional Orientation3d upper_body_pose = 5;
+
+        // Specific information about the classification of a moving object.
+        //
+        optional MovingObject.MovingObjectClassification moving_object_classification = 6;        
     }
 
     // Definition of available reference points. Left/middle/right and

osi_object.proto

@@ -308,6 +308,9 @@ message MovingObject
     //
     // \note OSI uses singular instead of plural for repeated field names.
     //
+    // \note DEPRECATED: Use assigned_lane_id in MovingObjectClassification
+    // instead.
+    //
     repeated Identifier assigned_lane_id = 4;
 
     // Specific information about the vehicle.
@@ -352,6 +355,10 @@ message MovingObject
     //
     repeated StatePoint future_trajectory = 8;
 
+    // Specific information about the classification of the vehicle.
+    //
+    optional MovingObjectClassification moving_object_classification = 9;    
+
     // Definition of object types.
     //
     enum Type
@@ -543,6 +550,31 @@ message MovingObject
         }
     }
 
+    //
+    // \brief Information for the classification of moving objects regarding
+    // \c MovingObject (host or other).
+    //
+    message MovingObjectClassification
+    {
+        // 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 = 1;
+
+        // Percentage value of the object width in the corresponding lane.
+        //
+        // \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 double assigned_lane_percentage = 2;        
+    }
+
     //
     // \brief Information for the classification of vehicles regarding
     // \c MovingObject (host or other).