diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-01-09 16:24:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 16:24:16 +0100 |
| commit | 5b75e5fdccc531f7b0e3dcd636fa1ff3500bb071 (patch) | |
| tree | c718433341207fa688e85e145cf83ac4149491ab /test/unit/proj_angular_io_test.cpp | |
| parent | 11bc4783ca2c5fed8603d0c49f5aea102eca2432 (diff) | |
| parent | a6899c98a6455dc022bdd6785af3e528488422b8 (diff) | |
| download | PROJ-5b75e5fdccc531f7b0e3dcd636fa1ff3500bb071.tar.gz PROJ-5b75e5fdccc531f7b0e3dcd636fa1ff3500bb071.zip | |
Merge pull request #1217 from rouault/remove_proj_5_crs_export
ISO19111: remove PROJ.5 specific format for CRS (refs #1214)
Diffstat (limited to 'test/unit/proj_angular_io_test.cpp')
| -rw-r--r-- | test/unit/proj_angular_io_test.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/test/unit/proj_angular_io_test.cpp b/test/unit/proj_angular_io_test.cpp index fdb44704..dbf09986 100644 --- a/test/unit/proj_angular_io_test.cpp +++ b/test/unit/proj_angular_io_test.cpp @@ -48,7 +48,9 @@ TEST(AngularUnits, Basic) { TEST(AngularUnits, Pipelines) { auto ctx = proj_context_create(); - auto P = proj_create(ctx, "proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=latlong +step +proj=axisswap +order=2,1"); + auto P = + proj_create(ctx, "proj=pipeline +step +proj=axisswap +order=2,1 +step " + "+proj=latlong +step +proj=axisswap +order=2,1"); EXPECT_TRUE(proj_angular_input(P, PJ_FWD)); EXPECT_TRUE(proj_angular_output(P, PJ_FWD)); @@ -57,45 +59,43 @@ TEST(AngularUnits, Pipelines) { proj_destroy(P); proj_context_destroy(ctx); - } TEST(AngularUnits, Pipelines2) { auto ctx = proj_context_create(); auto P = proj_create( - ctx, - "+proj=pipeline " - "+step +proj=axisswap +order=2,1 " - "+step +proj=unitconvert +xy_in=deg +xy_out=rad " - "+step +proj=tmerc +lat_0=0 +lon_0=-81 +k=0.9996 +x_0=500000.001016002 +y_0=0 +ellps=WGS84 " - "+step +proj=axisswap +order=2,1 " - "+step +proj=unitconvert +xy_in=m +z_in=m +xy_out=us-ft +z_out=us-ft"); + ctx, + "+proj=pipeline " + "+step +proj=axisswap +order=2,1 " + "+step +proj=unitconvert +xy_in=deg +xy_out=rad " + "+step +proj=tmerc +lat_0=0 +lon_0=-81 +k=0.9996 +x_0=500000.001016002 " + "+y_0=0 +ellps=WGS84 " + "+step +proj=axisswap +order=2,1 " + "+step +proj=unitconvert +xy_in=m +z_in=m +xy_out=us-ft +z_out=us-ft"); EXPECT_FALSE(proj_angular_input(P, PJ_FWD)); EXPECT_FALSE(proj_angular_output(P, PJ_FWD)); proj_destroy(P); proj_context_destroy(ctx); - } TEST(AngularUnits, Pipelines3) { auto ctx = proj_context_create(); auto P = proj_create( - ctx, - "+proj=pipeline " - "+step +proj=axisswap +order=2,1 " - "+step +proj=tmerc +lat_0=0 +lon_0=-81 +k=0.9996 +x_0=500000.001016002 +y_0=0 +ellps=WGS84 " - "+step +proj=axisswap +order=2,1 " - "+step +proj=unitconvert +xy_in=m +z_in=m +xy_out=us-ft +z_out=us-ft"); + ctx, + "+proj=pipeline " + "+step +proj=axisswap +order=2,1 " + "+step +proj=tmerc +lat_0=0 +lon_0=-81 +k=0.9996 +x_0=500000.001016002 " + "+y_0=0 +ellps=WGS84 " + "+step +proj=axisswap +order=2,1 " + "+step +proj=unitconvert +xy_in=m +z_in=m +xy_out=us-ft +z_out=us-ft"); EXPECT_TRUE(proj_angular_input(P, PJ_FWD)); EXPECT_FALSE(proj_angular_output(P, PJ_FWD)); proj_destroy(P); proj_context_destroy(ctx); - } - } // namespace |