diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-02-18 09:45:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 09:45:18 +0100 |
| commit | 4277e15cefae5bb1d49312498e0f626b652e7524 (patch) | |
| tree | 189e5bc87ac99a73f515b3800c2e1898c732f7b3 /src/iso19111/crs.cpp | |
| parent | 455cb889e8259d8799f4cc9cce6b06ebe076f363 (diff) | |
| parent | e8b2e2a36324006146406fb1fc89ce6ed863807f (diff) | |
| download | PROJ-4277e15cefae5bb1d49312498e0f626b652e7524.tar.gz PROJ-4277e15cefae5bb1d49312498e0f626b652e7524.zip | |
Merge pull request #1276 from rouault/intermediate_crs_use_only_if_no_direct_transformation
Modify the default strategy of researching intermediate CRS to do it only if there is no direct transformation
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 ebbed7a1..01a588e3 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -375,9 +375,10 @@ VerticalCRSPtr CRS::extractVerticalCRS() const { * * @return a CRS. */ -CRSNNPtr -CRS::createBoundCRSToWGS84IfPossible(const io::DatabaseContextPtr &dbContext, - bool allowIntermediateCRS) const { +CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( + const io::DatabaseContextPtr &dbContext, + operation::CoordinateOperationContext::IntermediateCRSUse + allowIntermediateCRSUse) const { auto thisAsCRS = NN_NO_CHECK( std::static_pointer_cast<CRS>(shared_from_this().as_nullable())); auto boundCRS = util::nn_dynamic_pointer_cast<BoundCRS>(thisAsCRS); @@ -442,7 +443,7 @@ CRS::createBoundCRSToWGS84IfPossible(const io::DatabaseContextPtr &dbContext, authority == "any" ? std::string() : authority); auto ctxt = operation::CoordinateOperationContext::create( authFactory, extent, 0.0); - ctxt->setAllowUseIntermediateCRS(allowIntermediateCRS); + ctxt->setAllowUseIntermediateCRS(allowIntermediateCRSUse); // ctxt->setSpatialCriterion( // operation::CoordinateOperationContext::SpatialCriterion::PARTIAL_INTERSECTION); auto list = |