diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-29 12:51:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 12:51:49 +0100 |
| commit | bf6b1a889b12d7ecdcb190cd14155e09e132095f (patch) | |
| tree | f742983990ca914ff3044352efd4e01eef5bd01d /test/unit/test_c_api.cpp | |
| parent | 74a10a8de03deb823690f143e191087bf7c4821f (diff) | |
| parent | b113d0825cf82f66f738746db0f21745017552e9 (diff) | |
| download | PROJ-bf6b1a889b12d7ecdcb190cd14155e09e132095f.tar.gz PROJ-bf6b1a889b12d7ecdcb190cd14155e09e132095f.zip | |
Merge pull request #1891 from rouault/rfc5
Implement RFC5: Adopt GeoTIFF-based grids for grids delivered with PROJ
Diffstat (limited to 'test/unit/test_c_api.cpp')
| -rw-r--r-- | test/unit/test_c_api.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp index df0bffb0..b74e5cf0 100644 --- a/test/unit/test_c_api.cpp +++ b/test/unit/test_c_api.cpp @@ -1298,12 +1298,10 @@ TEST_F(CApi, proj_coordoperation_get_grid_used) { ASSERT_NE(fullName, nullptr); ASSERT_NE(packageName, nullptr); ASSERT_NE(url, nullptr); - EXPECT_EQ(shortName, std::string("ntv1_can.dat")); + EXPECT_EQ(shortName, std::string("ca_nrc_ntv1_can.tif")); // EXPECT_EQ(fullName, std::string("")); - EXPECT_EQ(packageName, std::string("proj-datumgrid")); - EXPECT_TRUE(std::string(url).find( - "https://download.osgeo.org/proj/proj-datumgrid-") == 0) - << std::string(url); + EXPECT_EQ(packageName, std::string("")); + EXPECT_EQ(std::string(url), "https://cdn.proj.org/ca_nrc_ntv1_can.tif"); EXPECT_EQ(directDownload, 1); EXPECT_EQ(openLicense, 1); } @@ -3105,8 +3103,8 @@ TEST_F(CApi, proj_grid_get_info_from_database) { } { EXPECT_TRUE(proj_grid_get_info_from_database( - m_ctxt, "GDA94_GDA2020_conformal.gsb", nullptr, nullptr, nullptr, - nullptr, nullptr, nullptr)); + m_ctxt, "au_icsm_GDA94_GDA2020_conformal.tif", nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr)); } { const char *name = nullptr; @@ -3116,8 +3114,8 @@ TEST_F(CApi, proj_grid_get_info_from_database) { int open_license = 0; int available = 0; EXPECT_TRUE(proj_grid_get_info_from_database( - m_ctxt, "GDA94_GDA2020_conformal.gsb", &name, &package_name, &url, - &direct_download, &open_license, &available)); + m_ctxt, "au_icsm_GDA94_GDA2020_conformal.tif", &name, &package_name, + &url, &direct_download, &open_license, &available)); ASSERT_NE(name, nullptr); ASSERT_NE(package_name, nullptr); ASSERT_NE(url, nullptr); |