collector-m
diff --git a/‎common/autoware_api_utils/include/autoware_api_utils/rclcpp/client.hpp
+2-4 b/‎common/autoware_api_utils/include/autoware_api_utils/rclcpp/client.hpp
+2-4
diff --git a/‎common/autoware_api_utils/include/autoware_api_utils/rclcpp/service.hpp
+2-4 b/‎common/autoware_api_utils/include/autoware_api_utils/rclcpp/service.hpp
+2-4
diff --git a/‎simulator/simple_planning_simulator/CMakeLists.txt
+44 b/‎simulator/simple_planning_simulator/CMakeLists.txt
+44
diff --git a/‎simulator/simple_planning_simulator/design/simple_planning_simulator-design.md
+122 b/‎simulator/simple_planning_simulator/design/simple_planning_simulator-design.md
+122
@@ -41,8 +41,7 @@ class Client
     const typename ServiceT::Request::SharedPtr & request,
     const std::chrono::nanoseconds & timeout = std::chrono::seconds(2))
   {
-    RCLCPP_INFO(
-      logger_, "client request: \n%s", rosidl_generator_traits::to_yaml(*request).c_str());
+    RCLCPP_INFO(logger_, "client request");
 
     if (!client_->service_is_ready()) {
       RCLCPP_INFO(logger_, "client available");
@@ -55,8 +54,7 @@ class Client
       return {response_error("Internal service has timed out."), nullptr};
     }
 
-    RCLCPP_INFO(
-      logger_, "client response: \n%s", rosidl_generator_traits::to_yaml(future.get()).c_str());
+    RCLCPP_INFO(logger_, "client response");
     return {response_success(), future.get()};
   }
 
 
@@ -33,11 +33,9 @@ class Service
     auto wrapped_callback = [logger, callback](
                               typename ServiceT::Request::SharedPtr request,
                               typename ServiceT::Response::SharedPtr response) {
-      RCLCPP_INFO(
-        logger, "service request: \n%s", rosidl_generator_traits::to_yaml(*request).c_str());
+      RCLCPP_INFO(logger, "service request");
       callback(request, response);
-      RCLCPP_INFO(
-        logger, "service response: \n%s", rosidl_generator_traits::to_yaml(*response).c_str());
+      RCLCPP_INFO(logger, "service response");
     };
     return wrapped_callback;
   }
 
@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.6)
+
+project(simple_planning_simulator)
+
+### Dependencies
+find_package(ament_cmake_auto REQUIRED)
+ament_auto_find_build_dependencies()
+
+
+# Component
+ament_auto_add_library(${PROJECT_NAME} SHARED
+  include/simple_planning_simulator/simple_planning_simulator_core.hpp
+  include/simple_planning_simulator/visibility_control.hpp
+  src/simple_planning_simulator/simple_planning_simulator_core.cpp
+  src/simple_planning_simulator/vehicle_model/sim_model_interface.cpp
+  src/simple_planning_simulator/vehicle_model/sim_model_ideal_steer_vel.cpp
+  src/simple_planning_simulator/vehicle_model/sim_model_ideal_steer_acc.cpp
+  src/simple_planning_simulator/vehicle_model/sim_model_ideal_steer_acc_geared.cpp
+  src/simple_planning_simulator/vehicle_model/sim_model_delay_steer_acc.cpp
+  src/simple_planning_simulator/vehicle_model/sim_model_delay_steer_acc_geared.cpp
+)
+target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${tf2_INCLUDE_DIRS})
+autoware_set_compile_options(${PROJECT_NAME})
+
+target_compile_options(${PROJECT_NAME} PRIVATE -Wno-old-style-cast) # RCLCPP_ERROR_THROTTLE() has built-in old-style casts.
+
+
+# Node executable
+rclcpp_components_register_node(${PROJECT_NAME}
+  PLUGIN "simulation::simple_planning_simulator::SimplePlanningSimulator"
+  EXECUTABLE ${PROJECT_NAME}_exe
+)
+
+
+### Test
+if(BUILD_TESTING)
+  find_package(ament_lint_auto REQUIRED)
+  ament_lint_auto_find_test_dependencies()
+endif()
+
+
+
+
+ament_auto_package(INSTALL_TO_SHARE param launch)
@@ -0,0 +1,122 @@
+simple_planning_simulator {#simple_planning_simulator-package-design}
+===========
+
+
+# Purpose / Use cases
+
+This node simulates the vehicle motion for a vehicle command in 2D using a simple vehicle model.
+
+
+
+# Design
+
+
+The purpose of this simulator is for the integration test of planning and control modules. This does not simulate sensing or perception, but is implemented in pure c++ only and works without GPU.
+
+## Assumptions / Known limits
+
+ - It simulates only in 2D motion.
+ - It does not perform physical operations such as collision and sensing, but only calculates the integral results of vehicle dynamics.
+
+
+## Inputs / Outputs / API
+
+
+**input**
+ - input/vehicle_control_command [`autoware_auto_msgs/msg/VehicleControlCommand`] : target command to drive a vehicle.
+ - input/ackermann_control_command [`autoware_auto_msgs/msg/AckermannControlCommand`] : target command to drive a vehicle.
+ - input/vehicle_state_command [`autoware_auto_msgs/msg/VehicleStateCommand`] : target state command (e.g. gear).
+ - /initialpose [`geometry_msgs/msg/PoseWithCovarianceStamped`] : for initial pose
+
+**output**
+ - /tf [`tf2_msgs/msg/TFMessage`] : simulated vehicle pose (base_link)
+ - /vehicle/vehicle_kinematic_state [`autoware_auto_msgs/msg/VehicleKinematicState`] : simulated kinematic state (defined in CoM)
+ - /vehicle/state_report [`autoware_auto_msgs/msg/VehicleStateReport`] : current vehicle state (e.g. gear, mode, etc.)
+
+
+## Inner-workings / Algorithms
+
+### Common Parameters
+
+|Name|Type|Description|Default value|
+|:---|:---|:---|:---|
+|simulated_frame_id     | string | set to the child_frame_id in output tf |"base_link"|
+|origin_frame_id        | string | set to the frame_id in output tf |"odom"|
+|initialize_source      | string | If "ORIGIN", the initial pose is set at (0,0,0). If "INITIAL_POSE_TOPIC", node will wait until the `/initialpose` topic is published. | "INITIAL_POSE_TOPIC" | "INITIAL_POSE_TOPIC" |
+|add_measurement_noise  | bool | If true, the Gaussian noise is added to the simulated results.| true|
+|pos_noise_stddev       | double | Standard deviation for position noise   |  0.01|
+|rpy_noise_stddev       | double | Standard deviation for Euler angle noise|  0.0001|
+|vel_noise_stddev       | double | Standard deviation for longitudinal velocity noise |  0.0|
+|angvel_noise_stddev    | double | Standard deviation for angular velocity noise| 0.0|
+|steer_noise_stddev     | double | Standard deviation for steering angle noise|  0.0001|
+
+
+
+### Vehicle Model Parameters
+
+
+**vehicle_model_type options**
+
+ - `IDEAL_STEER_VEL`
+ - `IDEAL_STEER_ACC`
+ - `IDEAL_STEER_ACC_GEARED`
+ - `DELAY_STEER_ACC`
+ - `DELAY_STEER_ACC_GEARED`
+
+The `IDEAL` model moves ideally as commanded, while the `DELAY` model moves based on a 1st-order with time delay model. The `STEER` means the model receives the steer command. The `VEL` means the model receives the target velocity command, while the `ACC` model receives the target acceleration command. The `GEARED` suffix means that the motion will consider the gear command: the vehicle moves only one direction following the gear.
+
+The table below shows which models correspond to what parameters. The model names are written in abbreviated form (e.g. IDEAL_STEER_VEL = I_ST_V).
+
+
+|Name|Type|Description|I_ST_V|I_ST_A|I_ST_A_G|D_ST_A|D_ST_A_G|Default value| unit |
+|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|
+|acc_time_delay         | double | dead time for the acceleration input                     | x | x | x | o | o | 0.1 | [s] |
+|steer_time_delay       | double | dead time for the steering input                         | x | x | x | o | o | 0.24| [s] |
+|acc_time_constant      | double | time constant of the 1st-order acceleration dynamics     | x | x | x | o | o | 0.1 | [s] |
+|steer_time_constant    | double | time constant of the 1st-order steering dynamics         | x | x | x | o | o | 0.27| [s] |
+|vel_lim                | double | limit of velocity                                        | x | x | x | o | o | 50.0| [m/s] |
+|vel_rate_lim           | double | limit of acceleration                                    | x | x | x | o | o | 7.0 | [m/ss] |
+|steer_lim              | double | limit of steering angle                                  | x | x | x | o | o | 1.0 | [rad] |
+|steer_rate_lim         | double | limit of steering angle change rate                      | x | x | x | o | o | 5.0 | [rad/s] |
+<!-- |deadzone_delta_steer   | double | dead zone for the steering dynamics                      | x | x | x | o | o | 0.0 | [rad] | -->
+
+
+*Note*: The steering/velocity/acceleration dynamics is modeled by a first order system with a deadtime in a *delay* model. The definition of the *time constant* is the time it takes for the step response to rise up to 63% of its final value. The *deadtime* is a delay in the response to a control input.
+
+
+### Default TF configuration
+
+Since the vehicle outputs `odom`->`base_link` tf, this simulator outputs the tf with the same frame_id configuration.
+In the simple_planning_simulator.launch.py, the node that outputs the `map`->`odom` tf, that usually estimated by the localization module (e.g. NDT), will be launched as well. Since the tf output by this simulator module is an ideal value, `odom`->`map` will always be 0.
+
+
+## Error detection and handling
+
+The only validation on inputs being done is testing for a valid vehicle model type.
+
+
+# Security considerations
+<!-- Required -->
+<!-- Things to consider:
+- Spoofing (How do you check for and handle fake input?)
+- Tampering (How do you check for and handle tampered input?)
+- Repudiation (How are you affected by the actions of external actors?).
+- Information Disclosure (Can data leak?).
+- Denial of Service (How do you handle spamming?).
+- Elevation of Privilege (Do you need to change permission levels during execution?) -->
+
+
+# References / External links
+This is originally developed in the Autoware.AI. See the link below.
+
+https://github.com/Autoware-AI/simulation/tree/master/wf_simulator
+
+# Future extensions / Unimplemented parts
+
+ - Improving the accuracy of vehicle models (e.g., adding steering dead zones and slip behavior)
+ - Cooperation with modules that output pseudo pointcloud or pseudo perception results
+
+
+# Related issues
+
+ - #1142: Follow-up to #570 - Integrate simple_planning_simulator Into CI
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ class Client`
`41`	`41`	`const typename ServiceT::Request::SharedPtr & request,`
`42`	`42`	`const std::chrono::nanoseconds & timeout = std::chrono::seconds(2))`
`43`	`43`	`{`
`44`		`- RCLCPP_INFO(`
`45`		`- logger_, "client request: \n%s", rosidl_generator_traits::to_yaml(*request).c_str());`
	`44`	`+ RCLCPP_INFO(logger_, "client request");`
`46`	`45`
`47`	`46`	`if (!client_->service_is_ready()) {`
`48`	`47`	`RCLCPP_INFO(logger_, "client available");`
`@@ -55,8 +54,7 @@ class Client`
`55`	`54`	`return {response_error("Internal service has timed out."), nullptr};`
`56`	`55`	`}`
`57`	`56`
`58`		`- RCLCPP_INFO(`
`59`		`- logger_, "client response: \n%s", rosidl_generator_traits::to_yaml(future.get()).c_str());`
	`57`	`+ RCLCPP_INFO(logger_, "client response");`
`60`	`58`	`return {response_success(), future.get()};`
`61`	`59`	`}`
`62`	`60`