aboutsummaryrefslogtreecommitdiff
path: root/include/proj/coordinatesystem.hpp
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 /include/proj/coordinatesystem.hpp
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 'include/proj/coordinatesystem.hpp')
-rw-r--r--include/proj/coordinatesystem.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/proj/coordinatesystem.hpp b/include/proj/coordinatesystem.hpp
index ffb908fc..573f18e2 100644
--- a/include/proj/coordinatesystem.hpp
+++ b/include/proj/coordinatesystem.hpp
@@ -623,7 +623,7 @@ class PROJ_GCC_DLL TemporalCS : public CoordinateSystem {
INLINED_MAKE_SHARED
PROJ_INTERNAL std::string
- getWKT2Type(bool use2018Keywords) const override = 0;
+ getWKT2Type(bool use2019Keywords) const override = 0;
private:
TemporalCS(const TemporalCS &other) = delete;
@@ -661,7 +661,7 @@ class PROJ_GCC_DLL DateTimeTemporalCS final : public TemporalCS {
const CoordinateSystemAxisNNPtr &axis);
INLINED_MAKE_SHARED
- PROJ_INTERNAL std::string getWKT2Type(bool use2018Keywords) const override;
+ PROJ_INTERNAL std::string getWKT2Type(bool use2019Keywords) const override;
private:
DateTimeTemporalCS(const DateTimeTemporalCS &other) = delete;
@@ -697,7 +697,7 @@ class PROJ_GCC_DLL TemporalCountCS final : public TemporalCS {
const CoordinateSystemAxisNNPtr &axis);
INLINED_MAKE_SHARED
- PROJ_INTERNAL std::string getWKT2Type(bool use2018Keywords) const override;
+ PROJ_INTERNAL std::string getWKT2Type(bool use2019Keywords) const override;
private:
TemporalCountCS(const TemporalCountCS &other) = delete;
@@ -733,7 +733,7 @@ class PROJ_GCC_DLL TemporalMeasureCS final : public TemporalCS {
const CoordinateSystemAxisNNPtr &axis);
INLINED_MAKE_SHARED
- PROJ_INTERNAL std::string getWKT2Type(bool use2018Keywords) const override;
+ PROJ_INTERNAL std::string getWKT2Type(bool use2019Keywords) const override;
private:
TemporalMeasureCS(const TemporalMeasureCS &other) = delete;