diff options
| author | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2020-03-27 21:36:38 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2020-03-27 21:36:38 +0000 |
| commit | 685b28445f16fbfa0937a2a1819a69888e99c522 (patch) | |
| tree | ea00156f89bfc05a9a741b1a991bf2e34b48f45e /src | |
| parent | 7be171d3ef34e8f35f5571d52cc091bb08020234 (diff) | |
| download | PROJ-685b28445f16fbfa0937a2a1819a69888e99c522.tar.gz PROJ-685b28445f16fbfa0937a2a1819a69888e99c522.zip | |
Fix identification of projected CRS whose name is close but not strictly equal to a ESRI alias (fixes #2099)
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/crs.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index 1077929d..ea13dc88 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -3724,7 +3724,8 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { return res; } res.emplace_back(crsNN, eqName ? 90 : 70); - } else if (eqName && CRS::getPrivate()->implicitCS_ && + } else if (objects.size() == 1 && + CRS::getPrivate()->implicitCS_ && coordinateSystem() ->axisList()[0] ->unit() @@ -3742,11 +3743,11 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { derivingConversionRef()->_isEquivalentTo( crs->derivingConversionRef().get(), util::IComparable::Criterion::EQUIVALENT, - dbContext) && - objects.size() == 1) { + dbContext)) { res.clear(); - res.emplace_back(crsNN, - crs->nameStr() == thisName ? 100 : 90); + res.emplace_back(crsNN, crs->nameStr() == thisName + ? 100 + : eqName ? 90 : 70); return res; } else { res.emplace_back(crsNN, 25); |