diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-03 14:18:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-03 14:18:35 +0100 |
| commit | a0de56228be06427c7870cbc1923b11dad11856e (patch) | |
| tree | f7eef3160c08dfe6490119fcd2545c61516c4128 /src | |
| parent | c3aa3fe4e9ba17737bb013ed6e7a647fdd5303fe (diff) | |
| parent | dc55b17d0c7ae180bb73add3581fac7e8f959c11 (diff) | |
| download | PROJ-a0de56228be06427c7870cbc1923b11dad11856e.tar.gz PROJ-a0de56228be06427c7870cbc1923b11dad11856e.zip | |
Merge pull request #1759 from rouault/BWTA2017
Database: register the BWTA2017.gsb grid (DHDN->ETRS89 for Baden-Wurtemberg)
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/coordinateoperation.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index 27f11100..c295aff2 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -11580,11 +11580,13 @@ CoordinateOperationFactory::Private::findOpsInRegistryDirect( const auto authorities(getCandidateAuthorities( authFactory, srcAuthName, 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 = + authFactory->databaseContext(), authName); + auto resTmp = tmpAuthFactory->createFromCoordinateReferenceSystemCodes( srcAuthName, srcCode, targetAuthName, targetCode, context.context->getUsePROJAlternativeGridNames(), @@ -11593,6 +11595,10 @@ CoordinateOperationFactory::Private::findOpsInRegistryDirect( DISCARD_OPERATION_IF_MISSING_GRID, context.context->getDiscardSuperseded(), true, false, context.extent1, context.extent2); + res.insert(res.end(), resTmp.begin(), resTmp.end()); + if (authName == "PROJ") { + continue; + } if (!res.empty()) { resNonEmptyBeforeFiltering = true; auto resFiltered = |