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_factory.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/unit/test_factory.cpp') diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp index e68b42fc..881b7605 100644 --- a/test/unit/test_factory.cpp +++ b/test/unit/test_factory.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: Test ISO19111:2018 implementation + * Purpose: Test ISO19111:2019 implementation * Author: Even Rouault * ****************************************************************************** @@ -705,7 +705,7 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_helmert_8_CF) { " ID[\"EPSG\",1049]],\n"; auto wkt = op->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()); + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()); EXPECT_TRUE(wkt.find(expected) != std::string::npos) << wkt; } @@ -818,7 +818,7 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_helmert_15_CF) { EXPECT_EQ( op->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()), + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()), expected); } @@ -924,7 +924,7 @@ TEST( "in grid file.\"]]"; EXPECT_EQ( op->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()), + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()), expected); } @@ -940,7 +940,7 @@ TEST( " PARAMETERFILE[\"Longitude difference file\",\"alaska.los\"],\n"; auto wkt = op->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()); + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()); EXPECT_TRUE(wkt.find(expected) != std::string::npos) << wkt; } @@ -998,7 +998,7 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_other_transformation) { EXPECT_EQ( op->exportToWKT( - WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()), + WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()), expected); } -- cgit v1.2.3