aboutsummaryrefslogtreecommitdiff
path: root/src/iso19111/datum.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-09-04 15:46:13 +0200
committerEven Rouault <even.rouault@spatialys.com>2019-09-08 11:11:03 +0200
commit024f63731283c0026ad5b4dea4084bc48bbcc6f7 (patch)
tree7264a3e7c9f5388a537d0d4dbb31bbeceea720b0 /src/iso19111/datum.cpp
parentfaf7ec2d7f5d489bfd187f1a3408f0f09f94282f (diff)
downloadPROJ-024f63731283c0026ad5b4dea4084bc48bbcc6f7.tar.gz
PROJ-024f63731283c0026ad5b4dea4084bc48bbcc6f7.zip
Use in API and utilities WKT2_2019 instead of WKT2_2018 (fixes #1518)
- C API: PJ_GUESSED_WKT2_2019 is added, PJ_GUESSED_WKT2_2018 aliased to it - C API: PJ_WKT2_2019[_SIMPLIFIED] is added, PJ_WKT2_2018[_SIMPLIFIED] alias to it - C++ API: similarly for WKTFormatter::Convention::WKT2_2019[_SIMPLIFIED] Those above changes should be fully backward API and ABI compatible. projinfo changes: - accept WKT2_2019 as value for -o switch. WKT2_2018 is still accepted (undocumented) - output now uses 'WKT2_2019 string:', so might break scripts that would rely on that. Other internal code references to WKT2_2018 changes to WKT2_2019, included in tests.
Diffstat (limited to 'src/iso19111/datum.cpp')
-rw-r--r--src/iso19111/datum.cpp10
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();