diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-02-17 19:40:38 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-02-17 19:42:35 +0100 |
| commit | e8b2e2a36324006146406fb1fc89ce6ed863807f (patch) | |
| tree | 5c2c0c9229958d63e77171f64f909864855afb5d /src/iso19111/crs.cpp | |
| parent | a8cbe0c66974871f5a7bd7ef94001ebf461ac7ea (diff) | |
| download | PROJ-e8b2e2a36324006146406fb1fc89ce6ed863807f.tar.gz PROJ-e8b2e2a36324006146406fb1fc89ce6ed863807f.zip | |
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 = |
