diff options
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/test_c_api.cpp | 1253 | ||||
| -rw-r--r-- | test/unit/test_operation.cpp | 3 |
2 files changed, 614 insertions, 642 deletions
diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp index 9807de82..620685ef 100644 --- a/test/unit/test_c_api.cpp +++ b/test/unit/test_c_api.cpp @@ -139,7 +139,7 @@ class CApi : public ::testing::Test { struct ObjListKeeper { PJ_OBJ_LIST *m_res = nullptr; explicit ObjListKeeper(PJ_OBJ_LIST *res) : m_res(res) {} - ~ObjListKeeper() { proj_obj_list_destroy(m_res); } + ~ObjListKeeper() { proj_list_destroy(m_res); } ObjListKeeper(const ObjListKeeper &) = delete; ObjListKeeper &operator=(const ObjListKeeper &) = delete; @@ -148,12 +148,11 @@ class CApi : public ::testing::Test { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_from_user_input) { +TEST_F(CApi, proj_create_from_user_input) { proj_destroy(nullptr); - EXPECT_EQ(proj_obj_create_from_user_input(m_ctxt, "invalid", nullptr), - nullptr); + EXPECT_EQ(proj_create_from_user_input(m_ctxt, "invalid", nullptr), nullptr); { - auto obj = proj_obj_create_from_user_input( + auto obj = proj_create_from_user_input( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -183,8 +182,7 @@ TEST_F(CApi, proj_obj_create_from_user_input) { EXPECT_EQ(info.definition, std::string("")); } { - auto obj = - proj_obj_create_from_user_input(m_ctxt, "EPSG:4326", nullptr); + auto obj = proj_create_from_user_input(m_ctxt, "EPSG:4326", nullptr); ObjectKeeper keeper(obj); EXPECT_NE(obj, nullptr); } @@ -192,18 +190,18 @@ TEST_F(CApi, proj_obj_create_from_user_input) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_from_wkt) { +TEST_F(CApi, proj_create_from_wkt) { { - EXPECT_EQ(proj_obj_create_from_wkt(m_ctxt, "invalid", nullptr, nullptr, - nullptr), - nullptr); + EXPECT_EQ( + proj_create_from_wkt(m_ctxt, "invalid", nullptr, nullptr, nullptr), + nullptr); } { PROJ_STRING_LIST warningList = nullptr; PROJ_STRING_LIST errorList = nullptr; - EXPECT_EQ(proj_obj_create_from_wkt(m_ctxt, "invalid", nullptr, - &warningList, &errorList), + EXPECT_EQ(proj_create_from_wkt(m_ctxt, "invalid", nullptr, &warningList, + &errorList), nullptr); EXPECT_EQ(warningList, nullptr); proj_string_list_destroy(warningList); @@ -211,7 +209,7 @@ TEST_F(CApi, proj_obj_create_from_wkt) { proj_string_list_destroy(errorList); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -220,7 +218,7 @@ TEST_F(CApi, proj_obj_create_from_wkt) { EXPECT_NE(obj, nullptr); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, "GEOGCS[\"WGS 84\",\n" " DATUM[\"WGS_1984\",\n" @@ -233,7 +231,7 @@ TEST_F(CApi, proj_obj_create_from_wkt) { { PROJ_STRING_LIST warningList = nullptr; PROJ_STRING_LIST errorList = nullptr; - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, "GEOGCS[\"WGS 84\",\n" " DATUM[\"WGS_1984\",\n" @@ -251,7 +249,7 @@ TEST_F(CApi, proj_obj_create_from_wkt) { PROJ_STRING_LIST warningList = nullptr; PROJ_STRING_LIST errorList = nullptr; const char *const options[] = {"STRICT=NO", nullptr}; - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, "GEOGCS[\"WGS 84\",\n" " DATUM[\"WGS_1984\",\n" @@ -269,7 +267,7 @@ TEST_F(CApi, proj_obj_create_from_wkt) { { PROJ_STRING_LIST warningList = nullptr; PROJ_STRING_LIST errorList = nullptr; - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -283,7 +281,7 @@ TEST_F(CApi, proj_obj_create_from_wkt) { { PROJ_STRING_LIST warningList = nullptr; PROJ_STRING_LIST errorList = nullptr; - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, "PROJCS[\"test\",\n" " GEOGCS[\"WGS 84\",\n" " DATUM[\"WGS_1984\",\n" @@ -302,7 +300,7 @@ TEST_F(CApi, proj_obj_create_from_wkt) { proj_string_list_destroy(errorList); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, "PROJCS[\"test\",\n" " GEOGCS[\"WGS 84\",\n" " DATUM[\"WGS_1984\",\n" @@ -320,20 +318,19 @@ TEST_F(CApi, proj_obj_create_from_wkt) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_from_proj_string) { +TEST_F(CApi, proj_create_from_proj_string) { - EXPECT_EQ(proj_obj_create_from_proj_string(m_ctxt, "invalid", nullptr), + EXPECT_EQ(proj_create_from_proj_string(m_ctxt, "invalid", nullptr), nullptr); - auto obj = - proj_obj_create_from_proj_string(m_ctxt, "+proj=longlat", nullptr); + auto obj = proj_create_from_proj_string(m_ctxt, "+proj=longlat", nullptr); ObjectKeeper keeper(obj); EXPECT_NE(obj, nullptr); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_as_wkt) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_as_wkt) { + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -342,14 +339,13 @@ TEST_F(CApi, proj_obj_as_wkt) { ASSERT_NE(obj, nullptr); { - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT2_2018, nullptr); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2018, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("GEOGCRS[") == 0) << wkt; } { - auto wkt = - proj_obj_as_wkt(m_ctxt, obj, PJ_WKT2_2018_SIMPLIFIED, nullptr); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2018_SIMPLIFIED, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("GEOGCRS[") == 0) << wkt; EXPECT_TRUE(std::string(wkt).find("ANGULARUNIT[") == std::string::npos) @@ -357,14 +353,13 @@ TEST_F(CApi, proj_obj_as_wkt) { } { - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT2_2015, nullptr); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2015, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("GEODCRS[") == 0) << wkt; } { - auto wkt = - proj_obj_as_wkt(m_ctxt, obj, PJ_WKT2_2015_SIMPLIFIED, nullptr); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2015_SIMPLIFIED, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("GEODCRS[") == 0) << wkt; EXPECT_TRUE(std::string(wkt).find("ANGULARUNIT[") == std::string::npos) @@ -372,13 +367,13 @@ TEST_F(CApi, proj_obj_as_wkt) { } { - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, nullptr); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("GEOGCS[\"WGS 84\"") == 0) << wkt; } { - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_ESRI, nullptr); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT1_ESRI, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("GEOGCS[\"GCS_WGS_1984\"") == 0) << wkt; @@ -387,7 +382,7 @@ TEST_F(CApi, proj_obj_as_wkt) { // MULTILINE=NO { const char *const options[] = {"MULTILINE=NO", nullptr}; - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("\n") == std::string::npos) << wkt; } @@ -395,7 +390,7 @@ TEST_F(CApi, proj_obj_as_wkt) { // INDENTATION_WIDTH=2 { const char *const options[] = {"INDENTATION_WIDTH=2", nullptr}; - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("\n DATUM") != std::string::npos) << wkt; @@ -404,7 +399,7 @@ TEST_F(CApi, proj_obj_as_wkt) { // OUTPUT_AXIS=NO { const char *const options[] = {"OUTPUT_AXIS=NO", nullptr}; - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("AXIS") == std::string::npos) << wkt; } @@ -412,7 +407,7 @@ TEST_F(CApi, proj_obj_as_wkt) { // OUTPUT_AXIS=AUTO { const char *const options[] = {"OUTPUT_AXIS=AUTO", nullptr}; - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("AXIS") == std::string::npos) << wkt; } @@ -420,7 +415,7 @@ TEST_F(CApi, proj_obj_as_wkt) { // OUTPUT_AXIS=YES { const char *const options[] = {"OUTPUT_AXIS=YES", nullptr}; - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, options); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("AXIS") != std::string::npos) << wkt; } @@ -428,15 +423,15 @@ TEST_F(CApi, proj_obj_as_wkt) { // unsupported option { const char *const options[] = {"unsupported=yes", nullptr}; - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT2_2018, options); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2018, options); EXPECT_EQ(wkt, nullptr); } } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_as_wkt_check_db_use) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_as_wkt_check_db_use) { + auto obj = proj_create_from_wkt( m_ctxt, "GEOGCS[\"AGD66\",DATUM[\"Australian_Geodetic_Datum_1966\"," "SPHEROID[\"Australian National Spheroid\",6378160,298.25]]," "PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]]", @@ -444,7 +439,7 @@ TEST_F(CApi, proj_obj_as_wkt_check_db_use) { ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto wkt = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_ESRI, nullptr); + auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT1_ESRI, nullptr); EXPECT_EQ(std::string(wkt), "GEOGCS[\"GCS_Australian_1966\",DATUM[\"D_Australian_1966\"," "SPHEROID[\"Australian\",6378160.0,298.25]]," @@ -454,21 +449,21 @@ TEST_F(CApi, proj_obj_as_wkt_check_db_use) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_as_wkt_incompatible_WKT1) { +TEST_F(CApi, proj_as_wkt_incompatible_WKT1) { auto wkt = createBoundCRS()->exportToWKT(WKTFormatter::create().get()); - auto obj = proj_obj_create_from_wkt(m_ctxt, wkt.c_str(), nullptr, nullptr, - nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, wkt.c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr) << wkt; - auto wkt1_GDAL = proj_obj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, nullptr); + auto wkt1_GDAL = proj_as_wkt(m_ctxt, obj, PJ_WKT1_GDAL, nullptr); ASSERT_EQ(wkt1_GDAL, nullptr); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_as_proj_string) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_as_proj_string) { + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -477,7 +472,7 @@ TEST_F(CApi, proj_obj_as_proj_string) { ASSERT_NE(obj, nullptr); { - auto proj_5 = proj_obj_as_proj_string(m_ctxt, obj, PJ_PROJ_5, nullptr); + auto proj_5 = proj_as_proj_string(m_ctxt, obj, PJ_PROJ_5, nullptr); ASSERT_NE(proj_5, nullptr); EXPECT_EQ(std::string(proj_5), "+proj=pipeline +step +proj=longlat " "+ellps=WGS84 +step +proj=unitconvert " @@ -485,7 +480,7 @@ TEST_F(CApi, proj_obj_as_proj_string) { "+proj=axisswap +order=2,1"); } { - auto proj_4 = proj_obj_as_proj_string(m_ctxt, obj, PJ_PROJ_4, nullptr); + auto proj_4 = proj_as_proj_string(m_ctxt, obj, PJ_PROJ_4, nullptr); ASSERT_NE(proj_4, nullptr); EXPECT_EQ(std::string(proj_4), "+proj=longlat +datum=WGS84 +no_defs"); } @@ -493,27 +488,27 @@ TEST_F(CApi, proj_obj_as_proj_string) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_as_proj_string_incompatible_WKT1) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_as_proj_string_incompatible_WKT1) { + auto obj = proj_create_from_wkt( m_ctxt, createBoundCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto str = proj_obj_as_proj_string(m_ctxt, obj, PJ_PROJ_5, nullptr); + auto str = proj_as_proj_string(m_ctxt, obj, PJ_PROJ_5, nullptr); ASSERT_EQ(str, nullptr); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_as_proj_string_etmerc_option_yes) { - auto obj = proj_obj_create_from_proj_string(m_ctxt, "+proj=tmerc", nullptr); +TEST_F(CApi, proj_as_proj_string_etmerc_option_yes) { + auto obj = proj_create_from_proj_string(m_ctxt, "+proj=tmerc", nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); const char *options[] = {"USE_ETMERC=YES", nullptr}; - auto str = proj_obj_as_proj_string(m_ctxt, obj, PJ_PROJ_4, options); + auto str = proj_as_proj_string(m_ctxt, obj, PJ_PROJ_4, options); ASSERT_NE(str, nullptr); EXPECT_EQ(str, std::string("+proj=etmerc +lat_0=0 +lon_0=0 +k=1 +x_0=0 " "+y_0=0 +datum=WGS84 +units=m +no_defs")); @@ -521,14 +516,14 @@ TEST_F(CApi, proj_obj_as_proj_string_etmerc_option_yes) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_as_proj_string_etmerc_option_no) { +TEST_F(CApi, proj_as_proj_string_etmerc_option_no) { auto obj = - proj_obj_create_from_proj_string(m_ctxt, "+proj=utm +zone=31", nullptr); + proj_create_from_proj_string(m_ctxt, "+proj=utm +zone=31", nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); const char *options[] = {"USE_ETMERC=NO", nullptr}; - auto str = proj_obj_as_proj_string(m_ctxt, obj, PJ_PROJ_4, options); + auto str = proj_as_proj_string(m_ctxt, obj, PJ_PROJ_4, options); ASSERT_NE(str, nullptr); EXPECT_EQ(str, std::string("+proj=tmerc +lat_0=0 +lon_0=3 +k=0.9996 " "+x_0=500000 +y_0=0 +datum=WGS84 +units=m " @@ -537,17 +532,17 @@ TEST_F(CApi, proj_obj_as_proj_string_etmerc_option_no) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_crs_create_bound_crs_to_WGS84) { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "3844", PJ_OBJ_CATEGORY_CRS, false, nullptr); +TEST_F(CApi, proj_crs_create_bound_crs_to_WGS84) { + auto crs = proj_create_from_database(m_ctxt, "EPSG", "3844", + PJ_CATEGORY_CRS, false, nullptr); ObjectKeeper keeper(crs); ASSERT_NE(crs, nullptr); - auto res = proj_obj_crs_create_bound_crs_to_WGS84(m_ctxt, crs, nullptr); + auto res = proj_crs_create_bound_crs_to_WGS84(m_ctxt, crs, nullptr); ObjectKeeper keeper_res(res); ASSERT_NE(res, nullptr); - auto proj_4 = proj_obj_as_proj_string(m_ctxt, res, PJ_PROJ_4, nullptr); + auto proj_4 = proj_as_proj_string(m_ctxt, res, PJ_PROJ_4, nullptr); ASSERT_NE(proj_4, nullptr); EXPECT_EQ(std::string(proj_4), "+proj=sterea +lat_0=46 +lon_0=25 +k=0.99975 +x_0=500000 " @@ -555,15 +550,15 @@ TEST_F(CApi, proj_obj_crs_create_bound_crs_to_WGS84) { "+towgs84=2.329,-147.042,-92.08,-0.309,0.325,0.497,5.69 " "+units=m +no_defs"); - auto base_crs = proj_obj_get_source_crs(m_ctxt, res); + auto base_crs = proj_get_source_crs(m_ctxt, res); ObjectKeeper keeper_base_crs(base_crs); ASSERT_NE(base_crs, nullptr); - auto hub_crs = proj_obj_get_target_crs(m_ctxt, res); + auto hub_crs = proj_get_target_crs(m_ctxt, res); ObjectKeeper keeper_hub_crs(hub_crs); ASSERT_NE(hub_crs, nullptr); - auto transf = proj_obj_crs_get_coordoperation(m_ctxt, res); + auto transf = proj_crs_get_coordoperation(m_ctxt, res); ObjectKeeper keeper_transf(transf); ASSERT_NE(transf, nullptr); @@ -574,155 +569,154 @@ TEST_F(CApi, proj_obj_crs_create_bound_crs_to_WGS84) { 0.325, 0.497, 5.69}; EXPECT_EQ(values, expected); - auto res2 = - proj_obj_crs_create_bound_crs(m_ctxt, base_crs, hub_crs, transf); + auto res2 = proj_crs_create_bound_crs(m_ctxt, base_crs, hub_crs, transf); ObjectKeeper keeper_res2(res2); ASSERT_NE(res2, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(res, res2, PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(res, res2, PJ_COMP_STRICT)); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_crs_create_bound_crs_to_WGS84_on_invalid_type) { +TEST_F(CApi, proj_crs_create_bound_crs_to_WGS84_on_invalid_type) { auto wkt = createProjectedCRS()->derivingConversion()->exportToWKT( WKTFormatter::create().get()); - auto obj = proj_obj_create_from_wkt(m_ctxt, wkt.c_str(), nullptr, nullptr, - nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, wkt.c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr) << wkt; - auto res = proj_obj_crs_create_bound_crs_to_WGS84(m_ctxt, obj, nullptr); + auto res = proj_crs_create_bound_crs_to_WGS84(m_ctxt, obj, nullptr); ASSERT_EQ(res, nullptr); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_name) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_get_name) { + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto name = proj_obj_get_name(obj); + auto name = proj_get_name(obj); ASSERT_TRUE(name != nullptr); EXPECT_EQ(name, std::string("WGS 84")); - EXPECT_EQ(name, proj_obj_get_name(obj)); + EXPECT_EQ(name, proj_get_name(obj)); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_id_auth_name) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_get_id_auth_name) { + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto auth = proj_obj_get_id_auth_name(obj, 0); + auto auth = proj_get_id_auth_name(obj, 0); ASSERT_TRUE(auth != nullptr); EXPECT_EQ(auth, std::string("EPSG")); - EXPECT_EQ(auth, proj_obj_get_id_auth_name(obj, 0)); - EXPECT_EQ(proj_obj_get_id_auth_name(obj, -1), nullptr); - EXPECT_EQ(proj_obj_get_id_auth_name(obj, 1), nullptr); + EXPECT_EQ(auth, proj_get_id_auth_name(obj, 0)); + EXPECT_EQ(proj_get_id_auth_name(obj, -1), nullptr); + EXPECT_EQ(proj_get_id_auth_name(obj, 1), nullptr); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_id_code) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_get_id_code) { + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto code = proj_obj_get_id_code(obj, 0); + auto code = proj_get_id_code(obj, 0); ASSERT_TRUE(code != nullptr); EXPECT_EQ(code, std::string("4326")); - EXPECT_EQ(code, proj_obj_get_id_code(obj, 0)); - EXPECT_EQ(proj_obj_get_id_code(obj, -1), nullptr); - EXPECT_EQ(proj_obj_get_id_code(obj, 1), nullptr); + EXPECT_EQ(code, proj_get_id_code(obj, 0)); + EXPECT_EQ(proj_get_id_code(obj, -1), nullptr); + EXPECT_EQ(proj_get_id_code(obj, 1), nullptr); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_type) { +TEST_F(CApi, proj_get_type) { { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_GEOGRAPHIC_2D_CRS); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4979->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_GEOGRAPHIC_3D_CRS); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4978->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_GEOCENTRIC_CRS); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_GEOCENTRIC_CRS); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->datum() ->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_GEODETIC_REFERENCE_FRAME); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_GEODETIC_REFERENCE_FRAME); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->ellipsoid() ->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_ELLIPSOID); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_ELLIPSOID); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, createProjectedCRS() ->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_PROJECTED_CRS); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_PROJECTED_CRS); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, createVerticalCRS() ->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_VERTICAL_CRS); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_VERTICAL_CRS); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, createVerticalCRS() ->datum() ->exportToWKT(WKTFormatter::create().get()) @@ -730,10 +724,10 @@ TEST_F(CApi, proj_obj_get_type) { nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_VERTICAL_REFERENCE_FRAME); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_VERTICAL_REFERENCE_FRAME); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, createProjectedCRS() ->derivingConversion() ->exportToWKT(WKTFormatter::create().get()) @@ -741,19 +735,19 @@ TEST_F(CApi, proj_obj_get_type) { nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_CONVERSION); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_CONVERSION); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, createBoundCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_BOUND_CRS); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_BOUND_CRS); } { - auto obj = proj_obj_create_from_wkt( + auto obj = proj_create_from_wkt( m_ctxt, createBoundCRS() ->transformation() ->exportToWKT(WKTFormatter::create().get()) @@ -761,11 +755,11 @@ TEST_F(CApi, proj_obj_get_type) { nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_EQ(proj_obj_get_type(obj), PJ_OBJ_TYPE_TRANSFORMATION); + EXPECT_EQ(proj_get_type(obj), PJ_TYPE_TRANSFORMATION); } { - auto obj = proj_obj_create_from_wkt(m_ctxt, "AUTHORITY[\"EPSG\", 4326]", - nullptr, nullptr, nullptr); + auto obj = proj_create_from_wkt(m_ctxt, "AUTHORITY[\"EPSG\", 4326]", + nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_EQ(obj, nullptr); } @@ -773,63 +767,61 @@ TEST_F(CApi, proj_obj_get_type) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_from_database) { +TEST_F(CApi, proj_create_from_database) { { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "-1", PJ_OBJ_CATEGORY_CRS, false, nullptr); + auto crs = proj_create_from_database(m_ctxt, "EPSG", "-1", + PJ_CATEGORY_CRS, false, nullptr); ASSERT_EQ(crs, nullptr); } { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "4326", PJ_OBJ_CATEGORY_CRS, false, nullptr); + auto crs = proj_create_from_database(m_ctxt, "EPSG", "4326", + PJ_CATEGORY_CRS, false, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - EXPECT_TRUE(proj_obj_is_crs(crs)); - EXPECT_FALSE(proj_obj_is_deprecated(crs)); - EXPECT_EQ(proj_obj_get_type(crs), PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS); + EXPECT_TRUE(proj_is_crs(crs)); + EXPECT_FALSE(proj_is_deprecated(crs)); + EXPECT_EQ(proj_get_type(crs), PJ_TYPE_GEOGRAPHIC_2D_CRS); - const char *code = proj_obj_get_id_code(crs, 0); + const char *code = proj_get_id_code(crs, 0); ASSERT_NE(code, nullptr); EXPECT_EQ(std::string(code), "4326"); } { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "6871", PJ_OBJ_CATEGORY_CRS, false, nullptr); + auto crs = proj_create_from_database(m_ctxt, "EPSG", "6871", + PJ_CATEGORY_CRS, false, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - EXPECT_TRUE(proj_obj_is_crs(crs)); - EXPECT_EQ(proj_obj_get_type(crs), PJ_OBJ_TYPE_COMPOUND_CRS); + EXPECT_TRUE(proj_is_crs(crs)); + EXPECT_EQ(proj_get_type(crs), PJ_TYPE_COMPOUND_CRS); } { - auto ellipsoid = proj_obj_create_from_database( - m_ctxt, "EPSG", "7030", PJ_OBJ_CATEGORY_ELLIPSOID, false, nullptr); + auto ellipsoid = proj_create_from_database( + m_ctxt, "EPSG", "7030", PJ_CATEGORY_ELLIPSOID, false, nullptr); ASSERT_NE(ellipsoid, nullptr); ObjectKeeper keeper(ellipsoid); - EXPECT_EQ(proj_obj_get_type(ellipsoid), PJ_OBJ_TYPE_ELLIPSOID); + EXPECT_EQ(proj_get_type(ellipsoid), PJ_TYPE_ELLIPSOID); } { - auto pm = proj_obj_create_from_database(m_ctxt, "EPSG", "8903", - PJ_OBJ_CATEGORY_PRIME_MERIDIAN, - false, nullptr); + auto pm = proj_create_from_database( + m_ctxt, "EPSG", "8903", PJ_CATEGORY_PRIME_MERIDIAN, false, nullptr); ASSERT_NE(pm, nullptr); ObjectKeeper keeper(pm); - EXPECT_EQ(proj_obj_get_type(pm), PJ_OBJ_TYPE_PRIME_MERIDIAN); + EXPECT_EQ(proj_get_type(pm), PJ_TYPE_PRIME_MERIDIAN); } { - auto datum = proj_obj_create_from_database( - m_ctxt, "EPSG", "6326", PJ_OBJ_CATEGORY_DATUM, false, nullptr); + auto datum = proj_create_from_database( + m_ctxt, "EPSG", "6326", PJ_CATEGORY_DATUM, false, nullptr); ASSERT_NE(datum, nullptr); ObjectKeeper keeper(datum); - EXPECT_EQ(proj_obj_get_type(datum), - PJ_OBJ_TYPE_GEODETIC_REFERENCE_FRAME); + EXPECT_EQ(proj_get_type(datum), PJ_TYPE_GEODETIC_REFERENCE_FRAME); } { - auto op = proj_obj_create_from_database( - m_ctxt, "EPSG", "16031", PJ_OBJ_CATEGORY_COORDINATE_OPERATION, - false, nullptr); + auto op = proj_create_from_database(m_ctxt, "EPSG", "16031", + PJ_CATEGORY_COORDINATE_OPERATION, + false, nullptr); ASSERT_NE(op, nullptr); ObjectKeeper keeper(op); - EXPECT_EQ(proj_obj_get_type(op), PJ_OBJ_TYPE_CONVERSION); + EXPECT_EQ(proj_get_type(op), PJ_TYPE_CONVERSION); auto info = proj_pj_info(op); EXPECT_NE(info.id, nullptr); @@ -841,12 +833,12 @@ TEST_F(CApi, proj_obj_create_from_database) { EXPECT_EQ(info.accuracy, 0); } { - auto op = proj_obj_create_from_database( - m_ctxt, "EPSG", "1024", PJ_OBJ_CATEGORY_COORDINATE_OPERATION, false, + auto op = proj_create_from_database( + m_ctxt, "EPSG", "1024", PJ_CATEGORY_COORDINATE_OPERATION, false, nullptr); ASSERT_NE(op, nullptr); ObjectKeeper keeper(op); - EXPECT_EQ(proj_obj_get_type(op), PJ_OBJ_TYPE_TRANSFORMATION); + EXPECT_EQ(proj_get_type(op), PJ_TYPE_TRANSFORMATION); auto info = proj_pj_info(op); EXPECT_NE(info.id, nullptr); @@ -870,7 +862,7 @@ TEST_F(CApi, proj_obj_create_from_database) { // --------------------------------------------------------------------------- TEST_F(CApi, proj_crs) { - auto crs = proj_obj_create_from_wkt( + auto crs = proj_create_from_wkt( m_ctxt, createProjectedCRS() ->exportToWKT( @@ -879,67 +871,67 @@ TEST_F(CApi, proj_crs) { nullptr, nullptr, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - EXPECT_TRUE(proj_obj_is_crs(crs)); + EXPECT_TRUE(proj_is_crs(crs)); - auto geodCRS = proj_obj_crs_get_geodetic_crs(m_ctxt, crs); + auto geodCRS = proj_crs_get_geodetic_crs(m_ctxt, crs); ASSERT_NE(geodCRS, nullptr); ObjectKeeper keeper_geogCRS(geodCRS); - EXPECT_TRUE(proj_obj_is_crs(geodCRS)); - auto geogCRS_name = proj_obj_get_name(geodCRS); + EXPECT_TRUE(proj_is_crs(geodCRS)); + auto geogCRS_name = proj_get_name(geodCRS); ASSERT_TRUE(geogCRS_name != nullptr); EXPECT_EQ(geogCRS_name, std::string("WGS 84")); - auto h_datum = proj_obj_crs_get_horizontal_datum(m_ctxt, crs); + auto h_datum = proj_crs_get_horizontal_datum(m_ctxt, crs); ASSERT_NE(h_datum, nullptr); ObjectKeeper keeper_h_datum(h_datum); - auto datum = proj_obj_crs_get_datum(m_ctxt, crs); + auto datum = proj_crs_get_datum(m_ctxt, crs); ASSERT_NE(datum, nullptr); ObjectKeeper keeper_datum(datum); - EXPECT_TRUE(proj_obj_is_equivalent_to(h_datum, datum, PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(h_datum, datum, PJ_COMP_STRICT)); - auto datum_name = proj_obj_get_name(datum); + auto datum_name = proj_get_name(datum); ASSERT_TRUE(datum_name != nullptr); EXPECT_EQ(datum_name, std::string("World Geodetic System 1984")); - auto ellipsoid = proj_obj_get_ellipsoid(m_ctxt, crs); + auto ellipsoid = proj_get_ellipsoid(m_ctxt, crs); ASSERT_NE(ellipsoid, nullptr); ObjectKeeper keeper_ellipsoid(ellipsoid); - auto ellipsoid_name = proj_obj_get_name(ellipsoid); + auto ellipsoid_name = proj_get_name(ellipsoid); ASSERT_TRUE(ellipsoid_name != nullptr); EXPECT_EQ(ellipsoid_name, std::string("WGS 84")); - auto ellipsoid_from_datum = proj_obj_get_ellipsoid(m_ctxt, datum); + auto ellipsoid_from_datum = proj_get_ellipsoid(m_ctxt, datum); ASSERT_NE(ellipsoid_from_datum, nullptr); ObjectKeeper keeper_ellipsoid_from_datum(ellipsoid_from_datum); - EXPECT_EQ(proj_obj_get_ellipsoid(m_ctxt, ellipsoid), nullptr); - EXPECT_FALSE(proj_obj_is_crs(ellipsoid)); + EXPECT_EQ(proj_get_ellipsoid(m_ctxt, ellipsoid), nullptr); + EXPECT_FALSE(proj_is_crs(ellipsoid)); double a; double b; int b_is_computed; double rf; - EXPECT_TRUE(proj_obj_ellipsoid_get_parameters(m_ctxt, ellipsoid, nullptr, - nullptr, nullptr, nullptr)); - EXPECT_TRUE(proj_obj_ellipsoid_get_parameters(m_ctxt, ellipsoid, &a, &b, - &b_is_computed, &rf)); - EXPECT_FALSE(proj_obj_ellipsoid_get_parameters(m_ctxt, crs, &a, &b, - &b_is_computed, &rf)); + EXPECT_TRUE(proj_ellipsoid_get_parameters(m_ctxt, ellipsoid, nullptr, + nullptr, nullptr, nullptr)); + EXPECT_TRUE(proj_ellipsoid_get_parameters(m_ctxt, ellipsoid, &a, &b, + &b_is_computed, &rf)); + EXPECT_FALSE(proj_ellipsoid_get_parameters(m_ctxt, crs, &a, &b, + &b_is_computed, &rf)); EXPECT_EQ(a, 6378137); EXPECT_NEAR(b, 6356752.31424518, 1e-9); EXPECT_EQ(b_is_computed, 1); EXPECT_EQ(rf, 298.257223563); - auto id = proj_obj_get_id_code(ellipsoid, 0); + auto id = proj_get_id_code(ellipsoid, 0); ASSERT_TRUE(id != nullptr); EXPECT_EQ(id, std::string("7030")); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_prime_meridian) { - auto crs = proj_obj_create_from_wkt( +TEST_F(CApi, proj_get_prime_meridian) { + auto crs = proj_create_from_wkt( m_ctxt, createProjectedCRS() ->exportToWKT( @@ -949,31 +941,31 @@ TEST_F(CApi, proj_obj_get_prime_meridian) { ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - auto pm = proj_obj_get_prime_meridian(m_ctxt, crs); + auto pm = proj_get_prime_meridian(m_ctxt, crs); ASSERT_NE(pm, nullptr); ObjectKeeper keeper_pm(pm); - auto pm_name = proj_obj_get_name(pm); + auto pm_name = proj_get_name(pm); ASSERT_TRUE(pm_name != nullptr); EXPECT_EQ(pm_name, std::string("Greenwich")); - EXPECT_EQ(proj_obj_get_prime_meridian(m_ctxt, pm), nullptr); + EXPECT_EQ(proj_get_prime_meridian(m_ctxt, pm), nullptr); - EXPECT_TRUE(proj_obj_prime_meridian_get_parameters(m_ctxt, pm, nullptr, - nullptr, nullptr)); + EXPECT_TRUE(proj_prime_meridian_get_parameters(m_ctxt, pm, nullptr, nullptr, + nullptr)); double longitude = -1; double longitude_unit = 0; const char *longitude_unit_name = nullptr; - EXPECT_TRUE(proj_obj_prime_meridian_get_parameters( + EXPECT_TRUE(proj_prime_meridian_get_parameters( m_ctxt, pm, &longitude, &longitude_unit, &longitude_unit_name)); EXPECT_EQ(longitude, 0); EXPECT_NEAR(longitude_unit, UnitOfMeasure::DEGREE.conversionToSI(), 1e-10); ASSERT_TRUE(longitude_unit_name != nullptr); EXPECT_EQ(longitude_unit_name, std::string("degree")); - auto datum = proj_obj_crs_get_horizontal_datum(m_ctxt, crs); + auto datum = proj_crs_get_horizontal_datum(m_ctxt, crs); ASSERT_NE(datum, nullptr); ObjectKeeper keeper_datum(datum); - auto pm_from_datum = proj_obj_get_prime_meridian(m_ctxt, datum); + auto pm_from_datum = proj_get_prime_meridian(m_ctxt, datum); ASSERT_NE(pm_from_datum, nullptr); ObjectKeeper keeper_pm_from_datum(pm_from_datum); } @@ -981,54 +973,54 @@ TEST_F(CApi, proj_obj_get_prime_meridian) { // --------------------------------------------------------------------------- TEST_F(CApi, proj_crs_compound) { - auto crs = proj_obj_create_from_wkt( + auto crs = proj_create_from_wkt( m_ctxt, createCompoundCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - EXPECT_EQ(proj_obj_get_type(crs), PJ_OBJ_TYPE_COMPOUND_CRS); + EXPECT_EQ(proj_get_type(crs), PJ_TYPE_COMPOUND_CRS); - EXPECT_EQ(proj_obj_crs_get_sub_crs(m_ctxt, crs, -1), nullptr); - EXPECT_EQ(proj_obj_crs_get_sub_crs(m_ctxt, crs, 2), nullptr); + EXPECT_EQ(proj_crs_get_sub_crs(m_ctxt, crs, -1), nullptr); + EXPECT_EQ(proj_crs_get_sub_crs(m_ctxt, crs, 2), nullptr); - auto subcrs_horiz = proj_obj_crs_get_sub_crs(m_ctxt, crs, 0); + auto subcrs_horiz = proj_crs_get_sub_crs(m_ctxt, crs, 0); ASSERT_NE(subcrs_horiz, nullptr); ObjectKeeper keeper_subcrs_horiz(subcrs_horiz); - EXPECT_EQ(proj_obj_get_type(subcrs_horiz), PJ_OBJ_TYPE_PROJECTED_CRS); - EXPECT_EQ(proj_obj_crs_get_sub_crs(m_ctxt, subcrs_horiz, 0), nullptr); + EXPECT_EQ(proj_get_type(subcrs_horiz), PJ_TYPE_PROJECTED_CRS); + EXPECT_EQ(proj_crs_get_sub_crs(m_ctxt, subcrs_horiz, 0), nullptr); - auto subcrs_vertical = proj_obj_crs_get_sub_crs(m_ctxt, crs, 1); + auto subcrs_vertical = proj_crs_get_sub_crs(m_ctxt, crs, 1); ASSERT_NE(subcrs_vertical, nullptr); ObjectKeeper keeper_subcrs_vertical(subcrs_vertical); - EXPECT_EQ(proj_obj_get_type(subcrs_vertical), PJ_OBJ_TYPE_VERTICAL_CRS); + EXPECT_EQ(proj_get_type(subcrs_vertical), PJ_TYPE_VERTICAL_CRS); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_source_target_crs_bound_crs) { - auto crs = proj_obj_create_from_wkt( +TEST_F(CApi, proj_get_source_target_crs_bound_crs) { + auto crs = proj_create_from_wkt( m_ctxt, createBoundCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - auto sourceCRS = proj_obj_get_source_crs(m_ctxt, crs); + auto sourceCRS = proj_get_source_crs(m_ctxt, crs); ASSERT_NE(sourceCRS, nullptr); ObjectKeeper keeper_sourceCRS(sourceCRS); - EXPECT_EQ(std::string(proj_obj_get_name(sourceCRS)), "NTF (Paris)"); + EXPECT_EQ(std::string(proj_get_name(sourceCRS)), "NTF (Paris)"); - auto targetCRS = proj_obj_get_target_crs(m_ctxt, crs); + auto targetCRS = proj_get_target_crs(m_ctxt, crs); ASSERT_NE(targetCRS, nullptr); ObjectKeeper keeper_targetCRS(targetCRS); - EXPECT_EQ(std::string(proj_obj_get_name(targetCRS)), "WGS 84"); + EXPECT_EQ(std::string(proj_get_name(targetCRS)), "WGS 84"); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_source_target_crs_transformation) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_get_source_target_crs_transformation) { + auto obj = proj_create_from_wkt( m_ctxt, createBoundCRS() ->transformation() ->exportToWKT(WKTFormatter::create().get()) @@ -1037,62 +1029,62 @@ TEST_F(CApi, proj_obj_get_source_target_crs_transformation) { ASSERT_NE(obj, nullptr); ObjectKeeper keeper(obj); - auto sourceCRS = proj_obj_get_source_crs(m_ctxt, obj); + auto sourceCRS = proj_get_source_crs(m_ctxt, obj); ASSERT_NE(sourceCRS, nullptr); ObjectKeeper keeper_sourceCRS(sourceCRS); - EXPECT_EQ(std::string(proj_obj_get_name(sourceCRS)), "NTF (Paris)"); + EXPECT_EQ(std::string(proj_get_name(sourceCRS)), "NTF (Paris)"); - auto targetCRS = proj_obj_get_target_crs(m_ctxt, obj); + auto targetCRS = proj_get_target_crs(m_ctxt, obj); ASSERT_NE(targetCRS, nullptr); ObjectKeeper keeper_targetCRS(targetCRS); - EXPECT_EQ(std::string(proj_obj_get_name(targetCRS)), "WGS 84"); + EXPECT_EQ(std::string(proj_get_name(targetCRS)), "WGS 84"); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_source_crs_of_projected_crs) { - auto crs = proj_obj_create_from_wkt( +TEST_F(CApi, proj_get_source_crs_of_projected_crs) { + auto crs = proj_create_from_wkt( m_ctxt, createProjectedCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - auto sourceCRS = proj_obj_get_source_crs(m_ctxt, crs); + auto sourceCRS = proj_get_source_crs(m_ctxt, crs); ASSERT_NE(sourceCRS, nullptr); ObjectKeeper keeper_sourceCRS(sourceCRS); - EXPECT_EQ(std::string(proj_obj_get_name(sourceCRS)), "WGS 84"); + EXPECT_EQ(std::string(proj_get_name(sourceCRS)), "WGS 84"); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_source_target_crs_conversion_without_crs) { - auto obj = proj_obj_create_from_database( - m_ctxt, "EPSG", "16031", PJ_OBJ_CATEGORY_COORDINATE_OPERATION, false, - nullptr); +TEST_F(CApi, proj_get_source_target_crs_conversion_without_crs) { + auto obj = proj_create_from_database(m_ctxt, "EPSG", "16031", + PJ_CATEGORY_COORDINATE_OPERATION, + false, nullptr); ASSERT_NE(obj, nullptr); ObjectKeeper keeper(obj); - auto sourceCRS = proj_obj_get_source_crs(m_ctxt, obj); + auto sourceCRS = proj_get_source_crs(m_ctxt, obj); ASSERT_EQ(sourceCRS, nullptr); - auto targetCRS = proj_obj_get_target_crs(m_ctxt, obj); + auto targetCRS = proj_get_target_crs(m_ctxt, obj); ASSERT_EQ(targetCRS, nullptr); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_source_target_crs_invalid_object) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_get_source_target_crs_invalid_object) { + auto obj = proj_create_from_wkt( m_ctxt, "ELLIPSOID[\"WGS 84\",6378137,298.257223563]", nullptr, nullptr, nullptr); ASSERT_NE(obj, nullptr); ObjectKeeper keeper(obj); - auto sourceCRS = proj_obj_get_source_crs(m_ctxt, obj); + auto sourceCRS = proj_get_source_crs(m_ctxt, obj); ASSERT_EQ(sourceCRS, nullptr); - auto targetCRS = proj_obj_get_target_crs(m_ctxt, obj); + auto targetCRS = proj_get_target_crs(m_ctxt, obj); ASSERT_EQ(targetCRS, nullptr); } @@ -1130,40 +1122,40 @@ TEST_F(CApi, proj_get_authorities_from_database) { TEST_F(CApi, proj_get_codes_from_database) { auto listTypes = - std::vector<PJ_OBJ_TYPE>{PJ_OBJ_TYPE_ELLIPSOID, - - PJ_OBJ_TYPE_PRIME_MERIDIAN, - - PJ_OBJ_TYPE_GEODETIC_REFERENCE_FRAME, - PJ_OBJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME, - PJ_OBJ_TYPE_VERTICAL_REFERENCE_FRAME, - PJ_OBJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME, - PJ_OBJ_TYPE_DATUM_ENSEMBLE, - - PJ_OBJ_TYPE_CRS, - PJ_OBJ_TYPE_GEODETIC_CRS, - PJ_OBJ_TYPE_GEOCENTRIC_CRS, - PJ_OBJ_TYPE_GEOGRAPHIC_CRS, - PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS, - PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS, - PJ_OBJ_TYPE_VERTICAL_CRS, - PJ_OBJ_TYPE_PROJECTED_CRS, - PJ_OBJ_TYPE_COMPOUND_CRS, - PJ_OBJ_TYPE_TEMPORAL_CRS, - PJ_OBJ_TYPE_BOUND_CRS, - PJ_OBJ_TYPE_OTHER_CRS, - - PJ_OBJ_TYPE_CONVERSION, - PJ_OBJ_TYPE_TRANSFORMATION, - PJ_OBJ_TYPE_CONCATENATED_OPERATION, - PJ_OBJ_TYPE_OTHER_COORDINATE_OPERATION, - - PJ_OBJ_TYPE_UNKNOWN}; + std::vector<PJ_TYPE>{PJ_TYPE_ELLIPSOID, + + PJ_TYPE_PRIME_MERIDIAN, + + PJ_TYPE_GEODETIC_REFERENCE_FRAME, + PJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME, + PJ_TYPE_VERTICAL_REFERENCE_FRAME, + PJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME, + PJ_TYPE_DATUM_ENSEMBLE, + + PJ_TYPE_CRS, + PJ_TYPE_GEODETIC_CRS, + PJ_TYPE_GEOCENTRIC_CRS, + PJ_TYPE_GEOGRAPHIC_CRS, + PJ_TYPE_GEOGRAPHIC_2D_CRS, + PJ_TYPE_GEOGRAPHIC_3D_CRS, + PJ_TYPE_VERTICAL_CRS, + PJ_TYPE_PROJECTED_CRS, + PJ_TYPE_COMPOUND_CRS, + PJ_TYPE_TEMPORAL_CRS, + PJ_TYPE_BOUND_CRS, + PJ_TYPE_OTHER_CRS, + + PJ_TYPE_CONVERSION, + PJ_TYPE_TRANSFORMATION, + PJ_TYPE_CONCATENATED_OPERATION, + PJ_TYPE_OTHER_COORDINATE_OPERATION, + + PJ_TYPE_UNKNOWN}; for (const auto &type : listTypes) { auto list = proj_get_codes_from_database(m_ctxt, "EPSG", type, true); ListFreer feer(list); - if (type == PJ_OBJ_TYPE_TEMPORAL_CRS || type == PJ_OBJ_TYPE_BOUND_CRS || - type == PJ_OBJ_TYPE_UNKNOWN) { + if (type == PJ_TYPE_TEMPORAL_CRS || type == PJ_TYPE_BOUND_CRS || + type == PJ_TYPE_UNKNOWN) { EXPECT_EQ(list, nullptr) << type; } else { ASSERT_NE(list, nullptr) << type; @@ -1175,8 +1167,8 @@ TEST_F(CApi, proj_get_codes_from_database) { // --------------------------------------------------------------------------- TEST_F(CApi, conversion) { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "32631", PJ_OBJ_CATEGORY_CRS, false, nullptr); + auto crs = proj_create_from_database(m_ctxt, "EPSG", "32631", + PJ_CATEGORY_CRS, false, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); @@ -1185,14 +1177,14 @@ TEST_F(CApi, conversion) { nullptr, nullptr)); { - auto conv = proj_obj_crs_get_coordoperation(m_ctxt, crs); + auto conv = proj_crs_get_coordoperation(m_ctxt, crs); ASSERT_NE(conv, nullptr); ObjectKeeper keeper_conv(conv); - ASSERT_EQ(proj_obj_crs_get_coordoperation(m_ctxt, conv), nullptr); + ASSERT_EQ(proj_crs_get_coordoperation(m_ctxt, conv), nullptr); } - auto conv = proj_obj_crs_get_coordoperation(m_ctxt, crs); + auto conv = proj_crs_get_coordoperation(m_ctxt, crs); ASSERT_NE(conv, nullptr); ObjectKeeper keeper_conv(conv); @@ -1260,14 +1252,14 @@ TEST_F(CApi, conversion) { // --------------------------------------------------------------------------- TEST_F(CApi, transformation_from_boundCRS) { - auto crs = proj_obj_create_from_wkt( + auto crs = proj_create_from_wkt( m_ctxt, createBoundCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - auto transf = proj_obj_crs_get_coordoperation(m_ctxt, crs); + auto transf = proj_crs_get_coordoperation(m_ctxt, crs); ASSERT_NE(transf, nullptr); ObjectKeeper keeper_transf(transf); } @@ -1275,9 +1267,9 @@ TEST_F(CApi, transformation_from_boundCRS) { // --------------------------------------------------------------------------- TEST_F(CApi, proj_coordoperation_get_grid_used) { - auto op = proj_obj_create_from_database( - m_ctxt, "EPSG", "1312", PJ_OBJ_CATEGORY_COORDINATE_OPERATION, true, - nullptr); + auto op = proj_create_from_database(m_ctxt, "EPSG", "1312", + PJ_CATEGORY_COORDINATE_OPERATION, true, + nullptr); ASSERT_NE(op, nullptr); ObjectKeeper keeper(op); @@ -1318,9 +1310,9 @@ TEST_F(CApi, proj_coordoperation_get_grid_used) { // --------------------------------------------------------------------------- TEST_F(CApi, proj_coordoperation_is_instanciable) { - auto op = proj_obj_create_from_database( - m_ctxt, "EPSG", "1671", PJ_OBJ_CATEGORY_COORDINATE_OPERATION, true, - nullptr); + auto op = proj_create_from_database(m_ctxt, "EPSG", "1671", + PJ_CATEGORY_COORDINATE_OPERATION, true, + nullptr); ASSERT_NE(op, nullptr); ObjectKeeper keeper(op); EXPECT_EQ(proj_coordoperation_is_instanciable(m_ctxt, op), 1); @@ -1328,18 +1320,18 @@ TEST_F(CApi, proj_coordoperation_is_instanciable) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_operations) { +TEST_F(CApi, proj_create_operations) { auto ctxt = proj_create_operation_factory_context(m_ctxt, nullptr); ASSERT_NE(ctxt, nullptr); ContextKeeper keeper_ctxt(ctxt); - auto source_crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "4267", PJ_OBJ_CATEGORY_CRS, false, nullptr); // NAD27 + auto source_crs = proj_create_from_database( + m_ctxt, "EPSG", "4267", PJ_CATEGORY_CRS, false, nullptr); // NAD27 ASSERT_NE(source_crs, nullptr); ObjectKeeper keeper_source_crs(source_crs); - auto target_crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "4269", PJ_OBJ_CATEGORY_CRS, false, nullptr); // NAD83 + auto target_crs = proj_create_from_database( + m_ctxt, "EPSG", "4269", PJ_CATEGORY_CRS, false, nullptr); // NAD83 ASSERT_NE(target_crs, nullptr); ObjectKeeper keeper_target_crs(target_crs); @@ -1349,33 +1341,32 @@ TEST_F(CApi, proj_obj_create_operations) { proj_operation_factory_context_set_grid_availability_use( m_ctxt, ctxt, PROJ_GRID_AVAILABILITY_IGNORED); - auto res = proj_obj_create_operations(m_ctxt, source_crs, target_crs, ctxt); + auto res = proj_create_operations(m_ctxt, source_crs, target_crs, ctxt); ASSERT_NE(res, nullptr); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 7); + EXPECT_EQ(proj_list_get_count(res), 7); - EXPECT_EQ(proj_obj_list_get(m_ctxt, res, -1), nullptr); - EXPECT_EQ(proj_obj_list_get(m_ctxt, res, proj_obj_list_get_count(res)), - nullptr); - auto op = proj_obj_list_get(m_ctxt, res, 0); + EXPECT_EQ(proj_list_get(m_ctxt, res, -1), nullptr); + EXPECT_EQ(proj_list_get(m_ctxt, res, proj_list_get_count(res)), nullptr); + auto op = proj_list_get(m_ctxt, res, 0); ASSERT_NE(op, nullptr); ObjectKeeper keeper_op(op); - EXPECT_EQ(proj_obj_get_name(op), std::string("NAD27 to NAD83 (3)")); + EXPECT_EQ(proj_get_name(op), std::string("NAD27 to NAD83 (3)")); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_operations_with_pivot) { +TEST_F(CApi, proj_create_operations_with_pivot) { - auto source_crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "4326", PJ_OBJ_CATEGORY_CRS, false, nullptr); // WGS84 + auto source_crs = proj_create_from_database( + m_ctxt, "EPSG", "4326", PJ_CATEGORY_CRS, false, nullptr); // WGS84 ASSERT_NE(source_crs, nullptr); ObjectKeeper keeper_source_crs(source_crs); - auto target_crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "6668", PJ_OBJ_CATEGORY_CRS, false, nullptr); // JGD2011 + auto target_crs = proj_create_from_database( + m_ctxt, "EPSG", "6668", PJ_CATEGORY_CRS, false, nullptr); // JGD2011 ASSERT_NE(target_crs, nullptr); ObjectKeeper keeper_target_crs(target_crs); @@ -1387,17 +1378,16 @@ TEST_F(CApi, proj_obj_create_operations_with_pivot) { ASSERT_NE(ctxt, nullptr); ContextKeeper keeper_ctxt(ctxt); - auto res = - proj_obj_create_operations(m_ctxt, source_crs, target_crs, ctxt); + auto res = proj_create_operations(m_ctxt, source_crs, target_crs, ctxt); ASSERT_NE(res, nullptr); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 1); - auto op = proj_obj_list_get(m_ctxt, res, 0); + EXPECT_EQ(proj_list_get_count(res), 1); + auto op = proj_list_get(m_ctxt, res, 0); ASSERT_NE(op, nullptr); ObjectKeeper keeper_op(op); EXPECT_EQ( - proj_obj_get_name(op), + proj_get_name(op), std::string( "Inverse of JGD2000 to WGS 84 (1) + JGD2000 to JGD2011 (2)")); } @@ -1410,16 +1400,15 @@ TEST_F(CApi, proj_obj_create_operations_with_pivot) { proj_operation_factory_context_set_allow_use_intermediate_crs( m_ctxt, ctxt, false); - auto res = - proj_obj_create_operations(m_ctxt, source_crs, target_crs, ctxt); + auto res = proj_create_operations(m_ctxt, source_crs, target_crs, ctxt); ASSERT_NE(res, nullptr); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 1); - auto op = proj_obj_list_get(m_ctxt, res, 0); + EXPECT_EQ(proj_list_get_count(res), 1); + auto op = proj_list_get(m_ctxt, res, 0); ASSERT_NE(op, nullptr); ObjectKeeper keeper_op(op); - EXPECT_EQ(proj_obj_get_name(op), + EXPECT_EQ(proj_get_name(op), std::string("Null geographic offset from WGS 84 to JGD2011")); } @@ -1437,17 +1426,16 @@ TEST_F(CApi, proj_obj_create_operations_with_pivot) { proj_operation_factory_context_set_grid_availability_use( m_ctxt, ctxt, PROJ_GRID_AVAILABILITY_IGNORED); - auto res = - proj_obj_create_operations(m_ctxt, source_crs, target_crs, ctxt); + auto res = proj_create_operations(m_ctxt, source_crs, target_crs, ctxt); ASSERT_NE(res, nullptr); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 7); - auto op = proj_obj_list_get(m_ctxt, res, 1); + EXPECT_EQ(proj_list_get_count(res), 7); + auto op = proj_list_get(m_ctxt, res, 1); ASSERT_NE(op, nullptr); ObjectKeeper keeper_op(op); EXPECT_EQ( - proj_obj_get_name(op), + proj_get_name(op), std::string( "Inverse of Tokyo to WGS 84 (108) + Tokyo to JGD2011 (2)")); } @@ -1466,18 +1454,17 @@ TEST_F(CApi, proj_obj_create_operations_with_pivot) { proj_operation_factory_context_set_grid_availability_use( m_ctxt, ctxt, PROJ_GRID_AVAILABILITY_IGNORED); - auto res = - proj_obj_create_operations(m_ctxt, source_crs, target_crs, ctxt); + auto res = proj_create_operations(m_ctxt, source_crs, target_crs, ctxt); ASSERT_NE(res, nullptr); ObjListKeeper keeper_res(res); // includes results from ESRI - EXPECT_EQ(proj_obj_list_get_count(res), 5); - auto op = proj_obj_list_get(m_ctxt, res, 0); + EXPECT_EQ(proj_list_get_count(res), 5); + auto op = proj_list_get(m_ctxt, res, 0); ASSERT_NE(op, nullptr); ObjectKeeper keeper_op(op); EXPECT_EQ( - proj_obj_get_name(op), + proj_get_name(op), std::string( "Inverse of JGD2000 to WGS 84 (1) + JGD2000 to JGD2011 (2)")); } @@ -1489,9 +1476,9 @@ TEST_F(CApi, proj_context_set_database_path_null) { EXPECT_TRUE( proj_context_set_database_path(m_ctxt, nullptr, nullptr, nullptr)); - auto source_crs = proj_obj_create_from_database(m_ctxt, "EPSG", "4326", - PJ_OBJ_CATEGORY_CRS, false, - nullptr); // WGS84 + auto source_crs = proj_create_from_database(m_ctxt, "EPSG", "4326", + PJ_CATEGORY_CRS, false, + nullptr); // WGS84 ASSERT_NE(source_crs, nullptr); ObjectKeeper keeper_source_crs(source_crs); } @@ -1516,9 +1503,9 @@ TEST_F(CApi, proj_context_set_database_path_main_memory_one_aux) { EXPECT_TRUE(proj_context_set_database_path(m_ctxt, ":memory:", aux_db_list, nullptr)); - auto source_crs = proj_obj_create_from_database(m_ctxt, "EPSG", "4326", - PJ_OBJ_CATEGORY_CRS, false, - nullptr); // WGS84 + auto source_crs = proj_create_from_database(m_ctxt, "EPSG", "4326", + PJ_CATEGORY_CRS, false, + nullptr); // WGS84 ASSERT_NE(source_crs, nullptr); ObjectKeeper keeper_source_crs(source_crs); } @@ -1531,9 +1518,9 @@ TEST_F(CApi, proj_context_set_database_path_error_1) { nullptr, nullptr)); // We will eventually re-open on the default DB - auto source_crs = proj_obj_create_from_database(m_ctxt, "EPSG", "4326", - PJ_OBJ_CATEGORY_CRS, false, - nullptr); // WGS84 + auto source_crs = proj_create_from_database(m_ctxt, "EPSG", "4326", + PJ_CATEGORY_CRS, false, + nullptr); // WGS84 ASSERT_NE(source_crs, nullptr); ObjectKeeper keeper_source_crs(source_crs); } @@ -1547,9 +1534,9 @@ TEST_F(CApi, proj_context_set_database_path_error_2) { proj_context_set_database_path(m_ctxt, nullptr, aux_db_list, nullptr)); // We will eventually re-open on the default DB - auto source_crs = proj_obj_create_from_database(m_ctxt, "EPSG", "4326", - PJ_OBJ_CATEGORY_CRS, false, - nullptr); // WGS84 + auto source_crs = proj_create_from_database(m_ctxt, "EPSG", "4326", + PJ_CATEGORY_CRS, false, + nullptr); // WGS84 ASSERT_NE(source_crs, nullptr); ObjectKeeper keeper_source_crs(source_crs); } @@ -1596,46 +1583,45 @@ TEST_F(CApi, proj_context_guess_wkt_dialect) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_from_name) { +TEST_F(CApi, proj_create_from_name) { /* - PJ_OBJ_LIST PROJ_DLL *proj_obj_create_from_name( + PJ_OBJ_LIST PROJ_DLL *proj_create_from_name( PJ_CONTEXT *ctx, const char *auth_name, const char *searchedName, - const PJ_OBJ_TYPE* types, + const PJ_TYPE* types, size_t typesCount, int approximateMatch, size_t limitResultCount, const char* const *options); */ { - auto res = proj_obj_create_from_name(m_ctxt, nullptr, "WGS 84", nullptr, - 0, false, 0, nullptr); + auto res = proj_create_from_name(m_ctxt, nullptr, "WGS 84", nullptr, 0, + false, 0, nullptr); ASSERT_NE(res, nullptr); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 4); + EXPECT_EQ(proj_list_get_count(res), 4); } { - auto res = proj_obj_create_from_name(m_ctxt, "xx", "WGS 84", nullptr, 0, - false, 0, nullptr); + auto res = proj_create_from_name(m_ctxt, "xx", "WGS 84", nullptr, 0, + false, 0, nullptr); ASSERT_NE(res, nullptr); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 0); + EXPECT_EQ(proj_list_get_count(res), 0); } { - const PJ_OBJ_TYPE types[] = {PJ_OBJ_TYPE_GEODETIC_CRS, - PJ_OBJ_TYPE_PROJECTED_CRS}; - auto res = proj_obj_create_from_name(m_ctxt, nullptr, "WGS 84", types, - 2, true, 10, nullptr); + const PJ_TYPE types[] = {PJ_TYPE_GEODETIC_CRS, PJ_TYPE_PROJECTED_CRS}; + auto res = proj_create_from_name(m_ctxt, nullptr, "WGS 84", types, 2, + true, 10, nullptr); ASSERT_NE(res, nullptr); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 10); + EXPECT_EQ(proj_list_get_count(res), 10); } } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_identify) { - auto obj = proj_obj_create_from_wkt( +TEST_F(CApi, proj_identify) { + auto obj = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4807->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -1643,28 +1629,27 @@ TEST_F(CApi, proj_obj_identify) { ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); { - auto res = proj_obj_identify(m_ctxt, obj, nullptr, nullptr, nullptr); + auto res = proj_identify(m_ctxt, obj, nullptr, nullptr, nullptr); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 1); + EXPECT_EQ(proj_list_get_count(res), 1); } { int *confidence = nullptr; - auto res = proj_obj_identify(m_ctxt, obj, "EPSG", nullptr, &confidence); + auto res = proj_identify(m_ctxt, obj, "EPSG", nullptr, &confidence); ObjListKeeper keeper_res(res); - EXPECT_EQ(proj_obj_list_get_count(res), 1); + EXPECT_EQ(proj_list_get_count(res), 1); EXPECT_EQ(confidence[0], 100); proj_int_list_destroy(confidence); } { - auto objEllps = proj_obj_create_from_wkt( + auto objEllps = proj_create_from_wkt( m_ctxt, Ellipsoid::GRS1980->exportToWKT(WKTFormatter::create().get()) .c_str(), nullptr, nullptr, nullptr); ObjectKeeper keeperEllps(objEllps); ASSERT_NE(objEllps, nullptr); - auto res = - proj_obj_identify(m_ctxt, objEllps, nullptr, nullptr, nullptr); + auto res = proj_identify(m_ctxt, objEllps, nullptr, nullptr, nullptr); ObjListKeeper keeper_res(res); EXPECT_EQ(res, nullptr); } @@ -1672,21 +1657,20 @@ TEST_F(CApi, proj_obj_identify) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_area_of_use) { +TEST_F(CApi, proj_get_area_of_use) { { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "4326", PJ_OBJ_CATEGORY_CRS, false, nullptr); + auto crs = proj_create_from_database(m_ctxt, "EPSG", "4326", + PJ_CATEGORY_CRS, false, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - EXPECT_TRUE(proj_obj_get_area_of_use(m_ctxt, crs, nullptr, nullptr, - nullptr, nullptr, nullptr)); + EXPECT_TRUE(proj_get_area_of_use(m_ctxt, crs, nullptr, nullptr, nullptr, + nullptr, nullptr)); const char *name = nullptr; double w; double s; double e; double n; - EXPECT_TRUE( - proj_obj_get_area_of_use(m_ctxt, crs, &w, &s, &e, &n, &name)); + EXPECT_TRUE(proj_get_area_of_use(m_ctxt, crs, &w, &s, &e, &n, &name)); EXPECT_EQ(w, -180); EXPECT_EQ(s, -90); EXPECT_EQ(e, 180); @@ -1696,11 +1680,11 @@ TEST_F(CApi, proj_obj_get_area_of_use) { } { auto obj = - proj_obj_create_from_user_input(m_ctxt, "+proj=longlat", nullptr); + proj_create_from_user_input(m_ctxt, "+proj=longlat", nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - EXPECT_FALSE(proj_obj_get_area_of_use(m_ctxt, obj, nullptr, nullptr, - nullptr, nullptr, nullptr)); + EXPECT_FALSE(proj_get_area_of_use(m_ctxt, obj, nullptr, nullptr, + nullptr, nullptr, nullptr)); } } @@ -1708,23 +1692,23 @@ TEST_F(CApi, proj_obj_get_area_of_use) { TEST_F(CApi, proj_coordoperation_get_accuracy) { { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "4326", PJ_OBJ_CATEGORY_CRS, false, nullptr); + auto crs = proj_create_from_database(m_ctxt, "EPSG", "4326", + PJ_CATEGORY_CRS, false, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); EXPECT_EQ(proj_coordoperation_get_accuracy(m_ctxt, crs), -1.0); } { - auto obj = proj_obj_create_from_database( - m_ctxt, "EPSG", "1170", PJ_OBJ_CATEGORY_COORDINATE_OPERATION, false, - nullptr); + auto obj = proj_create_from_database(m_ctxt, "EPSG", "1170", + PJ_CATEGORY_COORDINATE_OPERATION, + false, nullptr); ASSERT_NE(obj, nullptr); ObjectKeeper keeper(obj); EXPECT_EQ(proj_coordoperation_get_accuracy(m_ctxt, obj), 16.0); } { auto obj = - proj_obj_create_from_user_input(m_ctxt, "+proj=helmert", nullptr); + proj_create_from_user_input(m_ctxt, "+proj=helmert", nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); EXPECT_EQ(proj_coordoperation_get_accuracy(m_ctxt, obj), -1.0); @@ -1733,21 +1717,21 @@ TEST_F(CApi, proj_coordoperation_get_accuracy) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_geographic_crs) { +TEST_F(CApi, proj_create_geographic_crs) { - auto cs = proj_obj_create_ellipsoidal_2D_cs( + auto cs = proj_create_ellipsoidal_2D_cs( m_ctxt, PJ_ELLPS2D_LATITUDE_LONGITUDE, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); { - auto obj = proj_obj_create_geographic_crs( + auto obj = proj_create_geographic_crs( m_ctxt, "WGS 84", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, cs); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto objRef = proj_obj_create_from_user_input( + auto objRef = proj_create_from_user_input( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -1755,36 +1739,36 @@ TEST_F(CApi, proj_obj_create_geographic_crs) { ObjectKeeper keeperobjRef(objRef); EXPECT_NE(objRef, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(obj, objRef, PJ_COMP_EQUIVALENT)); + EXPECT_TRUE(proj_is_equivalent_to(obj, objRef, PJ_COMP_EQUIVALENT)); - auto datum = proj_obj_crs_get_datum(m_ctxt, obj); + auto datum = proj_crs_get_datum(m_ctxt, obj); ObjectKeeper keeper_datum(datum); ASSERT_NE(datum, nullptr); - auto obj2 = proj_obj_create_geographic_crs_from_datum(m_ctxt, "WGS 84", - datum, cs); + auto obj2 = + proj_create_geographic_crs_from_datum(m_ctxt, "WGS 84", datum, cs); ObjectKeeper keeperObj(obj2); ASSERT_NE(obj2, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(obj, obj2, PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(obj, obj2, PJ_COMP_STRICT)); } { - auto obj = proj_obj_create_geographic_crs(m_ctxt, nullptr, nullptr, - nullptr, 1.0, 0.0, nullptr, - 0.0, nullptr, 0.0, cs); + auto obj = + proj_create_geographic_crs(m_ctxt, nullptr, nullptr, nullptr, 1.0, + 0.0, nullptr, 0.0, nullptr, 0.0, cs); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); } // Datum with GDAL_WKT1 spelling: special case of WGS_1984 { - auto obj = proj_obj_create_geographic_crs( + auto obj = proj_create_geographic_crs( m_ctxt, "WGS 84", "WGS_1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, cs); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto objRef = proj_obj_create_from_user_input( + auto objRef = proj_create_from_user_input( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -1792,18 +1776,18 @@ TEST_F(CApi, proj_obj_create_geographic_crs) { ObjectKeeper keeperobjRef(objRef); EXPECT_NE(objRef, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(obj, objRef, PJ_COMP_EQUIVALENT)); + EXPECT_TRUE(proj_is_equivalent_to(obj, objRef, PJ_COMP_EQUIVALENT)); } // Datum with GDAL_WKT1 spelling: database query { - auto obj = proj_obj_create_geographic_crs( + auto obj = proj_create_geographic_crs( m_ctxt, "NAD83", "North_American_Datum_1983", "GRS 1980", 6378137, 298.257222101, "Greenwich", 0.0, "Degree", 0.0174532925199433, cs); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto objRef = proj_obj_create_from_user_input( + auto objRef = proj_create_from_user_input( m_ctxt, GeographicCRS::EPSG_4269->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -1811,12 +1795,12 @@ TEST_F(CApi, proj_obj_create_geographic_crs) { ObjectKeeper keeperobjRef(objRef); EXPECT_NE(objRef, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(obj, objRef, PJ_COMP_EQUIVALENT)); + EXPECT_TRUE(proj_is_equivalent_to(obj, objRef, PJ_COMP_EQUIVALENT)); } // Datum with GDAL_WKT1 spelling: database query in alias_name table { - auto crs = proj_obj_create_geographic_crs( + auto crs = proj_create_geographic_crs( m_ctxt, "S-JTSK (Ferro)", "System_Jednotne_Trigonometricke_Site_Katastralni_Ferro", "Bessel 1841", 6377397.155, 299.1528128, "Ferro", @@ -1824,11 +1808,11 @@ TEST_F(CApi, proj_obj_create_geographic_crs) { ObjectKeeper keeper(crs); ASSERT_NE(crs, nullptr); - auto datum = proj_obj_crs_get_datum(m_ctxt, crs); + auto datum = proj_crs_get_datum(m_ctxt, crs); ASSERT_NE(datum, nullptr); ObjectKeeper keeper_datum(datum); - auto datum_name = proj_obj_get_name(datum); + auto datum_name = proj_get_name(datum); ASSERT_TRUE(datum_name != nullptr); EXPECT_EQ(datum_name, std::string("System of the Unified Trigonometrical Cadastral " @@ -1837,32 +1821,32 @@ TEST_F(CApi, proj_obj_create_geographic_crs) { // WKT1 with (deprecated) { - auto crs = proj_obj_create_geographic_crs( + auto crs = proj_create_geographic_crs( m_ctxt, "SAD69 (deprecated)", "South_American_Datum_1969", "GRS 1967", 6378160, 298.247167427, "Greenwich", 0, "Degree", 0.0174532925199433, cs); ObjectKeeper keeper(crs); ASSERT_NE(crs, nullptr); - auto name = proj_obj_get_name(crs); + auto name = proj_get_name(crs); ASSERT_TRUE(name != nullptr); EXPECT_EQ(name, std::string("SAD69")); - EXPECT_TRUE(proj_obj_is_deprecated(crs)); + EXPECT_TRUE(proj_is_deprecated(crs)); } } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_geocentric_crs) { +TEST_F(CApi, proj_create_geocentric_crs) { { - auto obj = proj_obj_create_geocentric_crs( + auto obj = proj_create_geocentric_crs( m_ctxt, "WGS 84", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto objRef = proj_obj_create_from_user_input( + auto objRef = proj_create_from_user_input( m_ctxt, GeographicCRS::EPSG_4978->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -1870,23 +1854,23 @@ TEST_F(CApi, proj_obj_create_geocentric_crs) { ObjectKeeper keeperobjRef(objRef); EXPECT_NE(objRef, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(obj, objRef, PJ_COMP_EQUIVALENT)); + EXPECT_TRUE(proj_is_equivalent_to(obj, objRef, PJ_COMP_EQUIVALENT)); - auto datum = proj_obj_crs_get_datum(m_ctxt, obj); + auto datum = proj_crs_get_datum(m_ctxt, obj); ObjectKeeper keeper_datum(datum); ASSERT_NE(datum, nullptr); - auto obj2 = proj_obj_create_geocentric_crs_from_datum( - m_ctxt, "WGS 84", datum, "Metre", 1.0); + auto obj2 = proj_create_geocentric_crs_from_datum(m_ctxt, "WGS 84", + datum, "Metre", 1.0); ObjectKeeper keeperObj(obj2); ASSERT_NE(obj2, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(obj, obj2, PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(obj, obj2, PJ_COMP_STRICT)); } { - auto obj = proj_obj_create_geocentric_crs( - m_ctxt, nullptr, nullptr, nullptr, 1.0, 0.0, nullptr, 0.0, nullptr, - 0.0, nullptr, 0.0); + auto obj = proj_create_geocentric_crs(m_ctxt, nullptr, nullptr, nullptr, + 1.0, 0.0, nullptr, 0.0, nullptr, + 0.0, nullptr, 0.0); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); } @@ -1897,7 +1881,7 @@ TEST_F(CApi, proj_obj_create_geocentric_crs) { TEST_F(CApi, check_coord_op_obj_can_be_used_with_proj_trans) { { - auto projCRS = proj_obj_create_conversion_utm(m_ctxt, 31, true); + auto projCRS = proj_create_conversion_utm(m_ctxt, 31, true); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); @@ -1912,23 +1896,23 @@ TEST_F(CApi, check_coord_op_obj_can_be_used_with_proj_trans) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_projections) { +TEST_F(CApi, proj_create_projections) { /* BEGIN: Generated by scripts/create_c_api_projections.py*/ { - auto projCRS = proj_obj_create_conversion_utm(m_ctxt, 0, 0); + auto projCRS = proj_create_conversion_utm(m_ctxt, 0, 0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_transverse_mercator( + auto projCRS = proj_create_conversion_transverse_mercator( m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { auto projCRS = - proj_obj_create_conversion_gauss_schreiber_transverse_mercator( + proj_create_conversion_gauss_schreiber_transverse_mercator( m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); @@ -1936,40 +1920,40 @@ TEST_F(CApi, proj_obj_create_projections) { } { auto projCRS = - proj_obj_create_conversion_transverse_mercator_south_oriented( + proj_create_conversion_transverse_mercator_south_oriented( m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_two_point_equidistant( + auto projCRS = proj_create_conversion_two_point_equidistant( m_ctxt, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_tunisia_mapping_grid( + auto projCRS = proj_create_conversion_tunisia_mapping_grid( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_albers_equal_area( + auto projCRS = proj_create_conversion_albers_equal_area( m_ctxt, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_lambert_conic_conformal_1sp( + auto projCRS = proj_create_conversion_lambert_conic_conformal_1sp( m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_lambert_conic_conformal_2sp( + auto projCRS = proj_create_conversion_lambert_conic_conformal_2sp( m_ctxt, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); @@ -1977,7 +1961,7 @@ TEST_F(CApi, proj_obj_create_projections) { } { auto projCRS = - proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan( + proj_create_conversion_lambert_conic_conformal_2sp_michigan( m_ctxt, 0, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); @@ -1985,351 +1969,342 @@ TEST_F(CApi, proj_obj_create_projections) { } { auto projCRS = - proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium( + proj_create_conversion_lambert_conic_conformal_2sp_belgium( m_ctxt, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_azimuthal_equidistant( + auto projCRS = proj_create_conversion_azimuthal_equidistant( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_guam_projection( + auto projCRS = proj_create_conversion_guam_projection( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_bonne( + auto projCRS = proj_create_conversion_bonne( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { auto projCRS = - proj_obj_create_conversion_lambert_cylindrical_equal_area_spherical( + proj_create_conversion_lambert_cylindrical_equal_area_spherical( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = - proj_obj_create_conversion_lambert_cylindrical_equal_area( - m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); + auto projCRS = proj_create_conversion_lambert_cylindrical_equal_area( + m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_cassini_soldner( + auto projCRS = proj_create_conversion_cassini_soldner( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_equidistant_conic( + auto projCRS = proj_create_conversion_equidistant_conic( m_ctxt, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_eckert_i( + auto projCRS = proj_create_conversion_eckert_i( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_eckert_ii( + auto projCRS = proj_create_conversion_eckert_ii( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_eckert_iii( + auto projCRS = proj_create_conversion_eckert_iii( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_eckert_iv( + auto projCRS = proj_create_conversion_eckert_iv( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_eckert_v( + auto projCRS = proj_create_conversion_eckert_v( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_eckert_vi( + auto projCRS = proj_create_conversion_eckert_vi( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_equidistant_cylindrical( + auto projCRS = proj_create_conversion_equidistant_cylindrical( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = - proj_obj_create_conversion_equidistant_cylindrical_spherical( - m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); + auto projCRS = proj_create_conversion_equidistant_cylindrical_spherical( + m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_gall( + auto projCRS = proj_create_conversion_gall( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_goode_homolosine( + auto projCRS = proj_create_conversion_goode_homolosine( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_interrupted_goode_homolosine( + auto projCRS = proj_create_conversion_interrupted_goode_homolosine( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = - proj_obj_create_conversion_geostationary_satellite_sweep_x( - m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); + auto projCRS = proj_create_conversion_geostationary_satellite_sweep_x( + m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = - proj_obj_create_conversion_geostationary_satellite_sweep_y( - m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); + auto projCRS = proj_create_conversion_geostationary_satellite_sweep_y( + m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_gnomonic( + auto projCRS = proj_create_conversion_gnomonic( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = - proj_obj_create_conversion_hotine_oblique_mercator_variant_a( - m_ctxt, 0, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, - "Metre", 1.0); + auto projCRS = proj_create_conversion_hotine_oblique_mercator_variant_a( + m_ctxt, 0, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", + 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = - proj_obj_create_conversion_hotine_oblique_mercator_variant_b( - m_ctxt, 0, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, - "Metre", 1.0); + auto projCRS = proj_create_conversion_hotine_oblique_mercator_variant_b( + m_ctxt, 0, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", + 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { auto projCRS = - proj_obj_create_conversion_hotine_oblique_mercator_two_point_natural_origin( + proj_create_conversion_hotine_oblique_mercator_two_point_natural_origin( m_ctxt, 0, 0, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_laborde_oblique_mercator( + auto projCRS = proj_create_conversion_laborde_oblique_mercator( m_ctxt, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = - proj_obj_create_conversion_international_map_world_polyconic( - m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", - 1.0); + auto projCRS = proj_create_conversion_international_map_world_polyconic( + m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_krovak_north_oriented( + auto projCRS = proj_create_conversion_krovak_north_oriented( m_ctxt, 0, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_krovak( - m_ctxt, 0, 0, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", - 1.0); + auto projCRS = + proj_create_conversion_krovak(m_ctxt, 0, 0, 0, 0, 0, 0, 0, "Degree", + 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_lambert_azimuthal_equal_area( + auto projCRS = proj_create_conversion_lambert_azimuthal_equal_area( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_miller_cylindrical( + auto projCRS = proj_create_conversion_miller_cylindrical( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_mercator_variant_a( + auto projCRS = proj_create_conversion_mercator_variant_a( m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_mercator_variant_b( + auto projCRS = proj_create_conversion_mercator_variant_b( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { auto projCRS = - proj_obj_create_conversion_popular_visualisation_pseudo_mercator( + proj_create_conversion_popular_visualisation_pseudo_mercator( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_mollweide( + auto projCRS = proj_create_conversion_mollweide( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_new_zealand_mapping_grid( + auto projCRS = proj_create_conversion_new_zealand_mapping_grid( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_oblique_stereographic( + auto projCRS = proj_create_conversion_oblique_stereographic( m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_orthographic( + auto projCRS = proj_create_conversion_orthographic( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_american_polyconic( + auto projCRS = proj_create_conversion_american_polyconic( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_polar_stereographic_variant_a( + auto projCRS = proj_create_conversion_polar_stereographic_variant_a( m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_polar_stereographic_variant_b( + auto projCRS = proj_create_conversion_polar_stereographic_variant_b( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_robinson( + auto projCRS = proj_create_conversion_robinson( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_sinusoidal( + auto projCRS = proj_create_conversion_sinusoidal( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_stereographic( + auto projCRS = proj_create_conversion_stereographic( m_ctxt, 0, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_van_der_grinten( + auto projCRS = proj_create_conversion_van_der_grinten( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_wagner_i( + auto projCRS = proj_create_conversion_wagner_i( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_wagner_ii( + auto projCRS = proj_create_conversion_wagner_ii( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_wagner_iii( + auto projCRS = proj_create_conversion_wagner_iii( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_wagner_iv( + auto projCRS = proj_create_conversion_wagner_iv( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_wagner_v( + auto projCRS = proj_create_conversion_wagner_v( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_wagner_vi( + auto projCRS = proj_create_conversion_wagner_vi( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_wagner_vii( + auto projCRS = proj_create_conversion_wagner_vii( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = - proj_obj_create_conversion_quadrilateralized_spherical_cube( - m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); + auto projCRS = proj_create_conversion_quadrilateralized_spherical_cube( + m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_spherical_cross_track_height( + auto projCRS = proj_create_conversion_spherical_cross_track_height( m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } { - auto projCRS = proj_obj_create_conversion_equal_earth( + auto projCRS = proj_create_conversion_equal_earth( m_ctxt, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); @@ -2339,32 +2314,32 @@ TEST_F(CApi, proj_obj_create_projections) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_cs_get_axis_info) { +TEST_F(CApi, proj_cs_get_axis_info) { { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "4326", PJ_OBJ_CATEGORY_CRS, false, nullptr); + auto crs = proj_create_from_database(m_ctxt, "EPSG", "4326", + PJ_CATEGORY_CRS, false, nullptr); ASSERT_NE(crs, nullptr); ObjectKeeper keeper(crs); - auto cs = proj_obj_crs_get_coordinate_system(m_ctxt, crs); + auto cs = proj_crs_get_coordinate_system(m_ctxt, crs); ASSERT_NE(cs, nullptr); ObjectKeeper keeperCs(cs); - EXPECT_EQ(proj_obj_cs_get_type(m_ctxt, cs), PJ_CS_TYPE_ELLIPSOIDAL); + EXPECT_EQ(proj_cs_get_type(m_ctxt, cs), PJ_CS_TYPE_ELLIPSOIDAL); - EXPECT_EQ(proj_obj_cs_get_axis_count(m_ctxt, cs), 2); + EXPECT_EQ(proj_cs_get_axis_count(m_ctxt, cs), 2); - EXPECT_FALSE(proj_obj_cs_get_axis_info(m_ctxt, cs, -1, nullptr, nullptr, - nullptr, nullptr, nullptr, - nullptr, nullptr)); + EXPECT_FALSE(proj_cs_get_axis_info(m_ctxt, cs, -1, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr)); - EXPECT_FALSE(proj_obj_cs_get_axis_info(m_ctxt, cs, 2, nullptr, nullptr, - nullptr, nullptr, nullptr, - nullptr, nullptr)); + EXPECT_FALSE(proj_cs_get_axis_info(m_ctxt, cs, 2, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr)); - EXPECT_TRUE(proj_obj_cs_get_axis_info(m_ctxt, cs, 0, nullptr, nullptr, - nullptr, nullptr, nullptr, - nullptr, nullptr)); + EXPECT_TRUE(proj_cs_get_axis_info(m_ctxt, cs, 0, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr)); const char *name = nullptr; const char *abbrev = nullptr; @@ -2374,7 +2349,7 @@ TEST_F(CApi, proj_obj_cs_get_axis_info) { const char *unitAuthority = nullptr; const char *unitCode = nullptr; - EXPECT_TRUE(proj_obj_cs_get_axis_info( + EXPECT_TRUE(proj_cs_get_axis_info( m_ctxt, cs, 0, &name, &abbrev, &direction, &unitConvFactor, &unitName, &unitAuthority, &unitCode)); ASSERT_NE(name, nullptr); @@ -2394,20 +2369,20 @@ TEST_F(CApi, proj_obj_cs_get_axis_info) { // Non CRS object { - auto obj = proj_obj_create_from_database( - m_ctxt, "EPSG", "1170", PJ_OBJ_CATEGORY_COORDINATE_OPERATION, false, - nullptr); + auto obj = proj_create_from_database(m_ctxt, "EPSG", "1170", + PJ_CATEGORY_COORDINATE_OPERATION, + false, nullptr); ASSERT_NE(obj, nullptr); ObjectKeeper keeper(obj); - EXPECT_EQ(proj_obj_crs_get_coordinate_system(m_ctxt, obj), nullptr); + EXPECT_EQ(proj_crs_get_coordinate_system(m_ctxt, obj), nullptr); - EXPECT_EQ(proj_obj_cs_get_type(m_ctxt, obj), PJ_CS_TYPE_UNKNOWN); + EXPECT_EQ(proj_cs_get_type(m_ctxt, obj), PJ_CS_TYPE_UNKNOWN); - EXPECT_EQ(proj_obj_cs_get_axis_count(m_ctxt, obj), -1); + EXPECT_EQ(proj_cs_get_axis_count(m_ctxt, obj), -1); - EXPECT_FALSE(proj_obj_cs_get_axis_info(m_ctxt, obj, 0, nullptr, nullptr, - nullptr, nullptr, nullptr, - nullptr, nullptr)); + EXPECT_FALSE(proj_cs_get_axis_info(m_ctxt, obj, 0, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr)); } } @@ -2420,23 +2395,22 @@ TEST_F(CApi, proj_context_get_database_metadata) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_clone) { - auto obj = - proj_obj_create_from_proj_string(m_ctxt, "+proj=longlat", nullptr); +TEST_F(CApi, proj_clone) { + auto obj = proj_create_from_proj_string(m_ctxt, "+proj=longlat", nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto clone = proj_obj_clone(m_ctxt, obj); + auto clone = proj_clone(m_ctxt, obj); ObjectKeeper keeperClone(clone); ASSERT_NE(clone, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(obj, clone, PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(obj, clone, PJ_COMP_STRICT)); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_crs_alter_geodetic_crs) { - auto projCRS = proj_obj_create_from_wkt( +TEST_F(CApi, proj_crs_alter_geodetic_crs) { + auto projCRS = proj_create_from_wkt( m_ctxt, createProjectedCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); @@ -2444,59 +2418,59 @@ TEST_F(CApi, proj_obj_crs_alter_geodetic_crs) { ASSERT_NE(projCRS, nullptr); auto newGeodCRS = - proj_obj_create_from_proj_string(m_ctxt, "+proj=longlat", nullptr); + proj_create_from_proj_string(m_ctxt, "+proj=longlat", nullptr); ObjectKeeper keeper_newGeodCRS(newGeodCRS); ASSERT_NE(newGeodCRS, nullptr); - auto geodCRS = proj_obj_crs_get_geodetic_crs(m_ctxt, projCRS); + auto geodCRS = proj_crs_get_geodetic_crs(m_ctxt, projCRS); ObjectKeeper keeper_geodCRS(geodCRS); ASSERT_NE(geodCRS, nullptr); auto geodCRSAltered = - proj_obj_crs_alter_geodetic_crs(m_ctxt, geodCRS, newGeodCRS); + proj_crs_alter_geodetic_crs(m_ctxt, geodCRS, newGeodCRS); ObjectKeeper keeper_geodCRSAltered(geodCRSAltered); ASSERT_NE(geodCRSAltered, nullptr); EXPECT_TRUE( - proj_obj_is_equivalent_to(geodCRSAltered, newGeodCRS, PJ_COMP_STRICT)); + proj_is_equivalent_to(geodCRSAltered, newGeodCRS, PJ_COMP_STRICT)); { auto projCRSAltered = - proj_obj_crs_alter_geodetic_crs(m_ctxt, projCRS, newGeodCRS); + proj_crs_alter_geodetic_crs(m_ctxt, projCRS, newGeodCRS); ObjectKeeper keeper_projCRSAltered(projCRSAltered); ASSERT_NE(projCRSAltered, nullptr); - EXPECT_EQ(proj_obj_get_type(projCRSAltered), PJ_OBJ_TYPE_PROJECTED_CRS); + EXPECT_EQ(proj_get_type(projCRSAltered), PJ_TYPE_PROJECTED_CRS); auto projCRSAltered_geodCRS = - proj_obj_crs_get_geodetic_crs(m_ctxt, projCRSAltered); + proj_crs_get_geodetic_crs(m_ctxt, projCRSAltered); ObjectKeeper keeper_projCRSAltered_geodCRS(projCRSAltered_geodCRS); ASSERT_NE(projCRSAltered_geodCRS, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(projCRSAltered_geodCRS, - newGeodCRS, PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(projCRSAltered_geodCRS, newGeodCRS, + PJ_COMP_STRICT)); } - // Check that proj_obj_crs_alter_geodetic_crs preserves deprecation flag + // Check that proj_crs_alter_geodetic_crs preserves deprecation flag { auto projCRSDeprecated = - proj_obj_alter_name(m_ctxt, projCRS, "new name (deprecated)"); + proj_alter_name(m_ctxt, projCRS, "new name (deprecated)"); ObjectKeeper keeper_projCRSDeprecated(projCRSDeprecated); ASSERT_NE(projCRSDeprecated, nullptr); - auto projCRSAltered = proj_obj_crs_alter_geodetic_crs( - m_ctxt, projCRSDeprecated, newGeodCRS); + auto projCRSAltered = + proj_crs_alter_geodetic_crs(m_ctxt, projCRSDeprecated, newGeodCRS); ObjectKeeper keeper_projCRSAltered(projCRSAltered); ASSERT_NE(projCRSAltered, nullptr); - EXPECT_EQ(proj_obj_get_name(projCRSAltered), std::string("new name")); - EXPECT_TRUE(proj_obj_is_deprecated(projCRSAltered)); + EXPECT_EQ(proj_get_name(projCRSAltered), std::string("new name")); + EXPECT_TRUE(proj_is_deprecated(projCRSAltered)); } } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_crs_alter_cs_angular_unit) { - auto crs = proj_obj_create_from_wkt( +TEST_F(CApi, proj_crs_alter_cs_angular_unit) { + auto crs = proj_create_from_wkt( m_ctxt, GeographicCRS::EPSG_4326->exportToWKT(WKTFormatter::create().get()) .c_str(), @@ -2505,32 +2479,32 @@ TEST_F(CApi, proj_obj_crs_alter_cs_angular_unit) { ASSERT_NE(crs, nullptr); { - auto alteredCRS = proj_obj_crs_alter_cs_angular_unit( - m_ctxt, crs, "my unit", 2, nullptr, nullptr); + auto alteredCRS = proj_crs_alter_cs_angular_unit(m_ctxt, crs, "my unit", + 2, nullptr, nullptr); ObjectKeeper keeper_alteredCRS(alteredCRS); ASSERT_NE(alteredCRS, nullptr); - auto cs = proj_obj_crs_get_coordinate_system(m_ctxt, alteredCRS); + auto cs = proj_crs_get_coordinate_system(m_ctxt, alteredCRS); ASSERT_NE(cs, nullptr); ObjectKeeper keeperCs(cs); double unitConvFactor = 0.0; const char *unitName = nullptr; - EXPECT_TRUE(proj_obj_cs_get_axis_info(m_ctxt, cs, 0, nullptr, nullptr, - nullptr, &unitConvFactor, - &unitName, nullptr, nullptr)); + EXPECT_TRUE(proj_cs_get_axis_info(m_ctxt, cs, 0, nullptr, nullptr, + nullptr, &unitConvFactor, &unitName, + nullptr, nullptr)); ASSERT_NE(unitName, nullptr); EXPECT_EQ(unitConvFactor, 2) << unitConvFactor; EXPECT_EQ(std::string(unitName), "my unit"); } { - auto alteredCRS = proj_obj_crs_alter_cs_angular_unit( + auto alteredCRS = proj_crs_alter_cs_angular_unit( m_ctxt, crs, "my unit", 2, "my auth", "my code"); ObjectKeeper keeper_alteredCRS(alteredCRS); ASSERT_NE(alteredCRS, nullptr); - auto cs = proj_obj_crs_get_coordinate_system(m_ctxt, alteredCRS); + auto cs = proj_crs_get_coordinate_system(m_ctxt, alteredCRS); ASSERT_NE(cs, nullptr); ObjectKeeper keeperCs(cs); double unitConvFactor = 0.0; @@ -2538,9 +2512,9 @@ TEST_F(CApi, proj_obj_crs_alter_cs_angular_unit) { const char *unitAuthName = nullptr; const char *unitCode = nullptr; - EXPECT_TRUE(proj_obj_cs_get_axis_info( - m_ctxt, cs, 0, nullptr, nullptr, nullptr, &unitConvFactor, - &unitName, &unitAuthName, &unitCode)); + EXPECT_TRUE(proj_cs_get_axis_info(m_ctxt, cs, 0, nullptr, nullptr, + nullptr, &unitConvFactor, &unitName, + &unitAuthName, &unitCode)); ASSERT_NE(unitName, nullptr); EXPECT_EQ(unitConvFactor, 2) << unitConvFactor; EXPECT_EQ(std::string(unitName), "my unit"); @@ -2553,8 +2527,8 @@ TEST_F(CApi, proj_obj_crs_alter_cs_angular_unit) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_crs_alter_cs_linear_unit) { - auto crs = proj_obj_create_from_wkt( +TEST_F(CApi, proj_crs_alter_cs_linear_unit) { + auto crs = proj_create_from_wkt( m_ctxt, createProjectedCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); @@ -2562,32 +2536,32 @@ TEST_F(CApi, proj_obj_crs_alter_cs_linear_unit) { ASSERT_NE(crs, nullptr); { - auto alteredCRS = proj_obj_crs_alter_cs_linear_unit( - m_ctxt, crs, "my unit", 2, nullptr, nullptr); + auto alteredCRS = proj_crs_alter_cs_linear_unit(m_ctxt, crs, "my unit", + 2, nullptr, nullptr); ObjectKeeper keeper_alteredCRS(alteredCRS); ASSERT_NE(alteredCRS, nullptr); - auto cs = proj_obj_crs_get_coordinate_system(m_ctxt, alteredCRS); + auto cs = proj_crs_get_coordinate_system(m_ctxt, alteredCRS); ASSERT_NE(cs, nullptr); ObjectKeeper keeperCs(cs); double unitConvFactor = 0.0; const char *unitName = nullptr; - EXPECT_TRUE(proj_obj_cs_get_axis_info(m_ctxt, cs, 0, nullptr, nullptr, - nullptr, &unitConvFactor, - &unitName, nullptr, nullptr)); + EXPECT_TRUE(proj_cs_get_axis_info(m_ctxt, cs, 0, nullptr, nullptr, + nullptr, &unitConvFactor, &unitName, + nullptr, nullptr)); ASSERT_NE(unitName, nullptr); EXPECT_EQ(unitConvFactor, 2) << unitConvFactor; EXPECT_EQ(std::string(unitName), "my unit"); } { - auto alteredCRS = proj_obj_crs_alter_cs_linear_unit( + auto alteredCRS = proj_crs_alter_cs_linear_unit( m_ctxt, crs, "my unit", 2, "my auth", "my code"); ObjectKeeper keeper_alteredCRS(alteredCRS); ASSERT_NE(alteredCRS, nullptr); - auto cs = proj_obj_crs_get_coordinate_system(m_ctxt, alteredCRS); + auto cs = proj_crs_get_coordinate_system(m_ctxt, alteredCRS); ASSERT_NE(cs, nullptr); ObjectKeeper keeperCs(cs); double unitConvFactor = 0.0; @@ -2595,9 +2569,9 @@ TEST_F(CApi, proj_obj_crs_alter_cs_linear_unit) { const char *unitAuthName = nullptr; const char *unitCode = nullptr; - EXPECT_TRUE(proj_obj_cs_get_axis_info( - m_ctxt, cs, 0, nullptr, nullptr, nullptr, &unitConvFactor, - &unitName, &unitAuthName, &unitCode)); + EXPECT_TRUE(proj_cs_get_axis_info(m_ctxt, cs, 0, nullptr, nullptr, + nullptr, &unitConvFactor, &unitName, + &unitAuthName, &unitCode)); ASSERT_NE(unitName, nullptr); EXPECT_EQ(unitConvFactor, 2) << unitConvFactor; EXPECT_EQ(std::string(unitName), "my unit"); @@ -2610,8 +2584,8 @@ TEST_F(CApi, proj_obj_crs_alter_cs_linear_unit) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_crs_alter_parameters_linear_unit) { - auto crs = proj_obj_create_from_wkt( +TEST_F(CApi, proj_crs_alter_parameters_linear_unit) { + auto crs = proj_create_from_wkt( m_ctxt, createProjectedCRS()->exportToWKT(WKTFormatter::create().get()).c_str(), nullptr, nullptr, nullptr); @@ -2619,12 +2593,12 @@ TEST_F(CApi, proj_obj_crs_alter_parameters_linear_unit) { ASSERT_NE(crs, nullptr); { - auto alteredCRS = proj_obj_crs_alter_parameters_linear_unit( + auto alteredCRS = proj_crs_alter_parameters_linear_unit( m_ctxt, crs, "my unit", 2, nullptr, nullptr, false); ObjectKeeper keeper_alteredCRS(alteredCRS); ASSERT_NE(alteredCRS, nullptr); - auto wkt = proj_obj_as_wkt(m_ctxt, alteredCRS, PJ_WKT2_2018, nullptr); + auto wkt = proj_as_wkt(m_ctxt, alteredCRS, PJ_WKT2_2018, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("500000") != std::string::npos) << wkt; @@ -2633,12 +2607,12 @@ TEST_F(CApi, proj_obj_crs_alter_parameters_linear_unit) { } { - auto alteredCRS = proj_obj_crs_alter_parameters_linear_unit( + auto alteredCRS = proj_crs_alter_parameters_linear_unit( m_ctxt, crs, "my unit", 2, nullptr, nullptr, true); ObjectKeeper keeper_alteredCRS(alteredCRS); ASSERT_NE(alteredCRS, nullptr); - auto wkt = proj_obj_as_wkt(m_ctxt, alteredCRS, PJ_WKT2_2018, nullptr); + auto wkt = proj_as_wkt(m_ctxt, alteredCRS, PJ_WKT2_2018, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_TRUE(std::string(wkt).find("250000") != std::string::npos) << wkt; @@ -2649,77 +2623,76 @@ TEST_F(CApi, proj_obj_crs_alter_parameters_linear_unit) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_engineering_crs) { +TEST_F(CApi, proj_create_engineering_crs) { - auto crs = proj_obj_create_engineering_crs(m_ctxt, "name"); + auto crs = proj_create_engineering_crs(m_ctxt, "name"); ObjectKeeper keeper(crs); ASSERT_NE(crs, nullptr); - auto wkt = proj_obj_as_wkt(m_ctxt, crs, PJ_WKT1_GDAL, nullptr); + auto wkt = proj_as_wkt(m_ctxt, crs, PJ_WKT1_GDAL, nullptr); ASSERT_NE(wkt, nullptr); EXPECT_EQ(std::string(wkt), "LOCAL_CS[\"name\"]") << wkt; } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_alter_name) { +TEST_F(CApi, proj_alter_name) { - auto cs = proj_obj_create_ellipsoidal_2D_cs( + auto cs = proj_create_ellipsoidal_2D_cs( m_ctxt, PJ_ELLPS2D_LONGITUDE_LATITUDE, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); - auto obj = proj_obj_create_geographic_crs( + auto obj = proj_create_geographic_crs( m_ctxt, "WGS 84", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, cs); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); { - auto alteredObj = proj_obj_alter_name(m_ctxt, obj, "new name"); + auto alteredObj = proj_alter_name(m_ctxt, obj, "new name"); ObjectKeeper keeper_alteredObj(alteredObj); ASSERT_NE(alteredObj, nullptr); - EXPECT_EQ(std::string(proj_obj_get_name(alteredObj)), "new name"); - EXPECT_FALSE(proj_obj_is_deprecated(alteredObj)); + EXPECT_EQ(std::string(proj_get_name(alteredObj)), "new name"); + EXPECT_FALSE(proj_is_deprecated(alteredObj)); } { - auto alteredObj = - proj_obj_alter_name(m_ctxt, obj, "new name (deprecated)"); + auto alteredObj = proj_alter_name(m_ctxt, obj, "new name (deprecated)"); ObjectKeeper keeper_alteredObj(alteredObj); ASSERT_NE(alteredObj, nullptr); - EXPECT_EQ(std::string(proj_obj_get_name(alteredObj)), "new name"); - EXPECT_TRUE(proj_obj_is_deprecated(alteredObj)); + EXPECT_EQ(std::string(proj_get_name(alteredObj)), "new name"); + EXPECT_TRUE(proj_is_deprecated(alteredObj)); } } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_alter_id) { +TEST_F(CApi, proj_alter_id) { - auto cs = proj_obj_create_ellipsoidal_2D_cs( + auto cs = proj_create_ellipsoidal_2D_cs( m_ctxt, PJ_ELLPS2D_LONGITUDE_LATITUDE, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); - auto obj = proj_obj_create_geographic_crs( + auto obj = proj_create_geographic_crs( m_ctxt, "WGS 84", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, cs); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); - auto alteredObj = proj_obj_alter_id(m_ctxt, obj, "auth", "code"); + auto alteredObj = proj_alter_id(m_ctxt, obj, "auth", "code"); ObjectKeeper keeper_alteredObj(alteredObj); ASSERT_NE(alteredObj, nullptr); - EXPECT_EQ(std::string(proj_obj_get_id_auth_name(alteredObj, 0)), "auth"); - EXPECT_EQ(std::string(proj_obj_get_id_code(alteredObj, 0)), "code"); + EXPECT_EQ(std::string(proj_get_id_auth_name(alteredObj, 0)), "auth"); + EXPECT_EQ(std::string(proj_get_id_code(alteredObj, 0)), "code"); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_projected_crs) { +TEST_F(CApi, proj_create_projected_crs) { PJ_PARAM_DESCRIPTION param; param.name = "param name"; @@ -2730,37 +2703,37 @@ TEST_F(CApi, proj_obj_create_projected_crs) { param.unit_conv_factor = 1.0; param.unit_type = PJ_UT_SCALE; - auto conv = proj_obj_create_conversion(m_ctxt, "conv", "conv auth", - "conv code", "method", "method auth", - "method code", 1, ¶m); + auto conv = proj_create_conversion(m_ctxt, "conv", "conv auth", "conv code", + "method", "method auth", "method code", + 1, ¶m); ObjectKeeper keeper_conv(conv); ASSERT_NE(conv, nullptr); - auto geog_cs = proj_obj_create_ellipsoidal_2D_cs( + auto geog_cs = proj_create_ellipsoidal_2D_cs( m_ctxt, PJ_ELLPS2D_LONGITUDE_LATITUDE, nullptr, 0); ObjectKeeper keeper_geog_cs(geog_cs); ASSERT_NE(geog_cs, nullptr); - auto geogCRS = proj_obj_create_geographic_crs( + auto geogCRS = proj_create_geographic_crs( m_ctxt, "WGS 84", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, geog_cs); ObjectKeeper keeper_geogCRS(geogCRS); ASSERT_NE(geogCRS, nullptr); - auto cs = proj_obj_create_cartesian_2D_cs( - m_ctxt, PJ_CART2D_EASTING_NORTHING, nullptr, 0); + auto cs = proj_create_cartesian_2D_cs(m_ctxt, PJ_CART2D_EASTING_NORTHING, + nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); auto projCRS = - proj_obj_create_projected_crs(m_ctxt, "my CRS", geogCRS, conv, cs); + proj_create_projected_crs(m_ctxt, "my CRS", geogCRS, conv, cs); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_transformation) { +TEST_F(CApi, proj_create_transformation) { PJ_PARAM_DESCRIPTION param; param.name = "param name"; @@ -2771,24 +2744,24 @@ TEST_F(CApi, proj_obj_create_transformation) { param.unit_conv_factor = 1.0; param.unit_type = PJ_UT_SCALE; - auto geog_cs = proj_obj_create_ellipsoidal_2D_cs( + auto geog_cs = proj_create_ellipsoidal_2D_cs( m_ctxt, PJ_ELLPS2D_LONGITUDE_LATITUDE, nullptr, 0); ObjectKeeper keeper_geog_cs(geog_cs); ASSERT_NE(geog_cs, nullptr); - auto source_crs = proj_obj_create_geographic_crs( + auto source_crs = proj_create_geographic_crs( m_ctxt, "Source CRS", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, geog_cs); ObjectKeeper keeper_source_crs(source_crs); ASSERT_NE(source_crs, nullptr); - auto target_crs = proj_obj_create_geographic_crs( + auto target_crs = proj_create_geographic_crs( m_ctxt, "WGS 84", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, geog_cs); ObjectKeeper keeper_target_crs(target_crs); ASSERT_NE(target_crs, nullptr); - auto interp_crs = proj_obj_create_geographic_crs( + auto interp_crs = proj_create_geographic_crs( m_ctxt, "Interpolation CRS", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, geog_cs); @@ -2796,7 +2769,7 @@ TEST_F(CApi, proj_obj_create_transformation) { ASSERT_NE(interp_crs, nullptr); { - auto transf = proj_obj_create_transformation( + auto transf = proj_create_transformation( m_ctxt, "transf", "transf auth", "transf code", source_crs, target_crs, interp_crs, "method", "method auth", "method code", 1, ¶m, 0); @@ -2805,21 +2778,21 @@ TEST_F(CApi, proj_obj_create_transformation) { EXPECT_EQ(proj_coordoperation_get_param_count(m_ctxt, transf), 1); - auto got_source_crs = proj_obj_get_source_crs(m_ctxt, transf); + auto got_source_crs = proj_get_source_crs(m_ctxt, transf); ObjectKeeper keeper_got_source_crs(got_source_crs); ASSERT_NE(got_source_crs, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(source_crs, got_source_crs, - PJ_COMP_STRICT)); + EXPECT_TRUE( + proj_is_equivalent_to(source_crs, got_source_crs, PJ_COMP_STRICT)); - auto got_target_crs = proj_obj_get_target_crs(m_ctxt, transf); + auto got_target_crs = proj_get_target_crs(m_ctxt, transf); ObjectKeeper keeper_got_target_crs(got_target_crs); ASSERT_NE(got_target_crs, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(target_crs, got_target_crs, - PJ_COMP_STRICT)); + EXPECT_TRUE( + proj_is_equivalent_to(target_crs, got_target_crs, PJ_COMP_STRICT)); } { - auto transf = proj_obj_create_transformation( + auto transf = proj_create_transformation( m_ctxt, "transf", "transf auth", "transf code", source_crs, target_crs, nullptr, "method", "method auth", "method code", 1, ¶m, -1); @@ -2830,152 +2803,150 @@ TEST_F(CApi, proj_obj_create_transformation) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_compound_crs) { +TEST_F(CApi, proj_create_compound_crs) { - auto horiz_cs = proj_obj_create_ellipsoidal_2D_cs( + auto horiz_cs = proj_create_ellipsoidal_2D_cs( m_ctxt, PJ_ELLPS2D_LONGITUDE_LATITUDE, nullptr, 0); ObjectKeeper keeper_horiz_cs(horiz_cs); ASSERT_NE(horiz_cs, nullptr); - auto horiz_crs = proj_obj_create_geographic_crs( + auto horiz_crs = proj_create_geographic_crs( m_ctxt, "WGS 84", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, horiz_cs); ObjectKeeper keeper_horiz_crs(horiz_crs); ASSERT_NE(horiz_crs, nullptr); - auto vert_crs = proj_obj_create_vertical_crs(m_ctxt, "myVertCRS", - "myVertDatum", nullptr, 0.0); + auto vert_crs = proj_create_vertical_crs(m_ctxt, "myVertCRS", "myVertDatum", + nullptr, 0.0); ObjectKeeper keeper_vert_crs(vert_crs); ASSERT_NE(vert_crs, nullptr); - EXPECT_EQ(proj_obj_get_name(vert_crs), std::string("myVertCRS")); + EXPECT_EQ(proj_get_name(vert_crs), std::string("myVertCRS")); - auto compound_crs = proj_obj_create_compound_crs(m_ctxt, "myCompoundCRS", - horiz_crs, vert_crs); + auto compound_crs = + proj_create_compound_crs(m_ctxt, "myCompoundCRS", horiz_crs, vert_crs); ObjectKeeper keeper_compound_crss(compound_crs); ASSERT_NE(compound_crs, nullptr); - EXPECT_EQ(proj_obj_get_name(compound_crs), std::string("myCompoundCRS")); + EXPECT_EQ(proj_get_name(compound_crs), std::string("myCompoundCRS")); - auto subcrs_horiz = proj_obj_crs_get_sub_crs(m_ctxt, compound_crs, 0); + auto subcrs_horiz = proj_crs_get_sub_crs(m_ctxt, compound_crs, 0); ASSERT_NE(subcrs_horiz, nullptr); ObjectKeeper keeper_subcrs_horiz(subcrs_horiz); - EXPECT_TRUE( - proj_obj_is_equivalent_to(subcrs_horiz, horiz_crs, PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(subcrs_horiz, horiz_crs, PJ_COMP_STRICT)); - auto subcrs_vert = proj_obj_crs_get_sub_crs(m_ctxt, compound_crs, 1); + auto subcrs_vert = proj_crs_get_sub_crs(m_ctxt, compound_crs, 1); ASSERT_NE(subcrs_vert, nullptr); ObjectKeeper keeper_subcrs_vert(subcrs_vert); - EXPECT_TRUE( - proj_obj_is_equivalent_to(subcrs_vert, vert_crs, PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(subcrs_vert, vert_crs, PJ_COMP_STRICT)); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_convert_conversion_to_other_method) { +TEST_F(CApi, proj_convert_conversion_to_other_method) { { - auto geog_cs = proj_obj_create_ellipsoidal_2D_cs( + auto geog_cs = proj_create_ellipsoidal_2D_cs( m_ctxt, PJ_ELLPS2D_LONGITUDE_LATITUDE, nullptr, 0); ObjectKeeper keeper_geog_cs(geog_cs); ASSERT_NE(geog_cs, nullptr); - auto geogCRS = proj_obj_create_geographic_crs( + auto geogCRS = proj_create_geographic_crs( m_ctxt, "WGS 84", "World Geodetic System 1984", "WGS 84", 6378137, 298.257223563, "Greenwich", 0.0, "Degree", 0.0174532925199433, geog_cs); ObjectKeeper keeper_geogCRS(geogCRS); ASSERT_NE(geogCRS, nullptr); - auto cs = proj_obj_create_cartesian_2D_cs( + auto cs = proj_create_cartesian_2D_cs( m_ctxt, PJ_CART2D_EASTING_NORTHING, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); - auto conv = proj_obj_create_conversion_mercator_variant_a( + auto conv = proj_create_conversion_mercator_variant_a( m_ctxt, 0, 1, 0.99, 2, 3, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_conv(conv); ASSERT_NE(conv, nullptr); auto projCRS = - proj_obj_create_projected_crs(m_ctxt, "my CRS", geogCRS, conv, cs); + proj_create_projected_crs(m_ctxt, "my CRS", geogCRS, conv, cs); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); // Wrong object type EXPECT_EQ( - proj_obj_convert_conversion_to_other_method( + proj_convert_conversion_to_other_method( m_ctxt, projCRS, EPSG_CODE_METHOD_MERCATOR_VARIANT_B, nullptr), nullptr); - auto conv_in_proj = proj_obj_crs_get_coordoperation(m_ctxt, projCRS); + auto conv_in_proj = proj_crs_get_coordoperation(m_ctxt, projCRS); ObjectKeeper keeper_conv_in_proj(conv_in_proj); ASSERT_NE(conv_in_proj, nullptr); // 3rd and 4th argument both 0/null - EXPECT_EQ(proj_obj_convert_conversion_to_other_method( - m_ctxt, conv_in_proj, 0, nullptr), + EXPECT_EQ(proj_convert_conversion_to_other_method(m_ctxt, conv_in_proj, + 0, nullptr), nullptr); - auto new_conv = proj_obj_convert_conversion_to_other_method( + auto new_conv = proj_convert_conversion_to_other_method( m_ctxt, conv_in_proj, EPSG_CODE_METHOD_MERCATOR_VARIANT_B, nullptr); ObjectKeeper keeper_new_conv(new_conv); ASSERT_NE(new_conv, nullptr); EXPECT_FALSE( - proj_obj_is_equivalent_to(new_conv, conv_in_proj, PJ_COMP_STRICT)); - EXPECT_TRUE(proj_obj_is_equivalent_to(new_conv, conv_in_proj, - PJ_COMP_EQUIVALENT)); + proj_is_equivalent_to(new_conv, conv_in_proj, PJ_COMP_STRICT)); + EXPECT_TRUE( + proj_is_equivalent_to(new_conv, conv_in_proj, PJ_COMP_EQUIVALENT)); - auto new_conv_from_name = proj_obj_convert_conversion_to_other_method( + auto new_conv_from_name = proj_convert_conversion_to_other_method( m_ctxt, conv_in_proj, 0, EPSG_NAME_METHOD_MERCATOR_VARIANT_B); ObjectKeeper keeper_new_conv_from_name(new_conv_from_name); ASSERT_NE(new_conv_from_name, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(new_conv, new_conv_from_name, - PJ_COMP_STRICT)); + EXPECT_TRUE(proj_is_equivalent_to(new_conv, new_conv_from_name, + PJ_COMP_STRICT)); - auto new_conv_back = proj_obj_convert_conversion_to_other_method( + auto new_conv_back = proj_convert_conversion_to_other_method( m_ctxt, conv_in_proj, 0, EPSG_NAME_METHOD_MERCATOR_VARIANT_A); ObjectKeeper keeper_new_conv_back(new_conv_back); ASSERT_NE(new_conv_back, nullptr); - EXPECT_TRUE(proj_obj_is_equivalent_to(conv_in_proj, new_conv_back, - PJ_COMP_STRICT)); + EXPECT_TRUE( + proj_is_equivalent_to(conv_in_proj, new_conv_back, PJ_COMP_STRICT)); } } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_get_non_deprecated) { - auto crs = proj_obj_create_from_database( - m_ctxt, "EPSG", "4226", PJ_OBJ_CATEGORY_CRS, false, nullptr); +TEST_F(CApi, proj_get_non_deprecated) { + auto crs = proj_create_from_database(m_ctxt, "EPSG", "4226", + PJ_CATEGORY_CRS, false, nullptr); ObjectKeeper keeper(crs); ASSERT_NE(crs, nullptr); - auto list = proj_obj_get_non_deprecated(m_ctxt, crs); + auto list = proj_get_non_deprecated(m_ctxt, crs); ASSERT_NE(list, nullptr); ObjListKeeper keeper_list(list); - EXPECT_EQ(proj_obj_list_get_count(list), 2); + EXPECT_EQ(proj_list_get_count(list), 2); } // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_query_geodetic_crs_from_datum) { +TEST_F(CApi, proj_query_geodetic_crs_from_datum) { { - auto list = proj_obj_query_geodetic_crs_from_datum( - m_ctxt, nullptr, "EPSG", "6326", nullptr); + auto list = proj_query_geodetic_crs_from_datum(m_ctxt, nullptr, "EPSG", + "6326", nullptr); ASSERT_NE(list, nullptr); ObjListKeeper keeper_list(list); - EXPECT_GE(proj_obj_list_get_count(list), 3); + EXPECT_GE(proj_list_get_count(list), 3); } { - auto list = proj_obj_query_geodetic_crs_from_datum( - m_ctxt, "EPSG", "EPSG", "6326", "geographic 2D"); + auto list = proj_query_geodetic_crs_from_datum(m_ctxt, "EPSG", "EPSG", + "6326", "geographic 2D"); ASSERT_NE(list, nullptr); ObjListKeeper keeper_list(list); - EXPECT_EQ(proj_obj_list_get_count(list), 1); + EXPECT_EQ(proj_list_get_count(list), 1); } } @@ -3018,35 +2989,35 @@ TEST_F(CApi, proj_uom_get_info_from_database) { // --------------------------------------------------------------------------- -TEST_F(CApi, proj_obj_create_cartesian_2D_cs) { +TEST_F(CApi, proj_create_cartesian_2D_cs) { { - auto cs = proj_obj_create_cartesian_2D_cs( + auto cs = proj_create_cartesian_2D_cs( m_ctxt, PJ_CART2D_EASTING_NORTHING, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); } { - auto cs = proj_obj_create_cartesian_2D_cs( + auto cs = proj_create_cartesian_2D_cs( m_ctxt, PJ_CART2D_NORTHING_EASTING, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); } { - auto cs = proj_obj_create_cartesian_2D_cs( + auto cs = proj_create_cartesian_2D_cs( m_ctxt, PJ_CART2D_NORTH_POLE_EASTING_SOUTH_NORTHING_SOUTH, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); } { - auto cs = proj_obj_create_cartesian_2D_cs( + auto cs = proj_create_cartesian_2D_cs( m_ctxt, PJ_CART2D_SOUTH_POLE_EASTING_NORTH_NORTHING_NORTH, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); } { - auto cs = proj_obj_create_cartesian_2D_cs( + auto cs = proj_create_cartesian_2D_cs( m_ctxt, PJ_CART2D_WESTING_SOUTHING, nullptr, 0); ObjectKeeper keeper_cs(cs); ASSERT_NE(cs, nullptr); diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp index b406227c..9b9273b5 100644 --- a/test/unit/test_operation.cpp +++ b/test/unit/test_operation.cpp @@ -4224,7 +4224,8 @@ TEST(operation, geogCRS_to_geogCRS_context_default) { // Romania has a larger area than Poland (given our approx formula) EXPECT_EQ(list[0]->getEPSGCode(), 15994); // Romania - 3m EXPECT_EQ(list[1]->getEPSGCode(), 1644); // Poland - 1m - EXPECT_EQ(list[2]->nameStr(), "Null geographic offset from Pulkovo 1942(58) to ETRS89"); + EXPECT_EQ(list[2]->nameStr(), + "Null geographic offset from Pulkovo 1942(58) to ETRS89"); EXPECT_EQ( list[0]->exportToPROJString(PROJStringFormatter::create().get()), |