Merge pull request #4213 from jjimenezshaw/vertica-method-1129

Process properly EPSG_CODE_METHOD_VERTICALGRID_GTG with code 1129
OSGeo · Aug 1, 2024 · a4593b4 · a4593b4
2 parents 6400b75 + 5d173d8
commit a4593b4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/iso19111/operation/singleoperation.cpp b/src/iso19111/operation/singleoperation.cpp
@@ -2269,6 +2269,7 @@ static bool isRegularVerticalGridMethod(int methodEPSGCode,
     return methodEPSGCode == EPSG_CODE_METHOD_VERTICALGRID_NZLVD ||
            methodEPSGCode == EPSG_CODE_METHOD_VERTICALGRID_BEV_AT ||
            methodEPSGCode == EPSG_CODE_METHOD_VERTICALGRID_GTX ||
+           methodEPSGCode == EPSG_CODE_METHOD_VERTICALGRID_GTG ||
            methodEPSGCode == EPSG_CODE_METHOD_VERTICALGRID_PL_TXT;
 }
 

diff --git a/src/proj_constants.h b/src/proj_constants.h
@@ -656,6 +656,10 @@
 #define EPSG_NAME_METHOD_VERTICALGRID_GTX                                      \
     "Vertical Offset by Grid Interpolation (gtx)"
 
+#define EPSG_CODE_METHOD_VERTICALGRID_GTG 1129
+#define EPSG_NAME_METHOD_VERTICALGRID_GTG                                      \
+    "Vertical Offset by Grid Interpolation (gtg)"
+
 #define EPSG_CODE_METHOD_VERTICALGRID_PL_TXT 1101
 #define EPSG_NAME_METHOD_VERTICALGRID_PL_TXT                                   \
     "Vertical Offset by Grid Interpolation (PL txt)"

diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
@@ -1208,6 +1208,15 @@ TEST(factory, AuthorityFactory_affine_parametric_transform) {
 
 // ---------------------------------------------------------------------------
 
+TEST(factory, AuthorityFactory_10566_issue_4212) {
+    auto factory = AuthorityFactory::create(DatabaseContext::create(), "EPSG");
+    auto op = factory->createCoordinateOperation("10566", true);
+    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()),
+              "+proj=vgridshift +grids=dk_sdfi_gllmsl_2022.tif +multiplier=1");
+}
+
+// ---------------------------------------------------------------------------
+
 TEST(factory,
      AuthorityFactory_createCoordinateOperation_concatenated_operation) {
     auto factory = AuthorityFactory::create(DatabaseContext::create(), "EPSG");