feat: make lanelet2 map loader utils functions public

Signed-off-by: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>

Author: mitsudome-r

map/autoware_map_loader/CMakeLists.txt

@@ -30,7 +30,7 @@ rclcpp_components_register_node(pointcloud_map_loader_node
 ament_auto_add_library(lanelet2_map_loader_node SHARED
   src/lanelet2_map_loader/lanelet2_map_loader_node.cpp
   src/lanelet2_map_loader/lanelet2_differential_loader_module.cpp
-  src/lanelet2_map_loader/utils.cpp
+  src/lanelet2_map_loader/lanelet2_map_loader_utils.cpp
 )
 
 rclcpp_components_register_node(lanelet2_map_loader_node
@@ -52,6 +52,7 @@ if(BUILD_TESTING)
     get_filename_component(filename ${filepath} NAME)
     string(REGEX REPLACE ".cpp" "" test_name ${filename})
     ament_add_gmock(${test_name} ${filepath})
+    target_include_directories(${test_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
     target_link_libraries(${test_name} ${${PROJECT_NAME}_LIBRARIES})
     target_link_libraries(${test_name} yaml-cpp)
     ament_target_dependencies(${test_name} ${${PROJECT_NAME}_FOUND_BUILD_DEPENDS})

map/autoware_map_loader/src/lanelet2_map_loader/utils.hpp map/autoware_map_loader/include/autoware/map_loader/lanelet2_map_loader_utils.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef LANELET2_MAP_LOADER__UTILS_HPP_
-#define LANELET2_MAP_LOADER__UTILS_HPP_
+#ifndef AUTOWARE__MAP_LOADER__LANELET2_MAP_LOADER_UTILS_HPP_
+#define AUTOWARE__MAP_LOADER__LANELET2_MAP_LOADER_UTILS_HPP_
 
 #include <rclcpp/time.hpp>
 
@@ -57,4 +57,4 @@ autoware_map_msgs::msg::LaneletMapBin create_map_bin_msg(
 
 }  // namespace autoware::map_loader
 
-#endif  // LANELET2_MAP_LOADER__UTILS_HPP_
+#endif  // AUTOWARE__MAP_LOADER__LANELET2_MAP_LOADER_UTILS_HPP_

map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_differential_loader_module.cpp

@@ -16,7 +16,8 @@
 
 #include "lanelet2_local_projector.hpp"
 #include "lanelet2_map_loader_node.hpp"
-#include "utils.hpp"
+
+#include <autoware/map_loader/lanelet2_map_loader_utils.hpp>
 
 #include <map>
 #include <memory>

map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_differential_loader_module.hpp

@@ -15,11 +15,10 @@
 #ifndef LANELET2_MAP_LOADER__LANELET2_DIFFERENTIAL_LOADER_MODULE_HPP_
 #define LANELET2_MAP_LOADER__LANELET2_DIFFERENTIAL_LOADER_MODULE_HPP_
 
-#include "utils.hpp"
-
 #include <autoware/component_interface_specs_universe/map.hpp>
 #include <autoware/component_interface_utils/rclcpp.hpp>
 #include <autoware/geography_utils/lanelet2_projector.hpp>
+#include <autoware/map_loader/lanelet2_map_loader_utils.hpp>
 #include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
 #include <autoware_lanelet2_extension/utility/message_conversion.hpp>
 #include <autoware_lanelet2_extension/utility/utilities.hpp>

map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_map_loader_node.cpp

@@ -34,10 +34,10 @@
 #include "lanelet2_map_loader_node.hpp"
 
 #include "lanelet2_local_projector.hpp"
-#include "utils.hpp"
 
 #include <ament_index_cpp/get_package_prefix.hpp>
 #include <autoware/geography_utils/lanelet2_projector.hpp>
+#include <autoware/map_loader/lanelet2_map_loader_utils.hpp>
 #include <autoware_lanelet2_extension/io/autoware_osm_parser.hpp>
 #include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
 #include <autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp>

map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_map_loader_node.hpp

@@ -16,10 +16,10 @@
 #define LANELET2_MAP_LOADER__LANELET2_MAP_LOADER_NODE_HPP_
 
 #include "lanelet2_differential_loader_module.hpp"
-#include "utils.hpp"
 
 #include <autoware/component_interface_specs_universe/map.hpp>
 #include <autoware/component_interface_utils/rclcpp.hpp>
+#include <autoware/map_loader/lanelet2_map_loader_utils.hpp>
 #include <autoware_lanelet2_extension/version.hpp>
 #include <rclcpp/rclcpp.hpp>
 

map/autoware_map_loader/src/lanelet2_map_loader/utils.cpp map/autoware_map_loader/src/lanelet2_map_loader/lanelet2_map_loader_utils.cpp

@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils.hpp"
-
 #include "lanelet2_local_projector.hpp"
 
 #include <autoware/geography_utils/lanelet2_projector.hpp>
+#include <autoware/map_loader/lanelet2_map_loader_utils.hpp>
 #include <autoware_lanelet2_extension/io/autoware_osm_parser.hpp>
 #include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
 #include <autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp>