Merge pull request #6 from robertocaiwu/hotfix/services

Hotfix/services: missing service imports
b-it-bots · Jun 6, 2019 · 4440b2a · 4440b2a
2 parents 04f3920 + 02c4fa6
commit 4440b2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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

diff --git 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', 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())