[pull] main from autowarefoundation:main

perception/detected_object_validation/include/detected_object_filter/object_lanelet_filter.hpp → perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_lanelet_filter.hpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
-#define DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
+#ifndef DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
+#define DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
 
-#include "utils/utils.hpp"
+#include "detected_object_validation/utils/utils.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 #include <tier4_autoware_utils/geometry/geometry.hpp>
@@ -69,4 +69,4 @@ class ObjectLaneletFilterNode : public rclcpp::Node
 
 }  // namespace object_lanelet_filter
 
-#endif  // DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
+#endif  // DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_

perception/detected_object_validation/include/detected_object_filter/object_position_filter.hpp → perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_position_filter.hpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
-#define DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
+#ifndef DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
+#define DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
 
-#include "utils/utils.hpp"
+#include "detected_object_validation/utils/utils.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 #include <tier4_autoware_utils/geometry/geometry.hpp>
@@ -55,4 +55,4 @@ class ObjectPositionFilterNode : public rclcpp::Node
 
 }  // namespace object_position_filter
 
-#endif  // DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
+#endif  // DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_

perception/detected_object_validation/include/obstacle_pointcloud_based_validator/debugger.hpp → perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/debugger.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
-#define OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
+#ifndef DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
+#define DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -113,4 +113,4 @@ class Debugger
 };
 }  // namespace obstacle_pointcloud_based_validator
 
-#endif  // OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
+#endif  // DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_

perception/detected_object_validation/include/obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp → perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp

@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
-#define OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
+// NOLINTNEXTLINE(whitespace/line_length)
+#ifndef DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
+// NOLINTNEXTLINE(whitespace/line_length)
+#define DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
 
-#include "obstacle_pointcloud_based_validator/debugger.hpp"
+#include "detected_object_validation/obstacle_pointcloud_based_validator/debugger.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -152,4 +154,5 @@ class ObstaclePointCloudBasedValidator : public rclcpp::Node
 };
 }  // namespace obstacle_pointcloud_based_validator
 
-#endif  // OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
+// NOLINTNEXTLINE(whitespace/line_length)
+#endif  // DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_

perception/detected_object_validation/include/occupancy_grid_based_validator/occupancy_grid_based_validator.hpp → perception/detected_object_validation/include/detected_object_validation/occupancy_grid_based_validator/occupancy_grid_based_validator.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
-#define OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
+#ifndef DETECTED_OBJECT_VALIDATION__OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
+#define DETECTED_OBJECT_VALIDATION__OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
 
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
@@ -68,4 +68,4 @@ class OccupancyGridBasedValidator : public rclcpp::Node
 };
 }  // namespace occupancy_grid_based_validator
 
-#endif  // OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
+#endif  // DETECTED_OBJECT_VALIDATION__OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_

perception/detected_object_validation/include/utils/utils.hpp → perception/detected_object_validation/include/detected_object_validation/utils/utils.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS__UTILS_HPP_
-#define UTILS__UTILS_HPP_
+#ifndef DETECTED_OBJECT_VALIDATION__UTILS__UTILS_HPP_
+#define DETECTED_OBJECT_VALIDATION__UTILS__UTILS_HPP_
 
 #include <cstdint>
 
@@ -33,4 +33,4 @@ struct FilterTargetLabel
 };  // struct FilterTargetLabel
 }  // namespace utils
 
-#endif  // UTILS__UTILS_HPP_
+#endif  // DETECTED_OBJECT_VALIDATION__UTILS__UTILS_HPP_

perception/detected_object_validation/src/object_lanelet_filter.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "detected_object_filter/object_lanelet_filter.hpp"
+#include "detected_object_validation/detected_object_filter/object_lanelet_filter.hpp"
 
 #include <lanelet2_extension/utility/message_conversion.hpp>
 #include <lanelet2_extension/utility/query.hpp>

perception/detected_object_validation/src/object_position_filter.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "detected_object_filter/object_position_filter.hpp"
+#include "detected_object_validation/detected_object_filter/object_position_filter.hpp"
 
 namespace object_position_filter
 {

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp"
+#include "detected_object_validation/obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp"
 
 #include <object_recognition_utils/object_recognition_utils.hpp>
 #include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>

perception/detected_object_validation/src/occupancy_grid_based_validator.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "occupancy_grid_based_validator/occupancy_grid_based_validator.hpp"
+#include "detected_object_validation/occupancy_grid_based_validator/occupancy_grid_based_validator.hpp"
 
 #include <object_recognition_utils/object_classification.hpp>
 #include <object_recognition_utils/object_recognition_utils.hpp>

perception/detected_object_validation/src/utils.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/utils.hpp"
+#include "detected_object_validation/utils/utils.hpp"
 
 #include <autoware_auto_perception_msgs/msg/object_classification.hpp>
 

perception/traffic_light_visualization/include/traffic_light_map_visualizer/node.hpp → 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_

perception/traffic_light_visualization/include/traffic_light_roi_visualizer/nodelet.hpp → 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_

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>
 

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>
 

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>