diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index bf877ad32a1..e3ac9ab917c 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 115e7712593..8cc741ab2a5 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 5.0.0 + 5.1.1 arithmetic library for scenario_simulator_v2 Tatsuya Yamasaki Apache License 2.0 diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index 3b0a823faa8..517278565a4 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -21,6 +21,55 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge pull request `#1439 `_ from tier4/fix/sonor-cloud-issue-5 + fix sonor cloud issue +* Refactor: Replace 'virtual' with 'override' in destructor for clarity +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* fix sonor cloud issue +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* fix sonor cloud issue +* Contributors: Masaya Kataoka, Taiga, Taiga Takano + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge pull request `#1431 `_ from tier4/fix/sonor-cloud-issue + fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* adding const to objects. +* Defined individually in each statement. +* adding const to large objects. +* Fix declaration mismatch. +* Remove unnecessary const from the return value of the function. +* Contributors: Masaya Kataoka, Taiga, Taiga Takano + +5.0.1 (2024-11-11) +------------------ +* Merge pull request `#1428 `_ from tier4/fix/dont-float-loop + Refactor curvature sampling loop to avoid using float counter +* add comment +* Refactor curvature sampling loop to avoid using float counter +* Contributors: Masaya Kataoka, Taiga Takano + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/common/math/geometry/include/geometry/bounding_box.hpp b/common/math/geometry/include/geometry/bounding_box.hpp index 2839301ac85..0dfa05e0d7c 100644 --- a/common/math/geometry/include/geometry/bounding_box.hpp +++ b/common/math/geometry/include/geometry/bounding_box.hpp @@ -63,11 +63,11 @@ auto toPolygon2D(const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> std::vector; auto toPolygon2D( const geometry_msgs::msg::Pose & pose, - const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> const boost_polygon; + const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> boost_polygon; std::vector getPointsFromBbox( - traffic_simulator_msgs::msg::BoundingBox bounding_box, double width_extension_right = 0.0, - double width_extension_left = 0.0, double length_extension_front = 0.0, - double length_extension_rear = 0.0); + const traffic_simulator_msgs::msg::BoundingBox & bounding_box, + const double width_extension_right = 0.0, const double width_extension_left = 0.0, + const double length_extension_front = 0.0, const double length_extension_rear = 0.0); DistancesFromCenterToEdge getDistancesFromCenterToEdge( const traffic_simulator_msgs::msg::BoundingBox & bounding_box); diff --git a/common/math/geometry/include/geometry/quaternion/quaternion_to_euler.hpp b/common/math/geometry/include/geometry/quaternion/quaternion_to_euler.hpp index 72901ccb8e0..a8a6ea0070d 100644 --- a/common/math/geometry/include/geometry/quaternion/quaternion_to_euler.hpp +++ b/common/math/geometry/include/geometry/quaternion/quaternion_to_euler.hpp @@ -31,7 +31,9 @@ auto convertQuaternionToEulerAngle(const T & q) { tf2::Quaternion tf_quat(q.x, q.y, q.z, q.w); tf2::Matrix3x3 mat(tf_quat); - double roll, pitch, yaw; + double roll; + double pitch; + double yaw; mat.getRPY(roll, pitch, yaw); return geometry_msgs::build().x(roll).y(pitch).z(yaw); } diff --git a/common/math/geometry/include/geometry/spline/catmull_rom_spline_interface.hpp b/common/math/geometry/include/geometry/spline/catmull_rom_spline_interface.hpp index 616d8d57d2d..8969a818308 100644 --- a/common/math/geometry/include/geometry/spline/catmull_rom_spline_interface.hpp +++ b/common/math/geometry/include/geometry/spline/catmull_rom_spline_interface.hpp @@ -29,6 +29,7 @@ namespace geometry class CatmullRomSplineInterface { public: + virtual ~CatmullRomSplineInterface() = default; virtual double getLength() const = 0; virtual std::optional getCollisionPointIn2D( const std::vector & polygon, diff --git a/common/math/geometry/include/geometry/spline/catmull_rom_subspline.hpp b/common/math/geometry/include/geometry/spline/catmull_rom_subspline.hpp index 424ab27004b..22827657f2f 100644 --- a/common/math/geometry/include/geometry/spline/catmull_rom_subspline.hpp +++ b/common/math/geometry/include/geometry/spline/catmull_rom_subspline.hpp @@ -32,6 +32,7 @@ namespace geometry class CatmullRomSubspline : public CatmullRomSplineInterface { public: + ~CatmullRomSubspline() override = default; explicit CatmullRomSubspline( std::shared_ptr spline, const double start_s, const double end_s) diff --git a/common/math/geometry/include/geometry/spline/hermite_curve.hpp b/common/math/geometry/include/geometry/spline/hermite_curve.hpp index 975bb5a69d2..309a5ec9e16 100644 --- a/common/math/geometry/include/geometry/spline/hermite_curve.hpp +++ b/common/math/geometry/include/geometry/spline/hermite_curve.hpp @@ -32,9 +32,20 @@ class HermiteCurve { private: friend class HermiteCurveTest; - double ax_, bx_, cx_, dx_; - double ay_, by_, cy_, dy_; - double az_, bz_, cz_, dz_; + double ax_; + double bx_; + double cx_; + double dx_; + + double ay_; + double by_; + double cy_; + double dy_; + + double az_; + double bz_; + double cz_; + double dz_; math::geometry::PolynomialSolver solver_; public: diff --git a/common/math/geometry/include/geometry/vector3/operator.hpp b/common/math/geometry/include/geometry/vector3/operator.hpp index 091e6ec8028..f1d839b6cb1 100644 --- a/common/math/geometry/include/geometry/vector3/operator.hpp +++ b/common/math/geometry/include/geometry/vector3/operator.hpp @@ -30,7 +30,7 @@ template < nullptr> auto operator+(const T & a, const U & b) { - if constexpr (std::is_same::value) { + if constexpr (std::is_same_v) { geometry_msgs::msg::Vector3 v; v.x = a.x + b.x; v.y = a.y + b.y; @@ -51,7 +51,7 @@ template < nullptr> auto operator-(const T & a, const U & b) { - if constexpr (std::is_same::value) { + if constexpr (std::is_same_v) { geometry_msgs::msg::Vector3 v; v.x = a.x - b.x; v.y = a.y - b.y; @@ -72,7 +72,7 @@ template < nullptr> auto operator*(const T & a, const U & b) { - if constexpr (std::is_same::value) { + if constexpr (std::is_same_v) { geometry_msgs::msg::Vector3 v; v.x = a.x * b; v.y = a.y * b; @@ -93,7 +93,7 @@ template < nullptr> auto operator/(const T & a, const U & b) { - if constexpr (std::is_same::value) { + if constexpr (std::is_same_v) { geometry_msgs::msg::Vector3 v; v.x = a.x / b; v.y = a.y / b; diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index a186c5f324d..db934a7df86 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 5.0.0 + 5.1.1 geometry math library for scenario_simulator_v2 application Masaya Kataoka Apache License 2.0 diff --git a/common/math/geometry/src/bounding_box.cpp b/common/math/geometry/src/bounding_box.cpp index e1e9cad6533..db3d75b2f9f 100644 --- a/common/math/geometry/src/bounding_box.cpp +++ b/common/math/geometry/src/bounding_box.cpp @@ -102,7 +102,8 @@ std::optional> get boost_point pointToSegmentProjection( const boost_point & p, const boost_point & p1, const boost_point & p2) { - boost_point v = p2, w = p; + auto v = p2; + auto w = p; boost::geometry::subtract_point(v, p1); boost::geometry::subtract_point(w, p1); @@ -121,14 +122,15 @@ boost_point pointToSegmentProjection( auto toPolygon2D( const geometry_msgs::msg::Pose & pose, - const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> const boost_polygon + const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> boost_polygon { return toBoostPolygon(transformPoints(pose, getPointsFromBbox(bounding_box))); } std::vector getPointsFromBbox( - traffic_simulator_msgs::msg::BoundingBox bounding_box, double width_extension_right, - double width_extension_left, double length_extension_front, double length_extension_rear) + const traffic_simulator_msgs::msg::BoundingBox & bounding_box, const double width_extension_right, + const double width_extension_left, const double length_extension_front, + const double length_extension_rear) { std::vector points; auto distances_from_center_to_edge = getDistancesFromCenterToEdge(bounding_box); @@ -159,7 +161,14 @@ auto toPolygon2D(const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> std::vector { std::vector points_bounding_box; - geometry_msgs::msg::Point p0, p1, p2, p3, p4, p5, p6, p7; + geometry_msgs::msg::Point p0; + geometry_msgs::msg::Point p1; + geometry_msgs::msg::Point p2; + geometry_msgs::msg::Point p3; + geometry_msgs::msg::Point p4; + geometry_msgs::msg::Point p5; + geometry_msgs::msg::Point p6; + geometry_msgs::msg::Point p7; p0.x = bounding_box.center.x + bounding_box.dimensions.x * 0.5; p0.y = bounding_box.center.y + bounding_box.dimensions.y * 0.5; diff --git a/common/math/geometry/src/intersection/intersection.cpp b/common/math/geometry/src/intersection/intersection.cpp index 85c87801788..6b161ff1fc9 100644 --- a/common/math/geometry/src/intersection/intersection.cpp +++ b/common/math/geometry/src/intersection/intersection.cpp @@ -23,8 +23,10 @@ namespace geometry { bool isIntersect2D(const LineSegment & line0, const LineSegment & line1) { - const auto &p0 = line0.start_point, &q0 = line0.end_point; - const auto &p1 = line1.start_point, &q1 = line1.end_point; + const auto & p0 = line0.start_point; + const auto & q0 = line0.end_point; + const auto & p1 = line1.start_point; + const auto & q1 = line1.end_point; const int relative_position_p0 = line1.relativePointPosition2D(p0); const int relative_position_q0 = line1.relativePointPosition2D(q0); diff --git a/common/math/geometry/src/spline/hermite_curve.cpp b/common/math/geometry/src/spline/hermite_curve.cpp index 1c719839cb8..33b44a9b704 100644 --- a/common/math/geometry/src/spline/hermite_curve.cpp +++ b/common/math/geometry/src/spline/hermite_curve.cpp @@ -94,13 +94,13 @@ std::set HermiteCurve::getCollisionPointsIn2D( } std::set s_values; for (size_t i = 0; i < (n - 1); i++) { - const auto p0 = polygon[i]; - const auto p1 = polygon[i + 1]; + const auto & p0 = polygon[i]; + const auto & p1 = polygon[i + 1]; s_values.merge(getCollisionPointsIn2D(p0, p1, search_backward, denormalize_s)); } if (close_start_end) { - const auto p0 = polygon[n - 1]; - const auto p1 = polygon[0]; + const auto & p0 = polygon[n - 1]; + const auto & p1 = polygon[0]; s_values.merge(getCollisionPointsIn2D(p0, p1, search_backward, denormalize_s)); } return s_values; @@ -202,7 +202,8 @@ std::optional HermiteCurve::getCollisionPointIn2D( std::optional HermiteCurve::getSValue( const geometry_msgs::msg::Pose & pose, double threshold_distance, bool denormalize_s) const { - geometry_msgs::msg::Point p0, p1; + geometry_msgs::msg::Point p0; + geometry_msgs::msg::Point p1; p0.y = threshold_distance; p1.y = -threshold_distance; const auto line = math::geometry::transformPoints(pose, {p0, p1}); @@ -313,13 +314,19 @@ std::pair HermiteCurve::get2DMinMaxCurvatureValue() const { std::pair ret; std::vector curvatures; - /** - * @brief 0.1 is a sampling resolution of the curvature - */ - for (double s = 0; s <= 1; s = s + 0.1) { + + /// @note Specifies the number of samples. The curve is divided into 10 segments for calculation. + constexpr int sample_count = 10; + + /// @note Sampling resolution. Calculated as 1.0 divided by sample_count. + constexpr double resolution = 1.0 / sample_count; + + for (int i = 0; i <= sample_count; ++i) { + double s = i * resolution; double curvature = get2DCurvature(s); curvatures.push_back(curvature); } + ret.first = *std::min_element(curvatures.begin(), curvatures.end()); ret.second = *std::max_element(curvatures.begin(), curvatures.end()); return ret; diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index e282c5fde4b..1a5ba7d3792 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 4a0781c0cf9..c9d5ad62709 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 5.0.0 + 5.1.1 Exception types for scenario simulator Tatsuya Yamasaki Apache License 2.0 diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index 32f259899ce..fbf2e1ab3f9 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 4dbb7fabd69..d2120775fe0 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 5.0.0 + 5.1.1 Lightweight JUnit library for ROS 2 Masaya Kataoka Tatsuya Yamasaki diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index 5a8306f13ea..c12ab33d26f 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 16d776391cf..2bcd71163c4 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 5.0.0 + 5.1.1 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index ad524ff1b0a..7db4a1ede48 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package concealer * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 3e8b64f2e15..a48474f2857 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 5.0.0 + 5.1.1 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst index 6c7f59d93f1..49712ca6578 100644 --- a/external/embree_vendor/CHANGELOG.rst +++ b/external/embree_vendor/CHANGELOG.rst @@ -24,6 +24,38 @@ Changelog for package embree_vendor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index 46478d8aacc..da79d3f0918 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 5.0.0 + 5.1.1 vendor packages for intel raytracing kernel library masaya Apache 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 9e214c815cb..9e377029223 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 7653804131f..9d6cbaf1e38 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 5.0.0 + 5.1.1 map package for kashiwanoha Masaya Kataoka Apache License 2.0 diff --git a/map/simple_cross_map/CHANGELOG.rst b/map/simple_cross_map/CHANGELOG.rst index 5e41e3a86b3..14b3b40402e 100644 --- a/map/simple_cross_map/CHANGELOG.rst +++ b/map/simple_cross_map/CHANGELOG.rst @@ -9,6 +9,38 @@ Changelog for package simple_cross_map * Merge branch 'master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/map/simple_cross_map/package.xml b/map/simple_cross_map/package.xml index aaaf976379c..845db4f8bb9 100644 --- a/map/simple_cross_map/package.xml +++ b/map/simple_cross_map/package.xml @@ -2,7 +2,7 @@ simple_cross_map - 5.0.0 + 5.1.1 map package for simple cross Masaya Kataoka Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index 86ef0b349a6..88841e2b7af 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -21,6 +21,40 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge pull request `#1357 `_ from tier4/feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* feat: support awf/universe/20240605 as architecture_type in mock_test.launch.py +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge pull request `#1406 `_ from tier4/RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/mock/cpp_mock_scenarios/launch/mock_test.launch.py b/mock/cpp_mock_scenarios/launch/mock_test.launch.py index b618c0e56ca..afa23b31524 100644 --- a/mock/cpp_mock_scenarios/launch/mock_test.launch.py +++ b/mock/cpp_mock_scenarios/launch/mock_test.launch.py @@ -78,7 +78,7 @@ def on_stdout_output(event: launch.Event) -> None: def architecture_types(): - return ["awf/universe", "awf/universe/20230906"] + return ["awf/universe", "awf/universe/20230906", "awf/universe/20240605"] def default_autoware_launch_package_of(architecture_type): @@ -89,6 +89,7 @@ def default_autoware_launch_package_of(architecture_type): return { "awf/universe": "autoware_launch", "awf/universe/20230906": "autoware_launch", + "awf/universe/20240605": "autoware_launch", }[architecture_type] @@ -100,6 +101,7 @@ def default_autoware_launch_file_of(architecture_type): return { "awf/universe": "planning_simulator.launch.xml", "awf/universe/20230906": "planning_simulator.launch.xml", + "awf/universe/20240605": "planning_simulator.launch.xml", }[architecture_type] diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index efa56481bbb..0b28f1784cd 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 5.0.0 + 5.1.1 C++ mock scenarios masaya Apache License 2.0 diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index f9c4c6f5ff0..fb2dc8d79ce 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 6f095b685ed..9b1e6dfffd9 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 5.0.0 + 5.1.1 TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index 64a80baadf5..fed7ffb5ced 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -32,6 +32,38 @@ Changelog for package openscenario_interpreter * add publish_empty_context parameter * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge pull request `#1406 `_ from tier4/RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 3de6aa58469..3c66d6df4e0 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 5.0.0 + 5.1.1 OpenSCENARIO 1.2.0 interpreter package for Autoware Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index 8ce3f6b8de3..6c8e52aa0b4 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 0ebef1c115f..e923174027f 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 5.0.0 + 5.1.1 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index 5ac4331a91b..bc9a44c9750 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 1b0a8e2bc72..8bbdb458351 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 5.0.0 + 5.1.1 ROS message types for package openscenario_interpreter Yamasaki Tatsuya Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index 2591f4f4879..a9f0cd82da5 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 7c3c8c0604b..4bb760d2477 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 5.0.0 + 5.1.1 Example package for TIER IV OpenSCENARIO Interpreter Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index 596e7db113b..1c49ac09c10 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index b2638e56e19..930529d29fa 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 5.0.0 + 5.1.1 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index 5f33bb739d1..ee1d43e7c6f 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -24,6 +24,38 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index a58334982d4..17c6c07c71a 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 5.0.0 + 5.1.1 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_validator/CHANGELOG.rst b/openscenario/openscenario_validator/CHANGELOG.rst index 53624dba86f..9b13a0a8bb2 100644 --- a/openscenario/openscenario_validator/CHANGELOG.rst +++ b/openscenario/openscenario_validator/CHANGELOG.rst @@ -10,6 +10,38 @@ Changelog for package openscenario_validator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/openscenario/openscenario_validator/package.xml b/openscenario/openscenario_validator/package.xml index 5adf8985778..54fb290f20f 100644 --- a/openscenario/openscenario_validator/package.xml +++ b/openscenario/openscenario_validator/package.xml @@ -2,7 +2,7 @@ openscenario_validator - 5.0.0 + 5.1.1 Validator for OpenSCENARIO 1.3 Kotaro Yoshimoto Apache License 2.0 diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst index dbdddb385b5..090873db47b 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -21,6 +21,43 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge pull request `#1431 `_ from tier4/fix/sonor-cloud-issue + fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* modified it to use smart pointers +* Change "NULL" to "nullptr". +* Enforces dynamic dispatch. +* Contributors: Masaya Kataoka, Taiga, Taiga Takano + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/rviz_plugins/openscenario_visualization/include/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.hpp b/rviz_plugins/openscenario_visualization/include/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.hpp index 0f020511a10..0e773c95e6f 100644 --- a/rviz_plugins/openscenario_visualization/include/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.hpp +++ b/rviz_plugins/openscenario_visualization/include/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.hpp @@ -88,13 +88,13 @@ private Q_SLOTS: protected: void processMessage(const Context::ConstSharedPtr msg_ptr); jsk_rviz_plugins::OverlayObject::Ptr overlay_; - rviz_common::properties::ColorProperty * property_text_color_; - rviz_common::properties::IntProperty * property_left_; - rviz_common::properties::IntProperty * property_top_; - rviz_common::properties::IntProperty * property_length_; - rviz_common::properties::IntProperty * property_width_; - rviz_common::properties::StringProperty * property_topic_name_; - rviz_common::properties::FloatProperty * property_value_scale_; + std::unique_ptr property_text_color_; + std::unique_ptr property_left_; + std::unique_ptr property_top_; + std::unique_ptr property_length_; + std::unique_ptr property_width_; + std::unique_ptr property_topic_name_; + std::unique_ptr property_value_scale_; private: void loadConditionGroups(const Context::ConstSharedPtr msg_ptr); diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index 632ef191501..fbd6e37b895 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 5.0.0 + 5.1.1 Visualization tools for simulation results Masaya Kataoka Kyoichi Sugahara diff --git a/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/jsk_overlay_utils.cpp b/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/jsk_overlay_utils.cpp index ce544b634dd..b3b4ded3849 100644 --- a/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/jsk_overlay_utils.cpp +++ b/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/jsk_overlay_utils.cpp @@ -110,7 +110,7 @@ OverlayObject::OverlayObject( OverlayObject::~OverlayObject() { - hide(); + this->hide(); panel_material_->unload(); Ogre::MaterialManager::getSingleton().remove(panel_material_->getName()); } diff --git a/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.cpp b/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.cpp index b702b772f68..0d1c54a46f5 100644 --- a/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.cpp +++ b/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,7 @@ VisualizationConditionGroupsDisplay::VisualizationConditionGroupsDisplay() : condition_groups_collection_ptr_(std::make_shared>()) { /// @note Get screen info of default display - const Screen * screen_info = DefaultScreenOfDisplay(XOpenDisplay(NULL)); + const Screen * screen_info = DefaultScreenOfDisplay(XOpenDisplay(nullptr)); /// @note Fixed height for a 4k resolution screen /// @sa https://github.com/tier4/scenario_simulator_v2/pull/1033#discussion_r1412781103 @@ -75,25 +76,25 @@ VisualizationConditionGroupsDisplay::VisualizationConditionGroupsDisplay() */ const int width = static_cast(std::round(2000 * scale)); - property_topic_name_ = new rviz_common::properties::StringProperty( + property_topic_name_ = std::make_unique( "Topic", "/simulation/context", "The topic on which to publish simulation context.", this, SLOT(updateTopic()), this); - property_text_color_ = new rviz_common::properties::ColorProperty( + property_text_color_ = std::make_unique( "Text Color", QColor(255, 255, 255), "text color", this, SLOT(updateVisualization()), this); - property_left_ = new rviz_common::properties::IntProperty( + property_left_ = std::make_unique( "Left", left, "Left of the plotter window", this, SLOT(updateVisualization()), this); property_left_->setMin(0); - property_top_ = new rviz_common::properties::IntProperty( + property_top_ = std::make_unique( "Top", top, "Top of the plotter window", this, SLOT(updateVisualization())); property_top_->setMin(0); - property_length_ = new rviz_common::properties::IntProperty( + property_length_ = std::make_unique( "Length", length, "Length of the plotter window", this, SLOT(updateVisualization()), this); property_length_->setMin(10); - property_width_ = new rviz_common::properties::IntProperty( + property_width_ = std::make_unique( "Width", width, "Width of the plotter window", this, SLOT(updateVisualization()), this); property_width_->setMin(10); - property_value_scale_ = new rviz_common::properties::FloatProperty( + property_value_scale_ = std::make_unique( "Value Scale", text_size, "This property controls the scaling factor for the text size on the panel. Setting a higher " "value results in larger text, making the displayed information easier to read.", diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst index 2d2e5acd011..aeb37a3afd6 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package real_time_factor_control_rviz_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml index bfd2a7e2e66..b30c47f3d3c 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml @@ -2,7 +2,7 @@ real_time_factor_control_rviz_plugin - 5.0.0 + 5.1.1 Slider controlling real time factor value. Paweł Lech Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 5ef2897c1cf..cf89c64a3b9 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 7971f17b2b0..8dc765b182c 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 5.0.0 + 5.1.1 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index 3e3a37227ea..6695b658de4 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge pull request `#1406 `_ from tier4/RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index d0b8c865318..e05626d08fe 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 5.0.0 + 5.1.1 Behavior tree plugin for traffic_simulator masaya Apache 2.0 diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index 69170d3e8cc..7df0cec7200 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge pull request `#1406 `_ from tier4/RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 2e477463b0f..667c3cddbb8 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 5.0.0 + 5.1.1 Behavior plugin for do nothing Masaya Kataoka Apache 2.0 diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index 5b1117ec499..b4444feb9da 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -21,6 +21,46 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge pull request `#1357 `_ from tier4/feature/traffic_light_group +* apply linter +* Merge branch 'master' into feature/traffic_light_group +* refactor: adjust include +* fix: remove deleted cpp file in CMakeLists.txt +* feat: support awf/universe/20240605 as architecture_type for V2I traffic light +* refactor: use traffic light publisher from traffic_simulator in simple_sensor_simulator +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* chore: apply formatter +* feat(traffic_simulator): support TrafficLightGroupArray in SimpleSensorSimulator +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge pull request `#1406 `_ from tier4/RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/simulation/simple_sensor_simulator/CMakeLists.txt b/simulation/simple_sensor_simulator/CMakeLists.txt index a66a436c362..ae8e1794af2 100644 --- a/simulation/simple_sensor_simulator/CMakeLists.txt +++ b/simulation/simple_sensor_simulator/CMakeLists.txt @@ -44,7 +44,6 @@ ament_auto_add_library(simple_sensor_simulator_component SHARED src/sensor_simulation/primitives/primitive.cpp src/sensor_simulation/primitives/primitive.cpp src/sensor_simulation/sensor_simulation.cpp - src/sensor_simulation/traffic_lights/traffic_lights_publisher.cpp src/simple_sensor_simulator.cpp src/vehicle_simulation/ego_entity_simulation.cpp src/vehicle_simulation/vehicle_model/sim_model_delay_steer_acc.cpp diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp index 9e078dda845..55050bbea5d 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp @@ -19,8 +19,6 @@ #include #include -#include -#include #include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_detector.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_detector.hpp index a93fc1e9dd4..f075c03887e 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_detector.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_detector.hpp @@ -15,10 +15,16 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_DETECTOR_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_DETECTOR_HPP_ +#include +#include #include -#include #include #include +#include + +#if __has_include() +#include +#endif namespace simple_sensor_simulator { @@ -48,11 +54,12 @@ class TrafficLightsDetector private: template auto makePublisher(NodeType & node, const std::string & architecture_type) - -> std::unique_ptr + -> std::unique_ptr { /* TrafficLightsDetector in SimpleSensorSimulator publishes using architecture-dependent topics: - "/perception/traffic_light_recognition/internal/traffic_signals" for >= "awf/universe/20230906" + "/perception/traffic_light_recognition/internal/traffic_signals" for >= "awf/universe/20240605" + "/perception/traffic_light_recognition/internal/traffic_signals" for == "awf/universe/20230906" "/perception/traffic_light_recognition/traffic_signals" for "awf/universe" V2ITrafficLights in TrafficSimulator publishes publishes using architecture-independent topics ("awf/universe..."): @@ -60,20 +67,27 @@ class TrafficLightsDetector */ if (architecture_type == "awf/universe") { using Message = autoware_auto_perception_msgs::msg::TrafficSignalArray; - return std::make_unique>( + return std::make_unique>( &node, "/perception/traffic_light_recognition/traffic_signals"); - } else if (architecture_type >= "awf/universe/20230906") { + } else if (architecture_type == "awf/universe/20230906") { using Message = autoware_perception_msgs::msg::TrafficSignalArray; - return std::make_unique>( + return std::make_unique>( + &node, "/perception/traffic_light_recognition/internal/traffic_signals"); +#if __has_include() + } else if (architecture_type >= "awf/universe/20240605") { + using Message = autoware_perception_msgs::msg::TrafficLightGroupArray; + return std::make_unique>( &node, "/perception/traffic_light_recognition/internal/traffic_signals"); +#endif } else { std::stringstream ss; - ss << "Unexpected architecture_type " << std::quoted(architecture_type) << " given."; + ss << "Unexpected architecture_type " << std::quoted(architecture_type) + << " given for traffic light."; throw std::invalid_argument(ss.str()); } } - const std::unique_ptr publisher_ptr_; + const std::unique_ptr publisher_ptr_; }; } // namespace traffic_lights } // namespace simple_sensor_simulator diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_publisher.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_publisher.hpp deleted file mode 100644 index 87ce6f2f61a..00000000000 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/traffic_lights/traffic_lights_publisher.hpp +++ /dev/null @@ -1,56 +0,0 @@ -// 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 SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_PUBLISHER_HPP_ -#define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_PUBLISHER_HPP_ - -#include -#include -#include -#include - -namespace simple_sensor_simulator -{ -namespace traffic_lights -{ -class TrafficLightsPublisherBase -{ -public: - virtual auto publish( - const rclcpp::Time & current_ros_time, - const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void = 0; -}; - -template -class TrafficLightsPublisher : public TrafficLightsPublisherBase -{ -public: - template - explicit TrafficLightsPublisher(const NodeTypePointer & node, const std::string & topic_name) - : TrafficLightsPublisherBase(), - traffic_light_state_array_publisher_( - rclcpp::create_publisher(node, topic_name, rclcpp::QoS(10).transient_local())) - { - } - - auto publish( - const rclcpp::Time & current_ros_time, - const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void override; - -private: - const typename rclcpp::Publisher::SharedPtr traffic_light_state_array_publisher_; -}; -} // namespace traffic_lights -} // namespace simple_sensor_simulator -#endif // SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_PUBLISHER_HPP_ diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 4ba71adf5e9..648dcf2c53c 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 5.0.0 + 5.1.1 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simple_sensor_simulator/src/sensor_simulation/traffic_lights/traffic_lights_publisher.cpp b/simulation/simple_sensor_simulator/src/sensor_simulation/traffic_lights/traffic_lights_publisher.cpp deleted file mode 100644 index 36b680138c2..00000000000 --- a/simulation/simple_sensor_simulator/src/sensor_simulation/traffic_lights/traffic_lights_publisher.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// 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. - -#include -#include -#include - -namespace simple_sensor_simulator -{ -namespace traffic_lights -{ -template <> -auto TrafficLightsPublisher::publish( - const rclcpp::Time & current_ros_time, - const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void -{ - using TrafficLightType = autoware_auto_perception_msgs::msg::TrafficSignal; - using TrafficLightBulbType = TrafficLightType::_lights_type::value_type; - - autoware_auto_perception_msgs::msg::TrafficSignalArray traffic_lights_message; - traffic_lights_message.header.frame_id = "camera_link"; // DIRTY HACK!!! - traffic_lights_message.header.stamp = current_ros_time; - for (const auto & traffic_light : request.states()) { - // NOT skip if the traffic light has no bulbs - TrafficLightType single_traffic_light_message; - single_traffic_light_message.map_primitive_id = traffic_light.id(); - for (const auto & bulb_status : traffic_light.traffic_light_status()) { - TrafficLightBulbType light_bulb_message; - simulation_interface::toMsg(bulb_status, light_bulb_message); - single_traffic_light_message.lights.push_back(light_bulb_message); - } - traffic_lights_message.signals.push_back(single_traffic_light_message); - } - traffic_light_state_array_publisher_->publish(traffic_lights_message); -} - -template <> -auto TrafficLightsPublisher::publish( - const rclcpp::Time & current_ros_time, - const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void -{ - using TrafficLightType = autoware_perception_msgs::msg::TrafficSignal; - using TrafficLightBulbType = TrafficLightType::_elements_type::value_type; - - autoware_perception_msgs::msg::TrafficSignalArray traffic_lights_message; - traffic_lights_message.stamp = current_ros_time; - for (const auto & traffic_light : request.states()) { - for (const auto & relation_id : traffic_light.relation_ids()) { - // skip if the traffic light has no bulbs - if (not traffic_light.traffic_light_status().empty()) { - TrafficLightType single_traffic_light_message; - single_traffic_light_message.traffic_signal_id = relation_id; - for (const auto & bulb_status : traffic_light.traffic_light_status()) { - TrafficLightBulbType light_bulb_message; - simulation_interface::toMsg(bulb_status, light_bulb_message); - single_traffic_light_message.elements.push_back(light_bulb_message); - } - traffic_lights_message.signals.push_back(single_traffic_light_message); - } - } - } - traffic_light_state_array_publisher_->publish(traffic_lights_message); -} -} // namespace traffic_lights -} // namespace simple_sensor_simulator diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 4f80ef2ae79..f3336898b2e 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge pull request `#1406 `_ from tier4/RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index d33276626c5..912ec472a2d 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 5.0.0 + 5.1.1 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index ec0e6910d19..7fc6bab4049 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -21,6 +21,47 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge pull request `#1357 `_ from tier4/feature/traffic_light_group +* refactor: delete unused member variable +* Merge branch 'master' into feature/traffic_light_group +* fix: fix build errors with autoware_perception_msgs/msg/traffic_light_group_array.hpp +* refactor: adjust include +* feat: support awf/universe/20240605 as architecture_type for V2I traffic light +* refactor: modify TrafficLightPublisher to publish from proto +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* chore: apply formatter +* feat(traffic_simulator): support TrafficLightGroup for V2I traffic lights +* feat(traffic_simulator): support TrafficLightGroupArray in TrafficLightPublisher +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge pull request `#1406 `_ from tier4/RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp b/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp index 47c98cd586c..de410fdcd9d 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -48,7 +47,6 @@ #include #include #include -#include #include #include #include diff --git a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_publisher.hpp b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_publisher.hpp index 618dda3a59a..6afb9df3ad9 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_publisher.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_publisher.hpp @@ -27,7 +27,9 @@ namespace traffic_simulator class TrafficLightPublisherBase { public: - virtual auto publish(const TrafficLightsBase & traffic_lights) const -> void = 0; + virtual auto publish( + const rclcpp::Time & current_ros_time, + const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void = 0; virtual ~TrafficLightPublisherBase() = default; }; @@ -38,10 +40,9 @@ class TrafficLightPublisher : public TrafficLightPublisherBase template explicit TrafficLightPublisher( const NodeTypePointer & node_ptr, const std::string & topic_name, - const std::string & frame = "camera_link") + const std::string & frame = "camera_link") // DIRTY HACK!!! : TrafficLightPublisherBase(), frame_(frame), - clock_ptr_(node_ptr->get_clock()), traffic_light_state_array_publisher_(rclcpp::create_publisher( node_ptr, topic_name, rclcpp::QoS(10).transient_local())) { @@ -49,11 +50,13 @@ class TrafficLightPublisher : public TrafficLightPublisherBase ~TrafficLightPublisher() override = default; - auto publish(const TrafficLightsBase & traffic_lights) const -> void override; + auto publish( + const rclcpp::Time & current_ros_time, + const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void override; private: const std::string frame_; - const rclcpp::Clock::SharedPtr clock_ptr_; + const typename rclcpp::Publisher::SharedPtr traffic_light_state_array_publisher_; }; } // namespace traffic_simulator diff --git a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights.hpp b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights.hpp index e2ae7cbd4b7..4893edf995c 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights.hpp @@ -17,6 +17,11 @@ #include #include + +#if __has_include() +#include +#endif + #include #include @@ -40,7 +45,8 @@ class ConventionalTrafficLights : public TrafficLightsBase private: auto update() const -> void { - backward_compatible_publisher_ptr_->publish(*this); + backward_compatible_publisher_ptr_->publish( + clock_ptr_->now(), generateUpdateTrafficLightsRequest()); if (isAnyTrafficLightChanged()) { marker_publisher_ptr_->deleteMarkers(); } @@ -70,8 +76,10 @@ class V2ITrafficLights : public TrafficLightsBase private: auto update() const -> void override { - publisher_ptr_->publish(*this); - legacy_topic_publisher_ptr_->publish(*this); + const auto now = clock_ptr_->now(); + const auto request = generateUpdateTrafficLightsRequest(); + publisher_ptr_->publish(now, request); + legacy_topic_publisher_ptr_->publish(now, request); if (isAnyTrafficLightChanged()) { marker_publisher_ptr_->deleteMarkers(); } @@ -91,10 +99,16 @@ class V2ITrafficLights : public TrafficLightsBase "/perception/traffic_light_recognition/internal/traffic_signals" for >= "awf/universe/20230906" "/perception/traffic_light_recognition/traffic_signals" for "awf/universe" */ - if (architecture_type.find("awf/universe") != std::string::npos) { + if (architecture_type <= "awf/universe/20230906") { return std::make_unique< TrafficLightPublisher>( node_ptr, topic_name); +#if __has_include() + } else if (architecture_type >= "awf/universe/20240605") { + return std::make_unique< + TrafficLightPublisher>( + node_ptr, topic_name); +#endif } else { throw common::SemanticError( "Unexpected architecture_type ", std::quoted(architecture_type), diff --git a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights_base.hpp b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights_base.hpp index 8220cf8d6a5..539232841e2 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights_base.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights_base.hpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -75,8 +74,6 @@ class TrafficLightsBase auto generateUpdateTrafficLightsRequest() const -> simulation_api_schema::UpdateTrafficLightsRequest; - auto generateTrafficSimulatorV1Msg() const -> traffic_simulator_msgs::msg::TrafficLightArrayV1; - protected: virtual auto update() const -> void = 0; diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 1c4d2f0dd04..3345b97692b 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 5.0.0 + 5.1.1 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp b/simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp index dfaee1e9098..3da4d9f6b6b 100644 --- a/simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +++ b/simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp @@ -15,23 +15,29 @@ #include #include #include +#include + +#if __has_include() +#include +#endif + #include namespace traffic_simulator { template <> auto TrafficLightPublisher::publish( - const TrafficLightsBase & traffic_lights) const -> void + const rclcpp::Time & current_ros_time, + const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void { - const auto states_as_proto_request = traffic_lights.generateUpdateTrafficLightsRequest(); autoware_auto_perception_msgs::msg::TrafficSignalArray message; - message.header.frame_id = "camera_link"; // DIRTY HACK!!! - message.header.stamp = clock_ptr_->now(); + message.header.frame_id = frame_; + message.header.stamp = current_ros_time; using TrafficLightType = autoware_auto_perception_msgs::msg::TrafficSignal; using TrafficLightBulbType = TrafficLightType::_lights_type::value_type; - for (const auto & traffic_light : states_as_proto_request.states()) { + for (const auto & traffic_light : request.states()) { TrafficLightType traffic_light_message; traffic_light_message.map_primitive_id = traffic_light.id(); for (const auto & bulb_status : traffic_light.traffic_light_status()) { @@ -46,17 +52,17 @@ auto TrafficLightPublisher auto TrafficLightPublisher::publish( - const TrafficLightsBase & traffic_lights) const -> void + const rclcpp::Time & current_ros_time, + const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void { - const auto states_as_proto_request = traffic_lights.generateUpdateTrafficLightsRequest(); autoware_perception_msgs::msg::TrafficSignalArray message; - message.stamp = clock_ptr_->now(); + message.stamp = current_ros_time; using TrafficLightType = autoware_perception_msgs::msg::TrafficSignal; using TrafficLightBulbType = autoware_perception_msgs::msg::TrafficSignal::_elements_type::value_type; - for (const auto & traffic_light : states_as_proto_request.states()) { + for (const auto & traffic_light : request.states()) { for (const auto & relation_id : traffic_light.relation_ids()) { // skip if the traffic light has no bulbs if (not traffic_light.traffic_light_status().empty()) { @@ -76,8 +82,54 @@ auto TrafficLightPublisher::p template <> auto TrafficLightPublisher::publish( - const TrafficLightsBase & traffic_lights) const -> void + [[maybe_unused]] const rclcpp::Time & current_ros_time, + const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void +{ + traffic_simulator_msgs::msg::TrafficLightArrayV1 message; + + using TrafficLightType = traffic_simulator_msgs::msg::TrafficLightV1; + using TrafficLightBulbType = traffic_simulator_msgs::msg::TrafficLightBulbV1; + for (const auto & traffic_light : request.states()) { + TrafficLightType traffic_light_message; + traffic_light_message.lanelet_way_id = traffic_light.id(); + for (const auto & bulb_status : traffic_light.traffic_light_status()) { + TrafficLightBulbType light_bulb_message; + simulation_interface::toMsg(bulb_status, light_bulb_message); + traffic_light_message.traffic_light_bulbs.push_back(light_bulb_message); + } + message.traffic_lights.push_back(traffic_light_message); + } + traffic_light_state_array_publisher_->publish(message); +} + +#if __has_include() +template <> +auto TrafficLightPublisher::publish( + const rclcpp::Time & current_ros_time, + const simulation_api_schema::UpdateTrafficLightsRequest & request) const -> void { - traffic_light_state_array_publisher_->publish(traffic_lights.generateTrafficSimulatorV1Msg()); + autoware_perception_msgs::msg::TrafficLightGroupArray message; + + message.stamp = current_ros_time; + + using TrafficLightGroupType = autoware_perception_msgs::msg::TrafficLightGroup; + using TrafficLightBulbType = autoware_perception_msgs::msg::TrafficLightElement; + for (const auto & traffic_light : request.states()) { + for (const auto & relation_id : traffic_light.relation_ids()) { + // skip if the traffic light has no bulbs + if (not traffic_light.traffic_light_status().empty()) { + TrafficLightGroupType traffic_light_group_message; + traffic_light_group_message.traffic_light_group_id = relation_id; + for (auto bulb_status : traffic_light.traffic_light_status()) { + TrafficLightBulbType light_bulb_message; + simulation_interface::toMsg(bulb_status, light_bulb_message); + traffic_light_group_message.elements.push_back(light_bulb_message); + } + message.traffic_light_groups.push_back(traffic_light_group_message); + } + } + } + traffic_light_state_array_publisher_->publish(message); } +#endif } // namespace traffic_simulator diff --git a/simulation/traffic_simulator/src/traffic_lights/traffic_lights_base.cpp b/simulation/traffic_simulator/src/traffic_lights/traffic_lights_base.cpp index 620a666d68c..48110784a63 100644 --- a/simulation/traffic_simulator/src/traffic_lights/traffic_lights_base.cpp +++ b/simulation/traffic_simulator/src/traffic_lights/traffic_lights_base.cpp @@ -107,17 +107,6 @@ auto TrafficLightsBase::generateUpdateTrafficLightsRequest() const return update_traffic_lights_request; } -auto TrafficLightsBase::generateTrafficSimulatorV1Msg() const - -> traffic_simulator_msgs::msg::TrafficLightArrayV1 -{ - traffic_simulator_msgs::msg::TrafficLightArrayV1 traffic_lights_message; - for (const auto & [id, traffic_light] : traffic_lights_map_) { - traffic_lights_message.traffic_lights.push_back( - static_cast(traffic_light)); - } - return traffic_lights_message; -} - // private auto TrafficLightsBase::isTrafficLightAdded(const lanelet::Id traffic_light_id) const -> bool { diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 9392d20a194..9f45436c646 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index bef5679372c..e37a3085850 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 5.0.0 + 5.1.1 ROS messages for openscenario Masaya Kataoka Apache License 2.0 diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 89111d53b5a..25d2b2ff64e 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -21,6 +21,38 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index c9688c4d9c5..cf0a0089a90 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 5.0.0 + 5.1.1 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index 774d9ebc284..5e2031c4365 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -35,6 +35,42 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +5.1.1 (2024-11-13) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Merge branch 'master' into fix/sonor-cloud-issue-5 +* Contributors: Masaya Kataoka, Taiga + +5.1.0 (2024-11-12) +------------------ +* Merge pull request `#1357 `_ from tier4/feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge branch 'master' into feature/traffic_light_group +* docs: add comment about archtecture_type purposes +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* Merge branch 'master' into feature/traffic_light_group +* fix architecture_type and typos +* chore(scenario_test_runner): add new architecture_type in launch file +* Contributors: Kotaro Yoshimoto + +5.0.2 (2024-11-11) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue +* Merge branch 'master' into fix/sonor-cloud-issue +* Contributors: Masaya Kataoka, Taiga + +5.0.1 (2024-11-11) +------------------ + 5.0.0 (2024-11-08) ------------------ * Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager diff --git a/test_runner/scenario_test_runner/launch/scenario_test_runner.launch.py b/test_runner/scenario_test_runner/launch/scenario_test_runner.launch.py index 6ebccaa9c89..eaf5a2ab722 100755 --- a/test_runner/scenario_test_runner/launch/scenario_test_runner.launch.py +++ b/test_runner/scenario_test_runner/launch/scenario_test_runner.launch.py @@ -33,7 +33,10 @@ def architecture_types(): - return ["awf/universe", "awf/universe/20230906"] + # awf/universe: autoware_auto_perception_msgs/TrafficSignalArray for traffic lights + # awf/universe/20230906: autoware_perception_msgs/TrafficSignalArray for traffic lights + # awf/universe/20240605: autoware_perception_msgs/TrafficLightGroupArray for traffic lights + return ["awf/universe", "awf/universe/20230906", "awf/universe/20240605"] def default_autoware_launch_package_of(architecture_type): @@ -44,6 +47,7 @@ def default_autoware_launch_package_of(architecture_type): return { "awf/universe": "autoware_launch", "awf/universe/20230906": "autoware_launch", + "awf/universe/20240605": "autoware_launch", }[architecture_type] @@ -55,6 +59,7 @@ def default_autoware_launch_file_of(architecture_type): return { "awf/universe": "planning_simulator.launch.xml", "awf/universe/20230906": "planning_simulator.launch.xml", + "awf/universe/20240605": "planning_simulator.launch.xml", }[architecture_type] diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index f5a01c6b0bd..fded4e7f340 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 5.0.0 + 5.1.1 scenario test runner package Tatsuya Yamasaki Apache License 2.0