Merge remote-tracking branch 'tier4/ref/RJD-1387-hdmap-utils-to-lanel…

…et-wrapper-distance-step-2' into ref/RJD-1387-hdmap-utils-to-lanelet-wrapper-route

Signed-off-by: Mateusz Palczuk <[email protected]>

.github/workflows/Documentation.yaml

@@ -8,8 +8,6 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
 
 jobs:
   generate:

.github/workflows/InterfaceUpdateNotification.yaml

@@ -1,8 +1,6 @@
 name: Interface update notification
 on:
   pull_request:
-    branches:
-      - master
     paths:
       - openscenario/openscenario_interpreter_msgs/msg/*.msg
       - simulation/traffic_simulator_msgs/msg/*.msg

.github/workflows/PostCheckList.yaml

@@ -1,8 +1,6 @@
 name: Post check list
 on:
   pull_request:
-    branches:
-      - master
     types: [opened, reopened]
 
 jobs:

.github/workflows/SpellCheck.yaml

@@ -3,8 +3,6 @@ name: Spell check
 on:
   workflow_dispatch:
   pull_request:
-    branches:
-      - master
 
 jobs:
   spell-check:

common/math/arithmetic/CHANGELOG.rst

@@ -21,6 +21,19 @@ Changelog for package arithmetic
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+9.4.0 (2025-02-06)
+------------------
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Contributors: Tatsuya Yamasaki, yamacir-kit
+
+9.3.1 (2025-02-06)
+------------------
+* Merge branch 'master' into chore/delete-target-branch-filter
+* Contributors: Masaya Kataoka
+
 9.3.0 (2025-02-05)
 ------------------
 * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator

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>9.3.0</version>
+  <version>9.4.0</version>
   <description>arithmetic library for scenario_simulator_v2</description>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

common/math/geometry/CHANGELOG.rst

@@ -21,6 +21,19 @@ Changelog for package geometry
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+9.4.0 (2025-02-06)
+------------------
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Contributors: Tatsuya Yamasaki, yamacir-kit
+
+9.3.1 (2025-02-06)
+------------------
+* Merge branch 'master' into chore/delete-target-branch-filter
+* Contributors: Masaya Kataoka
+
 9.3.0 (2025-02-05)
 ------------------
 * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator

common/math/geometry/include/geometry/spline/catmull_rom_spline.hpp

@@ -34,7 +34,7 @@ class CatmullRomSpline : public CatmullRomSplineInterface
   CatmullRomSpline() = default;
   explicit CatmullRomSpline(const std::vector<geometry_msgs::msg::Point> & control_points);
   auto getLength() const -> double override { return total_length_; }
-  auto getAltitudeRange() const -> std::pair<double, double>;
+  auto getAltitudeRange() const -> std::pair<double, double> override;
   auto getMaximum2DCurvature() const -> double;
   auto getPoint(const double s) const -> geometry_msgs::msg::Point;
   auto getPoint(const double s, const double offset) const -> geometry_msgs::msg::Point;

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>9.3.0</version>
+  <version>9.4.0</version>
   <description>geometry math library for scenario_simulator_v2 application</description>
   <maintainer email="[email protected]">Masaya Kataoka</maintainer>
   <license>Apache License 2.0</license>

common/scenario_simulator_exception/CHANGELOG.rst

@@ -21,6 +21,19 @@ Changelog for package scenario_simulator_exception
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+9.4.0 (2025-02-06)
+------------------
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Contributors: Tatsuya Yamasaki, yamacir-kit
+
+9.3.1 (2025-02-06)
+------------------
+* Merge branch 'master' into chore/delete-target-branch-filter
+* Contributors: Masaya Kataoka
+
 9.3.0 (2025-02-05)
 ------------------
 * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator

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>9.3.0</version>
+  <version>9.4.0</version>
   <description>Exception types for scenario simulator</description>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

common/simple_junit/CHANGELOG.rst

@@ -21,6 +21,19 @@ Changelog for package junit_exporter
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+9.4.0 (2025-02-06)
+------------------
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Contributors: Tatsuya Yamasaki, yamacir-kit
+
+9.3.1 (2025-02-06)
+------------------
+* Merge branch 'master' into chore/delete-target-branch-filter
+* Contributors: Masaya Kataoka
+
 9.3.0 (2025-02-05)
 ------------------
 * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator

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>9.3.0</version>
+  <version>9.4.0</version>
   <description>Lightweight JUnit library for ROS 2</description>
   <maintainer email="[email protected]">Masaya Kataoka</maintainer>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>

common/status_monitor/CHANGELOG.rst

@@ -21,6 +21,19 @@ Changelog for package status_monitor
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+9.4.0 (2025-02-06)
+------------------
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Contributors: Tatsuya Yamasaki, yamacir-kit
+
+9.3.1 (2025-02-06)
+------------------
+* Merge branch 'master' into chore/delete-target-branch-filter
+* Contributors: Masaya Kataoka
+
 9.3.0 (2025-02-05)
 ------------------
 * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator

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>9.3.0</version>
+  <version>9.4.0</version>
   <description>none</description>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

external/concealer/CHANGELOG.rst

@@ -21,6 +21,27 @@ Changelog for package concealer
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+9.4.0 (2025-02-06)
+------------------
+* Merge pull request `#1518 <https://github.com/tier4/scenario_simulator_v2/issues/1518>`_ from tier4/feature/support-latest-autoware-message-type
+  Support message type `autoware_internal_planning_msgs::msg::PathWithLaneId`
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Add new constant `concealer::default_architecture_type`
+* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type
+* Update function template `available<T>` to prepare its own node
+* Update the concealer node to use global arguments
+* Add new architecture-type `awf/universe/20250130`
+* Merge branch 'master' into feature/support-latest-autoware-message-type
+* Update `Subscriber` to handle multiple message types with priorities
+* Support message type `autoware_internal_planning_msgs::msg::PathWithLaneId`
+* Contributors: Tatsuya Yamasaki, yamacir-kit
+
+9.3.1 (2025-02-06)
+------------------
+* Merge branch 'master' into chore/delete-target-branch-filter
+* Contributors: Masaya Kataoka
+
 9.3.0 (2025-02-05)
 ------------------
 * Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator

external/concealer/CMakeLists.txt

@@ -18,6 +18,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
   src/execute.cpp
   src/field_operator_application.cpp
   src/is_package_exists.cpp
+  src/path_with_lane_id.cpp
   src/task_queue.cpp)
 
 target_link_libraries(${PROJECT_NAME}

external/concealer/include/concealer/autoware_universe.hpp

@@ -26,6 +26,7 @@
 #include <autoware_vehicle_msgs/msg/velocity_report.hpp>
 #include <autoware_vehicle_msgs/srv/control_mode_command.hpp>
 #include <concealer/continuous_transform_broadcaster.hpp>
+#include <concealer/path_with_lane_id.hpp>
 #include <concealer/publisher.hpp>
 #include <concealer/subscriber.hpp>
 #include <concealer/visibility.hpp>
@@ -34,7 +35,6 @@
 #include <geometry_msgs/msg/twist_stamped.hpp>
 #include <nav_msgs/msg/odometry.hpp>
 #include <rclcpp/rclcpp.hpp>
-#include <tier4_planning_msgs/msg/path_with_lane_id.hpp>
 
 namespace concealer
 {
@@ -50,17 +50,16 @@ class AutowareUniverse : public rclcpp::Node,
   using GearCommand                 = autoware_vehicle_msgs::msg::GearCommand;
   using GearReport                  = autoware_vehicle_msgs::msg::GearReport;
   using Odometry                    = nav_msgs::msg::Odometry;
-  using PathWithLaneId              = tier4_planning_msgs::msg::PathWithLaneId;
   using PoseWithCovarianceStamped   = geometry_msgs::msg::PoseWithCovarianceStamped;
   using SteeringReport              = autoware_vehicle_msgs::msg::SteeringReport;
   using TurnIndicatorsCommand       = autoware_vehicle_msgs::msg::TurnIndicatorsCommand;
   using TurnIndicatorsReport        = autoware_vehicle_msgs::msg::TurnIndicatorsReport;
   using VelocityReport              = autoware_vehicle_msgs::msg::VelocityReport;
 
-  Subscriber<Control>               getCommand;
-  Subscriber<GearCommand>           getGearCommand;
-  Subscriber<TurnIndicatorsCommand> getTurnIndicatorsCommand;
-  Subscriber<PathWithLaneId>        getPathWithLaneId;
+  Subscriber<Control>                  getCommand;
+  Subscriber<GearCommand>              getGearCommand;
+  Subscriber<TurnIndicatorsCommand>    getTurnIndicatorsCommand;
+  Subscriber<priority::PathWithLaneId> getPathWithLaneId;
 
   Publisher<AccelWithCovarianceStamped> setAcceleration;
   Publisher<Odometry>                   setOdometry;

external/concealer/include/concealer/available.hpp

@@ -0,0 +1,27 @@
+// Copyright 2015 TIER IV, Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef CONCEALER__AVAILABLE_HPP_
+#define CONCEALER__AVAILABLE_HPP_
+
+namespace concealer
+{
+template <typename T>
+constexpr auto available() -> bool
+{
+  return true;
+}
+}  // namespace concealer
+
+#endif  // CONCEALER__AVAILABLE_HPP_

external/concealer/include/concealer/convert.hpp

@@ -0,0 +1,27 @@
+// Copyright 2015 TIER IV, Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef CONCEALER__CONVERT_HPP_
+#define CONCEALER__CONVERT_HPP_
+
+namespace concealer
+{
+template <typename To, typename From>
+auto convert(const From & from) -> To
+{
+  return std::forward<decltype(from)>(from);
+}
+}  // namespace concealer
+
+#endif  // CONCEALER__CONVERT_HPP_

external/concealer/include/concealer/field_operator_application.hpp

@@ -31,6 +31,7 @@
 #include <autoware_vehicle_msgs/msg/gear_command.hpp>
 #include <autoware_vehicle_msgs/msg/turn_indicators_command.hpp>
 #include <concealer/autoware_universe.hpp>
+#include <concealer/path_with_lane_id.hpp>
 #include <concealer/publisher.hpp>
 #include <concealer/service.hpp>
 #include <concealer/subscriber.hpp>
@@ -44,7 +45,6 @@
 #include <tier4_external_api_msgs/msg/emergency.hpp>
 #include <tier4_external_api_msgs/srv/engage.hpp>
 #include <tier4_external_api_msgs/srv/set_velocity_limit.hpp>
-#include <tier4_planning_msgs/msg/path_with_lane_id.hpp>
 #include <tier4_planning_msgs/msg/trajectory.hpp>
 #include <tier4_rtc_msgs/msg/cooperate_status_array.hpp>
 #include <tier4_rtc_msgs/srv/auto_mode_with_module.hpp>
@@ -78,7 +78,6 @@ struct FieldOperatorApplication : public rclcpp::Node,
   using Emergency                       = tier4_external_api_msgs::msg::Emergency;
   using LocalizationInitializationState = autoware_adapi_v1_msgs::msg::LocalizationInitializationState;
   using MrmState                        = autoware_adapi_v1_msgs::msg::MrmState;
-  using PathWithLaneId                  = tier4_planning_msgs::msg::PathWithLaneId;
   using Trajectory                      = tier4_planning_msgs::msg::Trajectory;
   using TurnIndicatorsCommand           = autoware_vehicle_msgs::msg::TurnIndicatorsCommand;
 
@@ -98,10 +97,10 @@ struct FieldOperatorApplication : public rclcpp::Node,
 #if __has_include(<autoware_adapi_v1_msgs/msg/localization_initialization_state.hpp>)
   Subscriber<LocalizationInitializationState> getLocalizationState;
 #endif
-  Subscriber<MrmState>                        getMrmState;
-  Subscriber<PathWithLaneId>                  getPathWithLaneId;
-  Subscriber<Trajectory>                      getTrajectory;
-  Subscriber<TurnIndicatorsCommand>           getTurnIndicatorsCommand;
+  Subscriber<MrmState>                 getMrmState;
+  Subscriber<priority::PathWithLaneId> getPathWithLaneId;
+  Subscriber<Trajectory>               getTrajectory;
+  Subscriber<TurnIndicatorsCommand>    getTurnIndicatorsCommand;
 
   Service<ClearRoute>             requestClearRoute;
   Service<CooperateCommands>      requestCooperateCommands;