diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-11-14 15:48:39 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-11-14 14:49:06 +0000 |
| commit | 4db10d9e13223fd5aaafc2c187d9a96676c1d385 (patch) | |
| tree | 73491043fb834b0c9c0d18ff0889256f0602ca58 /src | |
| parent | cf8c1a825bb80b472900c0ca2d0530f86271995d (diff) | |
| download | PROJ-4db10d9e13223fd5aaafc2c187d9a96676c1d385.tar.gz PROJ-4db10d9e13223fd5aaafc2c187d9a96676c1d385.zip | |
Merge pull request #2937 from rouault/fix_2936
createOperations(): do not stop at the first operation in the PROJ namespace for vertical transformations
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/operation/coordinateoperationfactory.cpp | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp index e9bd3cfe..971e265a 100644 --- a/src/iso19111/operation/coordinateoperationfactory.cpp +++ b/src/iso19111/operation/coordinateoperationfactory.cpp @@ -1624,6 +1624,9 @@ CoordinateOperationFactory::Private::findOpsInRegistryDirect( context.extent1, context.extent2); res.insert(res.end(), resTmp.begin(), resTmp.end()); if (authName == "PROJ") { + // Do not stop at the first transformations available in + // the PROJ namespace, but allow the next authority to + // continue continue; } if (!res.empty()) { @@ -1669,24 +1672,34 @@ CoordinateOperationFactory::Private::findOpsInRegistryDirectTo( const auto authorities(getCandidateAuthorities( authFactory, targetAuthName, targetAuthName)); + std::vector<CoordinateOperationNNPtr> res; for (const auto &authority : authorities) { + const auto authName = + authority == "any" ? std::string() : authority; const auto tmpAuthFactory = io::AuthorityFactory::create( - authFactory->databaseContext(), - authority == "any" ? std::string() : authority); - auto res = tmpAuthFactory->createFromCoordinateReferenceSystemCodes( - std::string(), std::string(), targetAuthName, targetCode, - context.context->getUsePROJAlternativeGridNames(), + authFactory->databaseContext(), authName); + auto resTmp = + tmpAuthFactory->createFromCoordinateReferenceSystemCodes( + std::string(), std::string(), targetAuthName, targetCode, + context.context->getUsePROJAlternativeGridNames(), - gridAvailabilityUse == - CoordinateOperationContext::GridAvailabilityUse:: - DISCARD_OPERATION_IF_MISSING_GRID || + gridAvailabilityUse == + CoordinateOperationContext::GridAvailabilityUse:: + DISCARD_OPERATION_IF_MISSING_GRID || + gridAvailabilityUse == + CoordinateOperationContext::GridAvailabilityUse:: + KNOWN_AVAILABLE, gridAvailabilityUse == CoordinateOperationContext::GridAvailabilityUse:: KNOWN_AVAILABLE, - gridAvailabilityUse == CoordinateOperationContext:: - GridAvailabilityUse::KNOWN_AVAILABLE, - context.context->getDiscardSuperseded(), true, true, - context.extent1, context.extent2); + context.context->getDiscardSuperseded(), true, true, + context.extent1, context.extent2); + res.insert(res.end(), resTmp.begin(), resTmp.end()); + if (authName == "PROJ") { + // Do not stop at the first transformations available in + // the PROJ namespace, but allow the next authority to continue + continue; + } if (!res.empty()) { auto resFiltered = FilterResults(res, context.context, context.extent1, |