From 78302efb70eb4b49610cda6a60bf9ce39b82264f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 26 Aug 2019 18:12:38 +0200 Subject: createOperations(): fix pipeline generation when a CRS has terms like +datum=NAD27 and +over, where the datum was just replaced by its ellipsoid --- src/iso19111/crs.cpp | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'src/iso19111/crs.cpp') diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index b9694ba2..ad4acaff 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -1308,7 +1308,7 @@ void GeodeticCRS::addDatumInfoToPROJString( const auto &nadgrids = formatter->getHDatumExtension(); const auto &l_datum = datum(); if (formatter->getCRSExport() && l_datum && TOWGS84Params.empty() && - nadgrids.empty() && !formatter->getDropEarlyBindingsTerms()) { + nadgrids.empty()) { if (l_datum->_isEquivalentTo( datum::GeodeticReferenceFrame::EPSG_6326.get(), util::IComparable::Criterion::EQUIVALENT)) { @@ -2083,8 +2083,31 @@ void GeographicCRS::_exportToPROJString( primeMeridian()->longitude().getSIValue() != 0.0 || !formatter->getTOWGS84Parameters().empty() || !formatter->getHDatumExtension().empty()) { - formatter->addStep("longlat"); - addDatumInfoToPROJString(formatter); + + bool done = false; + if (formatter->getLegacyCRSToCRSContext() && + formatter->getHDatumExtension().empty() && + formatter->getTOWGS84Parameters().empty()) { + done = true; + const auto &l_datum = datum(); + if (l_datum && + l_datum->_isEquivalentTo( + datum::GeodeticReferenceFrame::EPSG_6326.get(), + util::IComparable::Criterion::EQUIVALENT)) { + formatter->addStep("longlat"); + formatter->addParam("ellps", "WGS84"); + } else if (l_datum && + l_datum->_isEquivalentTo( + datum::GeodeticReferenceFrame::EPSG_6267.get(), + util::IComparable::Criterion::EQUIVALENT)) { + formatter->addStep("longlat"); + formatter->addParam("datum", "NAD27"); + } + } + if (!done) { + formatter->addStep("longlat"); + addDatumInfoToPROJString(formatter); + } } if (!formatter->getCRSExport()) { addAngularUnitConvertAndAxisSwap(formatter); @@ -3132,7 +3155,8 @@ void ProjectedCRS::addUnitConvertAndAxisSwap(io::PROJStringFormatter *formatter, formatter->addParam("units", projUnit); } } - } else if (formatter->getCRSExport()) { + } else if (formatter->getCRSExport() && + !formatter->getLegacyCRSToCRSContext()) { formatter->addParam("units", "m"); } @@ -4143,11 +4167,6 @@ void BoundCRS::_exportToPROJString( "baseCRS of BoundCRS cannot be exported as a PROJ string"); } - if (formatter->getDropEarlyBindingsTerms()) { - crs_exportable->_exportToPROJString(formatter); - return; - } - auto vdatumProj4GridName = getVDatumPROJ4GRIDS(); if (!vdatumProj4GridName.empty()) { formatter->setVDatumExtension(vdatumProj4GridName); -- cgit v1.2.3 From ae70b26b9cbae85a38d5b26533ba06da0ea13940 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 26 Aug 2019 20:04:25 +0200 Subject: createOperations(): follow-up of previous commit for +datum=NAD83 case --- src/iso19111/crs.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/iso19111/crs.cpp') diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index ad4acaff..60b316f1 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -1323,7 +1323,12 @@ void GeodeticCRS::addDatumInfoToPROJString( datum::GeodeticReferenceFrame::EPSG_6269.get(), util::IComparable::Criterion::EQUIVALENT)) { datumWritten = true; - formatter->addParam("datum", "NAD83"); + if (formatter->getLegacyCRSToCRSContext()) { + // We do not want datum=NAD83 to cause a useless towgs84=0,0,0 + formatter->addParam("ellps", "GRS80"); + } else { + formatter->addParam("datum", "NAD83"); + } } } if (!datumWritten) { @@ -2084,28 +2089,28 @@ void GeographicCRS::_exportToPROJString( !formatter->getTOWGS84Parameters().empty() || !formatter->getHDatumExtension().empty()) { + formatter->addStep("longlat"); bool done = false; if (formatter->getLegacyCRSToCRSContext() && formatter->getHDatumExtension().empty() && formatter->getTOWGS84Parameters().empty()) { - done = true; const auto &l_datum = datum(); if (l_datum && l_datum->_isEquivalentTo( datum::GeodeticReferenceFrame::EPSG_6326.get(), util::IComparable::Criterion::EQUIVALENT)) { - formatter->addStep("longlat"); + done = true; formatter->addParam("ellps", "WGS84"); } else if (l_datum && l_datum->_isEquivalentTo( - datum::GeodeticReferenceFrame::EPSG_6267.get(), + datum::GeodeticReferenceFrame::EPSG_6269.get(), util::IComparable::Criterion::EQUIVALENT)) { - formatter->addStep("longlat"); - formatter->addParam("datum", "NAD27"); + done = true; + // We do not want datum=NAD83 to cause a useless towgs84=0,0,0 + formatter->addParam("ellps", "GRS80"); } } if (!done) { - formatter->addStep("longlat"); addDatumInfoToPROJString(formatter); } } -- cgit v1.2.3