From 2ddb81f3882a987737e957473400971c70cc3b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Zeren?= <baris@leodrive.ai>
Date: Thu, 3 Oct 2024 00:52:03 +0300
Subject: [PATCH] chore: use LaneletMapPtr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Barış Zeren <baris@leodrive.ai>
---
 .../io/autoware_multi_osm_parser.hpp                   | 10 +++++-----
 .../lib/autoware_multi_osm_parser.cpp                  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/io/autoware_multi_osm_parser.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/io/autoware_multi_osm_parser.hpp
index 0f98ca7..bcc7484 100644
--- a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/io/autoware_multi_osm_parser.hpp
+++ b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/io/autoware_multi_osm_parser.hpp
@@ -47,12 +47,12 @@ class MultiOsmParser : public Parser
   std::unique_ptr<LaneletMap> parse(
     const std::string & lanelet2_filename, ErrorMessages & errors) const override;
 
-  std::unique_ptr<LaneletMap> parse(
+  lanelet::LaneletMapPtr parse(
     const std::vector<std::string> & lanelet2_filenames, ErrorMessages & errors) const;
 
-  std::unique_ptr<LaneletMap> fromOsmFile(const osm::File & file, ErrorMessages & errors) const;
+  lanelet::LaneletMapPtr fromOsmFile(const osm::File & file, ErrorMessages & errors) const;
 
-  std::unique_ptr<LaneletMap> fromOsmFile(
+  lanelet::LaneletMapPtr fromOsmFile(
     const std::map<std::string, osm::File> & files_map, ErrorMessages & errors) const;
 
   static void parseVersions(
@@ -70,7 +70,7 @@ RegisterParser<MultiOsmParser> regParser;
 class MultiFileLoader
 {
 public:
-  static std::unique_ptr<LaneletMap> loadMap(
+  static lanelet::LaneletMapPtr loadMap(
     const osm::File & file, const Projector & projector, ErrorMessages & errors)
   {
     MultiFileLoader loader;
@@ -88,7 +88,7 @@ class MultiFileLoader
       loader.lineStrings_, loader.points_);
   }
 
-  static std::unique_ptr<LaneletMap> loadMap(
+  static lanelet::LaneletMapPtr loadMap(
     const std::map<std::string, osm::File> & files_map, const Projector & projector,
     ErrorMessages & errors)
   {
diff --git a/autoware_lanelet2_extension/lib/autoware_multi_osm_parser.cpp b/autoware_lanelet2_extension/lib/autoware_multi_osm_parser.cpp
index dc5b7d7..0cbb474 100644
--- a/autoware_lanelet2_extension/lib/autoware_multi_osm_parser.cpp
+++ b/autoware_lanelet2_extension/lib/autoware_multi_osm_parser.cpp
@@ -445,7 +445,7 @@ void testAndPrintLocaleWarning(ErrorMessages & errors)
   }
 }
 
-std::unique_ptr<LaneletMap> MultiOsmParser::parse(
+lanelet::LaneletMapPtr MultiOsmParser::parse(
   const std::vector<std::string> & lanelet2_filenames, lanelet::ErrorMessages & errors) const
 {
   std::map<std::string, osm::File> files;
@@ -506,16 +506,16 @@ std::unique_ptr<LaneletMap> MultiOsmParser::parse(
   registerIds(file.relations);
   errors = buildErrorMessage(
     "Errors ocurred while parsing Lanelet Map:", utils::concatenate({osmReadErrors, errors}));
-  return map;
+  return std::unique_ptr<LaneletMap>(map.get());
 }
 
-std::unique_ptr<LaneletMap> MultiOsmParser::fromOsmFile(
+lanelet::LaneletMapPtr MultiOsmParser::fromOsmFile(
   const std::map<std::string, osm::File> & files_map, ErrorMessages & errors) const
 {
   return MultiFileLoader::loadMap(files_map, projector(), errors);
 }
 
-std::unique_ptr<LaneletMap> MultiOsmParser::fromOsmFile(
+lanelet::LaneletMapPtr MultiOsmParser::fromOsmFile(
   const osm::File & file, lanelet::ErrorMessages & errors) const
 {
   return MultiFileLoader::loadMap(file, projector(), errors);