rfactoring

OPTITOOL · Jul 15, 2024 · 360b666 · 360b666
1 parent 5b13a1d
commit 360b666
Show file tree

Hide file tree

Showing 6 changed files with 625 additions and 535 deletions.
diff --git a/plugins/navteq/converter/Converter.hpp b/plugins/navteq/converter/Converter.hpp
@@ -51,18 +51,15 @@ class OGRLinearRing;
 class Converter {
 
 public:
-  Converter(const boost::filesystem::path &_executable_path) {
-    executable_path = _executable_path;
-  }
+  Converter(const boost::filesystem::path &_executable_path)
+      : executable_path(_executable_path) {}
   virtual ~Converter() {}
 
   virtual void convert(const std::vector<boost::filesystem::path> &dirs,
                        osmium::io::Writer &writer) = 0;
 
   void set_dummy_osm_object_attributes(osmium::OSMObject &obj);
 
-protected:
-  // data structure to store admin boundary tags
   struct mtd_area_dataset {
     osmium::unsigned_object_id_type area_id;
     std::string admin_lvl;
@@ -72,6 +69,9 @@ class Converter {
     std::vector<std::pair<std::string, std::string>> lang_code_2_area_name;
   };
 
+protected:
+  // data structure to store admin boundary tags
+
   void build_relation_members(
       osmium::builder::RelationBuilder &builder,
       const std::vector<osmium::unsigned_object_id_type> &ext_osm_way_ids,
@@ -171,7 +171,7 @@ class Converter {
 
 private:
   static std::map<std::string, std::string> lang_code_map;
-  boost::filesystem::path &executable_path;
+  boost::filesystem::path executable_path;
 };
 
 #endif // CONVERTER_HPP