diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-27 10:53:51 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-27 11:03:14 +0100 |
| commit | a4d389c37529bda488dc14fb4225e4dec40c0743 (patch) | |
| tree | 3531b98791f3aec23b382c62576be078f66f3fd8 /test/unit | |
| parent | 81ec8c0b58d66333fccd3703dab62a11132a0331 (diff) | |
| download | PROJ-a4d389c37529bda488dc14fb4225e4dec40c0743.tar.gz PROJ-a4d389c37529bda488dc14fb4225e4dec40c0743.zip | |
Remove proj_def.dat (fixes #201)
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/gie_self_tests.cpp | 7 | ||||
| -rw-r--r-- | test/unit/test_io.cpp | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp index b7af926b..4e788358 100644 --- a/test/unit/gie_self_tests.cpp +++ b/test/unit/gie_self_tests.cpp @@ -405,7 +405,7 @@ TEST(gie, info_functions) { ASSERT_NEAR(-2.0, proj_dmstor(&buf[0], NULL), 1e-7); /* test proj_derivatives_retrieve() and proj_factors_retrieve() */ - P = proj_create(PJ_DEFAULT_CTX, "+proj=merc"); + P = proj_create(PJ_DEFAULT_CTX, "+proj=merc +ellps=WGS84"); a = proj_coord(0, 0, 0, 0); a.lp.lam = proj_torad(12); a.lp.phi = proj_torad(55); @@ -488,7 +488,7 @@ TEST(gie, io_predicates) { " +rx=-0.00039 +ry=0.00080 +rz=-0.00114" " +dx=-0.0029 +dy=-0.0002 +dz=-0.0006 +ds=0.00001" " +drx=-0.00011 +dry=-0.00019 +drz=0.00007" - " +t_epoch=1988.0 +convention=coordinate_frame +no_defs"); + " +t_epoch=1988.0 +convention=coordinate_frame"); ASSERT_TRUE(P != nullptr); ASSERT_FALSE(proj_angular_input(P, PJ_FWD)); ASSERT_FALSE(proj_angular_input(P, PJ_INV)); @@ -500,14 +500,13 @@ TEST(gie, io_predicates) { ASSERT_FALSE(proj_angular_output(P, PJ_FWD)); ASSERT_FALSE(proj_angular_output(P, PJ_INV)); - /* We specified "no_defs" but didn't give any ellipsoid info */ /* pj_init_ctx should default to WGS84 */ ASSERT_EQ(P->a, 6378137.0); ASSERT_EQ(P->f, 1.0 / 298.257223563); proj_destroy(P); /* Test that pj_fwd* and pj_inv* returns NaNs when receiving NaN input */ - P = proj_create(PJ_DEFAULT_CTX, "+proj=merc"); + P = proj_create(PJ_DEFAULT_CTX, "+proj=merc +ellps=WGS84"); ASSERT_TRUE(P != nullptr); auto a = proj_coord(NAN, NAN, NAN, NAN); a = proj_trans(P, PJ_FWD, a); diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 466ce80b..5ea92fd0 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -7967,12 +7967,14 @@ TEST(io, projparse_init) { { auto obj = createFromUserInput( - "proj=pipeline step init=epsg:4326 step proj=longlat", dbContext, + "proj=pipeline step init=epsg:4326 step proj=longlat ellps=WGS84", + dbContext, true); auto co = nn_dynamic_pointer_cast<CoordinateOperation>(obj); ASSERT_TRUE(co != nullptr); EXPECT_EQ(co->exportToPROJString(PROJStringFormatter::create().get()), - "+proj=pipeline +step +init=epsg:4326 +step +proj=longlat"); + "+proj=pipeline +step +init=epsg:4326 +step +proj=longlat " + "+ellps=WGS84"); } { |