prediction: updated prediction obstacle proto

modules/dreamview/backend/simulation_world/simulation_world_service.cc

@@ -605,7 +605,7 @@ void SimulationWorldService::UpdateSimulationWorld(
     CreatePredictionTrajectory(&world_obj, obstacle);
 
     world_obj.set_timestamp_sec(
-        std::max(obstacle.time_stamp(), world_obj.timestamp_sec()));
+        std::max(obstacle.timestamp(), world_obj.timestamp_sec()));
   }
   world_.set_timestamp_sec(
       std::max(world_.timestamp_sec(), obstacles.header().timestamp_sec()));

modules/dreamview/backend/simulation_world/simulation_world_service_test.cc

@@ -401,7 +401,7 @@ TEST_F(SimulationWorldServiceTest, UpdatePrediction) {
         traj_pt->set_z(pt);
       }
     }
-    obstacle->set_time_stamp(123.456);
+    obstacle->set_timestamp(123.456);
   }
   sim_world_service_->UpdateSimulationWorld(prediction_obstacles);
   sim_world_service_->world_.clear_object();

modules/planning/common/testdata/sample_prediction.pb.txt

@@ -104,7 +104,7 @@ prediction_obstacle {
     type: VEHICLE
     timestamp: 0
   }
-  time_stamp: 1171064942.14
+  timestamp: 1171064942.14
   predicted_period: 5000
   trajectory {
     probability: 0.614424703209
@@ -1189,7 +1189,7 @@ prediction_obstacle {
     type: VEHICLE
     timestamp: 0
   }
-  time_stamp: 1171064942.14
+  timestamp: 1171064942.14
   predicted_period: 5000
   trajectory {
     probability: 0.918794968878

modules/prediction/predictor/predictor_manager.cc

@@ -97,7 +97,7 @@ void PredictorManager::Run(const PerceptionObstacles& perception_obstacles) {
       perception_obstacles.perception_obstacle()) {
     PredictionObstacle prediction_obstacle;
     prediction_obstacle.set_predicted_period(FLAGS_prediction_duration);
-    prediction_obstacle.set_time_stamp(perception_obstacle.timestamp());
+    prediction_obstacle.set_timestamp(perception_obstacle.timestamp());
     prediction_obstacle.mutable_perception_obstacle()->
         CopyFrom(perception_obstacle);
 

modules/prediction/proto/prediction_obstacle.proto

@@ -14,7 +14,7 @@ message Trajectory {
 
 message PredictionObstacle {
   optional apollo.perception.PerceptionObstacle perception_obstacle = 1;
-  optional double time_stamp = 2;  // GPS time in seconds
+  optional double timestamp = 2;  // GPS time in seconds
   // the length of the time for this prediction (e.g. 10s)
   optional double predicted_period = 3;
   // can have multiple trajectories per obstacle