Merge pull request #1366 from rouault/ogc_18_010r6_further_fixes

OGC 18-010r6 further fixes regarding WKT2:2018 export

4 files changed, 169 insertions, 36 deletions

diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp
index 4953529c..d7303df9 100644
--- a/test/unit/test_crs.cpp
+++ b/test/unit/test_crs.cpp
@@ -148,32 +148,72 @@ TEST(crs, GeographicCRS_datum_ensemble) {
         std::vector<DatumNNPtr>{GeodeticReferenceFrame::EPSG_6326,
                                 GeodeticReferenceFrame::EPSG_6326},
         PositionalAccuracy::create("100"));
-    auto crs = GeographicCRS::create(
-        PropertyMap().set(IdentifiedObject::NAME_KEY, "unnamed"), nullptr,
-        ensemble_vdatum,
-        EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE));
-    WKTFormatterNNPtr f(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018));
-    f->simulCurNodeHasId();
-    crs->exportToWKT(f.get());
-    auto expected = "GEOGCRS[\"unnamed\",\n"
-                    "    ENSEMBLE[\"unnamed\",\n"
-                    "        MEMBER[\"World Geodetic System 1984\"],\n"
-                    "        MEMBER[\"World Geodetic System 1984\"],\n"
-                    "        ELLIPSOID[\"WGS 84\",6378137,298.257223563,\n"
-                    "            LENGTHUNIT[\"metre\",1]],\n"
-                    "        ENSEMBLEACCURACY[100]],\n"
-                    "    PRIMEM[\"Greenwich\",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\",east,\n"
-                    "            ORDER[2],\n"
-                    "            ANGLEUNIT[\"degree\",0.0174532925199433]]]";
+    {
+        auto crs = GeographicCRS::create(
+            PropertyMap()
+                .set(IdentifiedObject::NAME_KEY, "unnamed")
+                .set(Identifier::CODESPACE_KEY, "MY_CODESPACE")
+                .set(Identifier::CODE_KEY, "MY_ID"),
+            nullptr, ensemble_vdatum,
+            EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE));
+        WKTFormatterNNPtr f(
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018));
+        crs->exportToWKT(f.get());
+        auto expected =
+            "GEOGCRS[\"unnamed\",\n"
+            "    ENSEMBLE[\"unnamed\",\n"
+            "        MEMBER[\"World Geodetic System 1984\"],\n"
+            "        MEMBER[\"World Geodetic System 1984\"],\n"
+            "        ELLIPSOID[\"WGS 84\",6378137,298.257223563,\n"
+            "            LENGTHUNIT[\"metre\",1]],\n"
+            "        ENSEMBLEACCURACY[100]],\n"
+            "    PRIMEM[\"Greenwich\",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\",east,\n"
+            "            ORDER[2],\n"
+            "            ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+            "    ID[\"MY_CODESPACE\",\"MY_ID\"]]";
 
-    EXPECT_EQ(f->toString(), expected);
+        EXPECT_EQ(f->toString(), expected);
+    }
+
+    {
+        auto crs = GeographicCRS::create(
+            PropertyMap().set(IdentifiedObject::NAME_KEY, "unnamed"), nullptr,
+            ensemble_vdatum,
+            EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE));
+        WKTFormatterNNPtr f(
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018));
+        crs->exportToWKT(f.get());
+        auto expected = "GEOGCRS[\"unnamed\",\n"
+                        "    ENSEMBLE[\"unnamed\",\n"
+                        "        MEMBER[\"World Geodetic System 1984\",\n"
+                        "            ID[\"EPSG\",6326]],\n"
+                        "        MEMBER[\"World Geodetic System 1984\",\n"
+                        "            ID[\"EPSG\",6326]],\n"
+                        "        ELLIPSOID[\"WGS 84\",6378137,298.257223563,\n"
+                        "            LENGTHUNIT[\"metre\",1],\n"
+                        "            ID[\"EPSG\",7030]],\n"
+                        "        ENSEMBLEACCURACY[100]],\n"
+                        "    PRIMEM[\"Greenwich\",0,\n"
+                        "        ANGLEUNIT[\"degree\",0.0174532925199433],\n"
+                        "        ID[\"EPSG\",8901]],\n"
+                        "    CS[ellipsoidal,2],\n"
+                        "        AXIS[\"latitude\",north,\n"
+                        "            ORDER[1],\n"
+                        "            ANGLEUNIT[\"degree\",0.0174532925199433,\n"
+                        "                ID[\"EPSG\",9122]]],\n"
+                        "        AXIS[\"longitude\",east,\n"
+                        "            ORDER[2],\n"
+                        "            ANGLEUNIT[\"degree\",0.0174532925199433,\n"
+                        "                ID[\"EPSG\",9122]]]]";
+
+        EXPECT_EQ(f->toString(), expected);
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -1561,6 +1601,52 @@ TEST(crs, projectedCRS_as_WKT2) {
 
 // ---------------------------------------------------------------------------
 
+TEST(crs, projectedCRS_as_WKT2_2018) {
+    auto crs = createProjected();
+
+    auto expected =
+        "PROJCRS[\"WGS 84 / UTM zone 31N\",\n"
+        "    BASEGEOGCRS[\"WGS 84\",\n"
+        "        DATUM[\"World Geodetic System 1984\",\n"
+        "            ELLIPSOID[\"WGS 84\",6378137,298.257223563,\n"
+        "                LENGTHUNIT[\"metre\",1]]],\n"
+        "        PRIMEM[\"Greenwich\",0,\n"
+        "            ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "        ID[\"EPSG\",4326]],\n"
+        "    CONVERSION[\"UTM zone 31N\",\n"
+        "        METHOD[\"Transverse Mercator\",\n"
+        "            ID[\"EPSG\",9807]],\n"
+        "        PARAMETER[\"Latitude of natural origin\",0,\n"
+        "            ANGLEUNIT[\"degree\",0.0174532925199433],\n"
+        "            ID[\"EPSG\",8801]],\n"
+        "        PARAMETER[\"Longitude of natural origin\",3,\n"
+        "            ANGLEUNIT[\"degree\",0.0174532925199433],\n"
+        "            ID[\"EPSG\",8802]],\n"
+        "        PARAMETER[\"Scale factor at natural origin\",0.9996,\n"
+        "            SCALEUNIT[\"unity\",1],\n"
+        "            ID[\"EPSG\",8805]],\n"
+        "        PARAMETER[\"False easting\",500000,\n"
+        "            LENGTHUNIT[\"metre\",1],\n"
+        "            ID[\"EPSG\",8806]],\n"
+        "        PARAMETER[\"False northing\",0,\n"
+        "            LENGTHUNIT[\"metre\",1],\n"
+        "            ID[\"EPSG\",8807]]],\n"
+        "    CS[Cartesian,2],\n"
+        "        AXIS[\"(E)\",east,\n"
+        "            ORDER[1],\n"
+        "            LENGTHUNIT[\"metre\",1]],\n"
+        "        AXIS[\"(N)\",north,\n"
+        "            ORDER[2],\n"
+        "            LENGTHUNIT[\"metre\",1]],\n"
+        "    ID[\"EPSG\",32631]]";
+
+    EXPECT_EQ(
+        crs->exportToWKT(
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+        expected);
+}
+// ---------------------------------------------------------------------------
+
 TEST(crs, projectedCRS_as_WKT2_simplified) {
     auto crs = createProjected();
 
@@ -4522,7 +4608,8 @@ TEST(crs, DerivedVerticalCRS_WKT2) {
 
     auto expected = "VERTCRS[\"Derived vertCRS\",\n"
                     "    BASEVERTCRS[\"ODN height\",\n"
-                    "        VDATUM[\"Ordnance Datum Newlyn\"]],\n"
+                    "        VDATUM[\"Ordnance Datum Newlyn\",\n"
+                    "            ID[\"EPSG\",5101]]],\n"
                     "    DERIVINGCONVERSION[\"unnamed\",\n"
                     "        METHOD[\"PROJ unimplemented\"]],\n"
                     "    CS[vertical,1],\n"
diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
index 944e0ebe..f4c560d5 100644
--- a/test/unit/test_factory.cpp
+++ b/test/unit/test_factory.cpp
@@ -734,7 +734,8 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_helmert_15_CF) {
         "                    LENGTHUNIT[\"metre\",1]],\n"
         "                AXIS[\"(Z)\",geocentricZ,\n"
         "                    ORDER[3],\n"
-        "                    LENGTHUNIT[\"metre\",1]]]],\n"
+        "                    LENGTHUNIT[\"metre\",1]],\n"
+        "            ID[\"EPSG\",5332]]],\n"
         "    TARGETCRS[\n"
         "        GEODCRS[\"GDA94\",\n"
         "            DATUM[\"Geocentric Datum of Australia 1994\",\n"
@@ -751,7 +752,8 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_helmert_15_CF) {
         "                    LENGTHUNIT[\"metre\",1]],\n"
         "                AXIS[\"(Z)\",geocentricZ,\n"
         "                    ORDER[3],\n"
-        "                    LENGTHUNIT[\"metre\",1]]]],\n"
+        "                    LENGTHUNIT[\"metre\",1]],\n"
+        "            ID[\"EPSG\",4938]]],\n"
         "    METHOD[\"Time-dependent Coordinate Frame rotation (geocen)\",\n"
         "        ID[\"EPSG\",1056]],\n"
         "    PARAMETER[\"X-axis translation\",-84.68,\n"
@@ -885,7 +887,8 @@ TEST(
         "                    ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
         "                AXIS[\"geodetic longitude (Lon)\",east,\n"
         "                    ORDER[2],\n"
-        "                    ANGLEUNIT[\"degree\",0.0174532925199433]]]],\n"
+        "                    ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "            ID[\"EPSG\",4749]]],\n"
         "    TARGETCRS[\n"
         "        GEOGCRS[\"NEA74 Noumea\",\n"
         "            DATUM[\"NEA74 Noumea\",\n"
@@ -899,7 +902,8 @@ TEST(
         "                    ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
         "                AXIS[\"geodetic longitude (Lon)\",east,\n"
         "                    ORDER[2],\n"
-        "                    ANGLEUNIT[\"degree\",0.0174532925199433]]]],\n"
+        "                    ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "            ID[\"EPSG\",4644]]],\n"
         "    METHOD[\"NTv2\",\n"
         "        ID[\"EPSG\",9615]],\n"
         "    PARAMETERFILE[\"Latitude and longitude difference "
@@ -953,7 +957,8 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_other_transformation) {
         "                    ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
         "                AXIS[\"geodetic longitude (Lon)\",east,\n"
         "                    ORDER[2],\n"
-        "                    ANGLEUNIT[\"degree\",0.0174532925199433]]]],\n"
+        "                    ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "            ID[\"EPSG\",4818]]],\n"
         "    TARGETCRS[\n"
         "        GEOGCRS[\"S-JTSK\",\n"
         "            DATUM[\"System of the Unified Trigonometrical Cadastral "
@@ -968,7 +973,8 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_other_transformation) {
         "                    ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
         "                AXIS[\"geodetic longitude (Lon)\",east,\n"
         "                    ORDER[2],\n"
-        "                    ANGLEUNIT[\"degree\",0.0174532925199433]]]],\n"
+        "                    ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+        "            ID[\"EPSG\",4156]]],\n"
         "    METHOD[\"Longitude rotation\",\n"
         "        ID[\"EPSG\",9601]],\n"
         "    PARAMETER[\"Longitude offset\",-17.6666666666667,\n"
diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
index 1d097d9b..17b3c334 100644
--- a/test/unit/test_io.cpp
+++ b/test/unit/test_io.cpp
@@ -1663,6 +1663,50 @@ TEST(wkt_parse, wkt2_2018_projected_with_id_in_basegeodcrs) {
     ASSERT_TRUE(crs != nullptr);
     ASSERT_EQ(crs->baseCRS()->identifiers().size(), 1U);
     EXPECT_EQ(crs->baseCRS()->identifiers().front()->code(), "4326");
+
+    {
+        auto got_wkt = crs->exportToWKT(
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        EXPECT_TRUE(got_wkt.find("ID[\"EPSG\",4326]]") != std::string::npos)
+            << got_wkt;
+    }
+
+    {
+        auto got_wkt = crs->exportToWKT(
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018_SIMPLIFIED)
+                .get());
+        EXPECT_TRUE(got_wkt.find("ID[\"EPSG\",4326]]") == std::string::npos)
+            << got_wkt;
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+TEST(wkt_parse, wkt2_2018_projected_no_id_but_id_in_basegeodcrs) {
+    auto wkt = "PROJCRS[\"WGS 84 / UTM zone 31N\",\n"
+               "    BASEGEOGCRS[\"WGS 84\",\n"
+               "        DATUM[\"World Geodetic System 1984\",\n"
+               "            ELLIPSOID[\"WGS 84\",6378137,298.257223563]],\n"
+               "        ID[\"EPSG\",4326]],\n"
+               "    CONVERSION[\"UTM zone 31N\",\n"
+               "        METHOD[\"Transverse Mercator\"],\n"
+               "        PARAMETER[\"Latitude of natural origin\",0],\n"
+               "        PARAMETER[\"Longitude of natural origin\",3],\n"
+               "        PARAMETER[\"Scale factor at natural origin\",0.9996],\n"
+               "        PARAMETER[\"False easting\",500000],\n"
+               "        PARAMETER[\"False northing\",0]],\n"
+               "    CS[Cartesian,2],\n"
+               "        AXIS[\"(E)\",east],\n"
+               "        AXIS[\"(N)\",north],\n"
+               "        UNIT[\"metre\",1]]";
+    auto obj = WKTParser().createFromWKT(wkt);
+    auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj);
+    ASSERT_TRUE(crs != nullptr);
+
+    auto got_wkt = crs->exportToWKT(
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+    EXPECT_TRUE(got_wkt.find("ID[\"EPSG\",4326]]") != std::string::npos)
+        << got_wkt;
 }
 
 // ---------------------------------------------------------------------------
diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp
index 9111b862..848fb23b 100644
--- a/test/unit/test_operation.cpp
+++ b/test/unit/test_operation.cpp
@@ -442,7 +442,6 @@ TEST(operation, concatenated_operation) {
     {
         auto formatter =
             WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
-        formatter->setOutputId(false);
         src_wkt = GeographicCRS::EPSG_4326->exportToWKT(formatter.get());
     }
 
@@ -450,7 +449,6 @@ TEST(operation, concatenated_operation) {
     {
         auto formatter =
             WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
-        formatter->setOutputId(false);
         dst_wkt = GeographicCRS::EPSG_4979->exportToWKT(formatter.get());
     }
 
@@ -458,7 +456,6 @@ TEST(operation, concatenated_operation) {
     {
         auto formatter =
             WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
-        formatter->setOutputId(false);
         step1_wkt = transf_1->exportToWKT(formatter.get());
     }
 
@@ -466,7 +463,6 @@ TEST(operation, concatenated_operation) {
     {
         auto formatter =
             WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
-        formatter->setOutputId(false);
         step2_wkt = transf_2->exportToWKT(formatter.get());
     }