diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-09-08 16:22:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-08 16:22:15 +0200 |
| commit | 051a983319fdb7a422273a786ea240ad612bb6b5 (patch) | |
| tree | fdce3020a63235f6c4a8b1799b3b695069d73b8a /src/iso19111/datum.cpp | |
| parent | 73ccf7e1ba2ba9e927c4eaef81f5237fb4f587b2 (diff) | |
| parent | 024f63731283c0026ad5b4dea4084bc48bbcc6f7 (diff) | |
| download | PROJ-051a983319fdb7a422273a786ea240ad612bb6b5.tar.gz PROJ-051a983319fdb7a422273a786ea240ad612bb6b5.zip | |
Merge pull request #1585 from rouault/replace_2018_by_2019
Use in API and utilities WKT2_2019 instead of WKT2_2018 (fixes #1578)
Diffstat (limited to 'src/iso19111/datum.cpp')
| -rw-r--r-- | src/iso19111/datum.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index 65905ca9..fffdc022 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -1416,7 +1416,7 @@ void DynamicGeodeticReferenceFrame::_exportToWKT( io::WKTFormatter *formatter) const // throw(FormattingException) { const bool isWKT2 = formatter->version() == io::WKTFormatter::Version::WKT2; - if (isWKT2 && formatter->use2018Keywords()) { + if (isWKT2 && formatter->use2019Keywords()) { formatter->startNode(io::WKTConstants::DYNAMIC, false); formatter->startNode(io::WKTConstants::FRAMEEPOCH, false); formatter->add( @@ -1530,9 +1530,9 @@ void DatumEnsemble::_exportToWKT( io::WKTFormatter *formatter) const // throw(FormattingException) { const bool isWKT2 = formatter->version() == io::WKTFormatter::Version::WKT2; - if (!isWKT2 || !formatter->use2018Keywords()) { + if (!isWKT2 || !formatter->use2019Keywords()) { throw io::FormattingException( - "DatumEnsemble can only be exported to WKT2:2018"); + "DatumEnsemble can only be exported to WKT2:2019"); } auto l_datums = datums(); @@ -1941,7 +1941,7 @@ void DynamicVerticalReferenceFrame::_exportToWKT( io::WKTFormatter *formatter) const // throw(FormattingException) { const bool isWKT2 = formatter->version() == io::WKTFormatter::Version::WKT2; - if (isWKT2 && formatter->use2018Keywords()) { + if (isWKT2 && formatter->use2019Keywords()) { formatter->startNode(io::WKTConstants::DYNAMIC, false); formatter->startNode(io::WKTConstants::FRAMEEPOCH, false); formatter->add( @@ -2067,7 +2067,7 @@ void TemporalDatum::_exportToWKT( } formatter->startNode(io::WKTConstants::TDATUM, !identifiers().empty()); formatter->addQuotedString(nameStr()); - if (formatter->use2018Keywords()) { + if (formatter->use2019Keywords()) { formatter->startNode(io::WKTConstants::CALENDAR, false); formatter->addQuotedString(calendar()); formatter->endNode(); |