diff options
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/test_factory.cpp | 2 | ||||
| -rw-r--r-- | test/unit/test_operation.cpp | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp index 4b3ca9a5..5cf45d1a 100644 --- a/test/unit/test_factory.cpp +++ b/test/unit/test_factory.cpp @@ -2756,7 +2756,7 @@ TEST(factory, createObjectsFromName) { auto res = factoryEPSG->createObjectsFromName( "WGS84", {AuthorityFactory::ObjectType::GEOGRAPHIC_2D_CRS}, true); EXPECT_EQ(res.size(), - 9U); // EPSG:4326 and EPSG:4030 and the 6 WGS84 realizations + 8U); // EPSG:4326 and the 6 WGS84 realizations // and EPSG:7881 'Tritan St. Helena'' whose alias is // 'WGS 84 Tritan St. Helena' if (!res.empty()) { diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp index 8a87f3e5..fb611f68 100644 --- a/test/unit/test_operation.cpp +++ b/test/unit/test_operation.cpp @@ -4948,16 +4948,9 @@ TEST(operation, geogCRS_to_geogCRS_context_concatenated_operation) { authFactory->createCoordinateReferenceSystem("4171"), // RGF93 ctxt); ASSERT_EQ(list.size(), 5U); - EXPECT_EQ(list[0]->nameStr(), "NTF (Paris) to RGF93 (2)"); - EXPECT_EQ(list[0]->exportToPROJString(PROJStringFormatter::create().get()), - "+proj=pipeline +step +proj=axisswap +order=2,1 +step " - "+proj=unitconvert +xy_in=grad +xy_out=rad +step +inv " - "+proj=longlat +ellps=clrk80ign +pm=paris +step +proj=hgridshift " - "+grids=fr_ign_ntf_r93.tif +step +proj=unitconvert +xy_in=rad " - "+xy_out=deg +step +proj=axisswap +order=2,1"); - EXPECT_EQ(list[1]->nameStr(), "NTF (Paris) to NTF (1) + NTF to RGF93 (1)"); - EXPECT_EQ(list[1]->exportToPROJString(PROJStringFormatter::create().get()), + EXPECT_EQ(list[0]->nameStr(), "NTF (Paris) to RGF93 (1)"); + EXPECT_EQ(list[0]->exportToPROJString(PROJStringFormatter::create().get()), "+proj=pipeline " "+step +proj=axisswap +order=2,1 " "+step +proj=unitconvert +xy_in=grad +xy_out=rad " @@ -4971,6 +4964,14 @@ TEST(operation, geogCRS_to_geogCRS_context_concatenated_operation) { "+step +proj=unitconvert +xy_in=rad +xy_out=deg " "+step +proj=axisswap +order=2,1"); + EXPECT_EQ(list[1]->nameStr(), "NTF (Paris) to RGF93 (2)"); + EXPECT_EQ(list[1]->exportToPROJString(PROJStringFormatter::create().get()), + "+proj=pipeline +step +proj=axisswap +order=2,1 +step " + "+proj=unitconvert +xy_in=grad +xy_out=rad +step +inv " + "+proj=longlat +ellps=clrk80ign +pm=paris +step +proj=hgridshift " + "+grids=fr_ign_ntf_r93.tif +step +proj=unitconvert +xy_in=rad " + "+xy_out=deg +step +proj=axisswap +order=2,1"); + EXPECT_TRUE(nn_dynamic_pointer_cast<ConcatenatedOperation>(list[0]) != nullptr); auto grids = list[0]->gridsNeeded(DatabaseContext::create(), false); |