createFromUserInput(): add capability to import PROJJSON

OSGeo · Aug 9, 2019 · 740be1b · 740be1b
1 parent 89f2cc7
commit 740be1b
Show file tree

Hide file tree

Showing 9 changed files with 23,771 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -344,6 +344,7 @@ dnl Generate files
 dnl ---------------------------------------------------------------------------
 
 AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile include/Makefile include/proj/Makefile include/proj/internal/Makefile
+                 include/proj/internal/nlohmann/Makefile
                  test/Makefile test/cli/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile
                  man/Makefile man/man1/Makefile man/man3/Makefile data/Makefile
                  jniwrap/Makefile jniwrap/org.osgeo.proj/Makefile jniwrap/org.osgeo.proj/org/Makefile jniwrap/org.osgeo.proj/org/proj4/Makefile])

diff --git a/include/proj/internal/Makefile.am b/include/proj/internal/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = nlohmann
+
 noinst_HEADERS = \
 	coordinateoperation_constants.hpp \
 	coordinateoperation_internal.hpp \

diff --git a/include/proj/internal/nlohmann/Makefile.am b/include/proj/internal/nlohmann/Makefile.am
@@ -0,0 +1,2 @@
+noinst_HEADERS = \
+	json.hpp
diff --git a/include/proj/internal/nlohmann/include_json.hpp b/include/proj/internal/nlohmann/include_json.hpp
@@ -0,0 +1,18 @@
+#if defined(__GNUC__)
+#pragma GCC system_header
+#endif
+
+// clang-format off
+#define and &&
+#define or ||
+#define not !
+// clang-format on
+
+// to avoid any clash if PROJ users have another version of nlohmann/json.hpp
+#define nlohmann proj_nlohmann
+
+#include "json.hpp"
+
+#undef and
+#undef or
+#undef not