Optimize pipelines of planetary CRS (geocentric latitude, west-positive longitude)

2 files changed, 113 insertions, 3 deletions

diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
index ed059fe3..f9a54f3c 100644
--- a/test/unit/test_io.cpp
+++ b/test/unit/test_io.cpp
@@ -7852,6 +7852,56 @@ TEST(io, projstringformatter_axisswap_unitconvert_axisswap) {
 
 // ---------------------------------------------------------------------------
 
+TEST(io, projstringformatter_axisswap_one_minus_two_inv) {
+    auto fmt = PROJStringFormatter::create();
+    fmt->ingestPROJString(
+        "+proj=pipeline +step +inv +proj=axisswap +order=1,-2");
+    EXPECT_EQ(fmt->toString(), "+proj=axisswap +order=1,-2");
+}
+
+// ---------------------------------------------------------------------------
+
+TEST(io, projstringformatter_axisswap_two_one_followed_two_minus_one) {
+    auto fmt = PROJStringFormatter::create();
+    fmt->ingestPROJString("+proj=pipeline "
+                          "+step +proj=axisswap +order=2,1 "
+                          "+step +proj=axisswap +order=2,-1");
+    EXPECT_EQ(fmt->toString(), "+proj=axisswap +order=1,-2");
+}
+
+// ---------------------------------------------------------------------------
+
+TEST(io, projstringformatter_axisswap_minus_two_one_followed_two_one) {
+    auto fmt = PROJStringFormatter::create();
+    fmt->ingestPROJString("+proj=pipeline "
+                          "+step +proj=axisswap +order=-2,1 "
+                          "+step +proj=axisswap +order=2,1");
+    EXPECT_EQ(fmt->toString(), "+proj=axisswap +order=1,-2");
+}
+
+// ---------------------------------------------------------------------------
+
+TEST(io, projstringformatter_unmodified) {
+    const char *const strs[] = {"+proj=pipeline "
+                                "+step +proj=axisswap +order=2,-1 "
+                                "+step +proj=axisswap +order=2,1",
+
+                                "+proj=pipeline "
+                                "+step +proj=axisswap +order=2,1 "
+                                "+step +proj=axisswap +order=-2,1",
+
+                                "+proj=pipeline "
+                                "+step +inv +proj=axisswap +order=-2,1 "
+                                "+step +proj=axisswap +order=2,1"};
+    for (const char *str : strs) {
+        auto fmt = PROJStringFormatter::create();
+        fmt->ingestPROJString(str);
+        EXPECT_EQ(fmt->toString(), str);
+    }
+}
+
+// ---------------------------------------------------------------------------
+
 TEST(io, projstringformatter_optim_hgridshift_vgridshift_hgridshift_inv) {
     // Nominal case
     {
@@ -8786,9 +8836,12 @@ TEST(io, projparse_longlat_axisswap) {
                     op->exportToPROJString(PROJStringFormatter::create().get()),
                     (atoi(order1) == 2 && atoi(order2) == 1)
                         ? "+proj=noop"
-                        : "+proj=pipeline +step +proj=axisswap +order=2,1 "
-                          "+step +proj=axisswap +order=" +
-                              std::string(order1) + "," + order2);
+                        : (atoi(order1) == 2 && atoi(order2) == -1)
+                              ? "+proj=axisswap +order=1,-2"
+                              : "+proj=pipeline +step +proj=axisswap "
+                                "+order=2,1 "
+                                "+step +proj=axisswap +order=" +
+                                    std::string(order1) + "," + order2);
             }
         }
     }
diff --git a/test/unit/test_operationfactory.cpp b/test/unit/test_operationfactory.cpp
index 2ee5a53c..31b23287 100644
--- a/test/unit/test_operationfactory.cpp
+++ b/test/unit/test_operationfactory.cpp
@@ -6953,3 +6953,60 @@ TEST(operation,
               "+step +inv +proj=geoc +ellps=WGS84 "
               "+step +proj=utm +zone=11 +ellps=WGS84");
 }
+
+// ---------------------------------------------------------------------------
+
+TEST(operation,
+     createOperation_spherical_ocentric_spherical_to_ellipsoidal_north_west) {
+    auto objSrc = WKTParser().createFromWKT(
+        "GEODCRS[\"Mercury (2015) - Sphere / Ocentric\",\n"
+        "    DATUM[\"Mercury (2015) - Sphere\",\n"
+        "        ELLIPSOID[\"Mercury (2015) - Sphere\",2440530,0,\n"
+        "            LENGTHUNIT[\"metre\",1]]],\n"
+        "    PRIMEM[\"Reference Meridian\",0,\n"
+        "        ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "    CS[spherical,2],\n"
+        "        AXIS[\"planetocentric latitude (U)\",north,\n"
+        "            ORDER[1],\n"
+        "            ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "        AXIS[\"planetocentric longitude (V)\",east,\n"
+        "            ORDER[2],\n"
+        "            ANGLEUNIT[\"degree\",0.0174532925199433]]]");
+    auto src = nn_dynamic_pointer_cast<CRS>(objSrc);
+    ASSERT_TRUE(src != nullptr);
+
+    auto objDest = WKTParser().createFromWKT(
+        "GEOGCRS[\"Mercury (2015) / Ographic\",\n"
+        "    DATUM[\"Mercury (2015)\",\n"
+        "        ELLIPSOID[\"Mercury (2015)\",2440530,1075.12334801762,\n"
+        "            LENGTHUNIT[\"metre\",1]]],\n"
+        "    PRIMEM[\"Reference Meridian\",0,\n"
+        "        ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "    CS[ellipsoidal,2],\n"
+        "        AXIS[\"latitude\",north,\n"
+        "            ORDER[1],\n"
+        "            ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "        AXIS[\"longitude\",west,\n"
+        "            ORDER[2],\n"
+        "            ANGLEUNIT[\"degree\",0.0174532925199433]]]"
+
+    );
+    auto dest = nn_dynamic_pointer_cast<CRS>(objDest);
+    ASSERT_TRUE(dest != nullptr);
+
+    {
+        auto op = CoordinateOperationFactory::create()->createOperation(
+            NN_CHECK_ASSERT(src), NN_CHECK_ASSERT(dest));
+        ASSERT_TRUE(op != nullptr);
+        EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()),
+                  "+proj=axisswap +order=1,-2");
+    }
+
+    {
+        auto op = CoordinateOperationFactory::create()->createOperation(
+            NN_CHECK_ASSERT(dest), NN_CHECK_ASSERT(src));
+        ASSERT_TRUE(op != nullptr);
+        EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()),
+                  "+proj=axisswap +order=1,-2");
+    }
+}