diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-02-22 17:05:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 17:05:21 +0100 |
| commit | 1a518773616fb001483c175e8dfab00c06e83c89 (patch) | |
| tree | 7c05597bfcd196a2220fa91526cad95dd8883218 | |
| parent | 4dcce2a8578131c1d7bb9d505cadc169f677cc3e (diff) | |
| parent | 6ef286ec69e7f6e3b1fba55e14aed209fbf705c0 (diff) | |
| download | PROJ-1a518773616fb001483c175e8dfab00c06e83c89.tar.gz PROJ-1a518773616fb001483c175e8dfab00c06e83c89.zip | |
Merge pull request #2545 from rouault/fix_gdal_test_issue_due_to_intl_rename
isEquivalentName(): fix for GDAL test failure
| -rw-r--r-- | src/iso19111/metadata.cpp | 2 | ||||
| -rw-r--r-- | test/unit/test_metadata.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/iso19111/metadata.cpp b/src/iso19111/metadata.cpp index fc788a30..e8ce37c6 100644 --- 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 index e12788b4..7cbc7de7 100644 --- 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")); } |