diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-01-31 19:00:02 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-01-31 19:00:02 +0100 |
| commit | dae4a3bfac6ec54c0520e4228846dfae1cd9a67d (patch) | |
| tree | df71dcf8db2964a800222f98275f90dd785bbed0 /src | |
| parent | 2aaf53b20abe68154054d193f8f0fea5a0b78ec1 (diff) | |
| download | PROJ-dae4a3bfac6ec54c0520e4228846dfae1cd9a67d.tar.gz PROJ-dae4a3bfac6ec54c0520e4228846dfae1cd9a67d.zip | |
exportToWKT(): restrict a8e7ef45d132b44dd4096c6fe3703fe92b390d1e to TOWGS84 only to avoid breaking other use cases
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/datum.cpp | 2 | ||||
| -rw-r--r-- | src/iso19111/io.cpp | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index 9d2e48a0..4df1b319 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -1126,7 +1126,7 @@ void GeodeticReferenceFrame::_exportToWKT( if (TOWGS84Params.size() == 7) { formatter->startNode(io::WKTConstants::TOWGS84, false); for (const auto &val : TOWGS84Params) { - formatter->add(val); + formatter->add(val, 12); } formatter->endNode(); } diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index 65667ab0..3517c225 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -501,18 +501,6 @@ static inline std::string normalizeExponent(const std::string &in) { static inline std::string normalizeSerializedString(const std::string &in) { auto ret(normalizeExponent(in)); - auto dotPos = ret.find('.'); - // Detect sequences like x.yz000000foo - if( dotPos != std::string::npos && - ret.find('e', dotPos) == std::string::npos && - ret.find('E', dotPos) == std::string::npos ) - { - auto zeroesPos = ret.find("000000", dotPos); - if( zeroesPos != std::string::npos ) - { - ret.resize(zeroesPos); - } - } return ret; } |
