diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c0eb60e5a1316..c26a628f75cc0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -150,6 +150,7 @@ planning/autoware_behavior_path_planner_common/** daniel.sanchez@tier4.jp fumiya planning/autoware_behavior_path_static_obstacle_avoidance_module/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp planning/autoware_behavior_velocity_planner/** kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp makoto.kurihara@tier4.jp mamoru.sobue@tier4.jp maxime.clement@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp planning/autoware_behavior_velocity_run_out_module/** kosuke.takeuchi@tier4.jp makoto.kurihara@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp +planning/autoware_behavior_velocity_stop_line_module/** fumiya.watanabe@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp zhe.shen@tier4.jp planning/autoware_behavior_velocity_template_module/** daniel.sanchez@tier4.jp planning/autoware_behavior_velocity_virtual_traffic_light_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp planning/autoware_behavior_velocity_walkway_module/** satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp @@ -182,7 +183,6 @@ planning/behavior_velocity_out_of_lane_module/** maxime.clement@tier4.jp shumpei planning/autoware_behavior_velocity_planner_common/** fumiya.watanabe@tier4.jp isamu.takagi@tier4.jp mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp planning/autoware_behavior_velocity_run_out_module/** kosuke.takeuchi@tier4.jp makoto.kurihara@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp planning/behavior_velocity_speed_bump_module/** mdogru@leodrive.ai shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp -planning/behavior_velocity_stop_line_module/** fumiya.watanabe@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp zhe.shen@tier4.jp planning/behavior_velocity_traffic_light_module/** mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp planning/freespace_planner/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp planning/freespace_planning_algorithms/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp diff --git a/planning/.pages b/planning/.pages index 6e3c6d5d49104..fe0f3e25e1db4 100644 --- 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 index acf4c1ce78e56..400768dd978d9 100644 --- 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 index 4d5dc17264df0..a7abdbce17dfc 100644 --- a/planning/autoware_behavior_velocity_planner/package.xml +++ b/planning/autoware_behavior_velocity_planner/package.xml @@ -67,6 +67,7 @@ ament_lint_auto autoware_behavior_velocity_intersection_module autoware_behavior_velocity_run_out_module + autoware_behavior_velocity_stop_line_module autoware_behavior_velocity_virtual_traffic_light_module autoware_behavior_velocity_walkway_module autoware_lint_common @@ -78,7 +79,6 @@ behavior_velocity_occlusion_spot_module behavior_velocity_out_of_lane_module behavior_velocity_speed_bump_module - behavior_velocity_stop_line_module behavior_velocity_traffic_light_module 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 index cdff8af4ac56e..1815200f99fb6 100644 --- 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 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/planning/behavior_velocity_stop_line_module/CMakeLists.txt b/planning/autoware_behavior_velocity_stop_line_module/CMakeLists.txt similarity index 86% rename from planning/behavior_velocity_stop_line_module/CMakeLists.txt rename to planning/autoware_behavior_velocity_stop_line_module/CMakeLists.txt index bef98aafe6f75..402eb5e20aa24 100644 --- a/planning/behavior_velocity_stop_line_module/CMakeLists.txt +++ b/planning/autoware_behavior_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/planning/behavior_velocity_stop_line_module/README.md b/planning/autoware_behavior_velocity_stop_line_module/README.md similarity index 100% rename from planning/behavior_velocity_stop_line_module/README.md rename to planning/autoware_behavior_velocity_stop_line_module/README.md diff --git a/planning/behavior_velocity_stop_line_module/config/stop_line.param.yaml b/planning/autoware_behavior_velocity_stop_line_module/config/stop_line.param.yaml similarity index 100% rename from planning/behavior_velocity_stop_line_module/config/stop_line.param.yaml rename to planning/autoware_behavior_velocity_stop_line_module/config/stop_line.param.yaml diff --git a/planning/behavior_velocity_stop_line_module/docs/calculate_stop_pose.drawio.svg b/planning/autoware_behavior_velocity_stop_line_module/docs/calculate_stop_pose.drawio.svg similarity index 100% rename from planning/behavior_velocity_stop_line_module/docs/calculate_stop_pose.drawio.svg rename to planning/autoware_behavior_velocity_stop_line_module/docs/calculate_stop_pose.drawio.svg diff --git a/planning/behavior_velocity_stop_line_module/docs/find_collision_segment.drawio.svg b/planning/autoware_behavior_velocity_stop_line_module/docs/find_collision_segment.drawio.svg similarity index 100% rename from planning/behavior_velocity_stop_line_module/docs/find_collision_segment.drawio.svg rename to planning/autoware_behavior_velocity_stop_line_module/docs/find_collision_segment.drawio.svg diff --git a/planning/behavior_velocity_stop_line_module/docs/find_offset_segment.drawio.svg b/planning/autoware_behavior_velocity_stop_line_module/docs/find_offset_segment.drawio.svg similarity index 100% rename from planning/behavior_velocity_stop_line_module/docs/find_offset_segment.drawio.svg rename to planning/autoware_behavior_velocity_stop_line_module/docs/find_offset_segment.drawio.svg diff --git a/planning/behavior_velocity_stop_line_module/docs/keep_stopping.svg b/planning/autoware_behavior_velocity_stop_line_module/docs/keep_stopping.svg similarity index 100% rename from planning/behavior_velocity_stop_line_module/docs/keep_stopping.svg rename to planning/autoware_behavior_velocity_stop_line_module/docs/keep_stopping.svg diff --git a/planning/behavior_velocity_stop_line_module/docs/node_and_segment.drawio.svg b/planning/autoware_behavior_velocity_stop_line_module/docs/node_and_segment.drawio.svg similarity index 100% rename from planning/behavior_velocity_stop_line_module/docs/node_and_segment.drawio.svg rename to planning/autoware_behavior_velocity_stop_line_module/docs/node_and_segment.drawio.svg diff --git a/planning/behavior_velocity_stop_line_module/docs/restart.svg b/planning/autoware_behavior_velocity_stop_line_module/docs/restart.svg similarity index 100% rename from planning/behavior_velocity_stop_line_module/docs/restart.svg rename to planning/autoware_behavior_velocity_stop_line_module/docs/restart.svg diff --git a/planning/behavior_velocity_stop_line_module/docs/restart_prevention.svg b/planning/autoware_behavior_velocity_stop_line_module/docs/restart_prevention.svg similarity index 100% rename from planning/behavior_velocity_stop_line_module/docs/restart_prevention.svg rename to planning/autoware_behavior_velocity_stop_line_module/docs/restart_prevention.svg diff --git a/planning/behavior_velocity_stop_line_module/docs/stop_line.svg b/planning/autoware_behavior_velocity_stop_line_module/docs/stop_line.svg similarity index 100% rename from planning/behavior_velocity_stop_line_module/docs/stop_line.svg rename to planning/autoware_behavior_velocity_stop_line_module/docs/stop_line.svg diff --git a/planning/behavior_velocity_stop_line_module/package.xml b/planning/autoware_behavior_velocity_stop_line_module/package.xml similarity index 90% rename from planning/behavior_velocity_stop_line_module/package.xml rename to planning/autoware_behavior_velocity_stop_line_module/package.xml index 3132f60d1f342..c3d3baa965834 100644 --- a/planning/behavior_velocity_stop_line_module/package.xml +++ b/planning/autoware_behavior_velocity_stop_line_module/package.xml @@ -1,9 +1,9 @@ - behavior_velocity_stop_line_module + autoware_behavior_velocity_stop_line_module 0.1.0 - The behavior_velocity_stop_line_module package + The autoware_behavior_velocity_stop_line_module package Fumiya Watanabe Zhe Shen diff --git a/planning/behavior_velocity_stop_line_module/plugins.xml b/planning/autoware_behavior_velocity_stop_line_module/plugins.xml similarity index 72% rename from planning/behavior_velocity_stop_line_module/plugins.xml rename to planning/autoware_behavior_velocity_stop_line_module/plugins.xml index 4b8ce9852fcec..6765a4bc1bb13 100644 --- a/planning/behavior_velocity_stop_line_module/plugins.xml +++ b/planning/autoware_behavior_velocity_stop_line_module/plugins.xml @@ -1,3 +1,3 @@ - + diff --git a/planning/behavior_velocity_stop_line_module/src/debug.cpp b/planning/autoware_behavior_velocity_stop_line_module/src/debug.cpp similarity index 100% rename from planning/behavior_velocity_stop_line_module/src/debug.cpp rename to planning/autoware_behavior_velocity_stop_line_module/src/debug.cpp diff --git a/planning/behavior_velocity_stop_line_module/src/manager.cpp b/planning/autoware_behavior_velocity_stop_line_module/src/manager.cpp similarity index 98% rename from planning/behavior_velocity_stop_line_module/src/manager.cpp rename to planning/autoware_behavior_velocity_stop_line_module/src/manager.cpp index 80f48fa65efaf..bf77530c2eb77 100644 --- a/planning/behavior_velocity_stop_line_module/src/manager.cpp +++ b/planning/autoware_behavior_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/planning/behavior_velocity_stop_line_module/src/manager.hpp b/planning/autoware_behavior_velocity_stop_line_module/src/manager.hpp similarity index 92% rename from planning/behavior_velocity_stop_line_module/src/manager.hpp rename to planning/autoware_behavior_velocity_stop_line_module/src/manager.hpp index eca5132a75c5f..dd7585fb2b1df 100644 --- a/planning/behavior_velocity_stop_line_module/src/manager.hpp +++ b/planning/autoware_behavior_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; class StopLineModuleManager : public SceneModuleManagerInterface diff --git a/planning/behavior_velocity_stop_line_module/src/scene.cpp b/planning/autoware_behavior_velocity_stop_line_module/src/scene.cpp similarity index 95% rename from planning/behavior_velocity_stop_line_module/src/scene.cpp rename to planning/autoware_behavior_velocity_stop_line_module/src/scene.cpp index 1bf777338e43c..4f34e23136264 100644 --- a/planning/behavior_velocity_stop_line_module/src/scene.cpp +++ b/planning/autoware_behavior_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/planning/behavior_velocity_stop_line_module/src/scene.hpp b/planning/autoware_behavior_velocity_stop_line_module/src/scene.hpp similarity index 92% rename from planning/behavior_velocity_stop_line_module/src/scene.hpp rename to planning/autoware_behavior_velocity_stop_line_module/src/scene.hpp index 0ae0a885f036f..f5b1340c4f933 100644 --- a/planning/behavior_velocity_stop_line_module/src/scene.hpp +++ b/planning/autoware_behavior_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;