diff options
| -rw-r--r-- | src/iso19111/io.cpp | 6 | ||||
| -rw-r--r-- | test/unit/test_crs.cpp | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index 6a1d7e32..8bfb4395 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -3839,6 +3839,12 @@ WKTParser::Private::buildProjectedCRS(const WKTNodeNNPtr &node) { ThrowNotExpectedCSType("Cartesian"); } + if (cartesianCS->axisList().size() == 3 && + baseGeodCRS->coordinateSystem()->axisList().size() == 2) { + baseGeodCRS = NN_NO_CHECK(util::nn_dynamic_pointer_cast<GeodeticCRS>( + baseGeodCRS->promoteTo3D(std::string(), dbContext_))); + } + addExtensionProj4ToProp(nodeP, props); return ProjectedCRS::create(props, baseGeodCRS, conversion, diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp index c17635db..2bde8ee3 100644 --- a/test/unit/test_crs.cpp +++ b/test/unit/test_crs.cpp @@ -5674,6 +5674,22 @@ TEST(crs, promoteTo3D_and_demoteTo2D) { EXPECT_EQ( crs3DAsProjected->baseCRS()->coordinateSystem()->axisList().size(), 3U); + + // Check that importing an exported Projected 3D CRS as WKT keeps + // the 3D aspect of the baseCRS (see #2122) + { + WKTFormatterNNPtr f( + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019)); + crs3DAsProjected->exportToWKT(f.get()); + auto obj = WKTParser().createFromWKT(f->toString()); + auto crsFromWkt = nn_dynamic_pointer_cast<ProjectedCRS>(obj); + ASSERT_TRUE(crsFromWkt != nullptr); + EXPECT_EQ(crsFromWkt->coordinateSystem()->axisList().size(), 3U); + EXPECT_EQ( + crsFromWkt->baseCRS()->coordinateSystem()->axisList().size(), + 3U); + } + EXPECT_TRUE(crs3D->promoteTo3D(std::string(), nullptr) ->isEquivalentTo(crs3D.get())); |