diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-08-26 20:04:25 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-08-26 20:04:25 +0200 |
| commit | ae70b26b9cbae85a38d5b26533ba06da0ea13940 (patch) | |
| tree | 15798bd63b7a9ab3e0067ce3130ceea7535c62b4 /src | |
| parent | 78302efb70eb4b49610cda6a60bf9ce39b82264f (diff) | |
| download | PROJ-ae70b26b9cbae85a38d5b26533ba06da0ea13940.tar.gz PROJ-ae70b26b9cbae85a38d5b26533ba06da0ea13940.zip | |
createOperations(): follow-up of previous commit for +datum=NAD83 case
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/crs.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
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); } } |