Merge 47dd4db into a0dfcf2

docs/source/operations/conversions/index.rst

@@ -15,6 +15,7 @@ conversions.
    cart
    geoc
    latlon
+   noop
    pop
    push
    unitconvert

docs/source/operations/conversions/noop.rst

@@ -0,0 +1,28 @@
+.. _noop:
+
+================================================================================
+No operation
+================================================================================
+
+.. versionadded:: 6.1.0
+
+Pass a coordinate through unchanged.
+
++---------------------+--------------------------------------------------------+
+| **Alias**           | noop                                                   |
++---------------------+--------------------------------------------------------+
+| **Domain**          | 4D                                                     |
++---------------------+--------------------------------------------------------+
+| **Input type**      | Any                                                    |
++---------------------+--------------------------------------------------------+
+| **Output type**     | Any                                                    |
++---------------------+--------------------------------------------------------+
+
+The no operation is a dummy operation that returns whatever is passed to it
+as seen in this example::
+
+    $ echo 12 34 56 78 | cct +proj=noop
+      12.0000        34.0000       56.0000       78.0000
+
+The operation has no options and default options will not affect the output.
+

src/Makefile.am

@@ -173,6 +173,7 @@ libproj_la_SOURCES = \
 	conversions/cart.cpp \
 	conversions/geoc.cpp \
 	conversions/geocent.cpp \
+	conversions/noop.cpp \
 	conversions/unitconvert.cpp \
 	\
 	transformations/affine.cpp \

src/conversions/noop.cpp

@@ -0,0 +1,19 @@
+#define PJ_LIB__
+
+#include "proj_internal.h"
+
+PROJ_HEAD(noop,    "No operation");
+
+static PJ_COORD noop(PJ_COORD coord, PJ *P) {
+    (void) P;
+    return coord;
+}
+
+PJ *CONVERSION(noop, 0) {
+    P->fwd4d = noop;
+    P->inv4d = noop;
+    P->left  = PJ_IO_UNITS_WHATEVER;
+    P->right = PJ_IO_UNITS_WHATEVER;
+    return P;
+}
+

src/iso19111/c_api.cpp

@@ -134,8 +134,7 @@ static PJ *pj_obj_create(PJ_CONTEXT *ctx, const IdentifiedObjectNNPtr &objIn) {
             auto formatter = PROJStringFormatter::create(
                 PROJStringFormatter::Convention::PROJ_5, dbContext);
             auto projString = coordop->exportToPROJString(formatter.get());
-            auto pj = pj_create_internal(
-                ctx, projString.empty() ? "+proj=affine" : projString.c_str());
+            auto pj = pj_create_internal(ctx, projString.c_str());
             if (pj) {
                 pj->iso_obj = objIn;
                 return pj;

src/iso19111/io.cpp

@@ -5342,6 +5342,11 @@ const std::string &PROJStringFormatter::toString() const {
             }
         }
     }
+
+    if (d->result_.empty()) {
+        d->appendToResult("+proj=noop");
+    }
+
     return d->result_;
 }
 

src/lib_proj.cmake

@@ -174,6 +174,7 @@ set(SRC_LIBPROJ_CONVERSIONS
   conversions/cart.cpp
   conversions/geoc.cpp
   conversions/geocent.cpp
+  conversions/noop.cpp
   conversions/unitconvert.cpp
 )
 

src/pj_list.h

@@ -106,6 +106,7 @@ PROJ_HEAD(nell_h, "Nell-Hammer")
 PROJ_HEAD(nicol, "Nicolosi Globular")
 PROJ_HEAD(nsper, "Near-sided perspective")
 PROJ_HEAD(nzmg, "New Zealand Map Grid")
+PROJ_HEAD(noop, "No operation")
 PROJ_HEAD(ob_tran, "General Oblique Transformation")
 PROJ_HEAD(ocea, "Oblique Cylindrical Equal Area")
 PROJ_HEAD(oea, "Oblated Equal Area")

test/cli/testprojinfo_out.dist

@@ -175,7 +175,7 @@ Operation n°1:
 unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation
 
 PROJ string:
-
++proj=noop
 
 WKT2_2018 string:
 COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",
@@ -540,7 +540,7 @@ Operation n°7:
 unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation
 
 PROJ string:
-
++proj=noop
 
 WKT2_2018 string:
 COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",

test/gie/more_builtins.gie

@@ -756,4 +756,21 @@ expect    359 10 0
 
 -------------------------------------------------------------------------------
 
+-------------------------------------------------------------------------------
+# No-op
+-------------------------------------------------------------------------------
+operation +proj=noop
+direction forward
+accept  25  25
+expect  25  25
+
+accept  25  25  25
+expect  25  25  25
+
+accept  25  25  25  25
+expect  25  25  25  25
+-------------------------------------------------------------------------------
+
+
+
 </gie>

test/unit/test_datum.cpp

@@ -175,7 +175,7 @@ TEST(datum, prime_meridian_to_PROJString) {
 
     EXPECT_EQ(PrimeMeridian::GREENWICH->exportToPROJString(
                   PROJStringFormatter::create().get()),
-              "");
+              "+proj=noop");
 
     EXPECT_EQ(PrimeMeridian::PARIS->exportToPROJString(
                   PROJStringFormatter::create().get()),
@@ -195,7 +195,7 @@ TEST(datum, prime_meridian_to_PROJString) {
             PropertyMap().set(IdentifiedObject::NAME_KEY, "Origin meridian"),
             Angle(0))
             ->exportToPROJString(PROJStringFormatter::create().get()),
-        "");
+        "+proj=noop");
 
     EXPECT_TRUE(PrimeMeridian::GREENWICH->isEquivalentTo(
         PrimeMeridian::GREENWICH.get()));

test/unit/test_io.cpp

@@ -6541,7 +6541,7 @@ TEST(io, projstringformatter_helmert_3_param_noop) {
     fmt->addParam("x", 0);
     fmt->addParam("y", 0);
     fmt->addParam("z", 0);
-    EXPECT_EQ(fmt->toString(), "");
+    EXPECT_EQ(fmt->toString(), "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -6557,7 +6557,7 @@ TEST(io, projstringformatter_helmert_7_param_noop) {
     fmt->addParam("rz", 0);
     fmt->addParam("s", 0);
     fmt->addParam("convention", "position_vector");
-    EXPECT_EQ(fmt->toString(), "");
+    EXPECT_EQ(fmt->toString(), "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -6587,7 +6587,7 @@ TEST(io, projstringformatter_merge_consecutive_helmert_3_param_noop) {
     fmt->addParam("x", -10);
     fmt->addParam("y", -20);
     fmt->addParam("z", -30);
-    EXPECT_EQ(fmt->toString(), "");
+    EXPECT_EQ(fmt->toString(), "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -6599,7 +6599,7 @@ TEST(io, projstringformatter_cart_grs80_wgs84) {
     fmt->addStep("cart");
     fmt->setCurrentStepInverted(true);
     fmt->addParam("ellps", "GRS80");
-    EXPECT_EQ(fmt->toString(), "");
+    EXPECT_EQ(fmt->toString(), "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -7334,7 +7334,7 @@ TEST(io, projparse_longlat_axis_neu) {
     auto op = CoordinateOperationFactory::create()->createOperation(
         GeographicCRS::EPSG_4326, NN_NO_CHECK(crs));
     ASSERT_TRUE(op != nullptr);
-    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "");
+    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -7437,7 +7437,7 @@ TEST(io, projparse_longlat_axisswap) {
                 EXPECT_EQ(
                     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);

test/unit/test_operation.cpp

@@ -636,7 +636,7 @@ TEST(operation, transformation_createGeocentricTranslations_null) {
 
     EXPECT_EQ(transf->inverse()->exportToPROJString(
                   PROJStringFormatter::create().get()),
-              "");
+              "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -956,7 +956,7 @@ TEST(operation, transformation_successive_helmert_noop) {
         std::vector<PositionalAccuracyNNPtr>{});
 
     EXPECT_EQ(concat->exportToPROJString(PROJStringFormatter::create().get()),
-              "");
+              "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -4131,7 +4131,7 @@ TEST(operation, PROJ_based_empty) {
         SingleOperation::createPROJBased(PropertyMap(), "", nullptr, nullptr);
 
     EXPECT_EQ(conv->exportToPROJString(PROJStringFormatter::create().get()),
-              "");
+              "+proj=noop");
 
     EXPECT_EQ(conv->exportToWKT(WKTFormatter::create().get()),
               "CONVERSION[\"PROJ-based coordinate operation\",\n"
@@ -4144,7 +4144,7 @@ TEST(operation, PROJ_based_empty) {
 
     EXPECT_EQ(conv->inverse()->exportToPROJString(
                   PROJStringFormatter::create().get()),
-              "");
+              "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -4328,7 +4328,7 @@ TEST(operation, geogCRS_to_geogCRS_context_filter_bbox) {
         ASSERT_EQ(list.size(), 1U);
         EXPECT_EQ(
             list[0]->exportToPROJString(PROJStringFormatter::create().get()),
-            "");
+            "+proj=noop");
     }
 }
 
@@ -4344,7 +4344,7 @@ TEST(operation, geogCRS_to_geogCRS_context_incompatible_area) {
         ctxt);
     ASSERT_EQ(list.size(), 1U);
     EXPECT_EQ(list[0]->exportToPROJString(PROJStringFormatter::create().get()),
-              "");
+              "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
@@ -4504,7 +4504,7 @@ TEST(operation, geogCRS_to_geogCRS_noop) {
         GeographicCRS::EPSG_4326, GeographicCRS::EPSG_4326);
     ASSERT_TRUE(op != nullptr);
     EXPECT_EQ(op->nameStr(), "Null geographic offset from WGS 84 to WGS 84");
-    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "");
+    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "+proj=noop");
     EXPECT_EQ(op->inverse()->nameStr(), op->nameStr());
 }
 
@@ -4651,7 +4651,7 @@ TEST(operation, geogCRS_to_geogCRS_CH1903_to_CH1903plus_context) {
     EXPECT_EQ(list[0]->nameStr(),
               "CH1903 to ETRS89 (1) + Inverse of CH1903+ to ETRS89 (1)");
     EXPECT_EQ(list[0]->exportToPROJString(PROJStringFormatter::create().get()),
-              "");
+              "+proj=noop");
 
     EXPECT_EQ(list[1]->nameStr(), "CH1903 to CH1903+ (1)");
     EXPECT_EQ(list[1]->exportToPROJString(PROJStringFormatter::create().get()),
@@ -4799,7 +4799,7 @@ TEST(operation, geocentricCRS_to_geocentricCRS_noop) {
     ASSERT_TRUE(op != nullptr);
     EXPECT_EQ(op->nameStr(),
               "Ballpark geocentric translation from WGS 84 to WGS 84");
-    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "");
+    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "+proj=noop");
     EXPECT_EQ(op->inverse()->nameStr(), op->nameStr());
 }
 
@@ -6481,7 +6481,7 @@ TEST(operation, compoundCRS_to_geogCRS_3D_context) {
                           PROJStringFormatter::Convention::PROJ_5,
                           authFactory->databaseContext())
                           .get()),
-                  "");
+                  "+proj=noop");
     }
 }