Merge branch 'master' into RJD-1197/distance

tier4 · Sep 9, 2024 · af63e5f · af63e5f
2 parents ddd827a + 6269ea8
commit af63e5f
Show file tree

Hide file tree

Showing 62 changed files with 192 additions and 82 deletions.
diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package arithmetic
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>arithmetic</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>arithmetic library for scenario_simulator_v2</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package geometry
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>geometry</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>geometry math library for scenario_simulator_v2 application</description>
   <maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
   <license>Apache License 2.0</license>

diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package scenario_simulator_exception
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>scenario_simulator_exception</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>Exception types for scenario simulator</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package junit_exporter
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>simple_junit</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>Lightweight JUnit library for ROS 2</description>
   <maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>

diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package status_monitor
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>status_monitor</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>none</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst
@@ -21,6 +21,12 @@ Changelog for package concealer
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+* Merge pull request `#1362 <https://github.com/tier4/scenario_simulator_v2/issues/1362>`_ from tier4/feature/ros2-parameter-forwarding
+* Add feature to forward parameters prefixed with `autoware.` to Autoware
+* Contributors: Kotaro Yoshimoto, yamacir-kit
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/external/concealer/include/concealer/launch.hpp b/external/concealer/include/concealer/launch.hpp
@@ -33,8 +33,9 @@
 
 namespace concealer
 {
-template <typename... Ts>
-auto ros2_launch(const std::string & package, const std::string & file, Ts &&... xs)
+template <typename Parameters>
+auto ros2_launch(
+  const std::string & package, const std::string & file, const Parameters & parameters)
 {
 #ifdef CONCEALER_ISOLATE_STANDARD_OUTPUT
   const std::string log_filename = "/tmp/scenario_test_runner/autoware-output.txt";
@@ -44,17 +45,23 @@ auto ros2_launch(const std::string & package, const std::string & file, Ts &&...
   ::close(fd);
 #endif
 
-  const auto process_id = fork();
+  const auto argv = [&]() {
+    auto argv = std::vector<std::string>();
 
-  const std::vector<std::string> argv{
-    "python3",
-    boost::algorithm::replace_all_copy(dollar("which ros2"), "\n", ""),
-    "launch",  // NOTE: The command 'ros2' is a Python script.
-    package,
-    file,
-    std::forward<decltype(xs)>(xs)...};
+    argv.push_back("python3");
+    argv.push_back(boost::algorithm::replace_all_copy(dollar("which ros2"), "\n", ""));
+    argv.push_back("launch");
+    argv.push_back(package);
+    argv.push_back(file);
 
-  if (process_id < 0) {
+    for (const auto & parameter : parameters) {
+      argv.push_back(parameter);
+    }
+
+    return argv;
+  }();
+
+  if (const auto process_id = fork(); process_id < 0) {
     throw std::system_error(errno, std::system_category());
   } else if (process_id == 0 and execute(argv) < 0) {
     std::cout << std::system_error(errno, std::system_category()).what() << std::endl;

diff --git a/external/concealer/package.xml b/external/concealer/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>concealer</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator.</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst
@@ -24,6 +24,9 @@ Changelog for package embree_vendor
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>embree_vendor</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>vendor packages for intel raytracing kernel library</description>
   <maintainer email="ms.kataoka@gmail.com">masaya</maintainer>
   <license>Apache 2.0</license>

diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package kashiwanoha_map
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>kashiwanoha_map</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>map package for kashiwanoha</description>
   <maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
   <license>Apache License 2.0</license>

diff --git a/map/simple_cross_map/CHANGELOG.rst b/map/simple_cross_map/CHANGELOG.rst
@@ -9,6 +9,9 @@ Changelog for package simple_cross_map
 * Merge branch 'master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/map/simple_cross_map/package.xml b/map/simple_cross_map/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>simple_cross_map</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>map package for simple cross</description>
   <maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
   <license>Apache License 2.0</license>

diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package cpp_mock_scenarios
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>cpp_mock_scenarios</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>C++ mock scenarios</description>
   <maintainer email="masaya.kataoka@tier4.jp">masaya</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package openscenario_experimental_catalog
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>openscenario_experimental_catalog</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>TIER IV experimental catalogs for OpenSCENARIO</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst
@@ -32,6 +32,9 @@ Changelog for package openscenario_interpreter
 * add publish_empty_context parameter
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>openscenario_interpreter</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>OpenSCENARIO 1.2.0 interpreter package for Autoware</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package openscenario_interpreter_example
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml
@@ -3,7 +3,7 @@
 
 <package format="3">
   <name>openscenario_interpreter_example</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>Examples for some TIER IV OpenSCENARIO Interpreter's features</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package openscenario_interpreter_msgs
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>openscenario_interpreter_msgs</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>ROS message types for package openscenario_interpreter</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Yamasaki Tatsuya</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package openscenario_preprocessor
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml
@@ -3,7 +3,7 @@
 
 <package format="3">
   <name>openscenario_preprocessor</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>Example package for TIER IV OpenSCENARIO Interpreter</description>
   <maintainer email="kotaro.yoshimoto@tier4.jp">Kotaro Yoshimoto</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package openscenario_preprocessor_msgs
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>openscenario_preprocessor_msgs</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>ROS message types for package openscenario_preprocessor</description>
   <maintainer email="kotaro.yoshimoto@tier4.jp">Kotaro Yoshimoto</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst
@@ -24,6 +24,9 @@ Changelog for package openscenario_utility
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>openscenario_utility</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>Utility tools for ASAM OpenSCENARIO 1.2.0</description>
   <maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/openscenario/openscenario_validator/CHANGELOG.rst b/openscenario/openscenario_validator/CHANGELOG.rst
@@ -10,6 +10,9 @@ Changelog for package openscenario_validator
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control

diff --git a/openscenario/openscenario_validator/package.xml b/openscenario/openscenario_validator/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>openscenario_validator</name>
-  <version>4.1.1</version>
+  <version>4.2.0</version>
   <description>Validator for OpenSCENARIO 1.3</description>
   <maintainer email="kotaro.yoshimoto@tier4.jp">Kotaro Yoshimoto</maintainer>
   <license>Apache License 2.0</license>

diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst
@@ -21,6 +21,9 @@ Changelog for package openscenario_visualization
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.0 (2024-09-09)
+------------------
+
 4.1.1 (2024-09-03)
 ------------------
 * Merge branch 'master' into fix/use-sim-time-for-real-time-factor-control