Null VerticalCRS to VerticalCRS: optimize as +proj=noop instead of +p…

…roj=geogoffset +dh=0
OSGeo · Oct 13, 2024 · aa8e518 · aa8e518
1 parent f118bd2
commit aa8e518
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/iso19111/operation/singleoperation.cpp b/src/iso19111/operation/singleoperation.cpp
@@ -4009,8 +4009,10 @@ bool SingleOperation::exportToPROJStringGeneric(
         sourceCRSVert->addLinearUnitConvert(formatter);
         formatter->stopInversion();
 
-        formatter->addStep("geogoffset");
-        formatter->addParam("dh", offsetHeight);
+        if (offsetHeight != 0) {
+            formatter->addStep("geogoffset");
+            formatter->addParam("dh", offsetHeight);
+        }
 
         targetCRSVert->addLinearUnitConvert(formatter);
 

diff --git a/test/cli/test_projinfo.yaml b/test/cli/test_projinfo.yaml
@@ -1834,3 +1834,7 @@ tests:
   out: |
     Candidate operations found: 1
     unknown id, Null geographic offset from NAD83(CSRS)v7 (geog2D) to NAD83(CSRS)v7 (geog3D) + Canada velocity grid v7 from epoch 1997 to epoch 2010 + Null geographic offset from NAD83(CSRS)v7 (geog3D) to NAD83(CSRS)v7 (geog2D), 0.01 m, Canada - onshore - Alberta; British Columbia (BC); Manitoba; New Brunswick (NB); Newfoundland and Labrador; Northwest Territories (NWT); Nova Scotia (NS); Nunavut; Ontario; Prince Edward Island (PEI); Quebec; Saskatchewan; Yukon.
+- comment: >
+    Test that "CGVD28 height" to "CGVD28(HTv2.0) height" is a no-op
+  args: -s "CGVD28 height" -t "CGVD28(HTv2.0) height" -o PROJ -q
+  out: +proj=noop