diff options
| -rw-r--r-- | src/iso19111/factory.cpp | 13 | ||||
| -rw-r--r-- | src/iso19111/operation/coordinateoperationfactory.cpp | 16 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index 49d2a737..5da9e6e0 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -4723,12 +4723,17 @@ AuthorityFactory::createBetweenGeodeticCRSWithDatumBasedIntermediates( sourceCRSCode == targetCRSCode) { return listTmp; } + const auto sourceGeodCRS = + dynamic_cast<crs::GeodeticCRS *>(sourceCRS.get()); + const auto targetGeodCRS = + dynamic_cast<crs::GeodeticCRS *>(targetCRS.get()); + if (!sourceGeodCRS || !targetGeodCRS) { + return listTmp; + } std::string minDate; - const auto &sourceDatum = - dynamic_cast<crs::GeodeticCRS *>(sourceCRS.get())->datum(); - const auto &targetDatum = - dynamic_cast<crs::GeodeticCRS *>(targetCRS.get())->datum(); + const auto &sourceDatum = sourceGeodCRS->datum(); + const auto &targetDatum = targetGeodCRS->datum(); if (sourceDatum && sourceDatum->publicationDate().has_value() && targetDatum && targetDatum->publicationDate().has_value()) { const auto sourceDate(sourceDatum->publicationDate()->toString()); diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp index 4832c7b8..4bd68b1d 100644 --- a/src/iso19111/operation/coordinateoperationfactory.cpp +++ b/src/iso19111/operation/coordinateoperationfactory.cpp @@ -1856,14 +1856,14 @@ createBallparkGeographicOffset(const crs::CRSNNPtr &sourceCRS, accuracies.emplace_back(metadata::PositionalAccuracy::create("0")); } - if (dynamic_cast<const crs::SingleCRS *>(sourceCRS.get()) - ->coordinateSystem() - ->axisList() - .size() == 3 || - dynamic_cast<const crs::SingleCRS *>(targetCRS.get()) - ->coordinateSystem() - ->axisList() - .size() == 3) { + const auto singleSourceCRS = + dynamic_cast<const crs::SingleCRS *>(sourceCRS.get()); + const auto singleTargetCRS = + dynamic_cast<const crs::SingleCRS *>(targetCRS.get()); + if ((singleSourceCRS && + singleSourceCRS->coordinateSystem()->axisList().size() == 3) || + (singleTargetCRS && + singleTargetCRS->coordinateSystem()->axisList().size() == 3)) { return Transformation::createGeographic3DOffsets( map, sourceCRS, targetCRS, angle0, angle0, common::Length(0), accuracies); |