From cd02d3398950ebd0f628ddb116abf7b6ae76d8e5 Mon Sep 17 00:00:00 2001
From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
Date: Tue, 2 Mar 2021 08:58:39 +0900
Subject: [PATCH] Sync with Ros2 v0.8.0 beta (#71)

* update sensing launch to support aip_x1 (#69)

Signed-off-by: taichiH <azumade.30@gmail.com>

* fix logging_simulator_bug (#68)

Signed-off-by: taichiH <azumade.30@gmail.com>

* fix aip_x1 param (#70)

Signed-off-by: taichiH <azumade.30@gmail.com>

Co-authored-by: Taichi Higashide <taichi.higashide@tier4.jp>
---
 launch/autoware_launch/launch/logging_simulator.launch.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/launch/autoware_launch/launch/logging_simulator.launch.xml b/launch/autoware_launch/launch/logging_simulator.launch.xml
index c05c32b7869ed..67ba948c08d93 100644
--- a/launch/autoware_launch/launch/logging_simulator.launch.xml
+++ b/launch/autoware_launch/launch/logging_simulator.launch.xml
@@ -4,7 +4,7 @@
   <arg name="map_path" doc="point cloud and lanelet2 map directory path"/>
   <arg name="vehicle_model"/>
   <arg name="sensor_model"/>
-  <arg name="vehicle_id" value="$(env VEHICLE_ID default)"/>
+  <arg name="vehicle_id" default="$(env VEHICLE_ID default)"/>
   <!-- Optional parameters -->
   <arg name="vehicle" default="true" doc="launch vehicle" />
   <arg name="system" default="true" doc="launch system" />
@@ -67,7 +67,7 @@
   </include>
 
   <!-- Rviz -->
-  <node pkg="rviz2" type="rviz2" name="rviz2" output="screen" args="-d $(find-pkg-share autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)" />
+  <node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(find-pkg-share autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)" />
 
   <!-- Web Controller -->
   <include file="$(find-pkg-share autoware_web_controller)/launch/autoware_web_controller.launch.xml" />