aboutsummaryrefslogtreecommitdiff
path: root/test/unit/test_operation.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-02-25 23:17:48 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-02-26 14:04:09 +0100
commit1f8541d6f43f7fde949772e0a2174e317542b985 (patch)
treeeaa29ccb86245bd6c3795d75d95132f4dd7a6bc6 /test/unit/test_operation.cpp
parent414ae2699ccfafdabacd12010acf7ad2f16fd889 (diff)
downloadPROJ-1f8541d6f43f7fde949772e0a2174e317542b985.tar.gz
PROJ-1f8541d6f43f7fde949772e0a2174e317542b985.zip
Database: update to EPSG v9.8.7
Diffstat (limited to 'test/unit/test_operation.cpp')
-rw-r--r--test/unit/test_operation.cpp19
1 files changed, 10 insertions, 9 deletions
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);