Solve conflicts

Signed-off-by: Barış Zeren <[email protected]>
autowarefoundation · Feb 27, 2024 · 3f87732 · 3f87732
1 parent 220a92f
commit 3f87732
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/common/component_interface_specs/CMakeLists.txt b/common/component_interface_specs/CMakeLists.txt
@@ -4,25 +4,6 @@ project(component_interface_specs)
 find_package(autoware_cmake REQUIRED)
 autoware_package()
 
-include_directories(
-  include
-  SYSTEM
-  ${rclcpp_INCLUDE_DIRS}
-  ${rosidl_runtime_cpp_INCLUDE_DIRS}
-  ${rcl_INCLUDE_DIRS}
-  ${autoware_adapi_v1_msgs_INCLUDE_DIRS}
-  ${autoware_auto_planning_msgs_INCLUDE_DIRS}
-  ${autoware_planning_msgs_INCLUDE_DIRS}
-  ${autoware_auto_vehicle_msgs_INCLUDE_DIRS}
-  ${tier4_control_msgs_INCLUDE_DIRS}
-  ${nav_msgs_INCLUDE_DIRS}
-  ${tier4_system_msgs_INCLUDE_DIRS}
-  ${tier4_vehicle_msgs_INCLUDE_DIRS}
-  ${autoware_auto_perception_msgs_INCLUDE_DIRS}
-  ${tier4_map_msgs_INCLUDE_DIRS}
-  ${autoware_map_msgs_INCLUDE_DIRS}
-)
-
 if(BUILD_TESTING)
   ament_auto_add_gtest(gtest_${PROJECT_NAME}
     test/gtest_main.cpp

diff --git a/map/map_loader/src/lanelet2_map_loader/lanelet2_map_loader_node.cpp b/map/map_loader/src/lanelet2_map_loader/lanelet2_map_loader_node.cpp
@@ -80,8 +80,8 @@ Lanelet2MapLoaderNode::Lanelet2MapLoaderNode(const rclcpp::NodeOptions & options
     sub_map_projector_info_,
     [this](const MapProjectorInfo::Message::ConstSharedPtr msg) { on_map_projector_info(msg); });
 
-  declare_parameter("lanelet2_map_path", "");
-  declare_parameter("center_line_resolution");
+  declare_parameter<std::string>("lanelet2_map_path");
+  declare_parameter<double>("center_line_resolution");
 
   if (declare_parameter<bool>("enabled_dynamic_lanelet_loading")) {
     std::vector<std::string> lanelet2_paths_or_directory =