WKT importer: accepts PROJ-based COORDINATEOPERATION

3 files changed, 38 insertions, 12 deletions

diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp
index ca882f49..9c393aba 100644
--- a/src/iso19111/coordinateoperation.cpp
+++ b/src/iso19111/coordinateoperation.cpp
@@ -12802,7 +12802,7 @@ PROJBasedOperationNNPtr PROJBasedOperation::create(
 
     auto method = OperationMethod::create(
         util::PropertyMap().set(common::IdentifiedObject::NAME_KEY,
-                                "PROJ-based operation method (approximate) : " +
+                                "PROJ-based operation method (approximate): " +
                                     projString),
         std::vector<GeneralOperationParameterNNPtr>{});
     auto op = PROJBasedOperation::nn_make_shared<PROJBasedOperation>(method);
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index d8282bb0..0a32bb7c 100644
--- a/src/iso19111/io.cpp
+++ b/src/iso19111/io.cpp
@@ -1342,7 +1342,7 @@ struct WKTParser::Private {
 
     CRSPtr buildCRS(const WKTNodeNNPtr &node);
 
-    CoordinateOperationNNPtr buildCoordinateOperation(const WKTNodeNNPtr &node);
+    TransformationNNPtr buildCoordinateOperation(const WKTNodeNNPtr &node);
 
     ConcatenatedOperationNNPtr
     buildConcatenatedOperation(const WKTNodeNNPtr &node);
@@ -2940,7 +2940,7 @@ WKTParser::Private::buildConversion(const WKTNodeNNPtr &node,
 
 // ---------------------------------------------------------------------------
 
-CoordinateOperationNNPtr
+TransformationNNPtr
 WKTParser::Private::buildCoordinateOperation(const WKTNodeNNPtr &node) {
     const auto *nodeP = node->GP();
     auto &methodNode = nodeP->lookForChild(WKTConstants::METHOD);
@@ -2991,11 +2991,10 @@ WKTParser::Private::buildCoordinateOperation(const WKTNodeNNPtr &node) {
             stripQuotes(accuracyNode->GP()->children()[0])));
     }
 
-    return util::nn_static_pointer_cast<CoordinateOperation>(
-        Transformation::create(buildProperties(node), NN_NO_CHECK(sourceCRS),
-                               NN_NO_CHECK(targetCRS), interpolationCRS,
-                               buildProperties(methodNode), parameters, values,
-                               accuracies));
+    return Transformation::create(buildProperties(node), NN_NO_CHECK(sourceCRS),
+                                  NN_NO_CHECK(targetCRS), interpolationCRS,
+                                  buildProperties(methodNode), parameters,
+                                  values, accuracies);
 }
 
 // ---------------------------------------------------------------------------
@@ -4307,16 +4306,31 @@ BaseObjectNNPtr WKTParser::Private::build(const WKTNodeNNPtr &node) {
     }
 
     if (ci_equal(name, WKTConstants::COORDINATEOPERATION)) {
-        return util::nn_static_pointer_cast<BaseObject>(
-            buildCoordinateOperation(node));
+        auto transf = buildCoordinateOperation(node);
+
+        const char *prefixes[] = {
+            "PROJ-based operation method: ",
+            "PROJ-based operation method (approximate): "};
+        for (const char *prefix : prefixes) {
+            if (starts_with(transf->method()->nameStr(), prefix)) {
+                auto projString =
+                    transf->method()->nameStr().substr(strlen(prefix));
+                return util::nn_static_pointer_cast<BaseObject>(
+                    PROJBasedOperation::create(
+                        PropertyMap(), projString, transf->sourceCRS(),
+                        transf->targetCRS(),
+                        transf->coordinateOperationAccuracies()));
+            }
+        }
+
+        return util::nn_static_pointer_cast<BaseObject>(transf);
     }
 
     if (ci_equal(name, WKTConstants::CONVERSION)) {
         auto conv =
             buildConversion(node, UnitOfMeasure::METRE, UnitOfMeasure::DEGREE);
 
-        if (conv->nameStr() == "PROJ-based coordinate operation" &&
-            starts_with(conv->method()->nameStr(),
+        if (starts_with(conv->method()->nameStr(),
                         "PROJ-based operation method: ")) {
             auto projString = conv->method()->nameStr().substr(
                 strlen("PROJ-based operation method: "));
diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp
index 730cd270..a38e9df2 100644
--- a/test/unit/test_operation.cpp
+++ b/test/unit/test_operation.cpp
@@ -6477,6 +6477,18 @@ TEST(operation, compoundCRS_to_compoundCRS_context) {
               "+step +proj=hgridshift +grids=conus +step "
               "+proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap "
               "+order=2,1");
+    {
+        // Test that we can round-trip this through WKT and still get the same
+        // PROJ string.
+        auto wkt = list[0]->exportToWKT(
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        auto obj = WKTParser().createFromWKT(wkt);
+        auto co = nn_dynamic_pointer_cast<CoordinateOperation>(obj);
+        ASSERT_TRUE(co != nullptr);
+        EXPECT_EQ(
+            list[0]->exportToPROJString(PROJStringFormatter::create().get()),
+            co->exportToPROJString(PROJStringFormatter::create().get()));
+    }
 
     bool foundApprox = false;
     for (size_t i = 0; i < list.size(); i++) {