Skip to content

Commit fb20601

Browse files
added getStart method to goal_intent_extract and start pose argument for findRoute
1 parent 3f23b82 commit fb20601

File tree

5 files changed

+14
-1
lines changed

5 files changed

+14
-1
lines changed

nav2_route/include/nav2_route/goal_intent_extractor.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ class GoalIntentExtractor
111111
*/
112112
void overrideStart(const geometry_msgs::msg::PoseStamped & start_pose);
113113

114+
/**
115+
* @brief gets the desired start pose
116+
* @return PoseStamped of start pose
117+
*/
118+
geometry_msgs::msgs::PoseStamped getStart();
119+
114120
protected:
115121
rclcpp::Logger logger_{rclcpp::get_logger("GoalIntentExtractor")};
116122
std::shared_ptr<NodeSpatialTree> node_spatial_tree_;

nav2_route/include/nav2_route/route_planner.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ class RoutePlanner
6868
Route findRoute(
6969
Graph & graph, unsigned int start_index, unsigned int goal_index,
7070
const std::vector<unsigned int> & blocked_ids,
71+
const geometry_msgs::msg::PoseStamped & start_pose,
7172
const geometry_msgs::msg::PoseStamped & goal);
7273

7374
protected:

nav2_route/src/goal_intent_extractor.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,11 @@ Route GoalIntentExtractor::pruneStartandGoal(
195195
return pruned_route;
196196
}
197197

198+
geometry_msgs::msgs::PoseStamped GoalIntentExtractor::getStart()
199+
{
200+
return start_;
201+
}
202+
198203
template Route GoalIntentExtractor::pruneStartandGoal<nav2_msgs::action::ComputeRoute::Goal>(
199204
const Route & input_route,
200205
const std::shared_ptr<const nav2_msgs::action::ComputeRoute::Goal> goal,

nav2_route/src/route_planner.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ void RoutePlanner::configure(
4242
Route RoutePlanner::findRoute(
4343
Graph & graph, unsigned int start_index, unsigned int goal_index,
4444
const std::vector<unsigned int> & blocked_ids,
45+
const geometry_msgs::msg::PoseStamped & /* start_pose */,
4546
const geometry_msgs::msg::PoseStamped & goal_pose)
4647
{
4748
if (graph.empty()) {

nav2_route/src/route_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ Route RouteServer::findRoute(
217217
} else {
218218
// Compute the route via graph-search, returns a node-edge sequence
219219
route = route_planner_->findRoute(
220-
graph_, start_route, end_route, rerouting_info.blocked_ids,
220+
graph_, start_route, end_route, rerouting_info.blocked_ids, goal_intent_extractor->getStart(),
221221
goal->goal);
222222
}
223223

0 commit comments

Comments
 (0)