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/proj.h | |
| 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/proj.h')
| -rw-r--r-- | src/proj.h | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -478,8 +478,11 @@ typedef char **PROJ_STRING_LIST; /** \brief Guessed WKT "dialect". */ typedef enum { - /** \ref WKT2_2018 */ - PJ_GUESSED_WKT2_2018, + /** \ref WKT2_2019 */ + PJ_GUESSED_WKT2_2019, + + /** Deprecated alias for PJ_GUESSED_WKT2_2019 */ + PJ_GUESSED_WKT2_2018 = PJ_GUESSED_WKT2_2019, /** \ref WKT2_2015 */ PJ_GUESSED_WKT2_2015, @@ -575,10 +578,14 @@ typedef enum PJ_WKT2_2015, /** cf osgeo::proj::io::WKTFormatter::Convention::WKT2_SIMPLIFIED */ PJ_WKT2_2015_SIMPLIFIED, - /** cf osgeo::proj::io::WKTFormatter::Convention::WKT2_2018 */ - PJ_WKT2_2018, - /** cf osgeo::proj::io::WKTFormatter::Convention::WKT2_2018_SIMPLIFIED */ - PJ_WKT2_2018_SIMPLIFIED, + /** cf osgeo::proj::io::WKTFormatter::Convention::WKT2_2019 */ + PJ_WKT2_2019, + /** Deprecated alias for PJ_WKT2_2019 */ + PJ_WKT2_2018 = PJ_WKT2_2019, + /** cf osgeo::proj::io::WKTFormatter::Convention::WKT2_2019_SIMPLIFIED */ + PJ_WKT2_2019_SIMPLIFIED, + /** Deprecated alias for PJ_WKT2_2019 */ + PJ_WKT2_2018_SIMPLIFIED = PJ_WKT2_2019_SIMPLIFIED, /** cf osgeo::proj::io::WKTFormatter::Convention::WKT1_GDAL */ PJ_WKT1_GDAL, /** cf osgeo::proj::io::WKTFormatter::Convention::WKT1_ESRI */ |