From d7989f7ce57c4650d242007fe38ea7bb8f8fd8dc Mon Sep 17 00:00:00 2001
From: Taekjin LEE <taekjin.lee@tier4.jp>
Date: Wed, 24 Jul 2024 15:20:46 +0900
Subject: [PATCH 1/3] chore: rename radar_tracks_msgs_converter to
 autoware_radar_tracks_msgs_converter

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
---
 aip_xx1_gen2_launch/launch/radar.launch.xml   | 12 ++++++------
 aip_xx1_gen2_launch/package.xml               |  1 +
 common_sensor_launch/launch/ars408.launch.xml |  2 +-
 common_sensor_launch/package.xml              |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/aip_xx1_gen2_launch/launch/radar.launch.xml b/aip_xx1_gen2_launch/launch/radar.launch.xml
index 7eb4dbcb..0ccb0f60 100644
--- a/aip_xx1_gen2_launch/launch/radar.launch.xml
+++ b/aip_xx1_gen2_launch/launch/radar.launch.xml
@@ -56,7 +56,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
+      <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -88,7 +88,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
+      <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -120,7 +120,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
+      <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -152,7 +152,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
+      <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -184,7 +184,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
+      <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -216,7 +216,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
+      <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
diff --git a/aip_xx1_gen2_launch/package.xml b/aip_xx1_gen2_launch/package.xml
index 5934d08a..d0b4a41e 100644
--- a/aip_xx1_gen2_launch/package.xml
+++ b/aip_xx1_gen2_launch/package.xml
@@ -11,6 +11,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
+  <exec_depend>autoware_radar_tracks_msgs_converter</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
   <exec_depend>glog_component</exec_depend>
   <exec_depend>gnss_poser</exec_depend>
diff --git a/common_sensor_launch/launch/ars408.launch.xml b/common_sensor_launch/launch/ars408.launch.xml
index 19451736..b9e9c777 100644
--- a/common_sensor_launch/launch/ars408.launch.xml
+++ b/common_sensor_launch/launch/ars408.launch.xml
@@ -48,7 +48,7 @@
   </include>
 
   <!-- Message converter -->
-  <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
+  <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
     <arg name="input/radar_objects" value="filtered_objects"/>
     <arg name="input/odometry" value="$(var input/odometry)"/>
     <arg name="output/radar_detected_objects" value="detected_objects"/>
diff --git a/common_sensor_launch/package.xml b/common_sensor_launch/package.xml
index 3b41b61d..7ba018a8 100644
--- a/common_sensor_launch/package.xml
+++ b/common_sensor_launch/package.xml
@@ -12,9 +12,9 @@
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
+  <exec_depend>autoware_radar_tracks_msgs_converter</exec_depend>
   <exec_depend>dummy_diag_publisher</exec_depend>
   <exec_depend>nebula_sensor_driver</exec_depend>
-  <exec_depend>radar_tracks_msgs_converter</exec_depend>
   <exec_depend>radar_tracks_noise_filter</exec_depend>
   <exec_depend>velodyne_monitor</exec_depend>
 

From 2b56f61ba66ecf1595e97c4404796bf9b8de8fdf Mon Sep 17 00:00:00 2001
From: Taekjin LEE <taekjin.lee@tier4.jp>
Date: Wed, 24 Jul 2024 15:29:36 +0900
Subject: [PATCH 2/3] chore: update package dependencies for radar object
 merging

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
---
 aip_x2_launch/launch/radar.launch.xml       | 2 +-
 aip_x2_launch/package.xml                   | 1 +
 aip_xx1_gen2_launch/launch/radar.launch.xml | 2 +-
 aip_xx1_gen2_launch/package.xml             | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aip_x2_launch/launch/radar.launch.xml b/aip_x2_launch/launch/radar.launch.xml
index 042e9d81..d3af1cd1 100644
--- a/aip_x2_launch/launch/radar.launch.xml
+++ b/aip_x2_launch/launch/radar.launch.xml
@@ -59,7 +59,7 @@
       </include>
     </group>
 
-    <include file="$(find-pkg-share simple_object_merger)/launch/simple_object_merger.launch.xml">
+    <include file="$(find-pkg-share autoware_simple_object_merger)/launch/simple_object_merger.launch.xml">
       <arg name="output/objects" value="detected_objects"/>
       <arg name="param_path" value="$(find-pkg-share aip_x2_launch)/config/simple_object_merger.param.yaml"/>
     </include>
diff --git a/aip_x2_launch/package.xml b/aip_x2_launch/package.xml
index b26c7777..2d8dfa40 100644
--- a/aip_x2_launch/package.xml
+++ b/aip_x2_launch/package.xml
@@ -11,6 +11,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
+  <exec_depend>autoware_simple_object_merger</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
   <exec_depend>dummy_diag_publisher</exec_depend>
   <exec_depend>gnss_poser</exec_depend>
diff --git a/aip_xx1_gen2_launch/launch/radar.launch.xml b/aip_xx1_gen2_launch/launch/radar.launch.xml
index 0ccb0f60..c917c9a6 100644
--- a/aip_xx1_gen2_launch/launch/radar.launch.xml
+++ b/aip_xx1_gen2_launch/launch/radar.launch.xml
@@ -227,7 +227,7 @@
 
     <!-- merge radar objects -->
     <let name="merger_param_path" value="$(find-pkg-share aip_xx1_gen2_launch)/config/radar_simple_object_merger.param.yaml"/>
-    <node pkg="simple_object_merger" exec="simple_object_merger_node" name="simple_object_merger" output="screen">
+    <node pkg="autoware_simple_object_merger" exec="simple_object_merger_node" name="simple_object_merger" output="screen">
       <remap from="~/output/objects" to="detected_objects"/>
       <param from="$(var merger_param_path)"/>
     </node>
diff --git a/aip_xx1_gen2_launch/package.xml b/aip_xx1_gen2_launch/package.xml
index d0b4a41e..99266c70 100644
--- a/aip_xx1_gen2_launch/package.xml
+++ b/aip_xx1_gen2_launch/package.xml
@@ -12,6 +12,7 @@
 
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
   <exec_depend>autoware_radar_tracks_msgs_converter</exec_depend>
+  <exec_depend>autoware_simple_object_merger</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
   <exec_depend>glog_component</exec_depend>
   <exec_depend>gnss_poser</exec_depend>

From 6b42cc50619a68ddcde20e9526b7b9ea47f7e26b Mon Sep 17 00:00:00 2001
From: Taekjin LEE <taekjin.lee@tier4.jp>
Date: Wed, 24 Jul 2024 16:14:45 +0900
Subject: [PATCH 3/3] chore: update package dependencies for radar object
 merging

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
---
 common_sensor_launch/launch/ars408.launch.xml | 2 +-
 common_sensor_launch/package.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common_sensor_launch/launch/ars408.launch.xml b/common_sensor_launch/launch/ars408.launch.xml
index b9e9c777..9a86faf2 100644
--- a/common_sensor_launch/launch/ars408.launch.xml
+++ b/common_sensor_launch/launch/ars408.launch.xml
@@ -40,7 +40,7 @@
   </include>
 
   <!-- Noise filter -->
-  <include file="$(find-pkg-share radar_tracks_noise_filter)/launch/radar_tracks_noise_filter.launch.xml">
+  <include file="$(find-pkg-share autoware_radar_tracks_noise_filter)/launch/radar_tracks_noise_filter.launch.xml">
     <arg name="input/tracks" value="objects_raw"/>
     <arg name="output/noise_tracks" value="noise_objects" />
     <arg name="output/filtered_tracks" value="filtered_objects" />
diff --git a/common_sensor_launch/package.xml b/common_sensor_launch/package.xml
index 7ba018a8..c0c1170b 100644
--- a/common_sensor_launch/package.xml
+++ b/common_sensor_launch/package.xml
@@ -13,9 +13,9 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <exec_depend>autoware_radar_tracks_msgs_converter</exec_depend>
+  <exec_depend>autoware_radar_tracks_noise_filter</exec_depend>
   <exec_depend>dummy_diag_publisher</exec_depend>
   <exec_depend>nebula_sensor_driver</exec_depend>
-  <exec_depend>radar_tracks_noise_filter</exec_depend>
   <exec_depend>velodyne_monitor</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>