diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-03-17 22:18:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-17 22:18:22 +0100 |
| commit | ab3383a4483f65679ae4a687cc8660572cd6102c (patch) | |
| tree | ab0d528ffa0cda0f0b61f8e26936dc828b24402b /test/unit/test_operationfactory.cpp | |
| parent | 1c1a3c5930229644440a7e41d032cc217cf2f8c0 (diff) | |
| parent | 3e7984f3b26e408e69b960f8e0d03b6ac0576188 (diff) | |
| download | PROJ-ab3383a4483f65679ae4a687cc8660572cd6102c.tar.gz PROJ-ab3383a4483f65679ae4a687cc8660572cd6102c.zip | |
Merge pull request #3119 from rouault/compound_to_2D_crs
Transformation: no longer do vertical trasnformation when doing compound CRS to 2D CRS / add --3d to cs2cs
Diffstat (limited to 'test/unit/test_operationfactory.cpp')
| -rw-r--r-- | test/unit/test_operationfactory.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/test/unit/test_operationfactory.cpp b/test/unit/test_operationfactory.cpp index 0c3ecae4..bb69e347 100644 --- a/test/unit/test_operationfactory.cpp +++ b/test/unit/test_operationfactory.cpp @@ -5441,7 +5441,9 @@ TEST(operation, compoundCRS_to_geogCRS_2D_promote_to_3D_context) { auto src = nn_dynamic_pointer_cast<CRS>(srcObj); ASSERT_TRUE(src != nullptr); auto nnSrc = NN_NO_CHECK(src); - auto dst = authFactory->createCoordinateReferenceSystem("4269"); // NAD83 + auto dst = + authFactory->createCoordinateReferenceSystem("4269")->promoteTo3D( + std::string(), authFactory->databaseContext()); // NAD83 auto listCompoundToGeog2D = CoordinateOperationFactory::create()->createOperations(nnSrc, dst, @@ -5454,18 +5456,11 @@ TEST(operation, compoundCRS_to_geogCRS_2D_promote_to_3D_context) { CoordinateOperationFactory::create()->createOperations(dst, nnSrc, ctxt); EXPECT_EQ(listGeog2DToCompound.size(), listCompoundToGeog2D.size()); - - auto listCompoundToGeog3D = - CoordinateOperationFactory::create()->createOperations( - nnSrc, - dst->promoteTo3D(std::string(), authFactory->databaseContext()), - ctxt); - EXPECT_EQ(listCompoundToGeog3D.size(), listCompoundToGeog2D.size()); } // --------------------------------------------------------------------------- -TEST(operation, compoundCRS_of_projCRS_to_geogCRS_2D_context) { +TEST(operation, compoundCRS_of_projCRS_to_geogCRS_3D_context) { auto authFactory = AuthorityFactory::create(DatabaseContext::create(), "EPSG"); auto ctxt = CoordinateOperationContext::create(authFactory, nullptr, 0.0); @@ -5480,7 +5475,9 @@ TEST(operation, compoundCRS_of_projCRS_to_geogCRS_2D_context) { auto src = nn_dynamic_pointer_cast<CRS>(srcObj); ASSERT_TRUE(src != nullptr); auto nnSrc = NN_NO_CHECK(src); - auto dst = authFactory->createCoordinateReferenceSystem("4269"); // NAD83 + auto dst = + authFactory->createCoordinateReferenceSystem("4269")->promoteTo3D( + std::string(), authFactory->databaseContext()); // NAD83 auto list = CoordinateOperationFactory::create()->createOperations( nnSrc, dst, ctxt); @@ -5945,7 +5942,9 @@ TEST(operation, compoundCRS_of_vertCRS_with_geoid_model_to_geogCRS) { createFromUserInput(wkt, authFactory->databaseContext(), false); auto src = nn_dynamic_pointer_cast<CRS>(srcObj); ASSERT_TRUE(src != nullptr); - auto dst = authFactory->createCoordinateReferenceSystem("4269"); // NAD83 + auto dst = + authFactory->createCoordinateReferenceSystem("4269")->promoteTo3D( + std::string(), authFactory->databaseContext()); // NAD83 auto list = CoordinateOperationFactory::create()->createOperations( NN_NO_CHECK(src), dst, ctxt); @@ -6153,7 +6152,7 @@ TEST(operation, compoundCRS_with_non_meter_horiz_and_vertical_to_geog) { AuthorityFactory::create(DatabaseContext::create(), "EPSG"); auto ctxt = CoordinateOperationContext::create(authFactory, nullptr, 0.0); auto list = CoordinateOperationFactory::create()->createOperations( - NN_NO_CHECK(src), authFactory->createCoordinateReferenceSystem("4326"), + NN_NO_CHECK(src), authFactory->createCoordinateReferenceSystem("4979"), ctxt); ASSERT_EQ(list.size(), 1U); // Check that vertical unit conversion is done just once |