Skip to content

Commit 68f78ac

Browse files
Cleanup and minor updates
Signed-off-by: Sushant Chavan <[email protected]>
1 parent 6940efa commit 68f78ac

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

configuration/packages/configuring-vector-object-server.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Features
5858
Covered use-cases
5959
*****************
6060

61-
Using Vector Object server publishing an output map as input mask to :ref:`Costmap Filters <foxy_migration>` allows covering following (not restricted only to) use-cases:
61+
Using Vector Object server publishing an output map as input mask to :ref:`Costmap Filters <costmap_filters>` allows covering following (not restricted only to) use-cases:
6262

6363
- No-access zone
6464
- Speed-restriction areas

migration/Foxy.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ Original GitHub tickets:
137137
- `PhotoAtWaypoint <https://github.com/ros-navigation/navigation2/pull/2041>`_
138138
- `InputAtWaypoint <https://github.com/ros-navigation/navigation2/pull/2049>`_
139139

140+
.. _costmap_filters:
141+
140142
Costmap Filters
141143
***************
142144

tutorials/docs/navigation2_with_vector_objects.rst

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ This value is equal to ``100`` which means "occupied" in OccupancyGrid format.
7171

7272
Each shape is being addressed by UUID, which could be specified manually in a string format. In the demonstration, it was skipped to specify UUID of the shapes in the parameters, so Vector Object server will automatically generate a new one for each shape. The list of UUID could be obtained later by calling ``GetShapes.srv`` service.
7373

74-
Costmap Filters are required ``CostmapFilterInfo.msg`` message to be published along with filter mask (rasterized map with vector shapes).
75-
Costmap Filter Info message is being published by Costmap Filter Info server, which is also launching by ``vector_object_server.launch.py`` script.
74+
Costmap Filters require ``CostmapFilterInfo.msg`` message to be published along with filter mask (rasterized map with vector shapes).
75+
Costmap Filter Info message is being published by Costmap Filter Info server, which is also launched by the ``vector_object_server.launch.py`` script.
7676

77-
Overall ``vector_object_server_params.yaml`` YAML-file for the demonstration to be look as follows:
77+
The complete ``vector_object_server_params.yaml`` YAML-file for the demonstration looks as follows:
7878

7979
.. code-block:: yaml
8080
@@ -104,7 +104,7 @@ Overall ``vector_object_server_params.yaml`` YAML-file for the demonstration to
104104
costmap_filter_info_server:
105105
ros__parameters:
106106
type: 0
107-
filter_info_topic: "costmap_filter_info"
107+
filter_info_topic: "vo_costmap_filter_info"
108108
mask_topic: "vo_map"
109109
base: 0.0
110110
multiplier: 1.0
@@ -113,11 +113,10 @@ More detailed information about each Vector Object server parameter and its oper
113113

114114
After Vector Objects and Costmap Filters Info servers were configured, launch them by command from below.
115115
Robot should bypass vector obstacles. For the demonstration purposes it is enough to avoid path planning through them.
116-
Thus, vector objects should be added to global costmap, so we need to choose ``global_costmap`` namespace for correct work:
117116

118117
.. code-block:: bash
119118
120-
ros2 launch nav2_map_server vector_object_server.launch.py namespace:=global_costmap
119+
ros2 launch nav2_map_server vector_object_server.launch.py
121120
122121
Preparing Nav2 stack
123122
====================
@@ -136,7 +135,7 @@ Since vector objects are being enabled in global costmaps, Keepout Filter called
136135
vector_object_layer:
137136
plugin: "nav2_costmap_2d::KeepoutFilter"
138137
enabled: True
139-
filter_info_topic: "costmap_filter_info"
138+
filter_info_topic: "vo_costmap_filter_info"
140139
141140
Demo Execution
142141
==============
@@ -158,7 +157,7 @@ We are using composable nodes technology, so in the console where Vector Object
158157
[INFO] [launch_ros.actions.load_composable_nodes]: Loaded node '/global_costmap/vector_object_server' in container 'nav2_container'
159158
[INFO] [launch_ros.actions.load_composable_nodes]: Loaded node '/global_costmap/costmap_filter_info_server' in container 'nav2_container'
160159
161-
The last lines mean that all three nodes: Vector Object server, Costmap Filter Info server and Lifecycle Manager handling them, were successfully loaded into running Nav2 container ``nav2_container``.
160+
The last lines mean that all three nodes: Vector Object server, Costmap Filter Info server, and the Lifecycle Manager handling them, were successfully loaded into the Nav2 container ``nav2_container``.
162161

163162
Set the initial pose for the robot, and check that vector objects were appeared on global costmap:
164163

0 commit comments

Comments
 (0)