Skip to content

Commit 558d745

Browse files
esteveesteve
committed
refactor(autoware_velocity_virtual_traffic_light_module): prefix package with autoware_ and move code to the autoware namespace
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent c696905 commit 558d745

File tree

22 files changed

+37
-23
lines changed

22 files changed

+37
-23
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ perception/traffic_light_occlusion_predictor/** shunsuke.miura@tier4.jp tao.zhon
148148
perception/traffic_light_visualization/** tao.zhong@tier4.jp yukihiro.saito@tier4.jp
149149
planning/autoware_behavior_path_external_request_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
150150
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
151+
planning/autoware_behavior_velocity_virtual_traffic_light_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
151152
planning/autoware_planning_test_manager/** kyoichi.sugahara@tier4.jp takamasa.horibe@tier4.jp
152153
planning/autoware_remaining_distance_time_calculator/** ahmed.ebrahim@leodrive.ai
153154
planning/autoware_static_centerline_generator/** kosuke.takeuchi@tier4.jp takayuki.murooka@tier4.jp
@@ -176,7 +177,6 @@ planning/behavior_velocity_speed_bump_module/** mdogru@leodrive.ai shumpei.wakab
176177
planning/behavior_velocity_stop_line_module/** fumiya.watanabe@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp zhe.shen@tier4.jp
177178
planning/behavior_velocity_template_module/** daniel.sanchez@tier4.jp
178179
planning/behavior_velocity_traffic_light_module/** mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
179-
planning/behavior_velocity_virtual_traffic_light_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
180180
planning/behavior_velocity_walkway_module/** satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
181181
planning/costmap_generator/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
182182
planning/external_velocity_limit_selector/** satoshi.ota@tier4.jp shinnosuke.hirakawa@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp

‎launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
/>
137137
<let
138138
name="behavior_velocity_planner_launch_modules"
139-
value="$(eval &quot;'$(var behavior_velocity_planner_launch_modules)' + 'behavior_velocity_planner::VirtualTrafficLightModulePlugin, '&quot;)"
139+
value="$(eval &quot;'$(var behavior_velocity_planner_launch_modules)' + 'autoware::behavior_velocity_planner::VirtualTrafficLightModulePlugin, '&quot;)"
140140
if="$(var launch_virtual_traffic_light_module)"
141141
/>
142142
<let

‎planning/.pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ nav:
3434
- 'Speed Bump': planning/behavior_velocity_speed_bump_module
3535
- 'Stop Line': planning/behavior_velocity_stop_line_module
3636
- 'Traffic Light': planning/behavior_velocity_traffic_light_module
37-
- 'Virtual Traffic Light': planning/behavior_velocity_virtual_traffic_light_module
37+
- 'Virtual Traffic Light': planning/autoware_behavior_velocity_virtual_traffic_light_module
3838
- 'Walkway': planning/behavior_velocity_walkway_module
3939
- 'Parking':
4040
- 'Freespace Planner':

‎planning/autoware_behavior_velocity_planner/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ It loads modules as plugins. Please refer to the links listed below for detail o
1414
- [Intersection](../behavior_velocity_intersection_module/README.md)
1515
- [MergeFromPrivate](../behavior_velocity_intersection_module/README.md#merge-from-private)
1616
- [Stop Line](../behavior_velocity_stop_line_module/README.md)
17-
- [Virtual Traffic Light](../behavior_velocity_virtual_traffic_light_module/README.md)
17+
- [Virtual Traffic Light](../autoware_behavior_velocity_virtual_traffic_light_module/README.md)
1818
- [Traffic Light](../behavior_velocity_traffic_light_module/README.md)
1919
- [Occlusion Spot](../behavior_velocity_occlusion_spot_module/README.md)
2020
- [No Stopping Area](../behavior_velocity_no_stopping_area_module/README.md)

‎planning/autoware_behavior_velocity_planner/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
<test_depend>ament_cmake_ros</test_depend>
6767
<test_depend>ament_lint_auto</test_depend>
68+
<test_depend>autoware_behavior_velocity_virtual_traffic_light_module</test_depend>
6869
<test_depend>autoware_lint_common</test_depend>
6970
<test_depend>behavior_velocity_blind_spot_module</test_depend>
7071
<test_depend>behavior_velocity_crosswalk_module</test_depend>
@@ -78,7 +79,6 @@
7879
<test_depend>behavior_velocity_speed_bump_module</test_depend>
7980
<test_depend>behavior_velocity_stop_line_module</test_depend>
8081
<test_depend>behavior_velocity_traffic_light_module</test_depend>
81-
<test_depend>behavior_velocity_virtual_traffic_light_module</test_depend>
8282
<test_depend>behavior_velocity_walkway_module</test_depend>
8383
<!--<test_depend>behavior_velocity_template_module</test_depend>-->
8484

‎planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ std::shared_ptr<BehaviorVelocityPlannerNode> generateNode()
6868
module_names.emplace_back("behavior_velocity_planner::MergeFromPrivateModulePlugin");
6969
module_names.emplace_back("behavior_velocity_planner::BlindSpotModulePlugin");
7070
module_names.emplace_back("behavior_velocity_planner::DetectionAreaModulePlugin");
71-
module_names.emplace_back("behavior_velocity_planner::VirtualTrafficLightModulePlugin");
71+
module_names.emplace_back("autoware::behavior_velocity_planner::VirtualTrafficLightModulePlugin");
7272
module_names.emplace_back("behavior_velocity_planner::NoStoppingAreaModulePlugin");
7373
module_names.emplace_back("behavior_velocity_planner::StopLineModulePlugin");
7474
module_names.emplace_back("behavior_velocity_planner::OcclusionSpotModulePlugin");

‎planning/behavior_velocity_virtual_traffic_light_module/CMakeLists.txt ‎planning/autoware_behavior_velocity_virtual_traffic_light_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_velocity_virtual_traffic_light_module)
2+
project(autoware_behavior_velocity_virtual_traffic_light_module)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

‎planning/behavior_velocity_virtual_traffic_light_module/README.md ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/README.md

File renamed without changes.

‎planning/behavior_velocity_virtual_traffic_light_module/config/virtual_traffic_light.param.yaml ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/config/virtual_traffic_light.param.yaml

File renamed without changes.

‎planning/behavior_velocity_virtual_traffic_light_module/docs/V2X_support_traffic_light.png ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/docs/V2X_support_traffic_light.png

File renamed without changes.

‎planning/behavior_velocity_virtual_traffic_light_module/docs/intersection-coordination.png ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/docs/intersection-coordination.png

File renamed without changes.

‎planning/behavior_velocity_virtual_traffic_light_module/docs/keep_stopping.svg ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/docs/keep_stopping.svg

File renamed without changes.

‎planning/behavior_velocity_virtual_traffic_light_module/docs/restart.svg ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/docs/restart.svg

File renamed without changes.

‎planning/behavior_velocity_virtual_traffic_light_module/docs/restart_prevention.svg ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/docs/restart_prevention.svg

File renamed without changes.

‎planning/behavior_velocity_virtual_traffic_light_module/package.xml ‎planning/autoware_behavior_velocity_virtual_traffic_light_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_velocity_virtual_traffic_light_module</name>
4+
<name>autoware_behavior_velocity_virtual_traffic_light_module</name>
55
<version>0.1.0</version>
6-
<description>The behavior_velocity_virtual_traffic_light_module package</description>
6+
<description>The autoware_behavior_velocity_virtual_traffic_light_module package</description>
77

88
<maintainer email="kosuke.takeuchi@tier4.jp">Kosuke Takeuchi</maintainer>
99
<maintainer email="tomoya.kimura@tier4.jp">Tomoya Kimura</maintainer>

‎planning/autoware_behavior_velocity_virtual_traffic_light_module/plugins.xml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<library path="autoware_behavior_velocity_virtual_traffic_light_module">
2+
<class type="autoware::behavior_velocity_planner::VirtualTrafficLightModulePlugin" base_class_type="behavior_velocity_planner::PluginInterface"/>
3+
</library>

‎planning/behavior_velocity_virtual_traffic_light_module/src/debug.cpp ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/src/debug.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ using tier4_autoware_utils::createMarkerScale;
2828
using tier4_autoware_utils::toMsg;
2929
using namespace std::literals::string_literals;
3030

31-
namespace behavior_velocity_planner
31+
namespace autoware::behavior_velocity_planner
3232
{
3333
namespace
3434
{
@@ -147,4 +147,4 @@ visualization_msgs::msg::MarkerArray VirtualTrafficLightModule::createDebugMarke
147147

148148
return debug_marker_array;
149149
}
150-
} // namespace behavior_velocity_planner
150+
} // namespace autoware::behavior_velocity_planner

‎planning/behavior_velocity_virtual_traffic_light_module/src/manager.cpp ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/src/manager.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@
2424
#include <unordered_map>
2525
#include <utility>
2626

27-
namespace behavior_velocity_planner
27+
namespace autoware::behavior_velocity_planner
2828
{
2929
using lanelet::autoware::VirtualTrafficLight;
3030
using tier4_autoware_utils::getOrDeclareParameter;
31+
namespace planning_utils = ::behavior_velocity_planner::planning_utils;
3132

3233
VirtualTrafficLightModuleManager::VirtualTrafficLightModuleManager(rclcpp::Node & node)
3334
: SceneModuleManagerInterface(node, getModuleName())
@@ -76,9 +77,9 @@ VirtualTrafficLightModuleManager::getModuleExpiredFunction(
7677
return id_set.count(scene_module->getModuleId()) == 0;
7778
};
7879
}
79-
} // namespace behavior_velocity_planner
80+
} // namespace autoware::behavior_velocity_planner
8081

8182
#include <pluginlib/class_list_macros.hpp>
8283
PLUGINLIB_EXPORT_CLASS(
83-
behavior_velocity_planner::VirtualTrafficLightModulePlugin,
84+
autoware::behavior_velocity_planner::VirtualTrafficLightModulePlugin,
8485
behavior_velocity_planner::PluginInterface)

‎planning/behavior_velocity_virtual_traffic_light_module/src/manager.hpp ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/src/manager.hpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727
#include <functional>
2828
#include <memory>
2929

30-
namespace behavior_velocity_planner
30+
namespace autoware::behavior_velocity_planner
3131
{
32+
using ::behavior_velocity_planner::PluginWrapper;
33+
using ::behavior_velocity_planner::SceneModuleInterface;
34+
using ::behavior_velocity_planner::SceneModuleManagerInterface;
3235
class VirtualTrafficLightModuleManager : public SceneModuleManagerInterface
3336
{
3437
public:
@@ -48,6 +51,6 @@ class VirtualTrafficLightModulePlugin : public PluginWrapper<VirtualTrafficLight
4851
{
4952
};
5053

51-
} // namespace behavior_velocity_planner
54+
} // namespace autoware::behavior_velocity_planner
5255

5356
#endif // MANAGER_HPP_

‎planning/behavior_velocity_virtual_traffic_light_module/src/scene.cpp ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/src/scene.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@
2323
#include <string>
2424
#include <vector>
2525

26-
namespace behavior_velocity_planner
26+
namespace autoware::behavior_velocity_planner
2727
{
28+
using ::behavior_velocity_planner::PlanningBehavior;
29+
using ::behavior_velocity_planner::SceneModuleInterface;
30+
using ::behavior_velocity_planner::VelocityFactor;
31+
namespace arc_lane_utils = ::behavior_velocity_planner::arc_lane_utils;
32+
namespace planning_utils = ::behavior_velocity_planner::planning_utils;
2833
namespace
2934
{
3035
using tier4_autoware_utils::calcDistance2d;
@@ -618,4 +623,4 @@ void VirtualTrafficLightModule::insertStopVelocityAtEndLine(
618623
module_data_.stop_head_pose_at_end_line =
619624
calcHeadPose(stop_pose, planner_data_->vehicle_info_.max_longitudinal_offset_m);
620625
}
621-
} // namespace behavior_velocity_planner
626+
} // namespace autoware::behavior_velocity_planner

‎planning/behavior_velocity_virtual_traffic_light_module/src/scene.hpp ‎planning/autoware_behavior_velocity_virtual_traffic_light_module/src/scene.hpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@
3030
#include <string>
3131
#include <vector>
3232

33-
namespace behavior_velocity_planner
33+
namespace autoware::behavior_velocity_planner
3434
{
35+
using ::behavior_velocity_planner::PathWithLaneId;
36+
using ::behavior_velocity_planner::StopReason;
37+
using ::behavior_velocity_planner::Pose;
38+
using ::behavior_velocity_planner::StopReason;
39+
using ::behavior_velocity_planner::SceneModuleInterface;
3540
class VirtualTrafficLightModule : public SceneModuleInterface
3641
{
3742
public:
@@ -126,5 +131,5 @@ class VirtualTrafficLightModule : public SceneModuleInterface
126131
autoware_auto_planning_msgs::msg::PathWithLaneId * path,
127132
tier4_planning_msgs::msg::StopReason * stop_reason, const size_t end_line_idx);
128133
};
129-
} // namespace behavior_velocity_planner
134+
} // namespace autoware::behavior_velocity_planner
130135
#endif // SCENE_HPP_

‎planning/behavior_velocity_virtual_traffic_light_module/plugins.xml

-3
This file was deleted.

0 commit comments

Comments
 (0)