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 /include/proj/io.hpp | |
| 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 'include/proj/io.hpp')
| -rw-r--r-- | include/proj/io.hpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/include/proj/io.hpp b/include/proj/io.hpp index 5b1a8588..e439b9ef 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -182,18 +182,24 @@ class PROJ_GCC_DLL WKTFormatter { WKT2_SIMPLIFIED, WKT2_2015_SIMPLIFIED = WKT2_SIMPLIFIED, - /** Full WKT2 string, conforming to ISO 19162:2018 / OGC 18-010, with - * (\ref WKT2_2018) all possible nodes and new keyword names. + /** Full WKT2 string, conforming to ISO 19162:2019 / OGC 18-010, with + * (\ref WKT2_2019) all possible nodes and new keyword names. * Non-normative list of differences: * <ul> - * <li>WKT2_2018 uses GEOGCRS / BASEGEOGCRS keywords for + * <li>WKT2_2019 uses GEOGCRS / BASEGEOGCRS keywords for * GeographicCRS.</li> * </ul> */ - WKT2_2018, + WKT2_2019, - /** WKT2_2018 with the simplification rule of WKT2_SIMPLIFIED */ - WKT2_2018_SIMPLIFIED, + /** Deprecated alias for WKT2_2019 */ + WKT2_2018 = WKT2_2019, + + /** WKT2_2019 with the simplification rule of WKT2_SIMPLIFIED */ + WKT2_2019_SIMPLIFIED, + + /** Deprecated alias for WKT2_2019_SIMPLIFIED */ + WKT2_2018_SIMPLIFIED = WKT2_2019_SIMPLIFIED, /** WKT1 as traditionally output by GDAL, deriving from OGC 01-009. A notable departure from WKT1_GDAL with respect to OGC 01-009 is @@ -322,7 +328,7 @@ class PROJ_GCC_DLL WKTFormatter { }; PROJ_INTERNAL Version version() const; - PROJ_INTERNAL bool use2018Keywords() const; + PROJ_INTERNAL bool use2019Keywords() const; PROJ_INTERNAL bool useESRIDialect() const; PROJ_INTERNAL const DatabaseContextPtr &databaseContext() const; @@ -736,8 +742,10 @@ class PROJ_GCC_DLL WKTParser { /** Guessed WKT "dialect" */ enum class PROJ_MSVC_DLL WKTGuessedDialect { - /** \ref WKT2_2018 */ - WKT2_2018, + /** \ref WKT2_2019 */ + WKT2_2019, + /** Deprecated alias for WKT2_2019 */ + WKT2_2018 = WKT2_2019, /** \ref WKT2_2015 */ WKT2_2015, /** \ref WKT1 */ |