diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-01-18 07:10:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 07:10:42 +0100 |
| commit | 8584dcd50777355b460b38418cae0db05dcf91bc (patch) | |
| tree | b7335182c91737ceda8518a638ac5a79bd2bc5b2 /test/unit/test_factory.cpp | |
| parent | 3fc48e6146e020b86a0ef87749cc645f9b4fa113 (diff) | |
| parent | 25f8ad123dc5fb7de0ac2fb10b55ae9efd2723a3 (diff) | |
| download | PROJ-8584dcd50777355b460b38418cae0db05dcf91bc.tar.gz PROJ-8584dcd50777355b460b38418cae0db05dcf91bc.zip | |
Merge pull request #1223 from rouault/unify_proj_create
Unify proj_create(), proj_create_from_user_input() and proj_create_from_proj_string() (fixes #1214)
Diffstat (limited to 'test/unit/test_factory.cpp')
| -rw-r--r-- | test/unit/test_factory.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp index e9b29728..027c0188 100644 --- a/test/unit/test_factory.cpp +++ b/test/unit/test_factory.cpp @@ -409,7 +409,7 @@ TEST(factory, AuthorityFactory_createGeodeticCRS_geographic2D) { EXPECT_TRUE(extent->isEquivalentTo(factory->createExtent("1262").get())); EXPECT_EQ(crs->exportToPROJString(PROJStringFormatter::create().get()), - "+proj=longlat +datum=WGS84 +no_defs"); + "+proj=longlat +datum=WGS84 +no_defs +type=crs"); } // --------------------------------------------------------------------------- @@ -972,7 +972,7 @@ TEST(factory, AuthorityFactory_test_uom_9110) { EXPECT_EQ(crs->exportToPROJString(PROJStringFormatter::create().get()), "+proj=sterea +lat_0=53.0019444444444 +lon_0=21.5027777777778 " "+k=0.9998 +x_0=4603000 +y_0=5806000 +ellps=krass +units=m " - "+no_defs"); + "+no_defs +type=crs"); } // --------------------------------------------------------------------------- @@ -2324,7 +2324,8 @@ TEST_F(FactoryWithTmpDatabase, custom_projected_crs) { EXPECT_EQ(crs->identifiers().size(), 1); EXPECT_EQ(crs->derivingConversion()->targetCRS().get(), crs.get()); EXPECT_EQ(crs->exportToPROJString(PROJStringFormatter::create().get()), - "+proj=mbt_s +unused_flag +datum=WGS84 +units=m +no_defs"); + "+proj=mbt_s +unused_flag +datum=WGS84 +units=m +no_defs " + "+type=crs"); EXPECT_TRUE(crs->canonicalBoundCRS() == nullptr); } { @@ -2333,15 +2334,16 @@ TEST_F(FactoryWithTmpDatabase, custom_projected_crs) { EXPECT_EQ(crs->identifiers().size(), 1); EXPECT_EQ(crs->derivingConversion()->targetCRS().get(), crs.get()); EXPECT_EQ(crs->exportToPROJString(PROJStringFormatter::create().get()), - "+proj=mbt_s +unused_flag +datum=WGS84 +units=m +no_defs"); + "+proj=mbt_s +unused_flag +datum=WGS84 +units=m +no_defs " + "+type=crs"); EXPECT_TRUE(crs->canonicalBoundCRS() != nullptr); } EXPECT_THROW(factory->createProjectedCRS("TEST_WRONG"), FactoryException); { - auto obj = - PROJStringParser().createFromPROJString("+proj=merc +a=1 +b=1"); + auto obj = PROJStringParser().createFromPROJString( + "+proj=merc +a=1 +b=1 +type=crs"); auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj); ASSERT_TRUE(crs != nullptr); auto res = crs->identify(factory); @@ -2352,8 +2354,8 @@ TEST_F(FactoryWithTmpDatabase, custom_projected_crs) { } { - auto obj = - PROJStringParser().createFromPROJString("+proj=merc +ellps=GRS80"); + auto obj = PROJStringParser().createFromPROJString( + "+proj=merc +ellps=GRS80 +type=crs"); auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj); ASSERT_TRUE(crs != nullptr); auto res = crs->identify(factory); @@ -2365,7 +2367,7 @@ TEST_F(FactoryWithTmpDatabase, custom_projected_crs) { { auto obj = PROJStringParser().createFromPROJString( - "+proj=merc +a=6378137 +rf=298.257222101"); + "+proj=merc +a=6378137 +rf=298.257222101 +type=crs"); auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj); ASSERT_TRUE(crs != nullptr); auto res = crs->identify(factory); @@ -2376,8 +2378,8 @@ TEST_F(FactoryWithTmpDatabase, custom_projected_crs) { } { - auto obj = - PROJStringParser().createFromPROJString("+proj=merc +ellps=WGS84"); + auto obj = PROJStringParser().createFromPROJString( + "+proj=merc +ellps=WGS84 +type=crs"); auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj); ASSERT_TRUE(crs != nullptr); auto res = crs->identify(factory); |