refactor(behavior_velocity_stop_line_module): prefix package and name…

…space with autoware_ Signed-off-by: Esteve Fernandez <[email protected]>
autowarefoundation · Jun 7, 2024 · 64c8c9a · 64c8c9a
1 parent f03323f
commit 64c8c9a
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 9 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -150,6 +150,7 @@ planning/autoware_behavior_path_planner_common/** [email protected] fumiya
 planning/autoware_behavior_path_static_obstacle_avoidance_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/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/autoware_behavior_velocity_run_out_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+planning/autoware_behavior_velocity_stop_line_module/** [email protected] [email protected] [email protected] [email protected]
 planning/autoware_behavior_velocity_template_module/** [email protected]
 planning/autoware_behavior_velocity_virtual_traffic_light_module/** [email protected] [email protected] [email protected]
 planning/autoware_behavior_velocity_walkway_module/** [email protected] [email protected] [email protected] [email protected]
@@ -182,7 +183,6 @@ planning/behavior_velocity_out_of_lane_module/** [email protected] shumpei
 planning/autoware_behavior_velocity_planner_common/** [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/autoware_behavior_velocity_run_out_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_speed_bump_module/** [email protected] [email protected] [email protected]
-planning/behavior_velocity_stop_line_module/** [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_traffic_light_module/** [email protected] [email protected] [email protected] [email protected]
 planning/freespace_planner/** [email protected] [email protected] [email protected]
 planning/freespace_planning_algorithms/** [email protected] [email protected] [email protected]

diff --git a/planning/.pages b/planning/.pages
@@ -32,7 +32,7 @@ nav:
         - 'Out of Lane': planning/behavior_velocity_out_of_lane_module
         - 'Run Out': planning/autoware_behavior_velocity_run_out_module
         - 'Speed Bump': planning/behavior_velocity_speed_bump_module
-        - 'Stop Line': planning/behavior_velocity_stop_line_module
+        - 'Stop Line': planning/autoware_behavior_velocity_stop_line_module
         - 'Traffic Light': planning/behavior_velocity_traffic_light_module
         - 'Virtual Traffic Light': planning/autoware_behavior_velocity_virtual_traffic_light_module
         - 'Walkway': planning/autoware_behavior_velocity_walkway_module

diff --git a/planning/autoware_behavior_velocity_planner/README.md b/planning/autoware_behavior_velocity_planner/README.md
@@ -13,7 +13,7 @@ It loads modules as plugins. Please refer to the links listed below for detail o
 - [Detection Area](../behavior_velocity_detection_area_module/README.md)
 - [Intersection](../autoware_behavior_velocity_intersection_module/README.md)
 - [MergeFromPrivate](../behavior_velocity_intersection_module/README.md#merge-from-private)
-- [Stop Line](../behavior_velocity_stop_line_module/README.md)
+- [Stop Line](../autoware_behavior_velocity_stop_line_module/README.md)
 - [Virtual Traffic Light](../autoware_behavior_velocity_virtual_traffic_light_module/README.md)
 - [Traffic Light](../behavior_velocity_traffic_light_module/README.md)
 - [Occlusion Spot](../behavior_velocity_occlusion_spot_module/README.md)

diff --git a/planning/autoware_behavior_velocity_planner/package.xml b/planning/autoware_behavior_velocity_planner/package.xml
@@ -67,6 +67,7 @@
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_behavior_velocity_intersection_module</test_depend>
   <test_depend>autoware_behavior_velocity_run_out_module</test_depend>
+  <test_depend>autoware_behavior_velocity_stop_line_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>
@@ -78,7 +79,6 @@
   <test_depend>behavior_velocity_occlusion_spot_module</test_depend>
   <test_depend>behavior_velocity_out_of_lane_module</test_depend>
   <test_depend>behavior_velocity_speed_bump_module</test_depend>
-  <test_depend>behavior_velocity_stop_line_module</test_depend>
   <test_depend>behavior_velocity_traffic_light_module</test_depend>
   <!--<test_depend>autoware_behavior_velocity_template_module</test_depend>-->
 

diff --git a/planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp b/planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp
@@ -105,7 +105,7 @@ std::shared_ptr<BehaviorVelocityPlannerNode> generateNode()
                    get_behavior_velocity_module_config_no_prefix("occlusion_spot"),
                    get_behavior_velocity_module_config("run_out"),
                    get_behavior_velocity_module_config_no_prefix("speed_bump"),
-                   get_behavior_velocity_module_config_no_prefix("stop_line"),
+                   get_behavior_velocity_module_config("stop_line"),
                    get_behavior_velocity_module_config_no_prefix("traffic_light"),
                    get_behavior_velocity_module_config("virtual_traffic_light"),
                    get_behavior_velocity_module_config_no_prefix("out_of_lane"),

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

diff --git a/...avior_velocity_stop_line_module/README.md → ...avior_velocity_stop_line_module/README.md b/...avior_velocity_stop_line_module/README.md → ...avior_velocity_stop_line_module/README.md
diff --git a/...p_line_module/config/stop_line.param.yaml → ...p_line_module/config/stop_line.param.yaml b/...p_line_module/config/stop_line.param.yaml → ...p_line_module/config/stop_line.param.yaml
diff --git a/...odule/docs/calculate_stop_pose.drawio.svg → ...odule/docs/calculate_stop_pose.drawio.svg b/...odule/docs/calculate_stop_pose.drawio.svg → ...odule/docs/calculate_stop_pose.drawio.svg
diff --git a/...le/docs/find_collision_segment.drawio.svg → ...le/docs/find_collision_segment.drawio.svg b/...le/docs/find_collision_segment.drawio.svg → ...le/docs/find_collision_segment.drawio.svg
diff --git a/...odule/docs/find_offset_segment.drawio.svg → ...odule/docs/find_offset_segment.drawio.svg b/...odule/docs/find_offset_segment.drawio.svg → ...odule/docs/find_offset_segment.drawio.svg
diff --git a/...y_stop_line_module/docs/keep_stopping.svg → ...y_stop_line_module/docs/keep_stopping.svg b/...y_stop_line_module/docs/keep_stopping.svg → ...y_stop_line_module/docs/keep_stopping.svg
diff --git a/...e_module/docs/node_and_segment.drawio.svg → ...e_module/docs/node_and_segment.drawio.svg b/...e_module/docs/node_and_segment.drawio.svg → ...e_module/docs/node_and_segment.drawio.svg
diff --git a/...elocity_stop_line_module/docs/restart.svg → ...elocity_stop_line_module/docs/restart.svg b/...elocity_stop_line_module/docs/restart.svg → ...elocity_stop_line_module/docs/restart.svg
diff --git a/...p_line_module/docs/restart_prevention.svg → ...p_line_module/docs/restart_prevention.svg b/...p_line_module/docs/restart_prevention.svg → ...p_line_module/docs/restart_prevention.svg
diff --git a/...ocity_stop_line_module/docs/stop_line.svg → ...ocity_stop_line_module/docs/stop_line.svg b/...ocity_stop_line_module/docs/stop_line.svg → ...ocity_stop_line_module/docs/stop_line.svg
diff --git a/...ior_velocity_stop_line_module/package.xml → ...ior_velocity_stop_line_module/package.xml b/...ior_velocity_stop_line_module/package.xml → ...ior_velocity_stop_line_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_stop_line_module</name>
+  <name>autoware_behavior_velocity_stop_line_module</name>
   <version>0.1.0</version>
-  <description>The behavior_velocity_stop_line_module package</description>
+  <description>The autoware_behavior_velocity_stop_line_module package</description>
 
   <maintainer email="[email protected]">Fumiya Watanabe</maintainer>
   <maintainer email="[email protected]">Zhe Shen</maintainer>

diff --git a/...ior_velocity_stop_line_module/plugins.xml → ...ior_velocity_stop_line_module/plugins.xml b/...ior_velocity_stop_line_module/plugins.xml → ...ior_velocity_stop_line_module/plugins.xml
@@ -1,3 +1,3 @@
-<library path="behavior_velocity_stop_line_module">
+<library path="autoware_behavior_velocity_stop_line_module">
   <class type="autoware::behavior_velocity_planner::StopLineModulePlugin" base_class_type="autoware::behavior_velocity_planner::PluginInterface"/>
 </library>
diff --git a/...r_velocity_stop_line_module/src/debug.cpp → ...r_velocity_stop_line_module/src/debug.cpp b/...r_velocity_stop_line_module/src/debug.cpp → ...r_velocity_stop_line_module/src/debug.cpp
diff --git a/...velocity_stop_line_module/src/manager.cpp → ...velocity_stop_line_module/src/manager.cpp b/...velocity_stop_line_module/src/manager.cpp → ...velocity_stop_line_module/src/manager.cpp
@@ -25,6 +25,7 @@ namespace autoware::behavior_velocity_planner
 {
 using lanelet::TrafficSign;
 using tier4_autoware_utils::getOrDeclareParameter;
+namespace planning_utils = ::behavior_velocity_planner::planning_utils;
 
 StopLineModuleManager::StopLineModuleManager(rclcpp::Node & node)
 : SceneModuleManagerInterface(node, getModuleName())

diff --git a/...velocity_stop_line_module/src/manager.hpp → ...velocity_stop_line_module/src/manager.hpp b/...velocity_stop_line_module/src/manager.hpp → ...velocity_stop_line_module/src/manager.hpp
@@ -32,6 +32,9 @@
 
 namespace autoware::behavior_velocity_planner
 {
+using ::behavior_velocity_planner::PluginWrapper;
+using ::behavior_velocity_planner::SceneModuleInterface;
+using ::behavior_velocity_planner::SceneModuleManagerInterface;
 using StopLineWithLaneId = std::pair<lanelet::ConstLineString3d, int64_t>;
 
 class StopLineModuleManager : public SceneModuleManagerInterface

diff --git a/...r_velocity_stop_line_module/src/scene.cpp → ...r_velocity_stop_line_module/src/scene.cpp b/...r_velocity_stop_line_module/src/scene.cpp → ...r_velocity_stop_line_module/src/scene.cpp
@@ -23,6 +23,11 @@
 
 namespace autoware::behavior_velocity_planner
 {
+using ::behavior_velocity_planner::PlanningBehavior;
+using ::behavior_velocity_planner::SceneModuleInterface;
+using ::behavior_velocity_planner::VelocityFactor;
+namespace arc_lane_utils = ::behavior_velocity_planner::arc_lane_utils;
+namespace planning_utils = ::behavior_velocity_planner::planning_utils;
 namespace bg = boost::geometry;
 
 StopLineModule::StopLineModule(

diff --git a/...r_velocity_stop_line_module/src/scene.hpp → ...r_velocity_stop_line_module/src/scene.hpp b/...r_velocity_stop_line_module/src/scene.hpp → ...r_velocity_stop_line_module/src/scene.hpp
@@ -35,6 +35,11 @@
 
 namespace autoware::behavior_velocity_planner
 {
+using ::behavior_velocity_planner::LineString2d;
+using ::behavior_velocity_planner::PathWithLaneId;
+using ::behavior_velocity_planner::Point2d;
+using ::behavior_velocity_planner::SceneModuleInterface;
+using ::behavior_velocity_planner::StopReason;
 class StopLineModule : public SceneModuleInterface
 {
   using StopLineWithLaneId = std::pair<lanelet::ConstLineString3d, int64_t>;