diff options
| -rw-r--r-- | include/proj/io.hpp | 4 | ||||
| -rw-r--r-- | src/iso19111/datum.cpp | 33 | ||||
| -rw-r--r-- | src/iso19111/factory.cpp | 23 |
3 files changed, 51 insertions, 9 deletions
diff --git a/include/proj/io.hpp b/include/proj/io.hpp index b07f55ff..6b811b2d 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -892,6 +892,10 @@ class PROJ_GCC_DLL DatabaseContext { PROJ_INTERNAL bool isKnownName(const std::string &name, const std::string &tableName) const; + PROJ_INTERNAL std::string getName(const std::string &tableName, + const std::string &authName, + const std::string &code) const; + PROJ_INTERNAL std::string getTextDefinition(const std::string &tableName, const std::string &authName, const std::string &code) const; diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index 96952866..ebef94a2 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -1401,17 +1401,32 @@ bool GeodeticReferenceFrame::hasEquivalentNameToUsingAlias( if (dbContext) { if (!identifiers().empty()) { const auto &id = identifiers().front(); - auto aliasesResult = + + const std::string officialNameFromId = dbContext->getName( + "geodetic_datum", *(id->codeSpace()), id->code()); + const auto aliasesResult = dbContext->getAliases(*(id->codeSpace()), id->code(), nameStr(), "geodetic_datum", std::string()); - const char *otherName = other->nameStr().c_str(); - for (const auto &aliasResult : aliasesResult) { - if (metadata::Identifier::isEquivalentName( - otherName, aliasResult.c_str())) { - return true; - } - } - return false; + + const auto isNameMatching = + [&aliasesResult, &officialNameFromId](const std::string &name) { + const char *nameCstr = name.c_str(); + if (metadata::Identifier::isEquivalentName( + nameCstr, officialNameFromId.c_str())) { + return true; + } else { + for (const auto &aliasResult : aliasesResult) { + if (metadata::Identifier::isEquivalentName( + nameCstr, aliasResult.c_str())) { + return true; + } + } + } + return false; + }; + + return isNameMatching(nameStr()) && + isNameMatching(other->nameStr()); } else if (!other->identifiers().empty()) { auto otherGRF = dynamic_cast<const GeodeticReferenceFrame *>(other); if (otherGRF) { diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index 4ea9d2ad..f4228532 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -3430,6 +3430,29 @@ std::list<std::string> DatabaseContext::getAliases( // --------------------------------------------------------------------------- +/** \brief Return the 'name' column of a table for an object + * + * @param tableName Table name/category. + * @param authName Authority name of the object. + * @param code Code of the object + * @return Name (or empty) + * @throw FactoryException + */ +std::string DatabaseContext::getName(const std::string &tableName, + const std::string &authName, + const std::string &code) const { + std::string sql("SELECT name FROM \""); + sql += replaceAll(tableName, "\"", "\"\""); + sql += "\" WHERE auth_name = ? AND code = ?"; + auto res = d->run(sql, {authName, code}); + if (res.empty()) { + return std::string(); + } + return res.front()[0]; +} + +// --------------------------------------------------------------------------- + /** \brief Return the 'text_definition' column of a table for an object * * @param tableName Table name/category. |