Merge branch 'development'

docs/_data/sidebars/3dfier_sidebar.yml

@@ -3,7 +3,7 @@
 entries:
 - title: sidebar
   product: 3dfier
-  version: v1.3.3
+  version: v1.3.5
   logo: 3dfierLogo.png
   folders:
   - title:

src/Map3d.cpp

@@ -488,7 +488,7 @@ bool Map3d::get_postgis_output(std::string connstr, bool pdok, bool citygml) {
         std::cerr << "ERROR: Cannot open database '" + connstr + "' for writing" << std::endl;
         dataSource->RollbackTransaction();
         GDALClose(dataSource);
-        GDALClose(driver);
+        // GDALClose(driver);
         return false;
       }
       layers.emplace(layername, layer);
@@ -544,7 +544,7 @@ bool Map3d::get_postgis_output(std::string connstr, bool pdok, bool citygml) {
     return false;
   }
   GDALClose(dataSource);
-  GDALClose(driver);
+  // GDALClose(driver);
   return true;
 #endif
 }
@@ -563,14 +563,14 @@ bool Map3d::get_gdal_output(std::string filename, std::string drivername, bool m
     if (layer == NULL) {
       std::cerr << "ERROR: Cannot open file '" + filename + "' for writing" << std::endl;
       GDALClose(layer);
-      GDALClose(driver);
+      // GDALClose(driver);
       return false;
     }
     for (auto& f : _lsFeatures) {
       f->get_shape(layer, false);
     }
     GDALClose(layer);
-    GDALClose(driver);
+    // GDALClose(driver);
   }
   else {
     std::unordered_map<std::string, OGRLayer*> layers;
@@ -604,7 +604,7 @@ void Map3d::close_gdal_resources(GDALDriver* driver, std::unordered_map<std::str
   for (auto& layer : layers) {
     GDALClose(layer.second);
   }
-  GDALClose(driver);
+  // GDALClose(driver);
 }
 #endif
 

src/main.cpp

@@ -36,7 +36,7 @@
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 
-std::string VERSION = "1.3.3";
+std::string VERSION = "1.3.5";
 
 bool validate_yaml(const char* arg, std::set<std::string>& allowedFeatures);
 int main(int argc, const char * argv[]);

vcpkg.json

@@ -1,16 +1,21 @@
 {
-    "name": "3dfier",
-    "version-string": "1.3.2",
-    "dependencies": [
-        "boost-program-options",
-        "boost-geometry",
-        "boost-locale",
-        "boost-chrono",
-        "boost-system",
-        "boost-filesystem",
-        "cgal",
-        "gdal",
-        "lastools",
-        "yaml-cpp"
-    ]
-}
+  "name": "3dfier",
+  "version-string": "1.3.5",
+  "dependencies": [
+    "boost-program-options",
+    "boost-geometry",
+    "boost-locale",
+    "boost-chrono",
+    "boost-system",
+    "boost-filesystem",
+    "cgal",
+    "gdal",
+    {
+      "name": "libpq",
+      "version>=": "16.2"
+    },
+    "lastools",
+    "yaml-cpp"
+  ],
+  "builtin-baseline": "3dd44b931481d7a8e9ba412621fa810232b66289"
+}