refactor(behavior_path_side_shift_module)!: prefix package and namesp…

…ace with autoware (autowarefoundation#7326) * add prefix autoware_ to side_shift package Signed-off-by: kyoichi-sugahara <kyoichi.sugahara@tier4.jp> * change directory name Signed-off-by: kyoichi-sugahara <kyoichi.sugahara@tier4.jp> --------- Signed-off-by: kyoichi-sugahara <kyoichi.sugahara@tier4.jp>
a-maumau · Jun 7, 2024 · 17aad93 · 17aad93
1 parent cac7eb3
commit 17aad93
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 33 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -160,7 +160,7 @@ planning/behavior_path_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.tak
 planning/behavior_path_planner/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
 planning/autoware_behavior_path_planner_common/** daniel.sanchez@tier4.jp fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp maxime.clement@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
 planning/behavior_path_sampling_planner_module/** daniel.sanchez@tier4.jp maxime.clement@tier4.jp
-planning/behavior_path_side_shift_module/** fumiya.watanabe@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
+planning/autoware_behavior_path_side_shift_module/** fumiya.watanabe@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
 planning/behavior_path_start_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
 planning/behavior_velocity_blind_spot_module/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
 planning/behavior_velocity_crosswalk_module/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp yuki.takagi@tier4.jp

diff --git a/planning/.pages b/planning/.pages
@@ -14,7 +14,7 @@ nav:
         - 'Dynamic Obstacle Avoidance': planning/autoware_behavior_path_dynamic_obstacle_avoidance_module
         - 'Goal Planner': planning/behavior_path_goal_planner_module
         - 'Lane Change': planning/behavior_path_lane_change_module
-        - 'Side Shift': planning/behavior_path_side_shift_module
+        - 'Side Shift': planning/autoware_behavior_path_side_shift_module
         - 'Start Planner': planning/behavior_path_start_planner_module
         - 'Static Obstacle Avoidance': planning/autoware_behavior_path_static_obstacle_avoidance_module
   - 'Behavior Velocity Planner':

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

diff --git a/...behavior_path_side_shift_module/README.md → ...behavior_path_side_shift_module/README.md b/...behavior_path_side_shift_module/README.md → ...behavior_path_side_shift_module/README.md
diff --git a/...shift_module/config/side_shift.param.yaml → ...shift_module/config/side_shift.param.yaml b/...shift_module/config/side_shift.param.yaml → ...shift_module/config/side_shift.param.yaml
diff --git a/...odule/images/side_shift_status.drawio.svg → ...odule/images/side_shift_status.drawio.svg b/...odule/images/side_shift_status.drawio.svg → ...odule/images/side_shift_status.drawio.svg
diff --git a/...r_path_side_shift_module/data_structs.hpp → ...r_path_side_shift_module/data_structs.hpp b/...r_path_side_shift_module/data_structs.hpp → ...r_path_side_shift_module/data_structs.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
-#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
 
 #include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
 
@@ -51,4 +51,4 @@ struct SideShiftDebugData
 };
 
 }  // namespace behavior_path_planner
-#endif  // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
+#endif  // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
diff --git a/...havior_path_side_shift_module/manager.hpp → ...havior_path_side_shift_module/manager.hpp b/...havior_path_side_shift_module/manager.hpp → ...havior_path_side_shift_module/manager.hpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
-#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
 
 #include "autoware_behavior_path_planner_common/interface/scene_module_manager_interface.hpp"
-#include "behavior_path_side_shift_module/scene.hpp"
+#include "autoware_behavior_path_side_shift_module/scene.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -50,4 +50,4 @@ class SideShiftModuleManager : public SceneModuleManagerInterface
 
 }  // namespace behavior_path_planner
 
-#endif  // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
+#endif  // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
diff --git a/...behavior_path_side_shift_module/scene.hpp → ...behavior_path_side_shift_module/scene.hpp b/...behavior_path_side_shift_module/scene.hpp → ...behavior_path_side_shift_module/scene.hpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
-#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
 
 #include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
 #include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
-#include "behavior_path_side_shift_module/data_structs.hpp"
+#include "autoware_behavior_path_side_shift_module/data_structs.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -131,4 +131,4 @@ class SideShiftModule : public SceneModuleInterface
 
 }  // namespace behavior_path_planner
 
-#endif  // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
+#endif  // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
diff --git a/...behavior_path_side_shift_module/utils.hpp → ...behavior_path_side_shift_module/utils.hpp b/...behavior_path_side_shift_module/utils.hpp → ...behavior_path_side_shift_module/utils.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
-#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
 
 #include <geometry_msgs/msg/point.hpp>
 #include <geometry_msgs/msg/pose.hpp>
@@ -41,4 +41,4 @@ Point transformToGrid(
 
 }  // namespace behavior_path_planner
 
-#endif  // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
+#endif  // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
diff --git a/...havior_path_side_shift_module/package.xml → ...havior_path_side_shift_module/package.xml b/...havior_path_side_shift_module/package.xml → ...havior_path_side_shift_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_path_side_shift_module</name>
+  <name>autoware_behavior_path_side_shift_module</name>
   <version>0.1.0</version>
-  <description>The behavior_path_side_shift_module package</description>
+  <description>The autoware_behavior_path_side_shift_module package</description>
 
   <maintainer email="satoshi.ota@tier4.jp">Satoshi Ota</maintainer>
   <maintainer email="fumiya.watanabe@tier4.jp">Fumiya Watanabe</maintainer>

diff --git a/...havior_path_side_shift_module/plugins.xml → ...havior_path_side_shift_module/plugins.xml b/...havior_path_side_shift_module/plugins.xml → ...havior_path_side_shift_module/plugins.xml
@@ -1,3 +1,3 @@
-<library path="behavior_path_side_shift_module">
+<library path="autoware_behavior_path_side_shift_module">
   <class type="behavior_path_planner::SideShiftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
 </library>
diff --git a/...or_path_side_shift_module/src/manager.cpp → ...or_path_side_shift_module/src/manager.cpp b/...or_path_side_shift_module/src/manager.cpp → ...or_path_side_shift_module/src/manager.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "behavior_path_side_shift_module/manager.hpp"
+#include "autoware_behavior_path_side_shift_module/manager.hpp"
 
 #include "tier4_autoware_utils/ros/update_param.hpp"
 

diff --git a/...vior_path_side_shift_module/src/scene.cpp → ...vior_path_side_shift_module/src/scene.cpp b/...vior_path_side_shift_module/src/scene.cpp → ...vior_path_side_shift_module/src/scene.cpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "behavior_path_side_shift_module/scene.hpp"
+#include "autoware_behavior_path_side_shift_module/scene.hpp"
 
 #include "autoware_behavior_path_planner_common/marker_utils/utils.hpp"
 #include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp"
 #include "autoware_behavior_path_planner_common/utils/path_utils.hpp"
 #include "autoware_behavior_path_planner_common/utils/utils.hpp"
-#include "behavior_path_side_shift_module/utils.hpp"
+#include "autoware_behavior_path_side_shift_module/utils.hpp"
 
 #include <lanelet2_extension/utility/utilities.hpp>
 

diff --git a/...vior_path_side_shift_module/src/utils.cpp → ...vior_path_side_shift_module/src/utils.cpp b/...vior_path_side_shift_module/src/utils.cpp → ...vior_path_side_shift_module/src/utils.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "behavior_path_side_shift_module/utils.hpp"
+#include "autoware_behavior_path_side_shift_module/utils.hpp"
 
 #include "autoware_behavior_path_planner_common/utils/utils.hpp"
 

diff --git a/..._behavior_path_planner_node_interface.cpp → ..._behavior_path_planner_node_interface.cpp b/..._behavior_path_planner_node_interface.cpp → ..._behavior_path_planner_node_interface.cpp
@@ -57,14 +57,15 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
   node_options.parameter_overrides(params);
 
   test_utils::updateNodeOptions(
-    node_options, {planning_test_utils_dir + "/config/test_common.param.yaml",
-                   planning_test_utils_dir + "/config/test_nearest_search.param.yaml",
-                   planning_test_utils_dir + "/config/test_vehicle_info.param.yaml",
-                   behavior_path_planner_dir + "/config/behavior_path_planner.param.yaml",
-                   behavior_path_planner_dir + "/config/drivable_area_expansion.param.yaml",
-                   behavior_path_planner_dir + "/config/scene_module_manager.param.yaml",
-                   ament_index_cpp::get_package_share_directory("behavior_path_side_shift_module") +
-                     "/config/side_shift.param.yaml"});
+    node_options,
+    {planning_test_utils_dir + "/config/test_common.param.yaml",
+     planning_test_utils_dir + "/config/test_nearest_search.param.yaml",
+     planning_test_utils_dir + "/config/test_vehicle_info.param.yaml",
+     behavior_path_planner_dir + "/config/behavior_path_planner.param.yaml",
+     behavior_path_planner_dir + "/config/drivable_area_expansion.param.yaml",
+     behavior_path_planner_dir + "/config/scene_module_manager.param.yaml",
+     ament_index_cpp::get_package_share_directory("autoware_behavior_path_side_shift_module") +
+       "/config/side_shift.param.yaml"});
 
   return std::make_shared<BehaviorPathPlannerNode>(node_options);
 }

diff --git a/planning/behavior_path_planner/README.md b/planning/behavior_path_planner/README.md
@@ -34,7 +34,7 @@ Behavior Path Planner has following scene modules
 | External Lane Change       | WIP                                                                                                                                                                        | LINK                                                                          |
 | Goal Planner               | this module is performed when ego-vehicle is in the road lane and goal is in the shoulder lane. ego-vehicle will stop at the goal.                                         | [LINK](../behavior_path_goal_planner_module/README.md)                        |
 | Start Planner              | this module is performed when ego-vehicle is stationary and footprint of ego-vehicle is included in shoulder lane. This module ends when ego-vehicle merges into the road. | [LINK](../behavior_path_start_planner_module/README.md)                       |
-| Side Shift                 | (for remote control) shift the path to left or right according to an external instruction.                                                                                 | [LINK](../behavior_path_side_shift_module/README.md)                          |
+| Side Shift                 | (for remote control) shift the path to left or right according to an external instruction.                                                                                 | [LINK](../autoware_behavior_path_side_shift_module/README.md)                 |
 
 !!! Note