Merge pull request #2545 from rouault/fix_gdal_test_issue_due_to_intl…

…_rename isEquivalentName(): fix for GDAL test failure
OSGeo · Feb 22, 2021 · 1a51877 · 1a51877
2 parents 4dcce2a + 6ef286e
commit 1a51877
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/iso19111/metadata.cpp b/src/iso19111/metadata.cpp
@@ -1124,7 +1124,7 @@ void Identifier::_exportToJSON(JSONFormatter *formatter) const {
 //! @cond Doxygen_Suppress
 static bool isIgnoredChar(char ch) {
     return ch == ' ' || ch == '_' || ch == '-' || ch == '/' || ch == '(' ||
-           ch == ')' || ch == '.' || ch == '&';
+           ch == ')' || ch == '.' || ch == '&' || ch == ',';
 }
 //! @endcond
 

diff --git a/test/unit/test_metadata.cpp b/test/unit/test_metadata.cpp
@@ -391,4 +391,8 @@ TEST(metadata, Identifier_isEquivalentName) {
     EXPECT_TRUE(Identifier::isEquivalentName("a", "\xc3\xa1"));
 
     EXPECT_TRUE(Identifier::isEquivalentName("\xc3\xa4", "\xc3\xa1"));
+
+    EXPECT_TRUE(Identifier::isEquivalentName(
+        "Unknown based on International 1924 (Hayford 1909, 1910) ellipsoid",
+        "Unknown_based_on_International_1924_Hayford_1909_1910_ellipsoid"));
 }