Merge pull request #1223 from rouault/unify_proj_create

Unify proj_create(), proj_create_from_user_input() and proj_create_from_proj_string() (fixes #1214)

1 files changed, 22 insertions, 0 deletions

diff --git a/include/proj/internal/io_internal.hpp b/include/proj/internal/io_internal.hpp
index 62196fef..be6a11bd 100644
--- a/include/proj/internal/io_internal.hpp
+++ b/include/proj/internal/io_internal.hpp
@@ -36,6 +36,7 @@
 #include <string>
 #include <vector>
 
+#include "proj/io.hpp"
 #include "proj/util.hpp"
 
 //! @cond Doxygen_Suppress
@@ -159,6 +160,27 @@ class WKTConstants {
 
 NS_PROJ_END
 
+// ---------------------------------------------------------------------------
+
+/** Auxiliary structure to PJ_CONTEXT storing C++ context stuff. */
+struct projCppContext {
+    NS_PROJ::io::DatabaseContextNNPtr databaseContext;
+    std::string lastUOMName_{};
+
+    explicit projCppContext(PJ_CONTEXT *ctx, const char *dbPath = nullptr,
+                            const char *const *auxDbPaths = nullptr)
+        : databaseContext(NS_PROJ::io::DatabaseContext::create(
+              dbPath ? dbPath : std::string(), toVector(auxDbPaths), ctx)) {}
+
+    static std::vector<std::string> toVector(const char *const *auxDbPaths) {
+        std::vector<std::string> res;
+        for (auto iter = auxDbPaths; iter && *iter; ++iter) {
+            res.emplace_back(std::string(*iter));
+        }
+        return res;
+    }
+};
+
 //! @endcond
 
 #endif // IO_INTERNAL_HH_INCLUDED