diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-01-17 17:01:20 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-01-17 21:57:27 +0100 |
| commit | c0ac895d77e823fe9a9458d013eb0f6378f39060 (patch) | |
| tree | 9e7641cda61a75c3a6209d17dad6fa7c8448cd44 /test/unit/test_operation.cpp | |
| parent | 3121d9bc309b439adcc2ab9743a3d2b3a8f48296 (diff) | |
| download | PROJ-c0ac895d77e823fe9a9458d013eb0f6378f39060.tar.gz PROJ-c0ac895d77e823fe9a9458d013eb0f6378f39060.zip | |
Remove proj_create_from_proj_string() and proj_create_from_user_input(), and make proj_create() do more or less what proj_create_from_user_input() did before (fixes #1214)
Diffstat (limited to 'test/unit/test_operation.cpp')
| -rw-r--r-- | test/unit/test_operation.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp index 3cf633b6..d134f086 100644 --- a/test/unit/test_operation.cpp +++ b/test/unit/test_operation.cpp @@ -4116,14 +4116,11 @@ TEST(operation, PROJ_based) { ->exportToPROJString(PROJStringFormatter::create().get()), str); - EXPECT_THROW(SingleOperation::createPROJBased(PropertyMap(), "+inv", - nullptr, nullptr) + EXPECT_THROW(SingleOperation::createPROJBased( + PropertyMap(), "+proj=pipeline +step +proj=pipeline", + nullptr, nullptr) ->exportToPROJString(PROJStringFormatter::create().get()), FormattingException); - EXPECT_THROW( - SingleOperation::createPROJBased(PropertyMap(), "foo", nullptr, nullptr) - ->exportToPROJString(PROJStringFormatter::create().get()), - FormattingException); } // --------------------------------------------------------------------------- @@ -4690,7 +4687,9 @@ TEST(operation, geogCRS_to_geogCRS_init_IGNF_to_init_IGNF_context) { EXPECT_EQ(list[0]->nameStr(), "NOUVELLE TRIANGULATION DE LA FRANCE (NTF) vers RGF93 (ETRS89)"); EXPECT_EQ(list[0]->exportToPROJString(PROJStringFormatter::create().get()), - "+proj=hgridshift +grids=ntf_r93.gsb"); + "+proj=pipeline +step +proj=unitconvert +xy_in=deg +xy_out=rad " + "+step +proj=hgridshift +grids=ntf_r93.gsb +step " + "+proj=unitconvert +xy_in=rad +xy_out=deg"); } // --------------------------------------------------------------------------- |