Merge pull request #12 from OPTITOOL/refactoring

Refactoring

.devcontainer/vcpkg.json

@@ -2,10 +2,7 @@
     "dependencies": [
         "boost-log",
         "boost-program-options",
-        "boost-filesystem",
         "icu",
-        "boost-timer",
-        "shapelib",
         "libosmium",
         {
             "name": "gdal",

.vscode/launch.json

@@ -18,8 +18,8 @@
                 "MIMode": "gdb",
                 "args": [
                     //"--bb=-25.0 32.9 31.4 71.7",
-                    "--countries=ALB AND AUT BEL BGR BIH BLR CHE CYP CZE DEU DNK ESP EST FIN FRA FRO GBR GIB GRC GRL HRV HUN IMN IRL ISL ITA KOS LIE LTU LUX LVA MCO MDA MKD MLT MNE NCY NLD NOR POL PRT ROU SJM SMR SRB SVK SVN SWE VAT",
-                    "/here-europe",
+                    "--countries=ALB AUT BEL BGR BIH BLR CHE CYP CZE DEU DNK ESP EST FIN FRA GBR GRC HRV HUN IRL ISL ITA LTU LUX LVA MDA MKD MLT MNE NLD NOR POL PRT ROU SRB SVK SVN SWE ",
+                    "${workspaceFolder}/here-data",
                     "build/europa.osm.pbf"
                 ]
             },

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "files.associations": {
+        "*.FTL": "csv",
         "cctype": "cpp",
         "clocale": "cpp",
         "cmath": "cpp",
@@ -55,7 +56,24 @@
         "stdexcept": "cpp",
         "streambuf": "cpp",
         "thread": "cpp",
-        "typeinfo": "cpp"
+        "typeinfo": "cpp",
+        "strstream": "cpp",
+        "bit": "cpp",
+        "charconv": "cpp",
+        "compare": "cpp",
+        "complex": "cpp",
+        "concepts": "cpp",
+        "source_location": "cpp",
+        "format": "cpp",
+        "numbers": "cpp",
+        "ranges": "cpp",
+        "semaphore": "cpp",
+        "shared_mutex": "cpp",
+        "span": "cpp",
+        "stdfloat": "cpp",
+        "stop_token": "cpp",
+        "typeindex": "cpp",
+        "variant": "cpp"
     },
     "C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
     "cmake.configureSettings": {

CMakeLists.txt

@@ -26,11 +26,10 @@ ENDIF()
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME ON)
 
-find_package(Boost REQUIRED COMPONENTS system filesystem log program_options)
+find_package(Boost REQUIRED COMPONENTS system log program_options)
 find_package(GDAL REQUIRED)
 find_package(geos REQUIRED)
 find_path(OSMIUM_INCLUDE_DIRS "osmium/version.hpp")
-find_package(shapelib CONFIG REQUIRED)
 find_package(ICU COMPONENTS uc data io i18n tu)
 
 # Find includes in corresponding build directories
@@ -50,6 +49,5 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${ICU_LIBRARY}
   PRIVATE GEOS::geos
   PRIVATE ${OSMIUM_INCLUDE_DIRS}
   PRIVATE GDAL::GDAL
-  PRIVATE shapelib::shp
   PRIVATE expat bz2
   )

comm2osm.cpp

@@ -11,15 +11,16 @@
 #include <iostream>
 #include <memory>
 #include <ogrsf_frmts.h>
+#include <set>
 #include <vector>
 
 #include "plugins/base_plugin.hpp"
 #include "plugins/dummy/dummy_plugin.hpp"
 #include "plugins/navteq/navteq_plugin.hpp"
 
-boost::filesystem::path input_path, output_file;
+std::filesystem::path input_path, output_file;
 std::vector<double> boundingBox;
-std::vector<std::string> countries;
+std::set<std::string> countries;
 static bool debug = false;
 
 void check_args_and_setup(int argc, char *argv[]) {
@@ -99,7 +100,7 @@ int main(int argc, char *argv[]) {
 
   std::vector<std::unique_ptr<base_plugin>> plugins;
 
-  boost::filesystem::path executable_path(argv[0]);
+  std::filesystem::path executable_path(argv[0]);
 
   // plugins.emplace_back(std::make_unique<dummy_plugin>());
   plugins.emplace_back(std::make_unique<navteq_plugin>(executable_path));

plugins/base_plugin.hpp

@@ -10,21 +10,22 @@
 
 #include <assert.h>
 #include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
+#include <filesystem>
+#include <set>
 
 #include <osmium/io/error.hpp>
 
 class base_plugin {
 public:
   std::string name;
-  boost::filesystem::path input_path;
-  boost::filesystem::path output_path;
-  boost::filesystem::path executable_path;
+  std::filesystem::path input_path;
+  std::filesystem::path output_path;
+  std::filesystem::path executable_path;
 
   base_plugin() { this->name = ""; };
   base_plugin(const std::string &name) { this->name = name; };
   base_plugin(const std::string &name,
-              const boost::filesystem::path &executable_path) {
+              const std::filesystem::path &executable_path) {
     this->name = name;
     this->executable_path = executable_path.parent_path();
   }
@@ -42,14 +43,14 @@ class base_plugin {
    * \param	inputh_path_rhs	input path to set
    * \param	output_path_rhs	output path to set (may be ommited)
    * */
-  void plugin_setup(const boost::filesystem::path &input_path_rhs,
-                    const boost::filesystem::path &output_path_rhs =
-                        boost::filesystem::path()) {
+  void plugin_setup(
+      const std::filesystem::path &input_path_rhs,
+      const std::filesystem::path &output_path_rhs = std::filesystem::path()) {
     input_path = input_path_rhs;
-    if (!boost::filesystem::is_directory(input_path))
+    if (!std::filesystem::is_directory(input_path))
       throw(osmium::io_error("input_path '" + input_path.string() +
                              "' is not valid."));
-    if (boost::filesystem::is_directory(output_path_rhs.parent_path()))
+    if (std::filesystem::is_directory(output_path_rhs.parent_path()))
       output_path = output_path_rhs;
   }
 
@@ -74,9 +75,9 @@ class base_plugin {
    *
    * \return returns true if input is existing and valid
    *  */
-  virtual bool check_input(const boost::filesystem::path &input_path,
-                           const boost::filesystem::path &output_path =
-                               boost::filesystem::path("")) = 0;
+  virtual bool check_input(
+      const std::filesystem::path &input_path,
+      const std::filesystem::path &output_path = std::filesystem::path("")) = 0;
 
   /**
    * \brief	Converts input to OSM files
@@ -92,7 +93,7 @@ class base_plugin {
   virtual void setBoundingBox(double minX, double minY, double maxX,
                               double maxY) = 0;
 
-  virtual void setCountries(const std::vector<std::string> &_countries) = 0;
+  virtual void setCountries(const std::set<std::string> &_countries) = 0;
 
   virtual void setDebug(bool debug) = 0;
 };

plugins/dummy/dummy_plugin.cpp

@@ -12,8 +12,7 @@ dummy_plugin::dummy_plugin() : base_plugin::base_plugin("Dummy Plugin") {}
 
 dummy_plugin::~dummy_plugin() {}
 
-bool dummy_plugin::check_input(boost::filesystem::path,
-                               boost::filesystem::path) {
+bool dummy_plugin::check_input(std::filesystem::path, std::filesystem::path) {
   return true;
 }
 

plugins/dummy/dummy_plugin.hpp

@@ -15,9 +15,8 @@ class dummy_plugin : public base_plugin {
   dummy_plugin();
   virtual ~dummy_plugin();
 
-  bool
-  check_input(boost::filesystem::path input_path,
-              boost::filesystem::path output_path = boost::filesystem::path());
+  bool check_input(std::filesystem::path input_path,
+                   std::filesystem::path output_path = std::filesystem::path());
   void execute();
 };