Skip to content

Commit 17aad93

Browse files
kyoichi-sugaharakyoichi-sugahara
authored
refactor(behavior_path_side_shift_module)!: prefix package and namespace with autoware (#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>
1 parent cac7eb3 commit 17aad93

File tree

17 files changed

+34
-33
lines changed

17 files changed

+34
-33
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ planning/behavior_path_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.tak
160160
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
161161
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
162162
planning/behavior_path_sampling_planner_module/** daniel.sanchez@tier4.jp maxime.clement@tier4.jp
163-
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
163+
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
164164
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
165165
planning/behavior_velocity_blind_spot_module/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
166166
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

‎planning/.pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ nav:
1414
- 'Dynamic Obstacle Avoidance': planning/autoware_behavior_path_dynamic_obstacle_avoidance_module
1515
- 'Goal Planner': planning/behavior_path_goal_planner_module
1616
- 'Lane Change': planning/behavior_path_lane_change_module
17-
- 'Side Shift': planning/behavior_path_side_shift_module
17+
- 'Side Shift': planning/autoware_behavior_path_side_shift_module
1818
- 'Start Planner': planning/behavior_path_start_planner_module
1919
- 'Static Obstacle Avoidance': planning/autoware_behavior_path_static_obstacle_avoidance_module
2020
- 'Behavior Velocity Planner':

‎planning/behavior_path_side_shift_module/CMakeLists.txt ‎planning/autoware_behavior_path_side_shift_module/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(behavior_path_side_shift_module)
2+
project(autoware_behavior_path_side_shift_module)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

‎planning/behavior_path_side_shift_module/README.md ‎planning/autoware_behavior_path_side_shift_module/README.md

File renamed without changes.

‎planning/behavior_path_side_shift_module/config/side_shift.param.yaml ‎planning/autoware_behavior_path_side_shift_module/config/side_shift.param.yaml

File renamed without changes.

‎planning/behavior_path_side_shift_module/images/side_shift_status.drawio.svg ‎planning/autoware_behavior_path_side_shift_module/images/side_shift_status.drawio.svg

File renamed without changes.

‎planning/behavior_path_side_shift_module/include/behavior_path_side_shift_module/data_structs.hpp ‎planning/autoware_behavior_path_side_shift_module/include/autoware_behavior_path_side_shift_module/data_structs.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
16-
#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
1717

1818
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
1919

@@ -51,4 +51,4 @@ struct SideShiftDebugData
5151
};
5252

5353
} // namespace behavior_path_planner
54-
#endif // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
54+
#endif // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_

‎planning/behavior_path_side_shift_module/include/behavior_path_side_shift_module/manager.hpp ‎planning/autoware_behavior_path_side_shift_module/include/autoware_behavior_path_side_shift_module/manager.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
16-
#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
1717

1818
#include "autoware_behavior_path_planner_common/interface/scene_module_manager_interface.hpp"
19-
#include "behavior_path_side_shift_module/scene.hpp"
19+
#include "autoware_behavior_path_side_shift_module/scene.hpp"
2020

2121
#include <rclcpp/rclcpp.hpp>
2222

@@ -50,4 +50,4 @@ class SideShiftModuleManager : public SceneModuleManagerInterface
5050

5151
} // namespace behavior_path_planner
5252

53-
#endif // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
53+
#endif // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_

‎planning/behavior_path_side_shift_module/include/behavior_path_side_shift_module/scene.hpp ‎planning/autoware_behavior_path_side_shift_module/include/autoware_behavior_path_side_shift_module/scene.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
16-
#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
1717

1818
#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
1919
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
20-
#include "behavior_path_side_shift_module/data_structs.hpp"
20+
#include "autoware_behavior_path_side_shift_module/data_structs.hpp"
2121

2222
#include <rclcpp/rclcpp.hpp>
2323

@@ -131,4 +131,4 @@ class SideShiftModule : public SceneModuleInterface
131131

132132
} // namespace behavior_path_planner
133133

134-
#endif // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
134+
#endif // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_

‎planning/behavior_path_side_shift_module/include/behavior_path_side_shift_module/utils.hpp ‎planning/autoware_behavior_path_side_shift_module/include/autoware_behavior_path_side_shift_module/utils.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
16-
#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
1717

1818
#include <geometry_msgs/msg/point.hpp>
1919
#include <geometry_msgs/msg/pose.hpp>
@@ -41,4 +41,4 @@ Point transformToGrid(
4141

4242
} // namespace behavior_path_planner
4343

44-
#endif // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
44+
#endif // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_

‎planning/behavior_path_side_shift_module/package.xml ‎planning/autoware_behavior_path_side_shift_module/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>behavior_path_side_shift_module</name>
4+
<name>autoware_behavior_path_side_shift_module</name>
55
<version>0.1.0</version>
6-
<description>The behavior_path_side_shift_module package</description>
6+
<description>The autoware_behavior_path_side_shift_module package</description>
77

88
<maintainer email="satoshi.ota@tier4.jp">Satoshi Ota</maintainer>
99
<maintainer email="fumiya.watanabe@tier4.jp">Fumiya Watanabe</maintainer>

‎planning/behavior_path_side_shift_module/plugins.xml ‎planning/autoware_behavior_path_side_shift_module/plugins.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<library path="behavior_path_side_shift_module">
1+
<library path="autoware_behavior_path_side_shift_module">
22
<class type="behavior_path_planner::SideShiftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
33
</library>

‎planning/behavior_path_side_shift_module/src/manager.cpp ‎planning/autoware_behavior_path_side_shift_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "behavior_path_side_shift_module/manager.hpp"
15+
#include "autoware_behavior_path_side_shift_module/manager.hpp"
1616

1717
#include "tier4_autoware_utils/ros/update_param.hpp"
1818

‎planning/behavior_path_side_shift_module/src/scene.cpp ‎planning/autoware_behavior_path_side_shift_module/src/scene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "behavior_path_side_shift_module/scene.hpp"
15+
#include "autoware_behavior_path_side_shift_module/scene.hpp"
1616

1717
#include "autoware_behavior_path_planner_common/marker_utils/utils.hpp"
1818
#include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp"
1919
#include "autoware_behavior_path_planner_common/utils/path_utils.hpp"
2020
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
21-
#include "behavior_path_side_shift_module/utils.hpp"
21+
#include "autoware_behavior_path_side_shift_module/utils.hpp"
2222

2323
#include <lanelet2_extension/utility/utilities.hpp>
2424

‎planning/behavior_path_side_shift_module/src/utils.cpp ‎planning/autoware_behavior_path_side_shift_module/src/utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "behavior_path_side_shift_module/utils.hpp"
15+
#include "autoware_behavior_path_side_shift_module/utils.hpp"
1616

1717
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
1818

‎planning/behavior_path_side_shift_module/test/test_behavior_path_planner_node_interface.cpp ‎planning/autoware_behavior_path_side_shift_module/test/test_behavior_path_planner_node_interface.cpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,15 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
5757
node_options.parameter_overrides(params);
5858

5959
test_utils::updateNodeOptions(
60-
node_options, {planning_test_utils_dir + "/config/test_common.param.yaml",
61-
planning_test_utils_dir + "/config/test_nearest_search.param.yaml",
62-
planning_test_utils_dir + "/config/test_vehicle_info.param.yaml",
63-
behavior_path_planner_dir + "/config/behavior_path_planner.param.yaml",
64-
behavior_path_planner_dir + "/config/drivable_area_expansion.param.yaml",
65-
behavior_path_planner_dir + "/config/scene_module_manager.param.yaml",
66-
ament_index_cpp::get_package_share_directory("behavior_path_side_shift_module") +
67-
"/config/side_shift.param.yaml"});
60+
node_options,
61+
{planning_test_utils_dir + "/config/test_common.param.yaml",
62+
planning_test_utils_dir + "/config/test_nearest_search.param.yaml",
63+
planning_test_utils_dir + "/config/test_vehicle_info.param.yaml",
64+
behavior_path_planner_dir + "/config/behavior_path_planner.param.yaml",
65+
behavior_path_planner_dir + "/config/drivable_area_expansion.param.yaml",
66+
behavior_path_planner_dir + "/config/scene_module_manager.param.yaml",
67+
ament_index_cpp::get_package_share_directory("autoware_behavior_path_side_shift_module") +
68+
"/config/side_shift.param.yaml"});
6869

6970
return std::make_shared<BehaviorPathPlannerNode>(node_options);
7071
}

‎planning/behavior_path_planner/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Behavior Path Planner has following scene modules
3434
| External Lane Change | WIP | LINK |
3535
| 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) |
3636
| 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) |
37-
| 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) |
37+
| 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) |
3838

3939
!!! Note
4040

0 commit comments

Comments
 (0)