Skip to content

Commit dd6cd80

Browse files
isamu-takagiknzo25
andauthored
feat: rename traffic signal element (autowarefoundation#4129)
* feat(traffic_light_arbiter): rename traffic signal element Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp> * feat(traffic_light_selector): remove traffic light selector Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp> * fix(traffic_light_arbiter): fix node name Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp> * update topic name Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp> * update message type Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp> * update message type Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp> --------- Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp> Co-authored-by: Kenzo Lobos Tsunekawa <kenzo.lobos@tier4.jp>
1 parent 334cb04 commit dd6cd80

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

perception/traffic_light_arbiter/include/traffic_light_arbiter/traffic_light_arbiter.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <rclcpp/rclcpp.hpp>
1919

2020
#include <autoware_auto_mapping_msgs/msg/had_map_bin.hpp>
21-
#include <autoware_perception_msgs/msg/traffic_light_array.hpp>
2221
#include <autoware_perception_msgs/msg/traffic_signal_array.hpp>
2322

2423
#include <lanelet2_core/Forward.h>
@@ -31,7 +30,7 @@ class TrafficLightArbiter : public rclcpp::Node
3130
explicit TrafficLightArbiter(const rclcpp::NodeOptions & options);
3231

3332
private:
34-
using Element = autoware_perception_msgs::msg::TrafficLightElement;
33+
using Element = autoware_perception_msgs::msg::TrafficSignalElement;
3534
using LaneletMapBin = autoware_auto_mapping_msgs::msg::HADMapBin;
3635
using TrafficSignalArray = autoware_perception_msgs::msg::TrafficSignalArray;
3736
using TrafficSignal = autoware_perception_msgs::msg::TrafficSignal;

perception/traffic_light_arbiter/launch/traffic_light_arbiter.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<node_container pkg="rclcpp_components" exec="component_container" name="container" namespace="">
44
<composable_node pkg="traffic_light_arbiter" plugin="TrafficLightArbiter" name="arbiter">
55
<remap from="~/sub/vector_map" to="/map/vector_map"/>
6-
<remap from="~/sub/perception_traffic_signals" to="/perception/traffic_light_selector/traffic_signals"/>
6+
<remap from="~/sub/perception_traffic_signals" to="/perception/traffic_light_recognition/traffic_signals"/>
77
<remap from="~/sub/external_traffic_signals" to="/external/traffic_light_recognition/traffic_signals"/>
88
<remap from="~/pub/traffic_signals" to="/perception/traffic_light_arbiter/traffic_signals"/>
99
</composable_node>

perception/traffic_light_arbiter/src/traffic_light_arbiter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ std::vector<TrafficLightConstPtr> filter_traffic_signals(const LaneletMapConstPt
4545
} // namespace lanelet
4646

4747
TrafficLightArbiter::TrafficLightArbiter(const rclcpp::NodeOptions & options)
48-
: Node("traffic_light_selector", options)
48+
: Node("traffic_light_arbiter", options)
4949
{
5050
external_time_tolerance_ = this->declare_parameter<double>("external_time_tolerance", 5.0);
5151
perception_time_tolerance_ = this->declare_parameter<double>("perception_time_tolerance", 1.0);

perception/traffic_light_multi_camera_fusion/src/node.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ V at_or(const std::unordered_map<K, V> & map, const K & key, const V & value)
9797
return map.count(key) ? map.at(key) : value;
9898
}
9999

100-
autoware_perception_msgs::msg::TrafficLightElement convert(
100+
autoware_perception_msgs::msg::TrafficSignalElement convert(
101101
const tier4_perception_msgs::msg::TrafficLightElement & input)
102102
{
103103
typedef tier4_perception_msgs::msg::TrafficLightElement OldElem;
104-
typedef autoware_perception_msgs::msg::TrafficLightElement NewElem;
104+
typedef autoware_perception_msgs::msg::TrafficSignalElement NewElem;
105105
static const std::unordered_map<OldElem::_color_type, NewElem::_color_type> color_map(
106106
{{OldElem::RED, NewElem::RED},
107107
{OldElem::AMBER, NewElem::AMBER},

perception/traffic_light_visualization/src/traffic_light_map_visualizer/node.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,18 +167,18 @@ void TrafficLightMapVisualizerNode::trafficSignalsCallback(
167167
visualization_msgs::msg::Marker marker;
168168
if (
169169
isAttributeValue(pt, "color", "red") &&
170-
elem.color == autoware_perception_msgs::msg::TrafficLightElement::RED) {
170+
elem.color == autoware_perception_msgs::msg::TrafficSignalElement::RED) {
171171
lightAsMarker(
172172
get_node_logging_interface(), pt, &marker, "traffic_light", current_time);
173173
} else if ( // NOLINT
174174
isAttributeValue(pt, "color", "green") &&
175-
elem.color == autoware_perception_msgs::msg::TrafficLightElement::GREEN) {
175+
elem.color == autoware_perception_msgs::msg::TrafficSignalElement::GREEN) {
176176
lightAsMarker(
177177
get_node_logging_interface(), pt, &marker, "traffic_light", current_time);
178178

179179
} else if ( // NOLINT
180180
isAttributeValue(pt, "color", "yellow") &&
181-
elem.color == autoware_perception_msgs::msg::TrafficLightElement::AMBER) {
181+
elem.color == autoware_perception_msgs::msg::TrafficSignalElement::AMBER) {
182182
lightAsMarker(
183183
get_node_logging_interface(), pt, &marker, "traffic_light", current_time);
184184
} else {

0 commit comments

Comments
 (0)