From 0ae2685b60d76034af66aef523bf916fd1de7385 Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <33620+esteve@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:35:40 +0100
Subject: [PATCH] fix(traffic_light_visualization): move header directory to
 match package name (#5864)

* fix(traffic_light_visualization): move header directory to match package name

Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>

* style(pre-commit): autofix

* fix: fix include

Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>

---------

Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .../traffic_light_map_visualizer/node.hpp                   | 6 +++---
 .../traffic_light_roi_visualizer/nodelet.hpp                | 6 +++---
 .../src/traffic_light_map_visualizer/main.cpp               | 3 ++-
 .../src/traffic_light_map_visualizer/node.cpp               | 3 ++-
 .../src/traffic_light_roi_visualizer/nodelet.cpp            | 3 ++-
 5 files changed, 12 insertions(+), 9 deletions(-)
 rename perception/traffic_light_visualization/include/{ => traffic_light_visualization}/traffic_light_map_visualizer/node.hpp (88%)
 rename perception/traffic_light_visualization/include/{ => traffic_light_visualization}/traffic_light_roi_visualizer/nodelet.hpp (95%)

diff --git a/perception/traffic_light_visualization/include/traffic_light_map_visualizer/node.hpp b/perception/traffic_light_visualization/include/traffic_light_visualization/traffic_light_map_visualizer/node.hpp
similarity index 88%
rename from perception/traffic_light_visualization/include/traffic_light_map_visualizer/node.hpp
rename to perception/traffic_light_visualization/include/traffic_light_visualization/traffic_light_map_visualizer/node.hpp
index 3f83cf6e926ad..5e981bbeafda1 100644
--- a/perception/traffic_light_visualization/include/traffic_light_map_visualizer/node.hpp
+++ b/perception/traffic_light_visualization/include/traffic_light_visualization/traffic_light_map_visualizer/node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TRAFFIC_LIGHT_MAP_VISUALIZER__NODE_HPP_
-#define TRAFFIC_LIGHT_MAP_VISUALIZER__NODE_HPP_
+#ifndef TRAFFIC_LIGHT_VISUALIZATION__TRAFFIC_LIGHT_MAP_VISUALIZER__NODE_HPP_
+#define TRAFFIC_LIGHT_VISUALIZATION__TRAFFIC_LIGHT_MAP_VISUALIZER__NODE_HPP_
 
 #include <lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
 #include <rclcpp/rclcpp.hpp>
@@ -49,4 +49,4 @@ class TrafficLightMapVisualizerNode : public rclcpp::Node
 
 }  // namespace traffic_light
 
-#endif  // TRAFFIC_LIGHT_MAP_VISUALIZER__NODE_HPP_
+#endif  // TRAFFIC_LIGHT_VISUALIZATION__TRAFFIC_LIGHT_MAP_VISUALIZER__NODE_HPP_
diff --git a/perception/traffic_light_visualization/include/traffic_light_roi_visualizer/nodelet.hpp b/perception/traffic_light_visualization/include/traffic_light_visualization/traffic_light_roi_visualizer/nodelet.hpp
similarity index 95%
rename from perception/traffic_light_visualization/include/traffic_light_roi_visualizer/nodelet.hpp
rename to perception/traffic_light_visualization/include/traffic_light_visualization/traffic_light_roi_visualizer/nodelet.hpp
index 1c64eb2f9e82b..13d9045e89e98 100644
--- a/perception/traffic_light_visualization/include/traffic_light_roi_visualizer/nodelet.hpp
+++ b/perception/traffic_light_visualization/include/traffic_light_visualization/traffic_light_roi_visualizer/nodelet.hpp
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef TRAFFIC_LIGHT_ROI_VISUALIZER__NODELET_HPP_
-#define TRAFFIC_LIGHT_ROI_VISUALIZER__NODELET_HPP_
+#ifndef TRAFFIC_LIGHT_VISUALIZATION__TRAFFIC_LIGHT_ROI_VISUALIZER__NODELET_HPP_
+#define TRAFFIC_LIGHT_VISUALIZATION__TRAFFIC_LIGHT_ROI_VISUALIZER__NODELET_HPP_
 
 #include <image_transport/image_transport.hpp>
 #include <image_transport/subscriber_filter.hpp>
@@ -123,4 +123,4 @@ class TrafficLightRoiVisualizerNodelet : public rclcpp::Node
 
 }  // namespace traffic_light
 
-#endif  // TRAFFIC_LIGHT_ROI_VISUALIZER__NODELET_HPP_
+#endif  // TRAFFIC_LIGHT_VISUALIZATION__TRAFFIC_LIGHT_ROI_VISUALIZER__NODELET_HPP_
diff --git a/perception/traffic_light_visualization/src/traffic_light_map_visualizer/main.cpp b/perception/traffic_light_visualization/src/traffic_light_map_visualizer/main.cpp
index 02f7a67302945..62d416457c6f0 100644
--- a/perception/traffic_light_visualization/src/traffic_light_map_visualizer/main.cpp
+++ b/perception/traffic_light_visualization/src/traffic_light_map_visualizer/main.cpp
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "traffic_light_visualization/traffic_light_map_visualizer/node.hpp"
+
 #include <rclcpp/rclcpp.hpp>
-#include <traffic_light_map_visualizer/node.hpp>
 
 #include <memory>
 
diff --git a/perception/traffic_light_visualization/src/traffic_light_map_visualizer/node.cpp b/perception/traffic_light_visualization/src/traffic_light_map_visualizer/node.cpp
index 53e06e47a1873..e621a20450bbf 100644
--- a/perception/traffic_light_visualization/src/traffic_light_map_visualizer/node.cpp
+++ b/perception/traffic_light_visualization/src/traffic_light_map_visualizer/node.cpp
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "traffic_light_visualization/traffic_light_map_visualizer/node.hpp"
+
 #include <lanelet2_extension/utility/message_conversion.hpp>
 #include <lanelet2_extension/utility/query.hpp>
 #include <lanelet2_extension/visualization/visualization.hpp>
-#include <traffic_light_map_visualizer/node.hpp>
 
 #include <visualization_msgs/msg/marker_array.hpp>
 
diff --git a/perception/traffic_light_visualization/src/traffic_light_roi_visualizer/nodelet.cpp b/perception/traffic_light_visualization/src/traffic_light_roi_visualizer/nodelet.cpp
index 2f2d80ba43233..4ff9729695be2 100644
--- a/perception/traffic_light_visualization/src/traffic_light_roi_visualizer/nodelet.cpp
+++ b/perception/traffic_light_visualization/src/traffic_light_roi_visualizer/nodelet.cpp
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "traffic_light_visualization/traffic_light_roi_visualizer/nodelet.hpp"  // NOLINT(whitespace/line_length)
+
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp_components/register_node_macro.hpp>
-#include <traffic_light_roi_visualizer/nodelet.hpp>
 
 #include <memory>
 #include <string>