diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-05-28 12:57:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 12:57:26 +0200 |
| commit | fdfeae1908e8bf9e199aed3654ff418aaaa4fe26 (patch) | |
| tree | ce3c845caafa23cdd25f7dbef6fa615c52492caf /src | |
| parent | 7b407e36e650aeae986218a0e213b2d8248c008d (diff) | |
| parent | edc6df3dc1a862ca47f0376d1e35971fc964c573 (diff) | |
| download | PROJ-fdfeae1908e8bf9e199aed3654ff418aaaa4fe26.tar.gz PROJ-fdfeae1908e8bf9e199aed3654ff418aaaa4fe26.zip | |
Merge pull request #2732 from rouault/epsg_10_024
Database: update to EPSG v10.024
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/operation/concatenatedoperation.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/iso19111/operation/concatenatedoperation.cpp b/src/iso19111/operation/concatenatedoperation.cpp index fda341dd..20bbce6f 100644 --- a/src/iso19111/operation/concatenatedoperation.cpp +++ b/src/iso19111/operation/concatenatedoperation.cpp @@ -245,34 +245,6 @@ void ConcatenatedOperation::fixStepsDirection( return false; }; - // Special case for EPSG:9731 "ETRS89 to ETRS89 + Catania 1965 height (1)" - // which chains "ETRS89 to ETRS89 + Genoa 1942 height (1)" and - // "Genoa 1942 height to Catania 1965 height (1)" - if (operationsInOut.size() == 2 && isGeographic(concatOpSourceCRS.get())) { - const auto compoundTarget = - dynamic_cast<const crs::CompoundCRS *>(concatOpTargetCRS.get()); - const auto compoundTargetOp0 = dynamic_cast<const crs::CompoundCRS *>( - operationsInOut[0]->targetCRS().get()); - if (compoundTarget && compoundTargetOp0 && - operationsInOut[0]->sourceCRS() && - operationsInOut[1]->sourceCRS() && - operationsInOut[1]->targetCRS() && - concatOpSourceCRS->nameStr() == - compoundTarget->componentReferenceSystems()[0]->nameStr() && - concatOpSourceCRS->nameStr() == - operationsInOut[0]->sourceCRS()->nameStr() && - concatOpSourceCRS->nameStr() == - compoundTargetOp0->componentReferenceSystems()[0]->nameStr() && - compoundTargetOp0->componentReferenceSystems()[1]->nameStr() == - operationsInOut[1]->sourceCRS()->nameStr() && - operationsInOut[1]->targetCRS()->nameStr() == - compoundTarget->componentReferenceSystems()[1]->nameStr()) { - operationsInOut[1]->setCRSs( - NN_NO_CHECK(operationsInOut[0]->targetCRS()), concatOpTargetCRS, - nullptr); - } - } - for (size_t i = 0; i < operationsInOut.size(); ++i) { auto &op = operationsInOut[i]; auto l_sourceCRS = op->sourceCRS(); |