Merge pull request #428 from tier4/sync-awf-latest

chore: sync awf-latest
tier4 · May 31, 2024 · e87a7f7 · e87a7f7
2 parents 26b2da2 + 5dfc307
commit e87a7f7
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 25 deletions.
diff --git a/autoware_launch/config/planning/preset/default_preset.yaml b/autoware_launch/config/planning/preset/default_preset.yaml
@@ -1,13 +1,13 @@
 launch:
   # behavior path modules
   - arg:
-      name: launch_avoidance_module
+      name: launch_static_obstacle_avoidance
       default: "true"
   - arg:
       name: launch_avoidance_by_lane_change_module
       default: "true"
   - arg:
-      name: launch_dynamic_avoidance_module
+      name: launch_dynamic_obstacle_avoidance
       default: "true"
   - arg:
       name: launch_sampling_planner_module

diff --git a/...ic_avoidance/dynamic_avoidance.param.yaml → ...ule/dynamic_obstacle_avoidance.param.yaml b/...ic_avoidance/dynamic_avoidance.param.yaml → ...ule/dynamic_obstacle_avoidance.param.yaml
diff --git a/...th_planner/avoidance/avoidance.param.yaml → ...dule/static_obstacle_avoidance.param.yaml b/...th_planner/avoidance/avoidance.param.yaml → ...dule/static_obstacle_avoidance.param.yaml
diff --git a/...ning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml b/...ning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml
@@ -59,7 +59,7 @@
       priority: 1
       max_module_size: 1
 
-    avoidance:
+    static_obstacle_avoidance:
       enable_rtc: false
       enable_simultaneous_execution_as_approved_module: true
       enable_simultaneous_execution_as_candidate_module: false
@@ -75,7 +75,7 @@
       priority: 3
       max_module_size: 1
 
-    dynamic_avoidance:
+    dynamic_obstacle_avoidance:
       enable_rtc: false
       enable_simultaneous_execution_as_approved_module: true
       enable_simultaneous_execution_as_candidate_module: true

diff --git a/autoware_launch/launch/components/tier4_planning_component.launch.xml b/autoware_launch/launch/components/tier4_planning_component.launch.xml
@@ -26,10 +26,16 @@
     <arg name="behavior_path_planner_common_param_path" value="$(var behavior_path_config_path)/behavior_path_planner.param.yaml"/>
     <arg name="behavior_path_planner_scene_module_manager_param_path" value="$(var behavior_path_config_path)/scene_module_manager.param.yaml"/>
     <arg name="behavior_path_planner_side_shift_module_param_path" value="$(var behavior_path_config_path)/side_shift/side_shift.param.yaml"/>
-    <arg name="behavior_path_planner_avoidance_module_param_path" value="$(var behavior_path_config_path)/avoidance/avoidance.param.yaml"/>
+    <arg
+      name="behavior_path_planner_static_obstacle_avoidance_module_param_path"
+      value="$(var behavior_path_config_path)/autoware_behavior_path_static_obstacle_avoidance_module/static_obstacle_avoidance.param.yaml"
+    />
     <arg name="behavior_path_planner_avoidance_by_lc_module_param_path" value="$(var behavior_path_config_path)/avoidance_by_lane_change/avoidance_by_lane_change.param.yaml"/>
     <arg name="behavior_path_planner_sampling_planner_module_param_path" value="$(var behavior_path_config_path)/sampling_planner/sampling_planner.param.yaml"/>
-    <arg name="behavior_path_planner_dynamic_avoidance_module_param_path" value="$(var behavior_path_config_path)/dynamic_avoidance/dynamic_avoidance.param.yaml"/>
+    <arg
+      name="behavior_path_planner_dynamic_obstacle_avoidance_module_param_path"
+      value="$(var behavior_path_config_path)/autoware_behavior_path_dynamic_obstacle_avoidance_module/dynamic_obstacle_avoidance.param.yaml"
+    />
     <arg name="behavior_path_planner_lane_change_module_param_path" value="$(var behavior_path_config_path)/lane_change/lane_change.param.yaml"/>
     <arg name="behavior_path_planner_goal_planner_module_param_path" value="$(var behavior_path_config_path)/goal_planner/goal_planner.param.yaml"/>
     <arg name="behavior_path_planner_start_planner_module_param_path" value="$(var behavior_path_config_path)/start_planner/start_planner.param.yaml"/>

diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz
@@ -1022,7 +1022,7 @@ Visualization Manager:
                         Durability Policy: Volatile
                         History Policy: Keep Last
                         Reliability Policy: Reliable
-                        Value: /planning/path_reference/avoidance
+                        Value: /planning/path_reference/static_obstacle_avoidance
                       Value: true
                       View Path:
                         Alpha: 0.3
@@ -1275,7 +1275,7 @@ Visualization Manager:
                         Durability Policy: Volatile
                         History Policy: Keep Last
                         Reliability Policy: Reliable
-                        Value: /planning/path_candidate/avoidance
+                        Value: /planning/path_candidate/static_obstacle_avoidance
                       Value: true
                       View Path:
                         Alpha: 0.30000001192092896
@@ -1353,15 +1353,15 @@ Visualization Manager:
                       Displays:
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: true
-                          Name: VirtualWall (Avoidance)
+                          Name: VirtualWall (StaticObstacleAvoidance)
                           Namespaces:
                             {}
                           Topic:
                             Depth: 5
                             Durability Policy: Volatile
                             History Policy: Keep Last
                             Reliability Policy: Reliable
-                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/virtual_wall/avoidance
+                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/virtual_wall/static_obstacle_avoidance
                           Value: true
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: true
@@ -1778,15 +1778,15 @@ Visualization Manager:
                           Value: false
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
-                          Name: Avoidance
+                          Name: StaticObstacleAvoidance
                           Namespaces:
                             {}
                           Topic:
                             Depth: 5
                             Durability Policy: Volatile
                             History Policy: Keep Last
                             Reliability Policy: Reliable
-                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/avoidance
+                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/static_obstacle_avoidance
                           Value: false
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
@@ -1886,15 +1886,15 @@ Visualization Manager:
                           Value: false
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
-                          Name: DynamicAvoidance
+                          Name: DynamicObstacleAvoidance
                           Namespaces:
                             {}
                           Topic:
                             Depth: 5
                             Durability Policy: Volatile
                             History Policy: Keep Last
                             Reliability Policy: Reliable
-                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/dynamic_avoidance
+                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/dynamic_obstacle_avoidance
                           Value: false
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
@@ -1926,7 +1926,7 @@ Visualization Manager:
                       Displays:
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
-                          Name: Info (Avoidance)
+                          Name: Info (StaticObstacleAvoidance)
                           Namespaces:
                             avoidable_target_objects_info: false
                             avoidable_target_objects_info_reason: false
@@ -1939,7 +1939,7 @@ Visualization Manager:
                             Durability Policy: Volatile
                             History Policy: Keep Last
                             Reliability Policy: Reliable
-                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/info/avoidance
+                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/info/static_obstacle_avoidance
                           Value: false
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
@@ -2027,15 +2027,15 @@ Visualization Manager:
                           Value: false
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
-                          Name: Info (DynamicAvoidance)
+                          Name: Info (DynamicObstacleAvoidance)
                           Namespaces:
                             {}
                           Topic:
                             Depth: 5
                             Durability Policy: Volatile
                             History Policy: Keep Last
                             Reliability Policy: Reliable
-                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/info/dynamic_avoidance
+                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/info/dynamic_obstacle_avoidance
                           Value: false
                       Enabled: false
                       Name: InfoMarker
@@ -2576,11 +2576,11 @@ Visualization Manager:
                         Bound: true
                         DebugMarker:
                           Arrow: true
-                          Avoidance: true
+                          StaticObstacleAvoidance: true
                           Blind Spot: true
                           Crosswalk: true
                           DetectionArea: true
-                          DynamicAvoidance: true
+                          DynamicObstacleAvoidance: true
                           GoalPlanner: true
                           Intersection: true
                           LaneFollowing: true
@@ -2599,9 +2599,9 @@ Visualization Manager:
                           Value: true
                           VirtualTrafficLight: true
                         InfoMarker:
-                          Info (Avoidance): true
+                          Info (StaticObstacleAvoidance): true
                           Info (AvoidanceByLC): true
-                          Info (DynamicAvoidance): true
+                          Info (DynamicObstacleAvoidance): true
                           Info (ExtLaneChangeLeft): true
                           Info (ExtLaneChangeRight): true
                           Info (GoalPlanner): true
@@ -2627,7 +2627,7 @@ Visualization Manager:
                         Value: true
                         VirtualWall:
                           Value: true
-                          VirtualWall (Avoidance): true
+                          VirtualWall (StaticObstacleAvoidance): true
                           VirtualWall (AvoidanceByLC): true
                           VirtualWall (BlindSpot): true
                           VirtualWall (Crosswalk): true
@@ -3500,7 +3500,7 @@ Visualization Manager:
                     Durability Policy: Volatile
                     History Policy: Keep Last
                     Reliability Policy: Reliable
-                    Value: /planning/debug/objects_of_interest/avoidance_left
+                    Value: /planning/debug/objects_of_interest/static_obstacle_avoidance_left
                   Value: true
                 - Class: rviz_default_plugins/MarkerArray
                   Enabled: true
@@ -3512,7 +3512,7 @@ Visualization Manager:
                     Durability Policy: Volatile
                     History Policy: Keep Last
                     Reliability Policy: Reliable
-                    Value: /planning/debug/objects_of_interest/avoidance_right
+                    Value: /planning/debug/objects_of_interest/static_obstacle_avoidance_right
                   Value: true
                 - Class: rviz_default_plugins/MarkerArray
                   Enabled: true