From 6c39d1c6bcb1fa1408885e03e68400e661976b0b Mon Sep 17 00:00:00 2001
From: NorahXiong <norah.xiong@autocore.ai>
Date: Sun, 19 Jan 2025 11:37:01 +0800
Subject: [PATCH 1/2] fix(autoware_internal_planning_msgs): fix PathPoint type
 error cause by duplicate definition in repo autoware_msgs and
 autoware_internal_msgs

Signed-off-by: NorahXiong <norah.xiong@autocore.ai>
---
 autoware_internal_planning_msgs/CMakeLists.txt              | 2 +-
 autoware_internal_planning_msgs/msg/PathPoint.msg           | 5 -----
 autoware_internal_planning_msgs/msg/PathPointWithLaneId.msg | 2 +-
 autoware_internal_planning_msgs/package.xml                 | 1 +
 4 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 autoware_internal_planning_msgs/msg/PathPoint.msg

diff --git a/autoware_internal_planning_msgs/CMakeLists.txt b/autoware_internal_planning_msgs/CMakeLists.txt
index 7fe90aa..8bd5ff3 100644
--- a/autoware_internal_planning_msgs/CMakeLists.txt
+++ b/autoware_internal_planning_msgs/CMakeLists.txt
@@ -15,7 +15,6 @@ find_package(ament_cmake_auto REQUIRED)
 ament_auto_find_build_dependencies()
 
 rosidl_generate_interfaces(${PROJECT_NAME}
-  "msg/PathPoint.msg"
   "msg/PathPointWithLaneId.msg"
   "msg/PathWithLaneId.msg"
   "msg/Scenario.msg"
@@ -23,6 +22,7 @@ rosidl_generate_interfaces(${PROJECT_NAME}
     builtin_interfaces
     geometry_msgs
     std_msgs
+    autoware_planning_msgs
 )
 
 if(BUILD_TESTING)
diff --git a/autoware_internal_planning_msgs/msg/PathPoint.msg b/autoware_internal_planning_msgs/msg/PathPoint.msg
deleted file mode 100644
index 697681f..0000000
--- a/autoware_internal_planning_msgs/msg/PathPoint.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-geometry_msgs/Pose pose
-float32 longitudinal_velocity_mps
-float32 lateral_velocity_mps
-float32 heading_rate_rps
-bool is_final
diff --git a/autoware_internal_planning_msgs/msg/PathPointWithLaneId.msg b/autoware_internal_planning_msgs/msg/PathPointWithLaneId.msg
index 25a02d2..19eea9f 100644
--- a/autoware_internal_planning_msgs/msg/PathPointWithLaneId.msg
+++ b/autoware_internal_planning_msgs/msg/PathPointWithLaneId.msg
@@ -1,2 +1,2 @@
-autoware_internal_planning_msgs/PathPoint point
+autoware_planning_msgs/PathPoint point
 int64[] lane_ids
diff --git a/autoware_internal_planning_msgs/package.xml b/autoware_internal_planning_msgs/package.xml
index fe530c5..e715bb1 100644
--- a/autoware_internal_planning_msgs/package.xml
+++ b/autoware_internal_planning_msgs/package.xml
@@ -16,6 +16,7 @@
   <depend>builtin_interfaces</depend>
   <depend>geometry_msgs</depend>
   <depend>std_msgs</depend>
+  <depend>autoware_planning_msgs</depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>

From d1f8c322294d057689f6fc7af1d24e908ffc0862 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 19 Jan 2025 03:39:14 +0000
Subject: [PATCH 2/2] style(pre-commit): autofix

---
 autoware_internal_planning_msgs/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoware_internal_planning_msgs/package.xml b/autoware_internal_planning_msgs/package.xml
index e715bb1..6bfe043 100644
--- a/autoware_internal_planning_msgs/package.xml
+++ b/autoware_internal_planning_msgs/package.xml
@@ -13,10 +13,10 @@
 
   <exec_depend>rosidl_default_runtime</exec_depend>
 
+  <depend>autoware_planning_msgs</depend>
   <depend>builtin_interfaces</depend>
   <depend>geometry_msgs</depend>
   <depend>std_msgs</depend>
-  <depend>autoware_planning_msgs</depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>