aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-02-09 16:54:14 +0100
committerEven Rouault <even.rouault@spatialys.com>2021-02-09 16:54:17 +0100
commit0b8f6e3586b3f180dd218caf3af39b37505043f1 (patch)
treeddc2f01eeb03700953794bd3cd58f5225745b408
parent88618bb4120b2a7c3999a00b2b3770ba73669cb8 (diff)
downloadPROJ-0b8f6e3586b3f180dd218caf3af39b37505043f1.tar.gz
PROJ-0b8f6e3586b3f180dd218caf3af39b37505043f1.zip
createOperations(): remove involved logic that was done for GDA94 -> WGS84 (G1762)
It is no longer needed for that particular case, since there's now a concatenated operation for it. It could in theory be useful for other cases, but removing it doesn't break existing tests, so...
-rw-r--r--src/iso19111/operation/coordinateoperationfactory.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp
index 51262ff6..e4b989c8 100644
--- a/src/iso19111/operation/coordinateoperationfactory.cpp
+++ b/src/iso19111/operation/coordinateoperationfactory.cpp
@@ -3196,26 +3196,6 @@ bool CoordinateOperationFactory::Private::createOperationsFromDatabase(
CoordinateOperationContext::IntermediateCRSUse::NEVER) {
bool tryWithGeodeticDatumIntermediate = res.empty();
- if (!tryWithGeodeticDatumIntermediate) {
- // This is in particular for the GDA94 to WGS 84 (G1762) case
- // As we have a WGS 84 -> WGS 84 (G1762) null-transformation in the
- // PROJ authority, previous steps might have use that WGS 84
- // intermediate directly. They might also have generated a path
- // through ITRF2008, as there is a path
- // GDA94 (geoc.) -> ITRF2008 (geoc.) -> WGS84 (G1762) (geoc.)
- // But there's a better path using
- // GDA94 (geog.) --> GDA2020 (geog.) and
- // GDA2020 (geoc.) -> WGS84 (G1762) (geoc.) that requires to
- // explore intermediates through their datum, and not directly
- // trough the CRS code.
- // Do that only if the number of results we got through other
- // algorithms is small, or if all results we have go through an
- // operation in the PROJ authority.
- constexpr size_t ARBITRARY_SMALL_NUMBER = 5U;
- tryWithGeodeticDatumIntermediate =
- res.size() < ARBITRARY_SMALL_NUMBER ||
- hasResultSetOnlyResultsWithPROJStep(res);
- }
if (tryWithGeodeticDatumIntermediate) {
auto resWithIntermediate = findsOpsInRegistryWithIntermediate(
sourceCRS, targetCRS, context, true);