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/iso19111/c_api.cpp | |
| 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/iso19111/c_api.cpp')
| -rw-r--r-- | src/iso19111/c_api.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index 0caafbb8..45eb16d1 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -360,8 +360,8 @@ PJ_GUESSED_WKT_DIALECT proj_context_guess_wkt_dialect(PJ_CONTEXT *ctx, (void)ctx; assert(wkt); switch (WKTParser().guessDialect(wkt)) { - case WKTParser::WKTGuessedDialect::WKT2_2018: - return PJ_GUESSED_WKT2_2018; + case WKTParser::WKTGuessedDialect::WKT2_2019: + return PJ_GUESSED_WKT2_2019; case WKTParser::WKTGuessedDialect::WKT2_2015: return PJ_GUESSED_WKT2_2015; case WKTParser::WKTGuessedDialect::WKT1_GDAL: @@ -1308,10 +1308,10 @@ const char *proj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, PJ_WKT_TYPE type, return WKTFormatter::Convention::WKT2_2015; case PJ_WKT2_2015_SIMPLIFIED: return WKTFormatter::Convention::WKT2_2015_SIMPLIFIED; - case PJ_WKT2_2018: - return WKTFormatter::Convention::WKT2_2018; - case PJ_WKT2_2018_SIMPLIFIED: - return WKTFormatter::Convention::WKT2_2018_SIMPLIFIED; + case PJ_WKT2_2019: + return WKTFormatter::Convention::WKT2_2019; + case PJ_WKT2_2019_SIMPLIFIED: + return WKTFormatter::Convention::WKT2_2019_SIMPLIFIED; case PJ_WKT1_GDAL: return WKTFormatter::Convention::WKT1_GDAL; case PJ_WKT1_ESRI: |