aboutsummaryrefslogtreecommitdiff
path: root/test/unit/test_io.cpp
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-11-25 20:01:05 +0100
committerGitHub <noreply@github.com>2019-11-25 20:01:05 +0100
commitf764bd8a970ce6d40da3203d4d0af6c8d5d2f762 (patch)
tree51d7b4959e9787a412251f8d3da55201da26c4dc /test/unit/test_io.cpp
parent992bb0b93a364de3d40d927367802e71b910da67 (diff)
parentfb73bc9bf71b4fe83907420366cc217ee86f6ef3 (diff)
downloadPROJ-f764bd8a970ce6d40da3203d4d0af6c8d5d2f762.tar.gz
PROJ-f764bd8a970ce6d40da3203d4d0af6c8d5d2f762.zip
Merge pull request #1745 from rouault/optimize_compound_to_geog
createOperations(): optimize compoundCRS to geogCRS, when the geogCRS of the compoundCRS is the same as the target geogCRS
Diffstat (limited to 'test/unit/test_io.cpp')
-rw-r--r--test/unit/test_io.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
index 07c4c6f1..fff86d27 100644
--- a/test/unit/test_io.cpp
+++ b/test/unit/test_io.cpp
@@ -8389,7 +8389,7 @@ TEST(io, projparse_axisswap_unitconvert_proj_unitconvert) {
"+type=crs +proj=pipeline +step +proj=axisswap +order=2,1 +step "
"+proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=igh "
"+lon_0=0 +x_0=0 +y_0=0 +ellps=GRS80 +step +proj=unitconvert +xy_in=m "
- "+z_in=m +xy_out=ft +z_out=ft";
+ "+xy_out=ft";
auto obj = PROJStringParser().createFromPROJString(input);
auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj);
ASSERT_TRUE(crs != nullptr);
@@ -8400,7 +8400,7 @@ TEST(io, projparse_axisswap_unitconvert_proj_unitconvert) {
"+proj=pipeline +step +proj=axisswap +order=2,1 +step "
"+proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=igh "
"+lon_0=0 +x_0=0 +y_0=0 +ellps=GRS80 +step +proj=unitconvert "
- "+xy_in=m +z_in=m +xy_out=ft +z_out=ft");
+ "+xy_in=m +xy_out=ft");
}
// ---------------------------------------------------------------------------
@@ -8410,7 +8410,7 @@ TEST(io, projparse_axisswap_unitconvert_proj_unitconvert_numeric_axisswap) {
"+type=crs +proj=pipeline +step +proj=axisswap +order=2,1 +step "
"+proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=igh "
"+lon_0=0 +x_0=0 +y_0=0 +ellps=GRS80 +step +proj=unitconvert +xy_in=m "
- "+z_in=m +xy_out=2.5 +z_out=2.5 +step +proj=axisswap +order=-2,-1";
+ "+xy_out=2.5 +step +proj=axisswap +order=-2,-1";
auto obj = PROJStringParser().createFromPROJString(input);
auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj);
ASSERT_TRUE(crs != nullptr);
@@ -8421,7 +8421,7 @@ TEST(io, projparse_axisswap_unitconvert_proj_unitconvert_numeric_axisswap) {
"+proj=pipeline +step +proj=axisswap +order=2,1 +step "
"+proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=igh "
"+lon_0=0 +x_0=0 +y_0=0 +ellps=GRS80 +step +proj=unitconvert "
- "+xy_in=m +z_in=m +xy_out=2.5 +z_out=2.5 +step +proj=axisswap "
+ "+xy_in=m +xy_out=2.5 +step +proj=axisswap "
"+order=-2,-1");
}