From 5962fdbb7b4781b1d1d5cb6c8d81b4d53e99e241 Mon Sep 17 00:00:00 2001
From: "Takagi, Isamu" <isamu.takagi@tier4.jp>
Date: Fri, 16 Sep 2022 19:11:58 +0900
Subject: [PATCH] feat: move adapi rviz adaptor

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
---
 .../launch/autoware_api.launch.xml                          | 6 ++++--
 launch/tier4_autoware_api_launch/package.xml                | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/launch/tier4_autoware_api_launch/launch/autoware_api.launch.xml b/launch/tier4_autoware_api_launch/launch/autoware_api.launch.xml
index a98ac01548732..1feed0327ef4d 100644
--- a/launch/tier4_autoware_api_launch/launch/autoware_api.launch.xml
+++ b/launch/tier4_autoware_api_launch/launch/autoware_api.launch.xml
@@ -3,13 +3,15 @@
   <arg name="launch_image_base64_converter" default="false"/>
   <arg name="launch_path_distance_calculator" default="false"/>
   <arg name="launch_default_ad_api" default="true"/>
+  <arg name="launch_rviz_adaptors" default="true"/>
   <!-- external api adaptor -->
   <arg name="launch_calibration_status_api" default="false"/>
   <arg name="launch_start_api" default="true"/>
 
   <!-- AD API -->
-  <group if="$(var launch_default_ad_api)">
-    <include file="$(find-pkg-share default_ad_api)/launch/default_ad_api.launch.py"/>
+  <group>
+    <include file="$(find-pkg-share default_ad_api)/launch/default_ad_api.launch.py" if="$(var launch_default_ad_api)"/>
+    <include file="$(find-pkg-share ad_api_adaptors)/launch/rviz_adaptors.launch.xml" if="$(var launch_rviz_adaptors)"/>
   </group>
 
   <!-- awapi (deprecated) -->
diff --git a/launch/tier4_autoware_api_launch/package.xml b/launch/tier4_autoware_api_launch/package.xml
index 9b7abb00a8c91..bae6cf02197f3 100644
--- a/launch/tier4_autoware_api_launch/package.xml
+++ b/launch/tier4_autoware_api_launch/package.xml
@@ -12,6 +12,7 @@
 
   <build_depend>autoware_cmake</build_depend>
 
+  <exec_depend>ad_api_adaptors</exec_depend>
   <exec_depend>autoware_iv_external_api_adaptor</exec_depend>
   <exec_depend>autoware_iv_internal_api_adaptor</exec_depend>
   <exec_depend>awapi_awiv_adapter</exec_depend>