From 7968d389aa180df520b4924dbc367170048a2ebd Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 14 Feb 2022 23:09:17 +0100 Subject: Fix importing CRS definition with +proj=peirce_q and +shape different from square or diamond. Follow-up of #3014. Fixes #3056. master only --- test/unit/test_io.cpp | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'test/unit/test_io.cpp') diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 33f4c731..69cab65c 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -9963,7 +9963,7 @@ TEST(io, projparse_ortho_spherical_on_sphere) { // --------------------------------------------------------------------------- -TEST(io, projparse_peirce_q) { +TEST(io, projparse_peirce_q_square) { std::string input("+proj=peirce_q +shape=square +type=crs"); auto obj = PROJStringParser().createFromPROJString(input); auto crs = nn_dynamic_pointer_cast(obj); @@ -9978,6 +9978,36 @@ TEST(io, projparse_peirce_q) { // --------------------------------------------------------------------------- +TEST(io, projparse_peirce_q_diamond) { + std::string input("+proj=peirce_q +shape=diamond +type=crs"); + auto obj = PROJStringParser().createFromPROJString(input); + auto crs = nn_dynamic_pointer_cast(obj); + ASSERT_TRUE(crs != nullptr); + EXPECT_EQ( + crs->exportToPROJString( + PROJStringFormatter::create(PROJStringFormatter::Convention::PROJ_4) + .get()), + "+proj=peirce_q +shape=diamond +lat_0=90 +lon_0=0 +k_0=1 +x_0=0 +y_0=0 " + "+datum=WGS84 +units=m +no_defs +type=crs"); +} + +// --------------------------------------------------------------------------- + +TEST(io, projparse_peirce_q_horizontal) { + std::string input("+proj=peirce_q +shape=horizontal +datum=WGS84 +units=m " + "+no_defs +type=crs"); + auto obj = PROJStringParser().createFromPROJString(input); + auto crs = nn_dynamic_pointer_cast(obj); + ASSERT_TRUE(crs != nullptr); + EXPECT_EQ( + crs->exportToPROJString( + PROJStringFormatter::create(PROJStringFormatter::Convention::PROJ_4) + .get()), + input); +} + +// --------------------------------------------------------------------------- + TEST(io, projparse_peirce_q_invalid_lat_0) { std::string input("+proj=peirce_q +lat_0=0 +shape=square +type=crs"); auto obj = PROJStringParser().createFromPROJString(input); -- cgit v1.2.3