Skip to content

Commit

Permalink
style(pre-commit): autofix
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] authored and mitsudome-r committed Feb 20, 2025
1 parent b19a6e5 commit e6809b3
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
#ifndef AUTOWARE__UNIVERSE_UTILS__GEOMETRY__BOOST_GEOMETRY_HPP_
#define AUTOWARE__UNIVERSE_UTILS__GEOMETRY__BOOST_GEOMETRY_HPP_

#include <autoware_utils/geometry/boost_geometry.hpp>

#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/geometries/register/ring.hpp>

#include <autoware_utils/geometry/boost_geometry.hpp>

#define EIGEN_MPL2_ONLY
#include <Eigen/Core>

Expand Down
2 changes: 1 addition & 1 deletion common/autoware_universe_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<depend>autoware_internal_planning_msgs</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_planning_msgs</depend>
<depend>autoware_vehicle_msgs</depend>
<depend>autoware_utils</depend>
<depend>autoware_vehicle_msgs</depend>
<depend>builtin_interfaces</depend>
<depend>diagnostic_msgs</depend>
<depend>geometry_msgs</depend>
Expand Down
2 changes: 1 addition & 1 deletion control/autoware_collision_detector/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<depend>autoware_adapi_v1_msgs</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_utils</depend>
<depend>autoware_universe_utils</depend>
<depend>autoware_utils</depend>
<depend>autoware_vehicle_info_utils</depend>
<depend>diagnostic_msgs</depend>
<depend>diagnostic_updater</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ std::vector<LinearRing2d> createVehicleFootprints(
// Create vehicle footprint on each TrajectoryPoint
std::vector<LinearRing2d> vehicle_footprints;
for (const auto & p : trajectory) {
vehicle_footprints.push_back(
autoware::universe_utils::transformVector(local_vehicle_footprint, autoware::universe_utils::pose2transform(p.pose)));
vehicle_footprints.push_back(autoware::universe_utils::transformVector(
local_vehicle_footprint, autoware::universe_utils::pose2transform(p.pose)));
}

return vehicle_footprints;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#ifndef AUTOWARE__OBSTACLE_COLLISION_CHECKER__OBSTACLE_COLLISION_CHECKER_HPP_
#define AUTOWARE__OBSTACLE_COLLISION_CHECKER__OBSTACLE_COLLISION_CHECKER_HPP_

#include <autoware/universe_utils/geometry/geometry.hpp>
#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>

#include <autoware_planning_msgs/msg/trajectory.hpp>
#include <autoware/universe_utils/geometry/geometry.hpp>
#include <geometry_msgs/msg/pose_stamped.hpp>
#include <geometry_msgs/msg/transform_stamped.hpp>
#include <geometry_msgs/msg/twist.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include "autoware/universe_utils/math/accumulator.hpp"

#include <autoware/route_handler/route_handler.hpp>
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
#include <autoware/universe_utils/ros/polling_subscriber.hpp>
#include <autoware/universe_utils/system/stop_watch.hpp>
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
#include <rclcpp/rclcpp.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ void ControlEvaluatorNode::AddBoundaryDistanceMetricMsg(
lanelet::ConstLanelet current_lane;
lanelet::utils::query::getClosestLanelet(current_lanelets, ego_pose, &current_lane);
const auto local_vehicle_footprint = vehicle_info_.createFootprint();
const auto current_vehicle_footprint =
autoware::universe_utils::transformVector(local_vehicle_footprint, autoware::universe_utils::pose2transform(ego_pose));
const auto current_vehicle_footprint = autoware::universe_utils::transformVector(
local_vehicle_footprint, autoware::universe_utils::pose2transform(ego_pose));

if (behavior_path.left_bound.size() >= 1) {
LineString2d left_boundary;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#ifndef AUTOWARE__PERCEPTION_ONLINE_EVALUATOR__UTILS__MARKER_UTILS_HPP_
#define AUTOWARE__PERCEPTION_ONLINE_EVALUATOR__UTILS__MARKER_UTILS_HPP_

#include <autoware_vehicle_info_utils/vehicle_info.hpp>
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
#include <autoware_vehicle_info_utils/vehicle_info.hpp>

#include "autoware_perception_msgs/msg/predicted_objects.hpp"
#include <geometry_msgs/msg/polygon.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <autoware/universe_utils/geometry/boost_geometry.hpp>
#include <autoware/universe_utils/geometry/boost_polygon_utils.hpp>
#include <autoware/universe_utils/geometry/geometry.hpp>

#include <autoware/universe_utils/ros/marker_helper.hpp>
#include <autoware/universe_utils/ros/uuid_helper.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ bool DefaultPlanner::is_goal_valid(
}

const auto local_vehicle_footprint = vehicle_info_.createFootprint();
autoware::universe_utils::LinearRing2d goal_footprint =
autoware::universe_utils::transformVector(local_vehicle_footprint, autoware::universe_utils::pose2transform(goal));
autoware::universe_utils::LinearRing2d goal_footprint = autoware::universe_utils::transformVector(
local_vehicle_footprint, autoware::universe_utils::pose2transform(goal));
pub_goal_footprint_marker_->publish(visualize_debug_footprint(goal_footprint));
const auto polygon_footprint = convert_linear_ring_to_polygon(goal_footprint);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#define LANELET2_PLUGINS__DEFAULT_PLANNER_HPP_

#include <autoware/mission_planner_universe/mission_planner_plugin.hpp>
#include <autoware/universe_utils/geometry/geometry.hpp>
#include <autoware/route_handler/route_handler.hpp>
#include <autoware/universe_utils/geometry/geometry.hpp>
#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
#include <rclcpp/rclcpp.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#ifndef AUTOWARE__OBSTACLE_CRUISE_PLANNER__TYPE_ALIAS_HPP_
#define AUTOWARE__OBSTACLE_CRUISE_PLANNER__TYPE_ALIAS_HPP_

#include <autoware/universe_utils/geometry/geometry.hpp>

#include "autoware_vehicle_info_utils/vehicle_info_utils.hpp"

#include <autoware/universe_utils/geometry/geometry.hpp>

#include "autoware_internal_debug_msgs/msg/float32_stamped.hpp"
#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
#include "autoware_perception_msgs/msg/predicted_object.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ GoalCandidates GoalSearcher::search(
for (double dy = 0; dy <= max_lateral_offset; dy += lateral_offset_interval) {
search_pose = calcOffsetPose(original_search_pose, 0, sign * dy, 0);

const auto transformed_vehicle_footprint =
autoware::universe_utils::transformVector(vehicle_footprint_, autoware::universe_utils::pose2transform(search_pose));
const auto transformed_vehicle_footprint = autoware::universe_utils::transformVector(
vehicle_footprint_, autoware::universe_utils::pose2transform(search_pose));

if (
parameters_.bus_stop_area.use_bus_stop_area &&
Expand Down Expand Up @@ -324,8 +324,8 @@ void GoalSearcher::countObjectsToAvoid(
// count number of objects to avoid
for (const auto & object : objects.objects) {
for (const auto & p : current_center_line_path.points) {
const auto transformed_vehicle_footprint =
autoware::universe_utils::transformVector(vehicle_footprint_, autoware::universe_utils::pose2transform(p.point.pose));
const auto transformed_vehicle_footprint = autoware::universe_utils::transformVector(
vehicle_footprint_, autoware::universe_utils::pose2transform(p.point.pose));
const auto obj_polygon = autoware::universe_utils::toPolygon2d(object);
const double distance = boost::geometry::distance(obj_polygon, transformed_vehicle_footprint);
if (distance > parameters_.object_recognition_collision_check_hard_margins.back()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ bool checkCollisionBetweenFootprintAndObjects(
const autoware::universe_utils::LinearRing2d & local_vehicle_footprint, const Pose & ego_pose,
const PredictedObjects & dynamic_objects, const double margin)
{
const auto vehicle_footprint =
autoware::universe_utils::transformVector(local_vehicle_footprint, autoware::universe_utils::pose2transform(ego_pose));
const auto vehicle_footprint = autoware::universe_utils::transformVector(
local_vehicle_footprint, autoware::universe_utils::pose2transform(ego_pose));

for (const auto & object : dynamic_objects.objects) {
const auto obj_polygon = autoware::universe_utils::toPolygon2d(object);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,8 @@ bool StartPlannerModule::isPreventingRearVehicleFromPassingThrough(const Pose &
geometry_msgs::msg::Pose & ego_overhang_point_as_pose,
const bool ego_is_merging_from_the_left) -> std::optional<std::pair<double, double>> {
const auto local_vehicle_footprint = vehicle_info_.createFootprint();
const auto vehicle_footprint =
autoware::universe_utils::transformVector(local_vehicle_footprint, autoware::universe_utils::pose2transform(ego_pose));
const auto vehicle_footprint = autoware::universe_utils::transformVector(
local_vehicle_footprint, autoware::universe_utils::pose2transform(ego_pose));
double smallest_lateral_gap_between_ego_and_border = std::numeric_limits<double>::max();
double corresponding_lateral_gap_with_other_lane_bound = std::numeric_limits<double>::max();

Expand Down

0 comments on commit e6809b3

Please sign in to comment.