From d4dcb971b6a5f599a0c9d11785c2ac82280b4e75 Mon Sep 17 00:00:00 2001 From: Roberto Cai Date: Thu, 6 Jun 2019 16:17:18 +0200 Subject: [PATCH 1/3] Fix import issues for node_info and map servers --- ros/src/topological_map_ros/topological_map.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ros/src/topological_map_ros/topological_map.py b/ros/src/topological_map_ros/topological_map.py index 346b121..a69fe7e 100644 --- a/ros/src/topological_map_ros/topological_map.py +++ b/ros/src/topological_map_ros/topological_map.py @@ -7,7 +7,7 @@ import tf from geometry_msgs.msg import PoseWithCovarianceStamped -from topological_map_ros.srv import TopologicalPath, TopologicalPathResponse, TopologicalPosition, TopologicalPositionResponse +from topological_map_ros.srv import TopologicalPath, TopologicalPathResponse, TopologicalPosition, TopologicalPositionResponse, NodeInfo, TopologicalMapInfo def generate_map(): @@ -37,8 +37,8 @@ def __init__(self): self.path_server = rospy.Service('topological_path_plan', TopologicalPath, self.handle_path_request) self.position_server = rospy.Service('topological_position', TopologicalPosition, self.handle_position_request) - self.node_info_server = rospy.Service('topological_node_info', Area, self.handle_node_info_request) - self.map_server = rospy.Service('~topological_map_info', TopoMap, self.handle_map_info_request) + self.node_info_server = rospy.Service('topological_node_info', NodeInfi, self.handle_node_info_request) + self.map_server = rospy.Service('~topological_map_info', TopologicalMapInfo, self.handle_map_info_request) self.rooms_config = rospy.get_param('~rooms', dict()) From 8bc79c28ef47f66465d9a794877db7b015db4774 Mon Sep 17 00:00:00 2001 From: Roberto Cai Date: Thu, 6 Jun 2019 16:19:37 +0200 Subject: [PATCH 2/3] Add service files to CMakeList --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27b5ca6..dfb6558 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ add_service_files( FILES TopologicalPath.srv TopologicalPosition.srv + TopologicalMapInfo.srv + NodeInfo.srv ) ## Generate added messages and services with any dependencies listed here From 02c4fa6c3067390957d0b3be7e9bad0919628186 Mon Sep 17 00:00:00 2001 From: Roberto Cai Date: Thu, 6 Jun 2019 16:22:48 +0200 Subject: [PATCH 3/3] Fix typo for node_info_server --- ros/src/topological_map_ros/topological_map.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros/src/topological_map_ros/topological_map.py b/ros/src/topological_map_ros/topological_map.py index a69fe7e..5b6e0e3 100644 --- a/ros/src/topological_map_ros/topological_map.py +++ b/ros/src/topological_map_ros/topological_map.py @@ -37,7 +37,7 @@ def __init__(self): self.path_server = rospy.Service('topological_path_plan', TopologicalPath, self.handle_path_request) self.position_server = rospy.Service('topological_position', TopologicalPosition, self.handle_position_request) - self.node_info_server = rospy.Service('topological_node_info', NodeInfi, self.handle_node_info_request) + self.node_info_server = rospy.Service('topological_node_info', NodeInfo, self.handle_node_info_request) self.map_server = rospy.Service('~topological_map_info', TopologicalMapInfo, self.handle_map_info_request) self.rooms_config = rospy.get_param('~rooms', dict())