Merge pull request #3373 from OSGeo/backport-3371-to-9.1

[Backport 9.1] createFromUserInput(): make it work better when approximate name is provided
OSGeo · Oct 9, 2022 · 5ed73e5 · 5ed73e5
2 parents cc6693a + 36ff062
commit 5ed73e5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
@@ -7329,6 +7329,24 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text,
                     }
                 }
 
+                // If there's exactly only one object whose name is equivalent
+                // to the user input, return it.
+                IdentifiedObjectPtr identifiedObj;
+                for (const auto &obj : res) {
+                    if (Identifier::isEquivalentName(obj->nameStr().c_str(),
+                                                     objectName.c_str())) {
+                        if (identifiedObj == nullptr) {
+                            identifiedObj = obj.as_nullable();
+                        } else {
+                            identifiedObj = nullptr;
+                            break;
+                        }
+                    }
+                }
+                if (identifiedObj) {
+                    return identifiedObj;
+                }
+
                 std::string msg("several objects matching this name: ");
                 bool first = true;
                 for (const auto &obj : res) {

diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
@@ -11911,6 +11911,14 @@ TEST(io, createFromUserInput) {
     EXPECT_NO_THROW(createFromUserInput("WGS84 UTM zone 31N", dbContext));
     EXPECT_NO_THROW(createFromUserInput("ID74", dbContext));
 
+    {
+        // Approximate match of a vertical CRS
+        auto obj = createFromUserInput("NGF IGN69 height", dbContext);
+        auto crs = nn_dynamic_pointer_cast<VerticalCRS>(obj);
+        EXPECT_TRUE(crs != nullptr);
+        EXPECT_EQ(crs->nameStr(), "NGF-IGN69 height");
+    }
+
     {
         // Exact match on each piece of the compound CRS
         auto obj = createFromUserInput("WGS 84 + EGM96 height", dbContext);