Skip to content

Commit

Permalink
Merge pull request #1478 from OSGeo/backport-1477-to-6.1
Browse files Browse the repository at this point in the history 
[Backport 6.1] createOperations(): avoid exception when transforming from NAD83 to projected CRS using NAD83(2011) (fixes #1474)
  • Loading branch information
@rouault
rouault committed May 21, 2019
2 parents 573e57a + 5727a6c commit 4c910ec
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 4 deletions.
72 changes: 68 additions & 4 deletions src/iso19111/coordinateoperation.cpp
View file
Expand Up @@ -9575,6 +9575,11 @@ void ConcatenatedOperation::_exportToWKT(io::WKTFormatter *formatter) const {
CoordinateOperationNNPtr ConcatenatedOperation::_shallowClone() const {
auto op =
ConcatenatedOperation::nn_make_shared<ConcatenatedOperation>(*this);
std::vector<CoordinateOperationNNPtr> ops;
for (const auto &subOp : d->operations_) {
ops.emplace_back(subOp->shallowClone());
}
op->d->operations_ = ops;
op->assignSelf(op);
op->setCRSs(this, false);
return util::nn_static_pointer_cast<CoordinateOperation>(op);
Expand Down Expand Up @@ -9976,6 +9981,9 @@ struct CoordinateOperationFactory::Private {
static ConversionNNPtr
createGeographicGeocentric(const crs::CRSNNPtr &sourceCRS,
const crs::CRSNNPtr &targetCRS);

static void setCRSs(CoordinateOperation *co, const crs::CRSNNPtr &sourceCRS,
const crs::CRSNNPtr &targetCRS);
};
//! @endcond

Expand Down Expand Up @@ -10870,6 +10878,31 @@ static std::vector<CoordinateOperationNNPtr> findsOpsInRegistryWithIntermediate(
context->getDiscardSuperseded(),
context->getIntermediateCRS());
if (!res.empty()) {

// If doing GeogCRS --> GeogCRS, only use GeogCRS as
// intermediate CRS
// Avoid weird behaviour when doing NAD83 -> NAD83(2011)
// that would go through NAVD88 otherwise.
if (context->getIntermediateCRS().empty() &&
dynamic_cast<const crs::GeographicCRS *>(
sourceCRS.get()) &&
dynamic_cast<const crs::GeographicCRS *>(
targetCRS.get())) {
std::vector<CoordinateOperationNNPtr> res2;
for (const auto &op : res) {
auto concatOp =
dynamic_cast<ConcatenatedOperation *>(op.get());
if (concatOp &&
dynamic_cast<const crs::GeographicCRS *>(
concatOp->operations()
.front()
->targetCRS()
.get())) {
res2.emplace_back(op);
}
}
res = std::move(res2);
}
return res;
}
}
Expand Down Expand Up @@ -11512,6 +11545,37 @@ static std::string objectAsStr(const common::IdentifiedObject *obj) {

// ---------------------------------------------------------------------------

void CoordinateOperationFactory::Private::setCRSs(
CoordinateOperation *co, const crs::CRSNNPtr &sourceCRS,
const crs::CRSNNPtr &targetCRS) {
co->setCRSs(sourceCRS, targetCRS, nullptr);
auto concat = dynamic_cast<ConcatenatedOperation *>(co);
if (concat) {
auto first = concat->operations().front().get();
auto &firstTarget(first->targetCRS());
if (firstTarget) {
setCRSs(first, sourceCRS, NN_NO_CHECK(firstTarget));
auto invCO = dynamic_cast<InverseCoordinateOperation *>(first);
if (invCO) {
setCRSs(invCO->forwardOperation().get(),
NN_NO_CHECK(firstTarget), sourceCRS);
}
}
auto last = concat->operations().back().get();
auto &lastSource(last->sourceCRS());
if (lastSource) {
setCRSs(last, NN_NO_CHECK(lastSource), targetCRS);
auto invCO = dynamic_cast<InverseCoordinateOperation *>(last);
if (invCO) {
setCRSs(invCO->forwardOperation().get(), targetCRS,
NN_NO_CHECK(lastSource));
}
}
}
}

// ---------------------------------------------------------------------------

void CoordinateOperationFactory::Private::createOperationsWithDatumPivot(
std::vector<CoordinateOperationNNPtr> &res, const crs::CRSNNPtr &sourceCRS,
const crs::CRSNNPtr &targetCRS, const crs::GeodeticCRS *geodSrc,
Expand Down Expand Up @@ -11604,18 +11668,18 @@ void CoordinateOperationFactory::Private::createOperationsWithDatumPivot(
}
if (isNullFirst) {
auto oldTarget(NN_CHECK_ASSERT(opSecondCloned->targetCRS()));
opSecondCloned->setCRSs(sourceCRS, oldTarget, nullptr);
setCRSs(opSecondCloned.get(), sourceCRS, oldTarget);
if (invCOForward) {
invCOForward->setCRSs(oldTarget, sourceCRS, nullptr);
setCRSs(invCOForward, oldTarget, sourceCRS);
}
} else {
subOps.emplace_back(opFirst);
}
if (isNullThird) {
auto oldSource(NN_CHECK_ASSERT(opSecondCloned->sourceCRS()));
opSecondCloned->setCRSs(oldSource, targetCRS, nullptr);
setCRSs(opSecondCloned.get(), oldSource, targetCRS);
if (invCOForward) {
invCOForward->setCRSs(targetCRS, oldSource, nullptr);
setCRSs(invCOForward, targetCRS, oldSource);
}
subOps.emplace_back(opSecondCloned);
} else {
Expand Down
23 changes: 23 additions & 0 deletions test/unit/test_operation.cpp
View file
Expand Up @@ -6902,6 +6902,29 @@ TEST(operation, IGNF_LAMB1_TO_EPSG_4326) {

// ---------------------------------------------------------------------------

TEST(operation, NAD83_to_projeted_CRS_based_on_NAD83_2011) {
auto authFactory =
AuthorityFactory::create(DatabaseContext::create(), "EPSG");
auto ctxt = CoordinateOperationContext::create(authFactory, nullptr, 0.0);
ctxt->setSpatialCriterion(
CoordinateOperationContext::SpatialCriterion::PARTIAL_INTERSECTION);
auto list = CoordinateOperationFactory::create()->createOperations(
// NAD83
authFactory->createCoordinateReferenceSystem("4269"),
// NAD83(2011) / California Albers
authFactory->createCoordinateReferenceSystem("6414"), ctxt);
ASSERT_EQ(list.size(), 1U);
EXPECT_EQ(list[0]->nameStr(), "Ballpark geographic offset from NAD83 to "
"NAD83(2011) + California Albers");
EXPECT_EQ(list[0]->exportToPROJString(PROJStringFormatter::create().get()),
"+proj=pipeline +step +proj=axisswap +order=2,1 "
"+step +proj=unitconvert +xy_in=deg +xy_out=rad "
"+step +proj=aea +lat_0=0 +lon_0=-120 +lat_1=34 "
"+lat_2=40.5 +x_0=0 +y_0=-4000000 +ellps=GRS80");
}

// ---------------------------------------------------------------------------

TEST(operation, isPROJInstantiable) {

{
Expand Down

0 comments on commit 4c910ec

Please sign in to comment.