style(pre-commit): autofix

autowarefoundation · Jul 2, 2024 · dcde650 · dcde650
1 parent 937ec2c
commit dcde650
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 24 deletions.
diff --git a/common/autoware_geography_utils/include/autoware_geography_utils/height.hpp b/common/autoware_geography_utils/include/autoware_geography_utils/height.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GEOGRAPHY_UTILS__HEIGHT_HPP_
-#define GEOGRAPHY_UTILS__HEIGHT_HPP_
+#ifndef AUTOWARE_GEOGRAPHY_UTILS__HEIGHT_HPP_
+#define AUTOWARE_GEOGRAPHY_UTILS__HEIGHT_HPP_
 
 #include <string>
 
@@ -30,4 +30,4 @@ double convert_height(
 
 }  // namespace autoware::geography_utils
 
-#endif  // GEOGRAPHY_UTILS__HEIGHT_HPP_
+#endif  // AUTOWARE_GEOGRAPHY_UTILS__HEIGHT_HPP_
diff --git a/common/autoware_geography_utils/include/autoware_geography_utils/lanelet2_projector.hpp b/common/autoware_geography_utils/include/autoware_geography_utils/lanelet2_projector.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GEOGRAPHY_UTILS__LANELET2_PROJECTOR_HPP_
-#define GEOGRAPHY_UTILS__LANELET2_PROJECTOR_HPP_
+#ifndef AUTOWARE_GEOGRAPHY_UTILS__LANELET2_PROJECTOR_HPP_
+#define AUTOWARE_GEOGRAPHY_UTILS__LANELET2_PROJECTOR_HPP_
 
 #include <tier4_map_msgs/msg/map_projector_info.hpp>
 
@@ -29,4 +29,4 @@ std::unique_ptr<lanelet::Projector> get_lanelet2_projector(const MapProjectorInf
 
 }  // namespace autoware::geography_utils
 
-#endif  // GEOGRAPHY_UTILS__LANELET2_PROJECTOR_HPP_
+#endif  // AUTOWARE_GEOGRAPHY_UTILS__LANELET2_PROJECTOR_HPP_
diff --git a/common/autoware_geography_utils/include/autoware_geography_utils/projection.hpp b/common/autoware_geography_utils/include/autoware_geography_utils/projection.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GEOGRAPHY_UTILS__PROJECTION_HPP_
-#define GEOGRAPHY_UTILS__PROJECTION_HPP_
+#ifndef AUTOWARE_GEOGRAPHY_UTILS__PROJECTION_HPP_
+#define AUTOWARE_GEOGRAPHY_UTILS__PROJECTION_HPP_
 
 #include <geographic_msgs/msg/geo_point.hpp>
 #include <geometry_msgs/msg/point.hpp>
@@ -30,4 +30,4 @@ GeoPoint project_reverse(const LocalPoint & local_point, const MapProjectorInfo
 
 }  // namespace autoware::geography_utils
 
-#endif  // GEOGRAPHY_UTILS__PROJECTION_HPP_
+#endif  // AUTOWARE_GEOGRAPHY_UTILS__PROJECTION_HPP_
diff --git a/common/autoware_geography_utils/src/lanelet2_projector.cpp b/common/autoware_geography_utils/src/lanelet2_projector.cpp
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #include <GeographicLib/Geoid.hpp>
+#include <autoware_geography_utils/lanelet2_projector.hpp>
 #include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
 #include <autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp>
-#include <autoware_geography_utils/lanelet2_projector.hpp>
 
 #include <lanelet2_projection/UTM.h>
 

diff --git a/common/autoware_geography_utils/src/projection.cpp b/common/autoware_geography_utils/src/projection.cpp
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #include <GeographicLib/Geoid.hpp>
-#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
 #include <autoware_geography_utils/lanelet2_projector.hpp>
 #include <autoware_geography_utils/projection.hpp>
+#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
 
 namespace autoware::geography_utils
 {

diff --git a/localization/geo_pose_projector/package.xml b/localization/geo_pose_projector/package.xml
@@ -18,10 +18,10 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
+  <depend>autoware_geography_utils</depend>
   <depend>component_interface_specs</depend>
   <depend>component_interface_utils</depend>
   <depend>geographic_msgs</depend>
-  <depend>autoware_geography_utils</depend>
   <depend>geometry_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/map/map_loader/package.xml b/map/map_loader/package.xml
@@ -20,12 +20,12 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
+  <depend>autoware_geography_utils</depend>
   <depend>autoware_lanelet2_extension</depend>
   <depend>autoware_map_msgs</depend>
   <depend>component_interface_specs</depend>
   <depend>component_interface_utils</depend>
   <depend>fmt</depend>
-  <depend>autoware_geography_utils</depend>
   <depend>geometry_msgs</depend>
   <depend>libpcl-all-dev</depend>
   <depend>pcl_conversions</depend>

diff --git a/map/map_loader/src/lanelet2_map_loader/lanelet2_map_loader_node.cpp b/map/map_loader/src/lanelet2_map_loader/lanelet2_map_loader_node.cpp
@@ -36,12 +36,12 @@
 #include "lanelet2_local_projector.hpp"
 
 #include <ament_index_cpp/get_package_prefix.hpp>
+#include <autoware_geography_utils/lanelet2_projector.hpp>
 #include <autoware_lanelet2_extension/io/autoware_osm_parser.hpp>
 #include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
 #include <autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp>
 #include <autoware_lanelet2_extension/utility/message_conversion.hpp>
 #include <autoware_lanelet2_extension/utility/utilities.hpp>
-#include <autoware_geography_utils/lanelet2_projector.hpp>
 #include <rclcpp/rclcpp.hpp>
 
 #include <lanelet2_core/LaneletMap.h>

diff --git a/planning/autoware_static_centerline_generator/package.xml b/planning/autoware_static_centerline_generator/package.xml
@@ -16,6 +16,7 @@
   <build_depend>rosidl_default_generators</build_depend>
 
   <depend>autoware_behavior_path_planner_common</depend>
+  <depend>autoware_geography_utils</depend>
   <depend>autoware_lanelet2_extension</depend>
   <depend>autoware_map_msgs</depend>
   <depend>autoware_mission_planner</depend>
@@ -27,7 +28,6 @@
   <depend>autoware_route_handler</depend>
   <depend>autoware_universe_utils</depend>
   <depend>autoware_vehicle_info_utils</depend>
-  <depend>autoware_geography_utils</depend>
   <depend>geometry_msgs</depend>
   <depend>global_parameter_loader</depend>
   <depend>interpolation</depend>

diff --git a/planning/autoware_static_centerline_generator/src/static_centerline_generator_node.cpp b/planning/autoware_static_centerline_generator/src/static_centerline_generator_node.cpp
@@ -871,7 +871,8 @@ void StaticCenterlineGeneratorNode::save_map()
 
   // save map with modified center line
   std::filesystem::create_directory("/tmp/autoware_static_centerline_generator");
-  const auto map_projector = autoware::geography_utils::get_lanelet2_projector(*map_projector_info_);
+  const auto map_projector =
+    autoware::geography_utils::get_lanelet2_projector(*map_projector_info_);
   lanelet::write(lanelet2_output_file_path, *original_map_ptr_, *map_projector);
   RCLCPP_INFO(
     get_logger(), "Saved map in %s", "/tmp/autoware_static_centerline_generator/lanelet2_map.osm");

diff --git a/sensing/gnss_poser/package.xml b/sensing/gnss_poser/package.xml
@@ -20,12 +20,12 @@
 
   <build_depend>libboost-dev</build_depend>
 
+  <depend>autoware_geography_utils</depend>
   <depend>autoware_sensing_msgs</depend>
   <depend>component_interface_specs</depend>
   <depend>component_interface_utils</depend>
   <depend>geographic_msgs</depend>
   <depend>geographiclib</depend>
-  <depend>autoware_geography_utils</depend>
   <depend>geometry_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/sensing/gnss_poser/src/gnss_poser_core.cpp b/sensing/gnss_poser/src/gnss_poser_core.cpp
@@ -114,7 +114,8 @@ void GNSSPoser::callbackNavSatFix(
   gps_point.latitude = nav_sat_fix_msg_ptr->latitude;
   gps_point.longitude = nav_sat_fix_msg_ptr->longitude;
   gps_point.altitude = nav_sat_fix_msg_ptr->altitude;
-  geometry_msgs::msg::Point position = autoware::geography_utils::project_forward(gps_point, projector_info_);
+  geometry_msgs::msg::Point position =
+    autoware::geography_utils::project_forward(gps_point, projector_info_);
   position.z = autoware::geography_utils::convert_height(
     position.z, gps_point.latitude, gps_point.longitude, MapProjectorInfo::Message::WGS84,
     projector_info_.vertical_datum);

diff --git a/system/default_ad_api/package.xml b/system/default_ad_api/package.xml
@@ -15,6 +15,7 @@
   <depend>autoware_ad_api_specs</depend>
   <depend>autoware_adapi_v1_msgs</depend>
   <depend>autoware_adapi_version_msgs</depend>
+  <depend>autoware_geography_utils</depend>
   <depend>autoware_motion_utils</depend>
   <depend>autoware_planning_msgs</depend>
   <depend>autoware_system_msgs</depend>
@@ -24,7 +25,6 @@
   <depend>component_interface_utils</depend>
   <depend>diagnostic_graph_utils</depend>
   <depend>geographic_msgs</depend>
-  <depend>autoware_geography_utils</depend>
   <depend>nav_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/system/default_ad_api/src/vehicle.cpp b/system/default_ad_api/src/vehicle.cpp
@@ -143,15 +143,17 @@ void VehicleNode::publish_kinematics()
   vehicle_kinematics.twist.header.frame_id = kinematic_state_msgs_->child_frame_id;
   vehicle_kinematics.twist.twist = kinematic_state_msgs_->twist;
   if (map_projector_info_->projector_type != MapProjectorInfo::LOCAL) {
-    const geographic_msgs::msg::GeoPoint projected_gps_point = autoware::geography_utils::project_reverse(
-      kinematic_state_msgs_->pose.pose.position, *map_projector_info_);
+    const geographic_msgs::msg::GeoPoint projected_gps_point =
+      autoware::geography_utils::project_reverse(
+        kinematic_state_msgs_->pose.pose.position, *map_projector_info_);
     vehicle_kinematics.geographic_pose.header = kinematic_state_msgs_->header;
     vehicle_kinematics.geographic_pose.header.frame_id = "global";
     vehicle_kinematics.geographic_pose.position.latitude = projected_gps_point.latitude;
     vehicle_kinematics.geographic_pose.position.longitude = projected_gps_point.longitude;
-    vehicle_kinematics.geographic_pose.position.altitude = autoware::geography_utils::convert_height(
-      projected_gps_point.altitude, projected_gps_point.latitude, projected_gps_point.longitude,
-      map_projector_info_->vertical_datum, MapProjectorInfo::WGS84);
+    vehicle_kinematics.geographic_pose.position.altitude =
+      autoware::geography_utils::convert_height(
+        projected_gps_point.altitude, projected_gps_point.latitude, projected_gps_point.longitude,
+        map_projector_info_->vertical_datum, MapProjectorInfo::WGS84);
   } else {
     vehicle_kinematics.geographic_pose.position.latitude = std::numeric_limits<double>::quiet_NaN();
     vehicle_kinematics.geographic_pose.position.longitude =