Rename use_lane_level_specification_for_waypoints to use_lane_ids_for_routing

Author: HansRobo

openscenario/openscenario_interpreter/src/syntax/assign_route_action.cpp

@@ -81,8 +81,8 @@ auto AssignRouteAction::start() -> void
   };
 
   traffic_simulator::v2::RouteOption route_option;
-  route_option.use_lane_level_specification_for_waypoints =
-    get_from_parameter("RoutingAction.use_lane_level_specification_for_waypoints", false);
+  route_option.use_lane_ids_for_routing =
+    get_from_parameter("RoutingAction.use_lane_ids_for_routing", false);
 
   for (const auto & actor : actors) {
     actor.apply([&](const auto & object) {

simulation/traffic_simulator/include/traffic_simulator/data_type/route_option.hpp

@@ -24,7 +24,7 @@ inline namespace v2
 struct RouteOption
 {
   bool allow_goal_modification = false;
-  bool use_lane_level_specification_for_waypoints = false;
+  bool use_lane_ids_for_routing = false;
 };
 }  // namespace v2
 
@@ -39,7 +39,7 @@ struct RouteOption
   {
     v2::RouteOption v2;
     v2.allow_goal_modification = allow_goal_modification;
-    v2.use_lane_level_specification_for_waypoints = false;
+    v2.use_lane_ids_for_routing = false;
     return v2;
   }
 };

simulation/traffic_simulator/src/entity/ego_entity.cpp

@@ -243,7 +243,7 @@ void EgoEntity::requestAssignRoute(
   const std::vector<CanonicalizedLaneletPose> & route,
   const traffic_simulator::RouteOption & option)
 {
-  if (option.use_lane_level_specification_for_waypoints) {
+  if (option.use_lane_ids_for_routing) {
     concealer::FieldOperatorApplication::RouteOption route_option;
     route_option.allow_goal_modification = option.allow_goal_modification;
 
@@ -311,7 +311,7 @@ void EgoEntity::requestAssignRoute(
   const std::vector<geometry_msgs::msg::Pose> & route,
   const traffic_simulator::RouteOption & option)
 {
-  if (option.use_lane_level_specification_for_waypoints) {
+  if (option.use_lane_ids_for_routing) {
     std::vector<CanonicalizedLaneletPose> lanelet_poses;
     for (const auto & pose : route) {
       if (auto lanelet_pose = pose::toCanonicalizedLaneletPose(pose, false)) {
@@ -395,7 +395,7 @@ auto EgoEntity::requestReplanRoute(
   clearRoute();
   /*
     NOTE:
-      This function does not support use_lane_level_specification_for_waypoints option.
+      This function does not support use_lane_ids_for_routing option.
       The developers should consider manual override simulation to determine whether support it or not.
    */
   {

test_runner/scenario_test_runner/scenario/RoutingAction.AssignRouteAction-use_lane_level_specification_for_waypoint.yaml renamed to test_runner/scenario_test_runner/scenario/RoutingAction.AssignRouteAction-use_lane_ids_for_routing.yaml

@@ -67,7 +67,7 @@ OpenSCENARIO:
                   - name: ''
                     ParameterDeclarations:
                       ParameterDeclaration:
-                        - name: RoutingAction.use_lane_level_specification_for_waypoints
+                        - name: RoutingAction.use_lane_ids_for_routing
                           parameterType: boolean
                           value: true
                     Event: