Merge pull request #1915 from rouault/fix_1911

Fix identification of ESRI-style datum names starting with D_ but without alias

1 files changed, 21 insertions, 0 deletions

diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp
index 66bfbfcd..542d1226 100644
--- a/test/unit/test_crs.cpp
+++ b/test/unit/test_crs.cpp
@@ -1321,6 +1321,7 @@ TEST(crs, geodeticcrs_identify_no_db) {
 TEST(crs, geodeticcrs_identify_db) {
     auto dbContext = DatabaseContext::create();
     auto factory = AuthorityFactory::create(dbContext, "EPSG");
+
     {
         // No match
         auto res =
@@ -1627,6 +1628,26 @@ TEST(crs, geodeticcrs_identify_db) {
         EXPECT_TRUE(res.front().first->_isEquivalentTo(
             crs.get(), IComparable::Criterion::EQUIVALENT, dbContext));
     }
+
+    {
+        // Identify "a" ESRI WKT representation of GDA2020. See #1911
+        auto wkt = "GEOGCS[\"GDA2020\",DATUM[\"D_GDA2020\","
+                   "SPHEROID[\"GRS_1980\",6378137.0,298.257222101]],"
+                   "PRIMEM[\"Greenwich\",0.0],"
+                   "UNIT[\"Degree\",0.017453292519943295]]";
+        auto obj =
+            WKTParser().attachDatabaseContext(dbContext).createFromWKT(wkt);
+        auto crs = nn_dynamic_pointer_cast<GeographicCRS>(obj);
+        ASSERT_TRUE(crs != nullptr);
+
+        auto allFactory = AuthorityFactory::create(dbContext, std::string());
+        auto res = crs->identify(allFactory);
+        ASSERT_EQ(res.size(), 1U);
+        ASSERT_TRUE(!res.front().first->identifiers().empty());
+        EXPECT_EQ(*res.front().first->identifiers()[0]->codeSpace(), "EPSG");
+        EXPECT_EQ(res.front().first->identifiers()[0]->code(), "7844");
+        EXPECT_EQ(res.front().second, 100);
+    }
 }
 
 // ---------------------------------------------------------------------------