refactor(autoware_behavior_velocity_speed_bump_module): prefix packag…

…e and namespace with autoware (#7467) Signed-off-by: Esteve Fernandez <[email protected]>
autowarefoundation · Jul 22, 2024 · af23e0e · af23e0e
1 parent 3f3511c
commit af23e0e
Show file tree

Hide file tree

Showing 21 changed files with 10 additions and 17 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -185,12 +185,12 @@ planning/behavior_velocity_planner/autoware_behavior_velocity_occlusion_spot_mod
 planning/behavior_velocity_planner/autoware_behavior_velocity_planner/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_planner/autoware_behavior_velocity_planner_common/** [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_planner/autoware_behavior_velocity_run_out_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+planning/behavior_velocity_planner/autoware_behavior_velocity_speed_bump_module/** [email protected] [email protected] [email protected]
 planning/behavior_velocity_planner/autoware_behavior_velocity_stop_line_module/** [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_planner/autoware_behavior_velocity_template_module/** [email protected]
 planning/behavior_velocity_planner/autoware_behavior_velocity_traffic_light_module/** [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_planner/autoware_behavior_velocity_virtual_traffic_light_module/** [email protected] [email protected] [email protected]
 planning/behavior_velocity_planner/autoware_behavior_velocity_walkway_module/** [email protected] [email protected] [email protected] [email protected]
-planning/behavior_velocity_planner/behavior_velocity_speed_bump_module/** [email protected] [email protected] [email protected]
 planning/motion_velocity_planner/autoware_motion_velocity_dynamic_obstacle_stop_module/** [email protected] [email protected]
 planning/motion_velocity_planner/autoware_motion_velocity_obstacle_velocity_limiter_module/** [email protected]
 planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/** [email protected] [email protected] [email protected] [email protected]

diff --git a/planning/.pages b/planning/.pages
@@ -29,7 +29,7 @@ nav:
         - 'No Stopping Area': planning/behavior_velocity_planner/autoware_behavior_velocity_no_stopping_area_module
         - 'Occlusion Spot': planning/behavior_velocity_planner/autoware_behavior_velocity_occlusion_spot_module
         - 'Run Out': planning/behavior_velocity_planner/autoware_behavior_velocity_run_out_module
-        - 'Speed Bump': planning/behavior_velocity_planner/behavior_velocity_speed_bump_module
+        - 'Speed Bump': planning/behavior_velocity_planner/autoware_behavior_velocity_speed_bump_module
         - 'Stop Line': planning/behavior_velocity_planner/autoware_behavior_velocity_stop_line_module
         - 'Traffic Light': planning/behavior_velocity_planner/autoware_behavior_velocity_traffic_light_module
         - 'Virtual Traffic Light': planning/behavior_velocity_planner/autoware_behavior_velocity_virtual_traffic_light_module

diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/README.md b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/README.md
@@ -19,7 +19,7 @@ It loads modules as plugins. Please refer to the links listed below for detail o
 - [Occlusion Spot](../autoware_behavior_velocity_occlusion_spot_module/README.md)
 - [No Stopping Area](../autoware_behavior_velocity_no_stopping_area_module/README.md)
 - [Run Out](../autoware_behavior_velocity_run_out_module/README.md)
-- [Speed Bump](../behavior_velocity_speed_bump_module/README.md)
+- [Speed Bump](../autoware_behavior_velocity_speed_bump_module/README.md)
 
 When each module plans velocity, it considers based on `base_link`(center of rear-wheel axis) pose.
 So for example, in order to stop at a stop line with the vehicles' front on the stop line, it calculates `base_link` position from the distance between `base_link` to front and modifies path velocity from the `base_link` position.

diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/package.xml b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/package.xml
@@ -66,20 +66,19 @@
   <test_depend>ament_cmake_ros</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_behavior_velocity_blind_spot_module</test_depend>
-  <test_depend>autoware_behavior_velocity_blind_spot_module</test_depend>
   <test_depend>autoware_behavior_velocity_crosswalk_module</test_depend>
   <test_depend>autoware_behavior_velocity_detection_area_module</test_depend>
   <test_depend>autoware_behavior_velocity_intersection_module</test_depend>
   <test_depend>autoware_behavior_velocity_no_drivable_lane_module</test_depend>
   <test_depend>autoware_behavior_velocity_no_stopping_area_module</test_depend>
   <test_depend>autoware_behavior_velocity_occlusion_spot_module</test_depend>
   <test_depend>autoware_behavior_velocity_run_out_module</test_depend>
+  <test_depend>autoware_behavior_velocity_speed_bump_module</test_depend>
   <test_depend>autoware_behavior_velocity_stop_line_module</test_depend>
   <test_depend>autoware_behavior_velocity_traffic_light_module</test_depend>
   <test_depend>autoware_behavior_velocity_virtual_traffic_light_module</test_depend>
   <test_depend>autoware_behavior_velocity_walkway_module</test_depend>
   <test_depend>autoware_lint_common</test_depend>
-  <test_depend>behavior_velocity_speed_bump_module</test_depend>
   <!--<test_depend>autoware_behavior_velocity_template_module</test_depend>-->
 
   <member_of_group>rosidl_interface_packages</member_of_group>

diff --git a/...vior_velocity_planner/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp b/...vior_velocity_planner/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp
@@ -55,12 +55,6 @@ std::shared_ptr<BehaviorVelocityPlannerNode> generateNode()
     ament_index_cpp::get_package_share_directory("autoware_velocity_smoother");
 
   // TODO(esteve): delete when all the modules are migrated to autoware_behavior_velocity_*
-  const auto get_behavior_velocity_module_config_no_prefix = [](const std::string & module) {
-    const auto package_name = "behavior_velocity_" + module + "_module";
-    const auto package_path = ament_index_cpp::get_package_share_directory(package_name);
-    return package_path + "/config/" + module + ".param.yaml";
-  };
-
   const auto get_behavior_velocity_module_config = [](const std::string & module) {
     const auto package_name = "autoware_behavior_velocity_" + module + "_module";
     const auto package_path = ament_index_cpp::get_package_share_directory(package_name);
@@ -103,7 +97,7 @@ std::shared_ptr<BehaviorVelocityPlannerNode> generateNode()
                    get_behavior_velocity_module_config("no_stopping_area"),
                    get_behavior_velocity_module_config("occlusion_spot"),
                    get_behavior_velocity_module_config("run_out"),
-                   get_behavior_velocity_module_config_no_prefix("speed_bump"),
+                   get_behavior_velocity_module_config("speed_bump"),
                    get_behavior_velocity_module_config("stop_line"),
                    get_behavior_velocity_module_config("traffic_light"),
                    get_behavior_velocity_module_config("virtual_traffic_light"),

diff --git a/...velocity_speed_bump_module/CMakeLists.txt → ...velocity_speed_bump_module/CMakeLists.txt b/...velocity_speed_bump_module/CMakeLists.txt → ...velocity_speed_bump_module/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(behavior_velocity_speed_bump_module)
+project(autoware_behavior_velocity_speed_bump_module)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()

diff --git a/...vior_velocity_speed_bump_module/README.md → ...vior_velocity_speed_bump_module/README.md b/...vior_velocity_speed_bump_module/README.md → ...vior_velocity_speed_bump_module/README.md
diff --git a/..._bump_module/config/speed_bump.param.yaml → ..._bump_module/config/speed_bump.param.yaml b/..._bump_module/config/speed_bump.param.yaml → ..._bump_module/config/speed_bump.param.yaml
diff --git a/...ed_bump_module/docs/speed_bump_design.svg → ...ed_bump_module/docs/speed_bump_design.svg b/...ed_bump_module/docs/speed_bump_design.svg → ...ed_bump_module/docs/speed_bump_design.svg
diff --git a/...bump_module/docs/speed_bump_scenarios.svg → ...bump_module/docs/speed_bump_scenarios.svg b/...bump_module/docs/speed_bump_scenarios.svg → ...bump_module/docs/speed_bump_scenarios.svg
diff --git a/..._bump_module/docs/speed_bump_vel_calc.png → ..._bump_module/docs/speed_bump_vel_calc.png b/..._bump_module/docs/speed_bump_vel_calc.png → ..._bump_module/docs/speed_bump_vel_calc.png
diff --git a/...or_velocity_speed_bump_module/package.xml → ...or_velocity_speed_bump_module/package.xml b/...or_velocity_speed_bump_module/package.xml → ...or_velocity_speed_bump_module/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>behavior_velocity_speed_bump_module</name>
+  <name>autoware_behavior_velocity_speed_bump_module</name>
   <version>0.1.0</version>
-  <description>The behavior_velocity_speed_bump_module package</description>
+  <description>The autoware_behavior_velocity_speed_bump_module package</description>
 
   <maintainer email="[email protected]">Tomoya Kimura</maintainer>
   <maintainer email="[email protected]">Shumpei Wakabayashi</maintainer>

diff --git a/...or_velocity_speed_bump_module/plugins.xml → ...or_velocity_speed_bump_module/plugins.xml b/...or_velocity_speed_bump_module/plugins.xml → ...or_velocity_speed_bump_module/plugins.xml
@@ -1,3 +1,3 @@
-<library path="behavior_velocity_speed_bump_module">
+<library path="autoware_behavior_velocity_speed_bump_module">
   <class type="autoware::behavior_velocity_planner::SpeedBumpModulePlugin" base_class_type="autoware::behavior_velocity_planner::PluginInterface"/>
 </library>
diff --git a/..._velocity_speed_bump_module/src/debug.cpp → ..._velocity_speed_bump_module/src/debug.cpp b/..._velocity_speed_bump_module/src/debug.cpp → ..._velocity_speed_bump_module/src/debug.cpp
diff --git a/...elocity_speed_bump_module/src/manager.cpp → ...elocity_speed_bump_module/src/manager.cpp b/...elocity_speed_bump_module/src/manager.cpp → ...elocity_speed_bump_module/src/manager.cpp
diff --git a/...elocity_speed_bump_module/src/manager.hpp → ...elocity_speed_bump_module/src/manager.hpp b/...elocity_speed_bump_module/src/manager.hpp → ...elocity_speed_bump_module/src/manager.hpp
diff --git a/..._velocity_speed_bump_module/src/scene.cpp → ..._velocity_speed_bump_module/src/scene.cpp b/..._velocity_speed_bump_module/src/scene.cpp → ..._velocity_speed_bump_module/src/scene.cpp
diff --git a/..._velocity_speed_bump_module/src/scene.hpp → ..._velocity_speed_bump_module/src/scene.hpp b/..._velocity_speed_bump_module/src/scene.hpp → ..._velocity_speed_bump_module/src/scene.hpp
diff --git a/...r_velocity_speed_bump_module/src/util.cpp → ...r_velocity_speed_bump_module/src/util.cpp b/...r_velocity_speed_bump_module/src/util.cpp → ...r_velocity_speed_bump_module/src/util.cpp
diff --git a/...r_velocity_speed_bump_module/src/util.hpp → ...r_velocity_speed_bump_module/src/util.hpp b/...r_velocity_speed_bump_module/src/util.hpp → ...r_velocity_speed_bump_module/src/util.hpp
diff --git a/.../behavior_velocity_planner/autoware_behavior_velocity_template_module/README.md b/.../behavior_velocity_planner/autoware_behavior_velocity_template_module/README.md
@@ -1,6 +1,6 @@
 ## Template
 
-A template for behavior velocity modules based on the behavior_velocity_speed_bump_module.
+A template for behavior velocity modules based on the autoware_behavior_velocity_speed_bump_module.
 
 # Autoware Behavior Velocity Module Template