diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-05-25 21:10:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-25 21:10:18 +0200 |
| commit | 9ff543c4ffd86152bc58d0a0164b2ce9ebbb8bec (patch) | |
| tree | 3eaff4e515826148a53cf717096d062d38c8e2f2 /src/iso19111/crs.cpp | |
| parent | 4ade1b2eb1ba2b28a76f446176da24712ce67720 (diff) | |
| parent | 172744361c83d2a40c11600a398a0e1668052031 (diff) | |
| download | PROJ-9ff543c4ffd86152bc58d0a0164b2ce9ebbb8bec.tar.gz PROJ-9ff543c4ffd86152bc58d0a0164b2ce9ebbb8bec.zip | |
Merge pull request #2240 from rouault/fix_identification_epsg_3035
Fix identification of (one of the) ESRI WKT formulations of EPSG:3035
Diffstat (limited to 'src/iso19111/crs.cpp')
| -rw-r--r-- | src/iso19111/crs.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index 35e11d84..b0ec35b9 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -3927,15 +3927,16 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { } else if (!unsignificantName) { for (int ipass = 0; ipass < 2; ipass++) { const bool approximateMatch = ipass == 1; - auto objects = authorityFactory->createObjectsFromName( + auto objects = authorityFactory->createObjectsFromNameEx( thisName, {io::AuthorityFactory::ObjectType::PROJECTED_CRS}, approximateMatch); - for (const auto &obj : objects) { - auto crs = util::nn_dynamic_pointer_cast<ProjectedCRS>(obj); + for (const auto &pairObjName : objects) { + auto crs = util::nn_dynamic_pointer_cast<ProjectedCRS>( + pairObjName.first); assert(crs); auto crsNN = NN_NO_CHECK(crs); const bool eqName = metadata::Identifier::isEquivalentName( - thisName.c_str(), crs->nameStr().c_str()); + thisName.c_str(), pairObjName.second.c_str()); foundEquivalentName |= eqName; addCRS(crsNN, eqName); |
