From 3121d9bc309b439adcc2ab9743a3d2b3a8f48296 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 17 Jan 2019 10:40:12 +0100
Subject: import/export PROJ strings from ISO19111 code: require/output
 +type=crs for CRS objects (refs #1214)

---
 src/apps/cs2cs.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/apps')

diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp
index af53a051..bde4f813 100644
--- a/src/apps/cs2cs.cpp
+++ b/src/apps/cs2cs.cpp
@@ -213,8 +213,9 @@ static PJ *instanciate_crs(const std::string &definition,
                                const char *const *optionsImportCRS,
                                bool &isGeog, double &toRadians,
                                bool &isLatFirst) {
-    PJ *crs = proj_create_from_user_input(nullptr, definition.c_str(),
-                                                  optionsImportCRS);
+    PJ *crs = proj_create_from_user_input(nullptr,
+                                          pj_add_type_crs_if_needed(definition).c_str(),
+                                          optionsImportCRS);
     if (!crs) {
         return nullptr;
     }
-- 
cgit v1.2.3


From c0ac895d77e823fe9a9458d013eb0f6378f39060 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 17 Jan 2019 17:01:20 +0100
Subject: Remove proj_create_from_proj_string() and
 proj_create_from_user_input(), and make proj_create() do more or less what
 proj_create_from_user_input() did before (fixes #1214)

---
 src/apps/cs2cs.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/apps')

diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp
index bde4f813..1c49965a 100644
--- a/src/apps/cs2cs.cpp
+++ b/src/apps/cs2cs.cpp
@@ -210,12 +210,10 @@ static void process(FILE *fid)
 /************************************************************************/
 
 static PJ *instanciate_crs(const std::string &definition,
-                               const char *const *optionsImportCRS,
                                bool &isGeog, double &toRadians,
                                bool &isLatFirst) {
-    PJ *crs = proj_create_from_user_input(nullptr,
-                                          pj_add_type_crs_if_needed(definition).c_str(),
-                                          optionsImportCRS);
+    PJ *crs = proj_create(nullptr,
+                          pj_add_type_crs_if_needed(definition).c_str());
     if (!crs) {
         return nullptr;
     }
@@ -536,16 +534,13 @@ int main(int argc, char **argv) {
         emess(3, "missing source and target coordinate systems");
     }
 
-    const char *const optionsProj4Mode[] = {"USE_PROJ4_INIT_RULES=YES",
-                                            nullptr};
-    const char *const *optionsImportCRS =
-        proj_context_get_use_proj4_init_rules(nullptr, TRUE) ? optionsProj4Mode
-                                                             : nullptr;
+    proj_context_use_proj4_init_rules(nullptr,
+        proj_context_get_use_proj4_init_rules(nullptr, TRUE));
 
     PJ *src = nullptr;
     if (!fromStr.empty()) {
         bool ignored;
-        src = instanciate_crs(fromStr, optionsImportCRS, srcIsGeog,
+        src = instanciate_crs(fromStr, srcIsGeog,
                               srcToRadians, ignored);
         if (!src) {
             emess(3, "cannot instantiate source coordinate system");
@@ -554,7 +549,7 @@ int main(int argc, char **argv) {
 
     PJ *dst = nullptr;
     if (!toStr.empty()) {
-        dst = instanciate_crs(toStr, optionsImportCRS, destIsGeog,
+        dst = instanciate_crs(toStr, destIsGeog,
                               destToRadians, destIsLatLong);
         if (!dst) {
             emess(3, "cannot instantiate target coordinate system");
-- 
cgit v1.2.3