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. --- test/unit/test_datum.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'test/unit/test_datum.cpp') diff --git a/test/unit/test_datum.cpp b/test/unit/test_datum.cpp index fbd1f79d..8a5d67cf 100644 --- a/test/unit/test_datum.cpp +++ b/test/unit/test_datum.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: Test ISO19111:2018 implementation + * Purpose: Test ISO19111:2019 implementation * Author: Even Rouault * ****************************************************************************** @@ -273,7 +273,7 @@ TEST(datum, dynamic_geodetic_reference_frame) { EXPECT_EQ(drf->exportToWKT(WKTFormatter::create().get()), expected); - auto expected_wtk2_2018 = + auto expected_wtk2_2019 = "DYNAMIC[\n" " FRAMEEPOCH[2018.5],\n" " MODEL[\"My model\"]],\n" @@ -284,8 +284,8 @@ TEST(datum, dynamic_geodetic_reference_frame) { " ANCHOR[\"My anchor\"]]"; EXPECT_EQ( drf->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()), - expected_wtk2_2018); + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()), + expected_wtk2_2019); } // --------------------------------------------------------------------------- @@ -355,7 +355,7 @@ TEST(datum, temporal_datum_time_origin_non_ISO8601) { // --------------------------------------------------------------------------- -TEST(datum, temporal_datum_WKT2_2018) { +TEST(datum, temporal_datum_WKT2_2019) { auto datum = TemporalDatum::create( PropertyMap().set(IdentifiedObject::NAME_KEY, "Gregorian calendar"), DateTime::create("0000-01-01"), @@ -367,7 +367,7 @@ TEST(datum, temporal_datum_WKT2_2018) { EXPECT_EQ( datum->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()), + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()), expected); } @@ -385,15 +385,15 @@ TEST(datum, dynamic_vertical_reference_frame) { EXPECT_EQ(drf->exportToWKT(WKTFormatter::create().get()), expected); - auto expected_wtk2_2018 = "DYNAMIC[\n" + auto expected_wtk2_2019 = "DYNAMIC[\n" " FRAMEEPOCH[2018.5],\n" " MODEL[\"My model\"]],\n" "VDATUM[\"test\",\n" " ANCHOR[\"My anchor\"]]"; EXPECT_EQ( drf->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()), - expected_wtk2_2018); + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()), + expected_wtk2_2019); } // --------------------------------------------------------------------------- @@ -412,7 +412,7 @@ TEST(datum, datum_ensemble) { FormattingException); EXPECT_EQ( ensemble->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()), + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()), "ENSEMBLE[\"test\",\n" " MEMBER[\"World Geodetic System 1984\",\n" " ID[\"EPSG\",6326]],\n" @@ -436,7 +436,7 @@ TEST(datum, datum_ensemble_vertical) { PositionalAccuracy::create("100")); EXPECT_EQ( ensemble->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()), + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()), "ENSEMBLE[\"unnamed\",\n" " MEMBER[\"vdatum1\"],\n" " MEMBER[\"vdatum2\"],\n" -- cgit v1.2.3