Skip to content

Added promixity BT node and BT tree#4620

Closed
Jakubach wants to merge 53 commits intoros-navigation:mainfrom
Jakubach:main
Closed

Added promixity BT node and BT tree#4620
Jakubach wants to merge 53 commits intoros-navigation:mainfrom
Jakubach:main

Conversation

@Jakubach
Copy link
Contributor


Basic Info

Info Please fill out this column
Ticket(s) this addresses (add tickets here #1)
Primary OS tested on (Ubuntu)
Robotic platform tested on (Gazebo simulation of custom robot)
Does this PR contain AI generated software? (No)

Description of contribution in a few bullet points

BT Node that return if the robot is in the goal proximity
PR related to the Steve advice on robotics stack:
https://robotics.stackexchange.com/questions/112576/maneuvers-on-paths-end-point-with-navigation2-smac-lattice-planner/112577?noredirect=1#comment48615_112577

Description of documentation updates required from your changes


Future work that may be required in bullet points

For Maintainers:

  • Check that any new parameters added are updated in docs.nav2.org
  • Check that any significant change is added to the migration guide
  • Check that any new features OR changes to existing behaviors are reflected in the tuning guide
  • Check that any new functions have Doxygen added
  • Check that any new features have test coverage
  • Check that any new plugins is added to the plugins page
  • If BT Node, Additionally: add to BT's XML index of nodes for groot, BT package's readme table, and BT library lists

Copy link
Member

@SteveMacenski SteveMacenski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise, needs a PR to add this new BT node to the migration guide and a configuration guide page to the BT XML nodes for this node. Looks good to start with! Make sure to check out the failing CI jobs for linting and other errors


} // namespace nav2_behavior_tree

#endif // NAV2_BEHAVIOR_TREE__PLUGINS__CONDITION__IS_GOAL_NEARBY_CONDITION_HPP_ No newline at end of file
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EOF line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What should I correct in this case?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add an extra line at the end of the file so that there's 81 lines instead of 81

* @brief A BT::ConditionNode that returns SUCCESS when the IsGoalNearby
* service returns true and FAILURE otherwise
*/
class IsGoalNearbyCondition : public BT::ConditionNode
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs test coverage

#include "behaviortree_cpp/bt_factory.h"
BT_REGISTER_NODES(factory)
{
factory.registerNodeType<nav2_behavior_tree::IsGoalNearbyCondition>("IsGoalNearby");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to add this to the nav2 node index

const nav_msgs::msg::Path& goal_path,
const double& prox_thr)
{
return nav2_util::geometry_utils::calculate_path_length(goal_path, 0) < prox_thr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's checking the last path length, but not the robot's proximity. If you replan every 10 seconds (or only on events) then this wouldn't tell you much about the robot's proximity to the goal based on the last path marker.

I think this either needs to

  • find the path's closest point like we do in the Controller plugins [1] which means we need to track the last path index to know where to search starting from on each call up to some maximum distance
  • just be based on a distance check from the robot's current pose -- which has problems if the path have overlapping segments from Navigate Through Poses.

[1] https://github.com/ros-navigation/navigation2/blob/main/nav2_regulated_pure_pursuit_controller/src/path_handler.cpp#L61-L79

Copy link
Contributor Author

@Jakubach Jakubach Aug 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am trying to implement the first idea but I am not sure if I've understood it correctly. It's should return a value to the closest point in the path (in case of straight line it would be a next point on the line, and in case of complex path not necessarily)?

Here is my current fragment of the code with that idea:

BT::NodeStatus IsGoalNearbyCondition::tick()
{
    nav_msgs::msg::Path path;
    double prox_thr;
    getInput("path", path);
    getInput("proximity_threshold", prox_thr);

    geometry_msgs::msg::PoseStamped pose; // robot pose in map frame
    nav2_util::getCurrentPose(
    pose, *tf_buffer_,
    "map", "base_link", 0.05);
    
    geometry_msgs::msg::PoseStamped robot_pose; // robot_pose in path frame
    if (!transformPose(path.header.frame_id, pose, robot_pose)) {
        return BT::NodeStatus::FAILURE;
    }

    auto closest_pose_upper_bound =
    nav2_util::geometry_utils::first_after_integrated_distance(
    path.poses.begin(), path.poses.end(), max_robot_pose_search_dist_);


    // First find the closest pose on the path to the robot
    // bounded by when the path turns around (if it does) so we don't get a pose from a later
    // portion of the path
    auto closest_pose_it =
    nav2_util::geometry_utils::min_by(
    path.poses.begin() + last_closest_index_, closest_pose_upper_bound,
    [&robot_pose](const geometry_msgs::msg::PoseStamped & ps) {
      return nav2_util::geometry_utils::euclidean_distance(robot_pose, ps);
    });

    last_closest_index_ = std::distance(path.poses.begin(), closest_pose_it);

    double distance_to_closest_point = nav2_util::geometry_utils::euclidean_distance(robot_pose, *closest_pose_it);
    RCLCPP_INFO(node_->get_logger(), "Distance to closest point: %f", distance_to_closest_point);

    if(distance_to_closest_point < prox_thr){
         return BT::NodeStatus::SUCCESS;
    }
    return BT::NodeStatus::FAILURE;
}


bool IsGoalNearbyCondition::transformPose(
  const std::string frame,
  const geometry_msgs::msg::PoseStamped & in_pose,
  geometry_msgs::msg::PoseStamped & out_pose) const
{
  if (in_pose.header.frame_id == frame) {
    out_pose = in_pose;
    return true;
  }

  try {
    tf_buffer_->transform(in_pose, out_pose, frame);
    out_pose.header.frame_id = frame;
    return true;
  } catch (tf2::TransformException & ex) {
    RCLCPP_ERROR(node_->get_logger(), "Exception in transformPose: %s", ex.what());
  }
  return false;
}

I though it's even working but after few attempts I've got segmentation fault so still working on that

</ReactiveFallback>
</RecoveryNode>
</BehaviorTree>
</root> No newline at end of file
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EOF line

<Inverter>
<GlobalUpdatedGoal/>
</Inverter>
<IsGoalNearby path="{path}" proximity_threshold="2.0"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test this?

@SteveMacenski
Copy link
Member

@Jakubach following up here - have you had a chance to work on this?

@Jakubach
Copy link
Contributor Author

@Jakubach following up here - have you had a chance to work on this?

@SteveMacenski I had another job but will back to this probably this month or November.

@SteveMacenski
Copy link
Member

Great, thank you!

SteveMacenski and others added 23 commits July 29, 2025 17:18
* Moving MPPI, Smac to secondary job

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* Use xlarge resource class

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* Bump the cache

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* back to large

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* fix

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* Add route server

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* Shift more packages over

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

---------

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>
Signed-off-by: Guillaume Doisy <guillaume@dexory.com>
Co-authored-by: Guillaume Doisy <guillaume@dexory.com>
* [DEX] limit comparison precision

Signed-off-by: Guillaume Doisy <guillaume@dexory.com>

* EPSILON 1e-5

Signed-off-by: Guillaume Doisy <guillaume@dexory.com>

---------

Signed-off-by: Guillaume Doisy <guillaume@dexory.com>
Co-authored-by: Guillaume Doisy <guillaume@dexory.com>
…s for CircleCI limits (ros-navigation#5409)

* Moving Nav2 behaviors to the system build job

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* Adding Docking

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* moving more over to balance jobs

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

---------

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>
)

* Add pause and seq with bb memory BT nodes

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Requested changes

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Lint

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Restructure pause, rename unpaused state to resumed

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Add PauseResumeController test

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Implement tests using xml_txt trees and dummy nodes

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Update include

Signed-off-by: redvinaa <redvinaa@gmail.com>

* One more fix because of sync

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Fix build

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Add tests

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Remove unreachable code

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Fix tests

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Update copyrights

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Fix size calc

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Rename to PersistentSequence

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Fix docstring

Signed-off-by: redvinaa <redvinaa@gmail.com>

---------

Signed-off-by: redvinaa <redvinaa@gmail.com>
Signed-off-by: Guillaume Doisy <guillaume@dexory.com>
Co-authored-by: Guillaume Doisy <guillaume@dexory.com>
Signed-off-by: Sushant Chavan <gitecsvc@gmail.com>
…ros-navigation#5420)

* fix: Add KDTree type definition to include unsigned int for IndexType

Signed-off-by: Ericsii <ericfengx@foxmail.com>

* code format

Signed-off-by: Ericsii <ericfengx@foxmail.com>

---------

Signed-off-by: Ericsii <ericfengx@foxmail.com>
Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
* Move nav_2d_util to nav2_util

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Rename frame

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Replace OdomSubscriber with OdomSmoother

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Use transformPoseInTargetFrame in all controllers

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

---------

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
…s-navigation#5406)

* Construct TF listeners passing nodes, spinning on separate thread

Signed-off-by: Patrick Roncagliolo <ronca.pat@gmail.com>

* (tentative) pin down of the impacting change

Signed-off-by: Patrick Roncagliolo <ronca.pat@gmail.com>

---------

Signed-off-by: Patrick Roncagliolo <ronca.pat@gmail.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
…ation#5423)

* Smooth path even if goal pose is so much near to the robot

Signed-off-by: CihatAltiparmak <cihataltiparmak1@gmail.com>

* Apply suggestions

Signed-off-by: CihatAltiparmak <cihataltiparmak1@gmail.com>

* Remove unnecessary diff

Signed-off-by: CihatAltiparmak <cihataltiparmak1@gmail.com>

---------

Signed-off-by: CihatAltiparmak <cihataltiparmak1@gmail.com>
…5427)

* Make pause resume controller use nav2::LifecycleNode

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Fix tests

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Use new nav2 create_service

Signed-off-by: redvinaa <redvinaa@gmail.com>

* Use attribues from parent, fix future wait, update docstring

Signed-off-by: redvinaa <redvinaa@gmail.com>

---------

Signed-off-by: redvinaa <redvinaa@gmail.com>
* Updating readme info

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* Adding configuration guide

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* Conciseness

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

---------

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
* Add support for dynamically changing keepout zone

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Linting

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Revert binary and speed changes

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

---------

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
Signed-off-by: Sushant Chavan <gitecsvc@gmail.com>
…s-navigation#5003)

* Add controller utils

Signed-off-by: Sakshay Mahna <sakshum19@gmail.com>

* Fix linting issues

Signed-off-by: Sakshay Mahna <sakshum19@gmail.com>

* Update regulated pure pursuit

Signed-off-by: Sakshay Mahna <sakshum19@gmail.com>

* Update graceful controller

Signed-off-by: Sakshay Mahna <sakshum19@gmail.com>

* Remove interpolate after goal & Use orientationAroundZAxis

Signed-off-by: Sakshay Mahna <sakshum19@gmail.com>

* Update nav2_util/src/controller_utils.cpp

Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>

* Update nav2_util/src/controller_utils.cpp

Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>

* Update nav2_util/src/controller_utils.cpp

Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>

* Remove interpolate_after_goal parameter from test

Signed-off-by: Sakshay Mahna <sakshum19@gmail.com>

---------

Signed-off-by: Sakshay Mahna <sakshum19@gmail.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
Co-authored-by: Steve Macenski <stevenmacenski@gmail.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
* Fix lifecycle manager deadlock during shutdown

Add stop() method to ServiceClient that cancels internal executor operations
and call it in LifecycleServiceClient destructor to prevent deadlock when
CTRL+C is pressed during lifecycle node bringup.

This addresses issue ros-navigation#5437 where spin_until_future_complete can hang
indefinitely during shutdown when bringup and shutdown sequences run
concurrently.

Co-authored-by: Steve Macenski <SteveMacenski@users.noreply.github.com>

* Update service_client.hpp

Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>

---------

Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Rebase

Signed-off-by: ElSayed ElSheikh <elsayed.elsheikh97@gmail.com>

* Make linters happy

Signed-off-by: ElSayed ElSheikh <elsayed.elsheikh97@gmail.com>

* Rename point_cloud_transport parameter

Signed-off-by: ElSayed ElSheikh <elsayed.elsheikh97@gmail.com>

* Rebase

Signed-off-by: ElSayed ElSheikh <elsayed.elsheikh97@gmail.com>

* Feedback

Signed-off-by: ElSayed ElSheikh <elsayed.elsheikh97@gmail.com>

* Feedback

Signed-off-by: ElSayed ElSheikh <elsayed.elsheikh97@gmail.com>

* Fix

Signed-off-by: ElSayed ElSheikh <elsayed.elsheikh97@gmail.com>

---------

Signed-off-by: ElSayed ElSheikh <elsayed.elsheikh97@gmail.com>
* Add option to override lethal cost in keepout zone

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Linting

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Update nav2_costmap_2d/plugins/costmap_filters/keepout_filter.cpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Base class call

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

---------

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
emersonknapp and others added 22 commits August 26, 2025 12:18
…ation#5453)

* Return early from edge interpolation for zero-length edges

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

* Move the check and add a test

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

---------

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
…s-navigation#5452)

* nav2_route vizualization marker use sphere_list and line_list for rendering performance

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

* Fix unit test and break out magic constants into named values

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

---------

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
* Fix SmacPlannerLattice dynamic parameter early exit

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* remove comment

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

---------

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>
…n#5490)

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
* fix-duplicate-poses

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* Update nav2_planner/src/planner_server.cpp

Co-authored-by: Steve Macenski <stevenmacenski@gmail.com>
Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

---------

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>
Co-authored-by: Steve Macenski <stevenmacenski@gmail.com>
* Revert "Add double spin_some in some BT nodes (ros-navigation#5055)"

This reverts commit 4e8469e.

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Update spin some to use spin all

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Replace 50 ms with bt loop duration

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

---------

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
)

* Add custom window size and poly order in SG filter

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Fix linting and benchmark tool

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Cmakelist

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Adding comments

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Add blog

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

---------

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>
Added 3Laws Robotics to the list of partners.

Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
* Fix segmentation fault

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* fix linting

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

---------

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>
…s-navigation#5507)

* Fixes for route graph

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

* Fix route graph vis

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>

---------

Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>
Signed-off-by: SteveMacenski <stevenmacenski@gmail.com>
…ion#5499)

* Fix pose timestamp when using transformPoseInTargetFrame

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Fix frame

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

* Update nav2_route/src/goal_intent_extractor.cpp

Co-authored-by: Steve Macenski <stevenmacenski@gmail.com>
Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>

---------

Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
Co-authored-by: Steve Macenski <stevenmacenski@gmail.com>
* Implement integral distance for critics

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* .

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* linting

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* more linting

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* fix tests

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* reset path length

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* fix sign

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* fix return value

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* Revert "fix return value"

This reverts commit 8b21e89.

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* remove extra variable

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* add doxygen

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* rename getCriticGoalPathDistance

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* delete withinPositionGoalTolerance

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* use only one path distance

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* cleanup

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* linting

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* reorder

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* format

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* fix tests

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

---------

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ts (ros-navigation#5485)

* Publish criticsStats

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* linting

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* change header to stamp

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* make unique_pointer

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* typo

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* Add readme

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* add to readme

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

* fixes

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>

---------

Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>
…_dependencies (ros-navigation#5514)

Signed-off-by: JPLDevMaster <joao.penha.lopes@tecnico.ulisboa.pt>
Signed-off-by: Guillaume Doisy <guillaume@dexory.com>
Co-authored-by: Guillaume Doisy <guillaume@dexory.com>
* Add Vector Object server

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Meet review comments

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>

* Simplify shapes param configuring

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Rename getROSParameter() to getParameter()

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Return back getMaskData() to nav2_costmap_2d

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Add composition node support

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>

* Remove redundant methods

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Update nav2_map_server/src/vo_server/vector_object_server.cpp

Co-authored-by: Steve Macenski <stevenmacenski@gmail.com>
Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Avoid shapes clearing

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Optimize switchMapUpdate() method

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Switch to vector of shapes

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Minor fixes

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Meet review comments

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Move isPointInside algorithm to nav2_util

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Testcases covering new functionality

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Fix linting issues

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Adjust for Vector Objects demonstration

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Code clean-up
* Corrected headers
* Functions ordering
* Comment fixes

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Additional code facelift
* Correct licensing years
* Fix Vector Object server dependencies
* Funcion rename for better readability
* Improve/fix comments

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>

* Minor fixing after rebase

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Rename vector object server

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Minor changes

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Update tests

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Merge branch 'main' into feature/vector_object_server

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Fix merge issues and pre-commit checks

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Change tf2_ros headers from `.h` to `.hpp`

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Fix race condition in pub-sub of VO map

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Cleanup

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Remove use of ament_target_dependencies

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Fix review comments

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Fix linter errors

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Fix exception handling

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Update nav2_map_server/include/nav2_map_server/vector_object_utils.hpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>

* Update nav2_util/include/nav2_util/raytrace_line_2d.hpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>

* Add error logs

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

* Fix cpplint

Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>

---------

Signed-off-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>
Signed-off-by: Sushant Chavan <sushant.chavan@idealworks.com>
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
Co-authored-by: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
Co-authored-by: Alexey Merzlyakov <60094858+AlexeyMerzlyakov@users.noreply.github.com>
Co-authored-by: Steve Macenski <stevenmacenski@gmail.com>
Co-authored-by: Alberto Tudela <ajtudela@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@mergify
Copy link
Contributor

mergify bot commented Jan 4, 2026

This pull request is in conflict. Could you fix it @Jakubach?

@mergify
Copy link
Contributor

mergify bot commented Jan 4, 2026

@Jakubach, your PR has failed to build. Please check CI outputs and resolve issues.
You may need to rebase or pull in main due to API changes (or your contribution genuinely fails).

@SteveMacenski
Copy link
Member

Woof, that conflict hit alot. Can you clean this up and make the last few changes so we can get this in this year? 😄

@Jakubach Jakubach deleted the branch ros-navigation:main January 6, 2026 23:00
@Jakubach Jakubach closed this Jan 6, 2026
@Jakubach Jakubach deleted the main branch January 6, 2026 23:00
@Jakubach Jakubach mentioned this pull request Jan 6, 2026
7 tasks
@Jakubach
Copy link
Contributor Author

Jakubach commented Jan 6, 2026

@SteveMacenski I just moved to the new PR to clean it up: #5843.
I will finish it tomorrow hopefully and after that ping you there for review

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.