libgproj: Use SRID for PJ object creation when possible (#2394)

* Use SRID for PJ creation * Use proj_get_source_crs() * Tabs to spaces
OSGeo · Jan 10, 2023 · 76d27ff · 76d27ff
1 parent d657c9a
commit 76d27ff
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/lib/proj/get_proj.c b/lib/proj/get_proj.c
@@ -274,6 +274,14 @@ int pj_get_kv(struct pj_info *info, const struct Key_Value *in_proj_keys,
 
     if (perr)
         G_fatal_error("PROJ 5 error %d", perr);
+
+    if (proj_get_type(pj) == PJ_TYPE_BOUND_CRS) {
+        PJ *source_crs = proj_get_source_crs(pjc, pj);
+        if (source_crs) {
+            proj_destroy(pj);
+            pj = source_crs;
+        }
+    }
 #endif
 
     info->pj = pj;
@@ -417,6 +425,14 @@ int pj_get_string(struct pj_info *info, char *str)
                   proj_errno_string(proj_context_errno(pjc)));
         return -1;
     }
+
+    if (proj_get_type(pj) == PJ_TYPE_BOUND_CRS) {
+        PJ *source_crs = proj_get_source_crs(pjc, pj);
+        if (source_crs) {
+            proj_destroy(pj);
+            pj = source_crs;
+        }
+    }
 #else
     /* Set finder function for locating datum conversion tables PK */
     pj_set_finder(FINDERFUNC);