From 752696eb8ac0ecb9ff96432ec5849625ed452f74 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 16 May 2021 12:41:07 +0200 Subject: Database: update to EPSG v10.022 --- test/cli/testprojinfo_out.dist | 4 ++-- test/unit/test_factory.cpp | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist index 7569f948..3482c90e 100644 --- a/test/cli/testprojinfo_out.dist +++ b/test/cli/testprojinfo_out.dist @@ -405,7 +405,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (4)", USAGE[ SCOPE["Transformation of coordinates at 1m to 2m level of accuracy."], AREA["Canada - onshore - Alberta; British Columbia; Manitoba; New Brunswick; Newfoundland and Labrador; Northwest Territories; Nova Scotia; Nunavut; Ontario; Prince Edward Island; Quebec; Saskatchewan; Yukon; offshore east coast west of 44°W and north of 40°N."], - BBOX[40,-141.00299072266,83.16267232269,-44]], + BBOX[40,-141.01,83.17,-44]], ID["DERIVED_FROM(EPSG)",1313], REMARK["Uses NTv2 data files. Replaces NTv1 (transformation code 1312) except in Quebec. Input expects longitudes to be positive west; EPSG GeogCRS NAD27 (code 4267) and (code 4269) have longitudes positive east. May be used as tfm to WGS 84 - see code 1693."]] @@ -460,7 +460,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (3)", USAGE[ SCOPE["Historic record only - now superseded - see remarks."], AREA["Canada - onshore - Alberta; British Columbia; Manitoba; New Brunswick; Newfoundland and Labrador; Northwest Territories; Nova Scotia; Nunavut; Ontario; Prince Edward Island; Quebec; Saskatchewan; Yukon; offshore east coast west of 44°W and north of 40°N."], - BBOX[40,-141.00299072266,83.16267232269,-44]], + BBOX[40,-141.01,83.17,-44]], ID["DERIVED_FROM(EPSG)",1312], REMARK["Uses NTv1 method. Replaced in Quebec by code 1462 and elsewhere in 1997 by NTv2 (transformation code 1313). Input expects longitudes to be positive west; EPSG GeogCRS NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]] diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp index 37013775..d7bb7a07 100644 --- a/test/unit/test_factory.cpp +++ b/test/unit/test_factory.cpp @@ -1326,6 +1326,26 @@ TEST( // --------------------------------------------------------------------------- +TEST( + factory, + AuthorityFactory_createCoordinateOperation_concatenated_operation_epsg_9731) { + auto factory = AuthorityFactory::create(DatabaseContext::create(), "EPSG"); + auto op = factory->createCoordinateOperation("9731", false); + auto concatenated = nn_dynamic_pointer_cast(op); + ASSERT_TRUE(concatenated != nullptr); + EXPECT_EQ( + concatenated->exportToPROJString(PROJStringFormatter::create().get()), + "+proj=pipeline " + "+step +proj=axisswap +order=2,1 " + "+step +proj=unitconvert +xy_in=deg +xy_out=rad " + "+step +inv +proj=vgridshift +grids=geo_igm_mar06.grd +multiplier=1 " + "+step +proj=unitconvert +xy_in=rad +xy_out=deg " + "+step +proj=axisswap +order=2,1 " + "+step +proj=geogoffset +dh=0.141"); +} + +// --------------------------------------------------------------------------- + static bool in(const std::string &str, const std::vector &list) { for (const auto &listItem : list) { if (str == listItem) { -- cgit v1.2.3