From 024f63731283c0026ad5b4dea4084bc48bbcc6f7 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 4 Sep 2019 15:46:13 +0200 Subject: 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. --- include/proj/internal/io_internal.hpp | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'include/proj/internal') diff --git a/include/proj/internal/io_internal.hpp b/include/proj/internal/io_internal.hpp index bd6d441d..781dfa6c 100644 --- a/include/proj/internal/io_internal.hpp +++ b/include/proj/internal/io_internal.hpp @@ -87,8 +87,8 @@ class WKTConstants { static const std::string CONVERSION; static const std::string METHOD; static const std::string REMARK; - static const std::string GEOGCRS; // WKT2-2018 - static const std::string BASEGEOGCRS; // WKT2-2018 + static const std::string GEOGCRS; // WKT2-2019 + static const std::string BASEGEOGCRS; // WKT2-2019 static const std::string SCOPE; static const std::string AREA; static const std::string BBOX; @@ -103,27 +103,27 @@ class WKTConstants { static const std::string TARGETCRS; static const std::string INTERPOLATIONCRS; static const std::string OPERATIONACCURACY; - static const std::string CONCATENATEDOPERATION; // WKT2-2018 - static const std::string STEP; // WKT2-2018 + static const std::string CONCATENATEDOPERATION; // WKT2-2019 + static const std::string STEP; // WKT2-2019 static const std::string BOUNDCRS; static const std::string ABRIDGEDTRANSFORMATION; static const std::string DERIVINGCONVERSION; static const std::string TDATUM; - static const std::string CALENDAR; // WKT2-2018 + static const std::string CALENDAR; // WKT2-2019 static const std::string TIMEORIGIN; static const std::string TIMECRS; static const std::string VERTICALEXTENT; static const std::string TIMEEXTENT; - static const std::string USAGE; // WKT2-2018 - static const std::string DYNAMIC; // WKT2-2018 - static const std::string FRAMEEPOCH; // WKT2-2018 - static const std::string MODEL; // WKT2-2018 - static const std::string VELOCITYGRID; // WKT2-2018 - static const std::string ENSEMBLE; // WKT2-2018 - static const std::string MEMBER; // WKT2-2018 - static const std::string ENSEMBLEACCURACY; // WKT2-2018 - static const std::string DERIVEDPROJCRS; // WKT2-2018 - static const std::string BASEPROJCRS; // WKT2-2018 + static const std::string USAGE; // WKT2-2019 + static const std::string DYNAMIC; // WKT2-2019 + static const std::string FRAMEEPOCH; // WKT2-2019 + static const std::string MODEL; // WKT2-2019 + static const std::string VELOCITYGRID; // WKT2-2019 + static const std::string ENSEMBLE; // WKT2-2019 + static const std::string MEMBER; // WKT2-2019 + static const std::string ENSEMBLEACCURACY; // WKT2-2019 + static const std::string DERIVEDPROJCRS; // WKT2-2019 + static const std::string BASEPROJCRS; // WKT2-2019 static const std::string EDATUM; static const std::string ENGCRS; static const std::string PDATUM; @@ -140,11 +140,11 @@ class WKTConstants { static const std::string GEODETICDATUM; static const std::string PROJECTEDCRS; static const std::string PRIMEMERIDIAN; - static const std::string GEOGRAPHICCRS; // WKT2-2018 - static const std::string TRF; // WKT2-2018 + static const std::string GEOGRAPHICCRS; // WKT2-2019 + static const std::string TRF; // WKT2-2019 static const std::string VERTICALCRS; static const std::string VERTICALDATUM; - static const std::string VRF; // WKT2-2018 + static const std::string VRF; // WKT2-2019 static const std::string TIMEDATUM; static const std::string TEMPORALQUANTITY; static const std::string ENGINEERINGDATUM; -- cgit v1.2.3