Merge pull request #1827 from rouault/improve_createObjectsFromName

Improvements regarding name aliases (refs #1823)

5 files changed, 65 insertions, 12 deletions

diff --git a/test/cli/testprojinfo b/test/cli/testprojinfo
index 4ce5e90c..b9c452fb 100755
--- a/test/cli/testprojinfo
+++ b/test/cli/testprojinfo
@@ -155,6 +155,26 @@ echo 'Testing -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-t
 $EXE -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects >>${OUT} 2>&1
 echo "" >>${OUT}
 
+echo 'Testing -k ellipsoid WGS84' >> ${OUT}
+$EXE -k ellipsoid WGS84 >>${OUT} 2>&1
+echo "" >>${OUT}
+
+echo 'Testing -k ellipsoid EPSG:7030' >> ${OUT}
+$EXE -k ellipsoid EPSG:7030 >>${OUT} 2>&1
+echo "" >>${OUT}
+
+echo 'Testing -k datum WGS84' >> ${OUT}
+$EXE -k datum WGS84 >>${OUT} 2>&1
+echo "" >>${OUT}
+
+echo 'Testing -k datum EPSG:6326' >> ${OUT}
+$EXE -k datum EPSG:6326 >>${OUT} 2>&1
+echo "" >>${OUT}
+
+echo 'Testing -k operation EPSG:8457 -o PROJ -q' >> ${OUT}
+$EXE -k operation EPSG:8457 -o PROJ -q >>${OUT} 2>&1
+echo "" >>${OUT}
+
 # do 'diff' with distribution results
 echo "diff ${OUT} with testprojinfo_out.dist"
 diff -u ${OUT} ${TEST_CLI_DIR}/testprojinfo_out.dist
diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist
index 794f313b..03ce9046 100644
--- a/test/cli/testprojinfo_out.dist
+++ b/test/cli/testprojinfo_out.dist
@@ -1096,3 +1096,38 @@ DERIVED_FROM(EPSG):8451, GDA2020 to AHD height (1), 0.03 m, Australia Christmas
 PROJ string:
 +proj=pipeline +step +inv +proj=vgridshift +grids=AUSGeoid2020_20180201.gtx +multiplier=1
 
+Testing -k ellipsoid WGS84
+PROJ string:
++ellps=WGS84
+
+WKT2:2019 string:
+ELLIPSOID["WGS 84",6378137,298.257223563,
+    LENGTHUNIT["metre",1],
+    ID["EPSG",7030]]
+
+Testing -k ellipsoid EPSG:7030
+PROJ string:
++ellps=WGS84
+
+WKT2:2019 string:
+ELLIPSOID["WGS 84",6378137,298.257223563,
+    LENGTHUNIT["metre",1],
+    ID["EPSG",7030]]
+
+Testing -k datum WGS84
+WKT2:2019 string:
+DATUM["World Geodetic System 1984",
+    ELLIPSOID["WGS 84",6378137,298.257223563,
+        LENGTHUNIT["metre",1]],
+    ID["EPSG",6326]]
+
+Testing -k datum EPSG:6326
+WKT2:2019 string:
+DATUM["World Geodetic System 1984",
+    ELLIPSOID["WGS 84",6378137,298.257223563,
+        LENGTHUNIT["metre",1]],
+    ID["EPSG",6326]]
+
+Testing -k operation EPSG:8457 -o PROJ -q
++proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=push +v_3 +step +proj=cart +ellps=bessel +step +proj=helmert +x=674.374 +y=15.056 +z=405.346 +step +inv +proj=cart +ellps=WGS84 +step +proj=pop +v_3 +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
+
diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp
index 78e6bced..a657c61e 100644
--- a/test/unit/test_c_api.cpp
+++ b/test/unit/test_c_api.cpp
@@ -1668,7 +1668,7 @@ TEST_F(CApi, proj_create_from_name) {
                                          false, 0, nullptr);
         ASSERT_NE(res, nullptr);
         ObjListKeeper keeper_res(res);
-        EXPECT_EQ(proj_list_get_count(res), 4);
+        EXPECT_EQ(proj_list_get_count(res), 5);
     }
     {
         auto res = proj_create_from_name(m_ctxt, "xx", "WGS 84", nullptr, 0,
diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
index 0d47bfc3..8ae58c96 100644
--- a/test/unit/test_factory.cpp
+++ b/test/unit/test_factory.cpp
@@ -2733,8 +2733,8 @@ TEST(factory, createObjectsFromName) {
 
     EXPECT_EQ(factory->createObjectsFromName("").size(), 0U);
 
-    // ellipsoid + 3 geodeticCRS
-    EXPECT_EQ(factory->createObjectsFromName("WGS 84", {}, false).size(), 4U);
+    // ellipsoid + datum + 3 geodeticCRS
+    EXPECT_EQ(factory->createObjectsFromName("WGS 84", {}, false).size(), 5U);
 
     EXPECT_EQ(factory->createObjectsFromName("WGS 84", {}, true, 10).size(),
               10U);
@@ -2749,7 +2749,9 @@ TEST(factory, createObjectsFromName) {
         auto res = factoryEPSG->createObjectsFromName(
             "WGS84", {AuthorityFactory::ObjectType::GEOGRAPHIC_2D_CRS}, true);
         EXPECT_EQ(res.size(),
-                  8U); // EPSG:4326 and EPSG:4030 and the 6 WGS84 realizations
+                  9U); // EPSG:4326 and EPSG:4030 and the 6 WGS84 realizations
+                       // and EPSG:7881 'Tritan St. Helena'' whose alias is
+                       // 'WGS 84 Tritan St. Helena'
         if (!res.empty()) {
             EXPECT_EQ(res.front()->getEPSGCode(), 4326);
         }
diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
index d165157d..fd38847c 100644
--- a/test/unit/test_io.cpp
+++ b/test/unit/test_io.cpp
@@ -493,18 +493,14 @@ TEST(wkt_parse, wkt1_geographic_old_datum_name_from_EPSG_code) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, wkt1_geographic_old_datum_name_witout_EPSG_code) {
+TEST(wkt_parse, wkt1_geographic_old_datum_name_without_EPSG_code) {
     auto wkt =
         "GEOGCS[\"S-JTSK (Ferro)\",\n"
         "    "
         "DATUM[\"System_Jednotne_Trigonometricke_Site_Katastralni_Ferro\",\n"
-        "        SPHEROID[\"Bessel 1841\",6377397.155,299.1528128,\n"
-        "            AUTHORITY[\"EPSG\",\"7004\"]]],\n"
-        "    PRIMEM[\"Ferro\",-17.66666666666667,\n"
-        "       AUTHORITY[\"EPSG\",\"8909\"]],\n"
-        "    UNIT[\"degree\",0.0174532925199433,\n"
-        "        AUTHORITY[\"EPSG\",\"9122\"]],\n"
-        "    AUTHORITY[\"EPSG\",\"4818\"]]";
+        "        SPHEROID[\"Bessel 1841\",6377397.155,299.1528128]],\n"
+        "    PRIMEM[\"Ferro\",-17.66666666666667],\n"
+        "    UNIT[\"degree\",0.0174532925199433]]";
     auto obj = WKTParser()
                    .attachDatabaseContext(DatabaseContext::create())
                    .createFromWKT(wkt);