From 6d2af0904652baba69ec81261c914e9b68221dac Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 16 Jan 2019 17:17:54 +0100 Subject: PROJBasedOperation: write it as a conformant CONVERSION WKT, and make it parsed appropriately on the reading side --- test/unit/test_io.cpp | 14 ++++++++++++++ test/unit/test_operation.cpp | 6 ++---- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 2b5eeffc..43b74fd8 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -2280,6 +2280,20 @@ TEST(wkt_parse, COORDINATEOPERATION) { // --------------------------------------------------------------------------- +TEST(wkt_parse, conversion_proj_based) { + + auto wkt = "CONVERSION[\"PROJ-based coordinate operation\",\n" + " METHOD[\"PROJ-based operation method: +proj=merc\"]]"; + + auto obj = WKTParser().createFromWKT(wkt); + auto transf = nn_dynamic_pointer_cast(obj); + ASSERT_TRUE(transf != nullptr); + EXPECT_EQ(transf->exportToPROJString(PROJStringFormatter::create().get()), + "+proj=merc"); +} + +// --------------------------------------------------------------------------- + TEST(wkt_parse, CONCATENATEDOPERATION) { auto transf_1 = Transformation::create( diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp index d3f05548..bdadd830 100644 --- a/test/unit/test_operation.cpp +++ b/test/unit/test_operation.cpp @@ -4099,8 +4099,7 @@ TEST(operation, PROJ_based) { EXPECT_EQ(conv->exportToWKT(WKTFormatter::create().get()), "CONVERSION[\"PROJ-based coordinate operation\",\n" - " METHOD[\"PROJ-based operation method\"],\n" - " PARAMETER[\"PROJ string\",\"+proj=merc\"]]"); + " METHOD[\"PROJ-based operation method: +proj=merc\"]]"); EXPECT_EQ(conv->inverse()->exportToPROJString( PROJStringFormatter::create().get()), @@ -4135,8 +4134,7 @@ TEST(operation, PROJ_based_empty) { EXPECT_EQ(conv->exportToWKT(WKTFormatter::create().get()), "CONVERSION[\"PROJ-based coordinate operation\",\n" - " METHOD[\"PROJ-based operation method\"],\n" - " PARAMETER[\"PROJ string\",\"\"]]"); + " METHOD[\"PROJ-based operation method: \"]]"); EXPECT_THROW( conv->exportToWKT( -- cgit v1.2.3