diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-09-04 15:46:13 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-09-08 11:11:03 +0200 |
| commit | 024f63731283c0026ad5b4dea4084bc48bbcc6f7 (patch) | |
| tree | 7264a3e7c9f5388a537d0d4dbb31bbeceea720b0 /src/iso19111/coordinatesystem.cpp | |
| parent | faf7ec2d7f5d489bfd187f1a3408f0f09f94282f (diff) | |
| download | PROJ-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/coordinatesystem.cpp')
| -rw-r--r-- | src/iso19111/coordinatesystem.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/iso19111/coordinatesystem.cpp b/src/iso19111/coordinatesystem.cpp index 5a852b0d..c58fcaaa 100644 --- a/src/iso19111/coordinatesystem.cpp +++ b/src/iso19111/coordinatesystem.cpp @@ -519,7 +519,7 @@ void CoordinateSystem::_exportToWKT( const auto &l_axisList = axisList(); if (isWKT2) { formatter->startNode(io::WKTConstants::CS_, !identifiers().empty()); - formatter->add(getWKT2Type(formatter->use2018Keywords())); + formatter->add(getWKT2Type(formatter->use2019Keywords())); formatter->add(static_cast<int>(l_axisList.size())); formatter->endNode(); formatter->startNode(std::string(), @@ -1268,8 +1268,8 @@ DateTimeTemporalCS::create(const util::PropertyMap &properties, // --------------------------------------------------------------------------- -std::string DateTimeTemporalCS::getWKT2Type(bool use2018Keywords) const { - return use2018Keywords ? "TemporalDateTime" : "temporal"; +std::string DateTimeTemporalCS::getWKT2Type(bool use2019Keywords) const { + return use2019Keywords ? "TemporalDateTime" : "temporal"; } // --------------------------------------------------------------------------- @@ -1301,8 +1301,8 @@ TemporalCountCS::create(const util::PropertyMap &properties, // --------------------------------------------------------------------------- -std::string TemporalCountCS::getWKT2Type(bool use2018Keywords) const { - return use2018Keywords ? "TemporalCount" : "temporal"; +std::string TemporalCountCS::getWKT2Type(bool use2019Keywords) const { + return use2019Keywords ? "TemporalCount" : "temporal"; } // --------------------------------------------------------------------------- @@ -1334,8 +1334,8 @@ TemporalMeasureCS::create(const util::PropertyMap &properties, // --------------------------------------------------------------------------- -std::string TemporalMeasureCS::getWKT2Type(bool use2018Keywords) const { - return use2018Keywords ? "TemporalMeasure" : "temporal"; +std::string TemporalMeasureCS::getWKT2Type(bool use2019Keywords) const { + return use2019Keywords ? "TemporalMeasure" : "temporal"; } } // namespace cs |
