diff --git a/autoware_api_launch/launch/autoware_api.launch.xml b/autoware_api_launch/launch/autoware_api.launch.xml
index c3562857f..45c1f62d1 100644
--- a/autoware_api_launch/launch/autoware_api.launch.xml
+++ b/autoware_api_launch/launch/autoware_api.launch.xml
@@ -1,6 +1,12 @@
+
+
+
+
+
+
diff --git a/autoware_api_launch/launch/include/internal_api_adaptor.launch.py b/autoware_api_launch/launch/include/internal_api_adaptor.launch.py
index 4b8513f54..422c35abe 100644
--- a/autoware_api_launch/launch/include/internal_api_adaptor.launch.py
+++ b/autoware_api_launch/launch/include/internal_api_adaptor.launch.py
@@ -13,7 +13,6 @@
# limitations under the License.
import launch
-from launch.substitutions import LaunchConfiguration
from launch_ros.actions import ComposableNodeContainer
from launch_ros.descriptions import ComposableNode
@@ -29,12 +28,7 @@ def _create_api_node(node_name, class_name, **kwargs):
def generate_launch_description():
- param_initial_pose = {
- "init_simulator_pose": LaunchConfiguration("init_simulator_pose"),
- "init_localization_pose": LaunchConfiguration("init_localization_pose"),
- }
components = [
- _create_api_node("initial_pose", "InitialPose", parameters=[param_initial_pose]),
_create_api_node("iv_msgs", "IVMsgs"),
_create_api_node("operator", "Operator"),
_create_api_node("route", "Route"),
diff --git a/autoware_api_launch/launch/include/internal_api_relay.launch.xml b/autoware_api_launch/launch/include/internal_api_relay.launch.xml
index 810e6a566..e850fb3dc 100644
--- a/autoware_api_launch/launch/include/internal_api_relay.launch.xml
+++ b/autoware_api_launch/launch/include/internal_api_relay.launch.xml
@@ -16,11 +16,5 @@
-
-
-
-
-
-
diff --git a/autoware_api_launch/package.xml b/autoware_api_launch/package.xml
index 577788065..71a37f44f 100644
--- a/autoware_api_launch/package.xml
+++ b/autoware_api_launch/package.xml
@@ -12,6 +12,7 @@
autoware_iv_external_api_adaptor
autoware_iv_internal_api_adaptor
awapi_awiv_adapter
+ default_ad_api
path_distance_calculator
topic_tools
diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml
index d4975c646..5f2af3643 100644
--- a/autoware_launch/launch/autoware.launch.xml
+++ b/autoware_launch/launch/autoware.launch.xml
@@ -95,10 +95,7 @@
-
-
-
-
+
@@ -112,6 +109,7 @@
args="-d $(find-pkg-share autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png"
if="$(var rviz)"
/>
+
diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml
index c143f2c51..3a360d460 100644
--- a/autoware_launch/launch/logging_simulator.launch.xml
+++ b/autoware_launch/launch/logging_simulator.launch.xml
@@ -111,10 +111,7 @@
-
-
-
-
+
@@ -128,6 +125,7 @@
args="-d $(find-pkg-share autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png"
if="$(var rviz)"
/>
+
diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml
index e9cb8c5f1..b7fb373d5 100644
--- a/autoware_launch/launch/planning_simulator.launch.xml
+++ b/autoware_launch/launch/planning_simulator.launch.xml
@@ -68,10 +68,7 @@
-
-
-
-
+
@@ -85,6 +82,7 @@
args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png"
if="$(var rviz)"
/>
+
@@ -96,10 +94,13 @@
+
+
+
diff --git a/autoware_launch/package.xml b/autoware_launch/package.xml
index fa7f7aad1..037f453fa 100644
--- a/autoware_launch/package.xml
+++ b/autoware_launch/package.xml
@@ -9,6 +9,7 @@
ament_cmake_auto
+ ad_api_adaptors
autoware_api_launch
control_launch
global_parameter_loader
diff --git a/localization_launch/launch/util/util.launch.xml b/localization_launch/launch/util/util.launch.xml
index 4b80a343d..783eee8ad 100644
--- a/localization_launch/launch/util/util.launch.xml
+++ b/localization_launch/launch/util/util.launch.xml
@@ -7,7 +7,12 @@
-
+
+
+
+
+
+
diff --git a/localization_launch/package.xml b/localization_launch/package.xml
index a6dbe359c..c61aaeed7 100644
--- a/localization_launch/package.xml
+++ b/localization_launch/package.xml
@@ -11,6 +11,7 @@
ament_cmake_auto
+ automatic_pose_initializer
ekf_localizer
gyro_odometer
ndt_scan_matcher
diff --git a/simulator_launch/launch/simulator.launch.xml b/simulator_launch/launch/simulator.launch.xml
index 5ebe48cd9..08d27a73b 100644
--- a/simulator_launch/launch/simulator.launch.xml
+++ b/simulator_launch/launch/simulator.launch.xml
@@ -1,6 +1,7 @@
+
@@ -74,6 +75,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/system_launch/config/ad_service_state_monitor.planning_simulation.param.yaml b/system_launch/config/ad_service_state_monitor.planning_simulation.param.yaml
index b20ffec09..51fbe99dd 100644
--- a/system_launch/config/ad_service_state_monitor.planning_simulation.param.yaml
+++ b/system_launch/config/ad_service_state_monitor.planning_simulation.param.yaml
@@ -24,7 +24,7 @@
names: [
"/map/vector_map",
"/perception/object_recognition/objects",
- "/initialpose2d",
+ "/initialpose3d",
"/planning/mission_planning/route",
"/planning/scenario_planning/trajectory",
"/control/trajectory_follower/control_cmd",
@@ -48,7 +48,7 @@
warn_rate: 5.0
type: "autoware_auto_perception_msgs/msg/PredictedObjects"
- /initialpose2d:
+ /initialpose3d:
module: "localization"
timeout: 0.0
warn_rate: 0.0