Merge pull request #3037 from direvus/2529-err-code-unknown-format

Set more precise error code for parsing errors in proj_create().

2 files changed, 8 insertions, 3 deletions

diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index 527ccd4f..4823213b 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -572,6 +572,11 @@ PJ *proj_create(PJ_CONTEXT *ctx, const char *text) {
         if (identifiedObject) {
             return pj_obj_create(ctx, NN_NO_CHECK(identifiedObject));
         }
+    } catch (const io::ParsingException &e) {
+        if (proj_context_errno(ctx) == 0) {
+            proj_context_errno_set(ctx, PROJ_ERR_INVALID_OP_WRONG_SYNTAX);
+        }
+        proj_log_error(ctx, __FUNCTION__, e.what());
     } catch (const std::exception &e) {
         proj_log_error(ctx, __FUNCTION__, e.what());
     }
diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie
index 9189b328..1b0c1541 100644
--- a/test/gie/4D-API_cs2cs-style.gie
+++ b/test/gie/4D-API_cs2cs-style.gie
@@ -533,11 +533,11 @@ expect      0 0 1
 roundtrip   1
 
 -------------------------------------------------------------------------------
-# Check that proj_create() returns a generic error when an exception is caught
+# Check that proj_create() returns a syntax error when an exception is caught
 # in the creation of a PJ object.
 -------------------------------------------------------------------------------
-operation   this is a bogus CRS meant to trigger a generic error in proj_create()
-expect      failure   errno other
+operation   this is a bogus CRS meant to trigger a syntax error in proj_create()
+expect      failure   errno invalid_op_wrong_syntax
 
 -------------------------------------------------------------------------------
 # Test proj=set