Skip to content

Commit 477c197

Browse files
refactor: traffic light arbiter/autoware prefix (#8181)
* refactor(traffic_light_arbiter): apply `autoware` namespace to traffic_light_arbiter Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> * refactor(traffic_light_arbiter): update the package name in CODEWONER Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> * style(pre-commit): autofix --------- Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 95aef0d commit 477c197

File tree

12 files changed

+30
-18
lines changed

12 files changed

+30
-18
lines changed

Diff for: .github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ perception/autoware_shape_estimation/** yoshi.ri@tier4.jp yukihiro.saito@tier4.j
136136
perception/autoware_simple_object_merger/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp yoshi.ri@tier4.jp
137137
perception/autoware_tensorrt_classifier/** kotaro.uetake@tier4.jp shunsuke.miura@tier4.jp
138138
perception/autoware_tensorrt_yolox/** dan.umeda@tier4.jp manato.hirabayashi@tier4.jp
139-
perception/traffic_light_arbiter/** kenzo.lobos@tier4.jp shunsuke.miura@tier4.jp
139+
perception/autoware_traffic_light_arbiter/** kenzo.lobos@tier4.jp shunsuke.miura@tier4.jp
140140
perception/autoware_traffic_light_classifier/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp yukihiro.saito@tier4.jp
141141
perception/autoware_traffic_light_fine_detector/** shintaro.tomie@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp
142142
perception/autoware_traffic_light_map_based_detector/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp yukihiro.saito@tier4.jp

Diff for: launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150

151151
<!-- V2X fusion -->
152152
<group>
153-
<include file="$(find-pkg-share traffic_light_arbiter)/launch/traffic_light_arbiter.launch.xml">
153+
<include file="$(find-pkg-share autoware_traffic_light_arbiter)/launch/traffic_light_arbiter.launch.xml">
154154
<arg name="perception_traffic_signals" value="$(var internal/traffic_signals)"/>
155155
<arg name="external_traffic_signals" value="$(var external/traffic_signals)"/>
156156
<arg name="output_traffic_signals" value="$(var judged/traffic_signals)"/>

Diff for: launch/tier4_perception_launch/package.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,16 @@
3939
<exec_depend>autoware_raindrop_cluster_filter</exec_depend>
4040
<exec_depend>autoware_shape_estimation</exec_depend>
4141
<exec_depend>autoware_tracking_object_merger</exec_depend>
42+
<exec_depend>autoware_traffic_light_arbiter</exec_depend>
43+
<exec_depend>autoware_traffic_light_classifier</exec_depend>
44+
<exec_depend>autoware_traffic_light_fine_detector</exec_depend>
45+
<exec_depend>autoware_traffic_light_map_based_detector</exec_depend>
46+
<exec_depend>autoware_traffic_light_multi_camera_fusion</exec_depend>
47+
<exec_depend>autoware_traffic_light_occlusion_predictor</exec_depend>
48+
<exec_depend>autoware_traffic_light_visualization</exec_depend>
4249
<exec_depend>image_transport_decompressor</exec_depend>
4350
<exec_depend>pointcloud_to_laserscan</exec_depend>
4451
<exec_depend>topic_tools</exec_depend>
45-
<exec_depend>traffic_light_arbiter</exec_depend>
4652

4753
<test_depend>ament_lint_auto</test_depend>
4854
<test_depend>autoware_lint_common</test_depend>

Diff for: perception/traffic_light_arbiter/CMakeLists.txt renamed to perception/autoware_traffic_light_arbiter/CMakeLists.txt

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

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
@@ -10,7 +10,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
1010
)
1111

1212
rclcpp_components_register_nodes(${PROJECT_NAME}
13-
TrafficLightArbiter
13+
"autoware::TrafficLightArbiter"
1414
)
1515

1616
ament_auto_package(INSTALL_TO_SHARE launch config)

Diff for: perception/traffic_light_arbiter/include/traffic_light_arbiter/signal_match_validator.hpp renamed to perception/autoware_traffic_light_arbiter/include/autoware/traffic_light_arbiter/signal_match_validator.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 TRAFFIC_LIGHT_ARBITER__SIGNAL_MATCH_VALIDATOR_HPP_
16-
#define TRAFFIC_LIGHT_ARBITER__SIGNAL_MATCH_VALIDATOR_HPP_
15+
#ifndef AUTOWARE__TRAFFIC_LIGHT_ARBITER__SIGNAL_MATCH_VALIDATOR_HPP_
16+
#define AUTOWARE__TRAFFIC_LIGHT_ARBITER__SIGNAL_MATCH_VALIDATOR_HPP_
1717

1818
#include <autoware_lanelet2_extension/utility/query.hpp>
1919
#include <rclcpp/rclcpp.hpp>
@@ -100,4 +100,4 @@ class SignalMatchValidator
100100
bool isPedestrianSignal(const lanelet::Id & signal_id);
101101
};
102102

103-
#endif // TRAFFIC_LIGHT_ARBITER__SIGNAL_MATCH_VALIDATOR_HPP_
103+
#endif // AUTOWARE__TRAFFIC_LIGHT_ARBITER__SIGNAL_MATCH_VALIDATOR_HPP_

Diff for: perception/traffic_light_arbiter/include/traffic_light_arbiter/traffic_light_arbiter.hpp renamed to perception/autoware_traffic_light_arbiter/include/autoware/traffic_light_arbiter/traffic_light_arbiter.hpp

+7-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 TRAFFIC_LIGHT_ARBITER__TRAFFIC_LIGHT_ARBITER_HPP_
16-
#define TRAFFIC_LIGHT_ARBITER__TRAFFIC_LIGHT_ARBITER_HPP_
15+
#ifndef AUTOWARE__TRAFFIC_LIGHT_ARBITER__TRAFFIC_LIGHT_ARBITER_HPP_
16+
#define AUTOWARE__TRAFFIC_LIGHT_ARBITER__TRAFFIC_LIGHT_ARBITER_HPP_
1717

18+
#include <autoware/traffic_light_arbiter/signal_match_validator.hpp>
1819
#include <rclcpp/rclcpp.hpp>
19-
#include <traffic_light_arbiter/signal_match_validator.hpp>
2020

2121
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
2222
#include <autoware_perception_msgs/msg/traffic_light_group_array.hpp>
@@ -26,6 +26,8 @@
2626
#include <memory>
2727
#include <unordered_set>
2828

29+
namespace autoware
30+
{
2931
class TrafficLightArbiter : public rclcpp::Node
3032
{
3133
public:
@@ -58,5 +60,6 @@ class TrafficLightArbiter : public rclcpp::Node
5860
TrafficSignalArray latest_external_msg_;
5961
std::unique_ptr<SignalMatchValidator> signal_match_validator_;
6062
};
63+
} // namespace autoware
6164

62-
#endif // TRAFFIC_LIGHT_ARBITER__TRAFFIC_LIGHT_ARBITER_HPP_
65+
#endif // AUTOWARE__TRAFFIC_LIGHT_ARBITER__TRAFFIC_LIGHT_ARBITER_HPP_

Diff for: perception/traffic_light_arbiter/launch/traffic_light_arbiter.launch.xml renamed to perception/autoware_traffic_light_arbiter/launch/traffic_light_arbiter.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<arg name="perception_traffic_signals" default="/internal/traffic_signals"/>
33
<arg name="external_traffic_signals" default="/external/traffic_signals"/>
44
<arg name="output_traffic_signals" default="/traffic_light_arbiter/traffic_signals"/>
5-
<arg name="traffic_light_arbiter_param_path" default="$(find-pkg-share traffic_light_arbiter)/config/traffic_light_arbiter.param.yaml"/>
5+
<arg name="traffic_light_arbiter_param_path" default="$(find-pkg-share autoware_traffic_light_arbiter)/config/traffic_light_arbiter.param.yaml"/>
66

77
<push-ros-namespace namespace="traffic_light_arbiter"/>
88
<node_container pkg="rclcpp_components" exec="component_container" name="container" namespace="">
9-
<composable_node pkg="traffic_light_arbiter" plugin="TrafficLightArbiter" name="arbiter">
9+
<composable_node pkg="autoware_traffic_light_arbiter" plugin="autoware::TrafficLightArbiter" name="arbiter">
1010
<remap from="~/sub/vector_map" to="/map/vector_map"/>
1111
<remap from="~/sub/perception_traffic_signals" to="$(var perception_traffic_signals)"/>
1212
<remap from="~/sub/external_traffic_signals" to="$(var external_traffic_signals)"/>

Diff for: perception/traffic_light_arbiter/package.xml renamed to perception/autoware_traffic_light_arbiter/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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>traffic_light_arbiter</name>
4+
<name>autoware_traffic_light_arbiter</name>
55
<version>0.1.0</version>
66
<description>The traffic_light_arbiter package</description>
77
<maintainer email="kenzo.lobos@tier4.jp">Kenzo Lobos-Tsunekawa</maintainer>

Diff for: perception/traffic_light_arbiter/src/signal_match_validator.cpp renamed to perception/autoware_traffic_light_arbiter/src/signal_match_validator.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 "traffic_light_arbiter/signal_match_validator.hpp"
15+
#include "autoware/traffic_light_arbiter/signal_match_validator.hpp"
1616

1717
namespace util
1818
{

Diff for: perception/traffic_light_arbiter/src/traffic_light_arbiter.cpp renamed to perception/autoware_traffic_light_arbiter/src/traffic_light_arbiter.cpp

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

15+
#include <autoware/traffic_light_arbiter/traffic_light_arbiter.hpp>
1516
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
1617
#include <autoware_lanelet2_extension/utility/query.hpp>
1718
#include <rclcpp/time.hpp>
18-
#include <traffic_light_arbiter/traffic_light_arbiter.hpp>
1919

2020
#include <lanelet2_core/LaneletMap.h>
2121
#include <lanelet2_core/primitives/BasicRegulatoryElements.h>
@@ -65,6 +65,8 @@ std::vector<TrafficLightConstPtr> filter_pedestrian_signals(const LaneletMapCons
6565

6666
} // namespace lanelet
6767

68+
namespace autoware
69+
{
6870
TrafficLightArbiter::TrafficLightArbiter(const rclcpp::NodeOptions & options)
6971
: Node("traffic_light_arbiter", options)
7072
{
@@ -228,6 +230,7 @@ void TrafficLightArbiter::arbitrateAndPublish(const builtin_interfaces::msg::Tim
228230

229231
pub_->publish(output_signals_msg);
230232
}
233+
} // namespace autoware
231234

232235
#include <rclcpp_components/register_node_macro.hpp>
233-
RCLCPP_COMPONENTS_REGISTER_NODE(TrafficLightArbiter)
236+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::TrafficLightArbiter)

0 commit comments

Comments
 (0)