From 0e0e0e475414ddeb75e0e140d8a3381a431036d9 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 28 Dec 2018 11:00:50 +0100 Subject: Rename proj_obj_XXX as proj_XXX and PJ_OBJ_XXX as PJ_XXX --- scripts/create_c_api_projections.py | 6 +- src/4D_api.cpp | 18 +- src/apps/cs2cs.cpp | 42 +- src/init.cpp | 4 +- src/iso19111/c_api.cpp | 1158 ++++++++++++++++---------------- src/proj.h | 152 ++--- src/proj_experimental.h | 176 ++--- test/unit/test_c_api.cpp | 1253 +++++++++++++++++------------------ test/unit/test_operation.cpp | 3 +- 9 files changed, 1414 insertions(+), 1398 deletions(-) diff --git a/scripts/create_c_api_projections.py b/scripts/create_c_api_projections.py index 76b54e1e..e99c36a8 100755 --- a/scripts/create_c_api_projections.py +++ b/scripts/create_c_api_projections.py @@ -96,7 +96,7 @@ for sectiondef in compounddef.iter('sectiondef'): shortName = name[len('create'):] c_shortName = snake_casify(shortName) - decl = "proj_obj_create_conversion_" + decl = "proj_create_conversion_" decl += c_shortName decl += "(\n" decl += " PJ_CONTEXT *ctx,\n" @@ -157,7 +157,7 @@ for sectiondef in compounddef.iter('sectiondef'): cppfile.write(", Scale(" + param[1] + ")") cppfile.write(");\n") - cppfile.write(" return proj_obj_create_conversion(conv);\n") + cppfile.write(" return proj_create_conversion(conv);\n") cppfile.write(" } catch (const std::exception &e) {\n"); cppfile.write(" proj_log_error(ctx, __FUNCTION__, e.what());\n") cppfile.write(" }\n") @@ -165,7 +165,7 @@ for sectiondef in compounddef.iter('sectiondef'): cppfile.write("}\n") test_cppfile.write("{\n") - test_cppfile.write(" auto projCRS = proj_obj_create_conversion_" + c_shortName + "(\n") + test_cppfile.write(" auto projCRS = proj_create_conversion_" + c_shortName + "(\n") test_cppfile.write(" m_ctxt") for param in params: test_cppfile.write(", 0") diff --git a/src/4D_api.cpp b/src/4D_api.cpp index ce9d7bd9..d8288af8 100644 --- a/src/4D_api.cpp +++ b/src/4D_api.cpp @@ -743,7 +743,7 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char - a PROJ string, like "+proj=longlat +datum=WGS84". When using that syntax, the axis order and unit for geographic CRS will be longitude, latitude, and the unit degrees. - - more generally any string accepted by proj_obj_create_from_user_input() + - more generally any string accepted by proj_create_from_user_input() An "area of use" can be specified in area. When it is supplied, the more accurate transformation between two given systems can be chosen. @@ -763,13 +763,13 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char const char* const* optionsImportCRS = proj_context_get_use_proj4_init_rules(ctx, FALSE) ? optionsProj4Mode : nullptr; - auto src = proj_obj_create_from_user_input(ctx, source_crs, optionsImportCRS); + auto src = proj_create_from_user_input(ctx, source_crs, optionsImportCRS); if( !src ) { proj_context_log_debug(ctx, "Cannot instanciate source_crs"); return nullptr; } - auto dst = proj_obj_create_from_user_input(ctx, target_crs, optionsImportCRS); + auto dst = proj_create_from_user_input(ctx, target_crs, optionsImportCRS); if( !dst ) { proj_context_log_debug(ctx, "Cannot instanciate target_crs"); proj_destroy(src); @@ -796,7 +796,7 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char proj_operation_factory_context_set_grid_availability_use( ctx, operation_ctx, PROJ_GRID_AVAILABILITY_DISCARD_OPERATION_IF_MISSING_GRID); - auto op_list = proj_obj_create_operations(ctx, src, dst, operation_ctx); + auto op_list = proj_create_operations(ctx, src, dst, operation_ctx); proj_operation_factory_context_destroy(operation_ctx); proj_destroy(src); @@ -806,19 +806,19 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char return nullptr; } - if( proj_obj_list_get_count(op_list) == 0 ) { - proj_obj_list_destroy(op_list); + if( proj_list_get_count(op_list) == 0 ) { + proj_list_destroy(op_list); proj_context_log_debug(ctx, "No operation found matching criteria"); return nullptr; } - auto op = proj_obj_list_get(ctx, op_list, 0); - proj_obj_list_destroy(op_list); + auto op = proj_list_get(ctx, op_list, 0); + proj_list_destroy(op_list); if( !op ) { return nullptr; } - proj_string = proj_obj_as_proj_string(ctx, op, PJ_PROJ_5, nullptr); + proj_string = proj_as_proj_string(ctx, op, PJ_PROJ_5, nullptr); if( !proj_string) { proj_destroy(op); proj_context_log_debug(ctx, "Cannot export operation as a PROJ string"); diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp index e7f43c76..1e8fb474 100644 --- a/src/apps/cs2cs.cpp +++ b/src/apps/cs2cs.cpp @@ -213,7 +213,7 @@ static PJ *instanciate_crs(const std::string &definition, const char *const *optionsImportCRS, bool &isGeog, double &toRadians, bool &isLatFirst) { - PJ *crs = proj_obj_create_from_user_input(nullptr, definition.c_str(), + PJ *crs = proj_create_from_user_input(nullptr, definition.c_str(), optionsImportCRS); if (!crs) { return nullptr; @@ -223,21 +223,21 @@ static PJ *instanciate_crs(const std::string &definition, toRadians = 0.0; isLatFirst = false; - auto type = proj_obj_get_type(crs); - if (type == PJ_OBJ_TYPE_BOUND_CRS) { - auto base = proj_obj_get_source_crs(nullptr, crs); + auto type = proj_get_type(crs); + if (type == PJ_TYPE_BOUND_CRS) { + auto base = proj_get_source_crs(nullptr, crs); proj_destroy(crs); crs = base; - type = proj_obj_get_type(crs); + type = proj_get_type(crs); } - if (type == PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS || - type == PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS) { - auto cs = proj_obj_crs_get_coordinate_system(nullptr, crs); + if (type == PJ_TYPE_GEOGRAPHIC_2D_CRS || + type == PJ_TYPE_GEOGRAPHIC_3D_CRS) { + auto cs = proj_crs_get_coordinate_system(nullptr, crs); assert(cs); isGeog = true; const char *axisName = ""; - proj_obj_cs_get_axis_info(nullptr, cs, 0, + proj_cs_get_axis_info(nullptr, cs, 0, &axisName, // name, nullptr, // abbrev nullptr, // direction @@ -263,32 +263,32 @@ static PJ *instanciate_crs(const std::string &definition, static std::string get_geog_crs_proj_string_from_proj_crs(PJ *src, double &toRadians, bool &isLatFirst) { - auto srcType = proj_obj_get_type(src); - if (srcType == PJ_OBJ_TYPE_BOUND_CRS) { - auto base = proj_obj_get_source_crs(nullptr, src); + auto srcType = proj_get_type(src); + if (srcType == PJ_TYPE_BOUND_CRS) { + auto base = proj_get_source_crs(nullptr, src); assert(base); proj_destroy(src); src = base; - srcType = proj_obj_get_type(src); + srcType = proj_get_type(src); } - if (srcType != PJ_OBJ_TYPE_PROJECTED_CRS) { + if (srcType != PJ_TYPE_PROJECTED_CRS) { return std::string(); } - auto base = proj_obj_get_source_crs(nullptr, src); + auto base = proj_get_source_crs(nullptr, src); assert(base); - auto baseType = proj_obj_get_type(base); - if (baseType != PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS && - baseType != PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS) { + auto baseType = proj_get_type(base); + if (baseType != PJ_TYPE_GEOGRAPHIC_2D_CRS && + baseType != PJ_TYPE_GEOGRAPHIC_3D_CRS) { proj_destroy(base); return std::string(); } - auto cs = proj_obj_crs_get_coordinate_system(nullptr, base); + auto cs = proj_crs_get_coordinate_system(nullptr, base); assert(cs); const char *axisName = ""; - proj_obj_cs_get_axis_info(nullptr, cs, 0, + proj_cs_get_axis_info(nullptr, cs, 0, &axisName, // name, nullptr, // abbrev nullptr, // direction @@ -302,7 +302,7 @@ static std::string get_geog_crs_proj_string_from_proj_crs(PJ *src, proj_destroy(cs); - auto retCStr = proj_obj_as_proj_string(nullptr, base, PJ_PROJ_5, nullptr); + auto retCStr = proj_as_proj_string(nullptr, base, PJ_PROJ_5, nullptr); std::string ret(retCStr ? retCStr : ""); proj_destroy(base); return ret; diff --git a/src/init.cpp b/src/init.cpp index 85c59d58..2ed34a09 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -287,12 +287,12 @@ Expand key from buffer or (if not in buffer) from init file strcpy(szInitStr, "+init="); strcat(szInitStr, xkey); - src = proj_obj_create_from_user_input(ctx, szInitStr, optionsProj4Mode); + src = proj_create_from_user_input(ctx, szInitStr, optionsProj4Mode); if( !src ) { return nullptr; } - proj_string = proj_obj_as_proj_string(ctx, src, PJ_PROJ_4, nullptr); + proj_string = proj_as_proj_string(ctx, src, PJ_PROJ_4, nullptr); if( !proj_string ) { proj_destroy(src); return nullptr; diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index 20629e8b..7f51e613 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -146,15 +146,15 @@ getDBcontextNoException(PJ_CONTEXT *ctx, const char *function) { // --------------------------------------------------------------------------- static PJ *pj_obj_create(PJ_CONTEXT *ctx, const IdentifiedObjectNNPtr &objIn) { - auto coordop = dynamic_cast(objIn.get()); - if( coordop ) { + auto coordop = dynamic_cast(objIn.get()); + if (coordop) { auto dbContext = getDBcontextNoException(ctx, __FUNCTION__); try { auto formatter = PROJStringFormatter::create( PROJStringFormatter::Convention::PROJ_5, dbContext); - auto pj = proj_create(ctx, - coordop->exportToPROJString(formatter.get()).c_str()); - if( pj ) { + auto pj = proj_create( + ctx, coordop->exportToPROJString(formatter.get()).c_str()); + if (pj) { pj->iso_obj = objIn; return pj; } @@ -321,9 +321,9 @@ static const char *getOptionValue(const char *option, * @return Object that must be unreferenced with proj_destroy(), or NULL in * case of error. */ -PJ *proj_obj_clone(PJ_CONTEXT *ctx, const PJ *obj) { +PJ *proj_clone(PJ_CONTEXT *ctx, const PJ *obj) { SANITIZE_CTX(ctx); - if( !obj->iso_obj ) { + if (!obj->iso_obj) { return nullptr; } try { @@ -361,8 +361,8 @@ PJ *proj_obj_clone(PJ_CONTEXT *ctx, const PJ *obj) { * @return Object that must be unreferenced with proj_destroy(), or NULL in * case of error. */ -PJ *proj_obj_create_from_user_input(PJ_CONTEXT *ctx, const char *text, - const char *const *options) { +PJ *proj_create_from_user_input(PJ_CONTEXT *ctx, const char *text, + const char *const *options) { SANITIZE_CTX(ctx); assert(text); (void)options; @@ -440,10 +440,10 @@ template static PROJ_STRING_LIST to_string_list(T &&set) { * @return Object that must be unreferenced with proj_destroy(), or NULL in * case of error. */ -PJ *proj_obj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, - const char *const *options, - PROJ_STRING_LIST *out_warnings, - PROJ_STRING_LIST *out_grammar_errors) { +PJ *proj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, + const char *const *options, + PROJ_STRING_LIST *out_warnings, + PROJ_STRING_LIST *out_grammar_errors) { SANITIZE_CTX(ctx); assert(wkt); @@ -534,9 +534,8 @@ PJ *proj_obj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, * @return Object that must be unreferenced with proj_destroy(), or NULL in * case of error. */ -PJ *proj_obj_create_from_proj_string(PJ_CONTEXT *ctx, - const char *proj_string, - const char *const *options) { +PJ *proj_create_from_proj_string(PJ_CONTEXT *ctx, const char *proj_string, + const char *const *options) { SANITIZE_CTX(ctx); (void)options; assert(proj_string); @@ -575,11 +574,10 @@ PJ *proj_obj_create_from_proj_string(PJ_CONTEXT *ctx, * @return Object that must be unreferenced with proj_destroy(), or NULL in * case of error. */ -PJ *proj_obj_create_from_database(PJ_CONTEXT *ctx, const char *auth_name, - const char *code, - PJ_OBJ_CATEGORY category, - int usePROJAlternativeGridNames, - const char *const *options) { +PJ *proj_create_from_database(PJ_CONTEXT *ctx, const char *auth_name, + const char *code, PJ_CATEGORY category, + int usePROJAlternativeGridNames, + const char *const *options) { assert(auth_name); assert(code); (void)options; @@ -589,20 +587,20 @@ PJ *proj_obj_create_from_database(PJ_CONTEXT *ctx, const char *auth_name, auto factory = AuthorityFactory::create(getDBcontext(ctx), auth_name); IdentifiedObjectPtr obj; switch (category) { - case PJ_OBJ_CATEGORY_ELLIPSOID: + case PJ_CATEGORY_ELLIPSOID: obj = factory->createEllipsoid(codeStr).as_nullable(); break; - case PJ_OBJ_CATEGORY_PRIME_MERIDIAN: + case PJ_CATEGORY_PRIME_MERIDIAN: obj = factory->createPrimeMeridian(codeStr).as_nullable(); break; - case PJ_OBJ_CATEGORY_DATUM: + case PJ_CATEGORY_DATUM: obj = factory->createDatum(codeStr).as_nullable(); break; - case PJ_OBJ_CATEGORY_CRS: + case PJ_CATEGORY_CRS: obj = factory->createCoordinateReferenceSystem(codeStr).as_nullable(); break; - case PJ_OBJ_CATEGORY_COORDINATE_OPERATION: + case PJ_CATEGORY_COORDINATE_OPERATION: obj = factory ->createCoordinateOperation( codeStr, usePROJAlternativeGridNames != 0) @@ -702,13 +700,13 @@ int proj_uom_get_info_from_database(PJ_CONTEXT *ctx, const char *auth_name, * @param datum_code Datum code (must not be NULL) * @param crs_type "geographic 2D", "geographic 3D", "geocentric" or NULL * @return a result set that must be unreferenced with - * proj_obj_list_destroy(), or NULL in case of error. + * proj_list_destroy(), or NULL in case of error. */ -PJ_OBJ_LIST *proj_obj_query_geodetic_crs_from_datum(PJ_CONTEXT *ctx, - const char *crs_auth_name, - const char *datum_auth_name, - const char *datum_code, - const char *crs_type) { +PJ_OBJ_LIST *proj_query_geodetic_crs_from_datum(PJ_CONTEXT *ctx, + const char *crs_auth_name, + const char *datum_auth_name, + const char *datum_code, + const char *crs_type) { assert(datum_auth_name); assert(datum_code); SANITIZE_CTX(ctx); @@ -732,101 +730,101 @@ PJ_OBJ_LIST *proj_obj_query_geodetic_crs_from_datum(PJ_CONTEXT *ctx, //! @cond Doxygen_Suppress static AuthorityFactory::ObjectType -convertPJObjectTypeToObjectType(PJ_OBJ_TYPE type, bool &valid) { +convertPJObjectTypeToObjectType(PJ_TYPE type, bool &valid) { valid = true; AuthorityFactory::ObjectType cppType = AuthorityFactory::ObjectType::CRS; switch (type) { - case PJ_OBJ_TYPE_ELLIPSOID: + case PJ_TYPE_ELLIPSOID: cppType = AuthorityFactory::ObjectType::ELLIPSOID; break; - case PJ_OBJ_TYPE_PRIME_MERIDIAN: + case PJ_TYPE_PRIME_MERIDIAN: cppType = AuthorityFactory::ObjectType::PRIME_MERIDIAN; break; - case PJ_OBJ_TYPE_GEODETIC_REFERENCE_FRAME: - case PJ_OBJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME: + case PJ_TYPE_GEODETIC_REFERENCE_FRAME: + case PJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME: cppType = AuthorityFactory::ObjectType::GEODETIC_REFERENCE_FRAME; break; - case PJ_OBJ_TYPE_VERTICAL_REFERENCE_FRAME: - case PJ_OBJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME: + case PJ_TYPE_VERTICAL_REFERENCE_FRAME: + case PJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME: cppType = AuthorityFactory::ObjectType::VERTICAL_REFERENCE_FRAME; break; - case PJ_OBJ_TYPE_DATUM_ENSEMBLE: + case PJ_TYPE_DATUM_ENSEMBLE: cppType = AuthorityFactory::ObjectType::DATUM; break; - case PJ_OBJ_TYPE_CRS: + case PJ_TYPE_CRS: cppType = AuthorityFactory::ObjectType::CRS; break; - case PJ_OBJ_TYPE_GEODETIC_CRS: + case PJ_TYPE_GEODETIC_CRS: cppType = AuthorityFactory::ObjectType::GEODETIC_CRS; break; - case PJ_OBJ_TYPE_GEOCENTRIC_CRS: + case PJ_TYPE_GEOCENTRIC_CRS: cppType = AuthorityFactory::ObjectType::GEOCENTRIC_CRS; break; - case PJ_OBJ_TYPE_GEOGRAPHIC_CRS: + case PJ_TYPE_GEOGRAPHIC_CRS: cppType = AuthorityFactory::ObjectType::GEOGRAPHIC_CRS; break; - case PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS: + case PJ_TYPE_GEOGRAPHIC_2D_CRS: cppType = AuthorityFactory::ObjectType::GEOGRAPHIC_2D_CRS; break; - case PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS: + case PJ_TYPE_GEOGRAPHIC_3D_CRS: cppType = AuthorityFactory::ObjectType::GEOGRAPHIC_3D_CRS; break; - case PJ_OBJ_TYPE_VERTICAL_CRS: + case PJ_TYPE_VERTICAL_CRS: cppType = AuthorityFactory::ObjectType::VERTICAL_CRS; break; - case PJ_OBJ_TYPE_PROJECTED_CRS: + case PJ_TYPE_PROJECTED_CRS: cppType = AuthorityFactory::ObjectType::PROJECTED_CRS; break; - case PJ_OBJ_TYPE_COMPOUND_CRS: + case PJ_TYPE_COMPOUND_CRS: cppType = AuthorityFactory::ObjectType::COMPOUND_CRS; break; - case PJ_OBJ_TYPE_ENGINEERING_CRS: + case PJ_TYPE_ENGINEERING_CRS: valid = false; break; - case PJ_OBJ_TYPE_TEMPORAL_CRS: + case PJ_TYPE_TEMPORAL_CRS: valid = false; break; - case PJ_OBJ_TYPE_BOUND_CRS: + case PJ_TYPE_BOUND_CRS: valid = false; break; - case PJ_OBJ_TYPE_OTHER_CRS: + case PJ_TYPE_OTHER_CRS: cppType = AuthorityFactory::ObjectType::CRS; break; - case PJ_OBJ_TYPE_CONVERSION: + case PJ_TYPE_CONVERSION: cppType = AuthorityFactory::ObjectType::CONVERSION; break; - case PJ_OBJ_TYPE_TRANSFORMATION: + case PJ_TYPE_TRANSFORMATION: cppType = AuthorityFactory::ObjectType::TRANSFORMATION; break; - case PJ_OBJ_TYPE_CONCATENATED_OPERATION: + case PJ_TYPE_CONCATENATED_OPERATION: cppType = AuthorityFactory::ObjectType::CONCATENATED_OPERATION; break; - case PJ_OBJ_TYPE_OTHER_COORDINATE_OPERATION: + case PJ_TYPE_OTHER_COORDINATE_OPERATION: cppType = AuthorityFactory::ObjectType::COORDINATE_OPERATION; break; - case PJ_OBJ_TYPE_UNKNOWN: + case PJ_TYPE_UNKNOWN: valid = false; break; } @@ -850,14 +848,14 @@ convertPJObjectTypeToObjectType(PJ_OBJ_TYPE type, bool &valid) { * Or 0 for unlimited. * @param options should be set to NULL for now * @return a result set that must be unreferenced with - * proj_obj_list_destroy(), or NULL in case of error. + * proj_list_destroy(), or NULL in case of error. */ -PJ_OBJ_LIST *proj_obj_create_from_name(PJ_CONTEXT *ctx, const char *auth_name, - const char *searchedName, - const PJ_OBJ_TYPE *types, - size_t typesCount, int approximateMatch, - size_t limitResultCount, - const char *const *options) { +PJ_OBJ_LIST *proj_create_from_name(PJ_CONTEXT *ctx, const char *auth_name, + const char *searchedName, + const PJ_TYPE *types, size_t typesCount, + int approximateMatch, + size_t limitResultCount, + const char *const *options) { assert(searchedName); assert((types != nullptr && typesCount > 0) || (types == nullptr && typesCount == 0)); @@ -895,43 +893,43 @@ PJ_OBJ_LIST *proj_obj_create_from_name(PJ_CONTEXT *ctx, const char *auth_name, * @param obj Object (must not be NULL) * @return its type. */ -PJ_OBJ_TYPE proj_obj_get_type(const PJ *obj) { +PJ_TYPE proj_get_type(const PJ *obj) { assert(obj); - if( !obj->iso_obj ) { - return PJ_OBJ_TYPE_UNKNOWN; + if (!obj->iso_obj) { + return PJ_TYPE_UNKNOWN; } auto ptr = obj->iso_obj.get(); if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_ELLIPSOID; + return PJ_TYPE_ELLIPSOID; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_PRIME_MERIDIAN; + return PJ_TYPE_PRIME_MERIDIAN; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME; + return PJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_GEODETIC_REFERENCE_FRAME; + return PJ_TYPE_GEODETIC_REFERENCE_FRAME; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME; + return PJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_VERTICAL_REFERENCE_FRAME; + return PJ_TYPE_VERTICAL_REFERENCE_FRAME; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_DATUM_ENSEMBLE; + return PJ_TYPE_DATUM_ENSEMBLE; } { auto crs = dynamic_cast(ptr); if (crs) { if (crs->coordinateSystem()->axisList().size() == 2) { - return PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS; + return PJ_TYPE_GEOGRAPHIC_2D_CRS; } else { - return PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS; + return PJ_TYPE_GEOGRAPHIC_3D_CRS; } } } @@ -940,49 +938,49 @@ PJ_OBJ_TYPE proj_obj_get_type(const PJ *obj) { auto crs = dynamic_cast(ptr); if (crs) { if (crs->isGeocentric()) { - return PJ_OBJ_TYPE_GEOCENTRIC_CRS; + return PJ_TYPE_GEOCENTRIC_CRS; } else { - return PJ_OBJ_TYPE_GEODETIC_CRS; + return PJ_TYPE_GEODETIC_CRS; } } } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_VERTICAL_CRS; + return PJ_TYPE_VERTICAL_CRS; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_PROJECTED_CRS; + return PJ_TYPE_PROJECTED_CRS; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_COMPOUND_CRS; + return PJ_TYPE_COMPOUND_CRS; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_TEMPORAL_CRS; + return PJ_TYPE_TEMPORAL_CRS; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_ENGINEERING_CRS; + return PJ_TYPE_ENGINEERING_CRS; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_BOUND_CRS; + return PJ_TYPE_BOUND_CRS; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_OTHER_CRS; + return PJ_TYPE_OTHER_CRS; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_CONVERSION; + return PJ_TYPE_CONVERSION; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_TRANSFORMATION; + return PJ_TYPE_TRANSFORMATION; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_CONCATENATED_OPERATION; + return PJ_TYPE_CONCATENATED_OPERATION; } if (dynamic_cast(ptr)) { - return PJ_OBJ_TYPE_OTHER_COORDINATE_OPERATION; + return PJ_TYPE_OTHER_COORDINATE_OPERATION; } - return PJ_OBJ_TYPE_UNKNOWN; + return PJ_TYPE_UNKNOWN; } // --------------------------------------------------------------------------- @@ -992,9 +990,9 @@ PJ_OBJ_TYPE proj_obj_get_type(const PJ *obj) { * @param obj Object (must not be NULL) * @return TRUE if it is deprecated, FALSE otherwise */ -int proj_obj_is_deprecated(const PJ *obj) { +int proj_is_deprecated(const PJ *obj) { assert(obj); - if( !obj->iso_obj ) { + if (!obj->iso_obj) { return false; } return obj->iso_obj->isDeprecated(); @@ -1008,9 +1006,9 @@ int proj_obj_is_deprecated(const PJ *obj) { * @param obj Object (of type CRS for now) for which non-deprecated objects * must be searched. Must not be NULL * @return a result set that must be unreferenced with - * proj_obj_list_destroy(), or NULL in case of error. + * proj_list_destroy(), or NULL in case of error. */ -PJ_OBJ_LIST *proj_obj_get_non_deprecated(PJ_CONTEXT *ctx, const PJ *obj) { +PJ_OBJ_LIST *proj_get_non_deprecated(PJ_CONTEXT *ctx, const PJ *obj) { assert(obj); SANITIZE_CTX(ctx); auto crs = dynamic_cast(obj->iso_obj.get()); @@ -1039,14 +1037,14 @@ PJ_OBJ_LIST *proj_obj_get_non_deprecated(PJ_CONTEXT *ctx, const PJ *obj) { * @param criterion Comparison criterion * @return TRUE if they are equivalent */ -int proj_obj_is_equivalent_to(const PJ *obj, const PJ *other, - PJ_COMPARISON_CRITERION criterion) { +int proj_is_equivalent_to(const PJ *obj, const PJ *other, + PJ_COMPARISON_CRITERION criterion) { assert(obj); assert(other); - if( !obj->iso_obj ) { + if (!obj->iso_obj) { return false; } - if( !other->iso_obj ) { + if (!other->iso_obj) { return false; } @@ -1082,7 +1080,7 @@ int proj_obj_is_equivalent_to(const PJ *obj, const PJ *other, * * @param obj Object (must not be NULL) */ -int proj_obj_is_crs(const PJ *obj) { +int proj_is_crs(const PJ *obj) { assert(obj); return dynamic_cast(obj->iso_obj.get()) != nullptr; } @@ -1096,9 +1094,9 @@ int proj_obj_is_crs(const PJ *obj) { * @param obj Object (must not be NULL) * @return a string, or NULL in case of error or missing name. */ -const char *proj_obj_get_name(const PJ *obj) { +const char *proj_get_name(const PJ *obj) { assert(obj); - if( !obj->iso_obj ) { + if (!obj->iso_obj) { return nullptr; } const auto &desc = obj->iso_obj->name()->description(); @@ -1120,9 +1118,9 @@ const char *proj_obj_get_name(const PJ *obj) { * @param index Index of the identifier. 0 = first identifier * @return a string, or NULL in case of error or missing name. */ -const char *proj_obj_get_id_auth_name(const PJ *obj, int index) { +const char *proj_get_id_auth_name(const PJ *obj, int index) { assert(obj); - if( !obj->iso_obj ) { + if (!obj->iso_obj) { return nullptr; } const auto &ids = obj->iso_obj->identifiers(); @@ -1148,9 +1146,9 @@ const char *proj_obj_get_id_auth_name(const PJ *obj, int index) { * @param index Index of the identifier. 0 = first identifier * @return a string, or NULL in case of error or missing name. */ -const char *proj_obj_get_id_code(const PJ *obj, int index) { +const char *proj_get_id_code(const PJ *obj, int index) { assert(obj); - if( !obj->iso_obj ) { + if (!obj->iso_obj) { return nullptr; } const auto &ids = obj->iso_obj->identifiers(); @@ -1165,7 +1163,7 @@ const char *proj_obj_get_id_code(const PJ *obj, int index) { /** \brief Get a WKT representation of an object. * * The returned string is valid while the input obj parameter is valid, - * and until a next call to proj_obj_as_wkt() with the same input object. + * and until a next call to proj_as_wkt() with the same input object. * * This function calls osgeo::proj::io::IWKTExportable::exportToWKT(). * @@ -1188,11 +1186,11 @@ const char *proj_obj_get_id_code(const PJ *obj, int index) { * * @return a string, or NULL in case of error. */ -const char *proj_obj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, - PJ_WKT_TYPE type, const char *const *options) { +const char *proj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, PJ_WKT_TYPE type, + const char *const *options) { SANITIZE_CTX(ctx); assert(obj); - if( !obj->iso_obj ) { + if (!obj->iso_obj) { return nullptr; } @@ -1266,7 +1264,7 @@ const char *proj_obj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, /** \brief Get a PROJ string representation of an object. * * The returned string is valid while the input obj parameter is valid, - * and until a next call to proj_obj_as_proj_string() with the same input + * and until a next call to proj_as_proj_string() with the same input * object. * * This function calls @@ -1285,9 +1283,9 @@ const char *proj_obj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, * use of etmerc by utm conversions) * @return a string, or NULL in case of error. */ -const char *proj_obj_as_proj_string(PJ_CONTEXT *ctx, const PJ *obj, - PJ_PROJ_STRING_TYPE type, - const char *const *options) { +const char *proj_as_proj_string(PJ_CONTEXT *ctx, const PJ *obj, + PJ_PROJ_STRING_TYPE type, + const char *const *options) { SANITIZE_CTX(ctx); assert(obj); auto exportable = @@ -1353,12 +1351,12 @@ const char *proj_obj_as_proj_string(PJ_CONTEXT *ctx, const PJ *obj, * @return TRUE in case of success, FALSE in case of error or if the area * of use is unknown. */ -int proj_obj_get_area_of_use(PJ_CONTEXT *ctx, const PJ *obj, - double *out_west_lon_degree, - double *out_south_lat_degree, - double *out_east_lon_degree, - double *out_north_lat_degree, - const char **out_area_name) { +int proj_get_area_of_use(PJ_CONTEXT *ctx, const PJ *obj, + double *out_west_lon_degree, + double *out_south_lat_degree, + double *out_east_lon_degree, + double *out_north_lat_degree, + const char **out_area_name) { (void)ctx; if (out_area_name) { *out_area_name = nullptr; @@ -1445,14 +1443,15 @@ static const GeodeticCRS *extractGeodeticCRS(PJ_CONTEXT *ctx, const PJ *crs, * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error. */ -PJ *proj_obj_crs_get_geodetic_crs(PJ_CONTEXT *ctx, const PJ *crs) { +PJ *proj_crs_get_geodetic_crs(PJ_CONTEXT *ctx, const PJ *crs) { SANITIZE_CTX(ctx); auto geodCRS = extractGeodeticCRS(ctx, crs, __FUNCTION__); if (!geodCRS) { return nullptr; } - return pj_obj_create(ctx, NN_NO_CHECK(nn_dynamic_pointer_cast( - geodCRS->shared_from_this()))); + return pj_obj_create(ctx, + NN_NO_CHECK(nn_dynamic_pointer_cast( + geodCRS->shared_from_this()))); } // --------------------------------------------------------------------------- @@ -1470,8 +1469,7 @@ PJ *proj_obj_crs_get_geodetic_crs(PJ_CONTEXT *ctx, const PJ *crs) { * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error. */ -PJ *proj_obj_crs_get_sub_crs(PJ_CONTEXT *ctx, const PJ *crs, - int index) { +PJ *proj_crs_get_sub_crs(PJ_CONTEXT *ctx, const PJ *crs, int index) { SANITIZE_CTX(ctx); assert(crs); auto l_crs = dynamic_cast(crs->iso_obj.get()); @@ -1501,9 +1499,8 @@ PJ *proj_obj_crs_get_sub_crs(PJ_CONTEXT *ctx, const PJ *crs, * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error. */ -PJ *proj_obj_crs_create_bound_crs(PJ_CONTEXT *ctx, const PJ *base_crs, - const PJ *hub_crs, - const PJ *transformation) { +PJ *proj_crs_create_bound_crs(PJ_CONTEXT *ctx, const PJ *base_crs, + const PJ *hub_crs, const PJ *transformation) { SANITIZE_CTX(ctx); assert(base_crs); assert(hub_crs); @@ -1525,9 +1522,10 @@ PJ *proj_obj_crs_create_bound_crs(PJ_CONTEXT *ctx, const PJ *base_crs, return nullptr; } try { - return pj_obj_create(ctx, BoundCRS::create(NN_NO_CHECK(l_base_crs), - NN_NO_CHECK(l_hub_crs), - NN_NO_CHECK(l_transformation))); + return pj_obj_create(ctx, + BoundCRS::create(NN_NO_CHECK(l_base_crs), + NN_NO_CHECK(l_hub_crs), + NN_NO_CHECK(l_transformation))); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); return nullptr; @@ -1558,9 +1556,8 @@ PJ *proj_obj_crs_create_bound_crs(PJ_CONTEXT *ctx, const PJ *base_crs, * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error. */ -PJ *proj_obj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx, - const PJ *crs, - const char *const *options) { +PJ *proj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx, const PJ *crs, + const char *const *options) { SANITIZE_CTX(ctx); assert(crs); auto l_crs = dynamic_cast(crs->iso_obj.get()); @@ -1583,7 +1580,7 @@ PJ *proj_obj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx, } } return pj_obj_create(ctx, l_crs->createBoundCRSToWGS84IfPossible( - dbContext, allowIntermediateCRS)); + dbContext, allowIntermediateCRS)); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); return nullptr; @@ -1603,7 +1600,7 @@ PJ *proj_obj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx, * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error. */ -PJ *proj_obj_get_ellipsoid(PJ_CONTEXT *ctx, const PJ *obj) { +PJ *proj_get_ellipsoid(PJ_CONTEXT *ctx, const PJ *obj) { SANITIZE_CTX(ctx); auto ptr = obj->iso_obj.get(); if (dynamic_cast(ptr)) { @@ -1635,7 +1632,7 @@ PJ *proj_obj_get_ellipsoid(PJ_CONTEXT *ctx, const PJ *obj) { * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error. */ -PJ *proj_obj_crs_get_horizontal_datum(PJ_CONTEXT *ctx, const PJ *crs) { +PJ *proj_crs_get_horizontal_datum(PJ_CONTEXT *ctx, const PJ *crs) { SANITIZE_CTX(ctx); auto geodCRS = extractGeodeticCRS(ctx, crs, __FUNCTION__); if (!geodCRS) { @@ -1674,14 +1671,15 @@ PJ *proj_obj_crs_get_horizontal_datum(PJ_CONTEXT *ctx, const PJ *crs) { * flattening. or NULL * @return TRUE in case of success. */ -int proj_obj_ellipsoid_get_parameters(PJ_CONTEXT *ctx, const PJ *ellipsoid, - double *out_semi_major_metre, - double *out_semi_minor_metre, - int *out_is_semi_minor_computed, - double *out_inv_flattening) { +int proj_ellipsoid_get_parameters(PJ_CONTEXT *ctx, const PJ *ellipsoid, + double *out_semi_major_metre, + double *out_semi_minor_metre, + int *out_is_semi_minor_computed, + double *out_inv_flattening) { SANITIZE_CTX(ctx); assert(ellipsoid); - auto l_ellipsoid = dynamic_cast(ellipsoid->iso_obj.get()); + auto l_ellipsoid = + dynamic_cast(ellipsoid->iso_obj.get()); if (!l_ellipsoid) { proj_log_error(ctx, __FUNCTION__, "Object is not a Ellipsoid"); return FALSE; @@ -1718,7 +1716,7 @@ int proj_obj_ellipsoid_get_parameters(PJ_CONTEXT *ctx, const PJ *ellipsoid, * in case of error. */ -PJ *proj_obj_get_prime_meridian(PJ_CONTEXT *ctx, const PJ *obj) { +PJ *proj_get_prime_meridian(PJ_CONTEXT *ctx, const PJ *obj) { SANITIZE_CTX(ctx); auto ptr = obj->iso_obj.get(); if (dynamic_cast(ptr)) { @@ -1751,14 +1749,15 @@ PJ *proj_obj_get_prime_meridian(PJ_CONTEXT *ctx, const PJ *obj) { * or NULL * @return TRUE in case of success. */ -int proj_obj_prime_meridian_get_parameters(PJ_CONTEXT *ctx, - const PJ *prime_meridian, - double *out_longitude, - double *out_unit_conv_factor, - const char **out_unit_name) { +int proj_prime_meridian_get_parameters(PJ_CONTEXT *ctx, + const PJ *prime_meridian, + double *out_longitude, + double *out_unit_conv_factor, + const char **out_unit_name) { SANITIZE_CTX(ctx); assert(prime_meridian); - auto l_pm = dynamic_cast(prime_meridian->iso_obj.get()); + auto l_pm = + dynamic_cast(prime_meridian->iso_obj.get()); if (!l_pm) { proj_log_error(ctx, __FUNCTION__, "Object is not a PrimeMeridian"); return false; @@ -1791,7 +1790,7 @@ int proj_obj_prime_meridian_get_parameters(PJ_CONTEXT *ctx, * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error, or missing source CRS. */ -PJ *proj_obj_get_source_crs(PJ_CONTEXT *ctx, const PJ *obj) { +PJ *proj_get_source_crs(PJ_CONTEXT *ctx, const PJ *obj) { SANITIZE_CTX(ctx); assert(obj); auto ptr = obj->iso_obj.get(); @@ -1830,7 +1829,7 @@ PJ *proj_obj_get_source_crs(PJ_CONTEXT *ctx, const PJ *obj) { * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error, or missing target CRS. */ -PJ *proj_obj_get_target_crs(PJ_CONTEXT *ctx, const PJ *obj) { +PJ *proj_get_target_crs(PJ_CONTEXT *ctx, const PJ *obj) { SANITIZE_CTX(ctx); assert(obj); auto ptr = obj->iso_obj.get(); @@ -1881,15 +1880,14 @@ PJ *proj_obj_get_target_crs(PJ_CONTEXT *ctx, const PJ *obj) { * @param out_confidence Output parameter. Pointer to an array of integers that * will be allocated by the function and filled with the confidence values * (0-100). There are as many elements in this array as - * proj_obj_list_get_count() + * proj_list_get_count() * returns on the return value of this function. *confidence should be * released with proj_int_list_destroy(). * @return a list of matching reference CRS, or nullptr in case of error. */ -PJ_OBJ_LIST *proj_obj_identify(PJ_CONTEXT *ctx, const PJ *obj, - const char *auth_name, - const char *const *options, - int **out_confidence) { +PJ_OBJ_LIST *proj_identify(PJ_CONTEXT *ctx, const PJ *obj, + const char *auth_name, const char *const *options, + int **out_confidence) { SANITIZE_CTX(ctx); assert(obj); (void)options; @@ -1974,7 +1972,7 @@ PROJ_STRING_LIST proj_get_authorities_from_database(PJ_CONTEXT *ctx) { */ PROJ_STRING_LIST proj_get_codes_from_database(PJ_CONTEXT *ctx, const char *auth_name, - PJ_OBJ_TYPE type, + PJ_TYPE type, int allow_deprecated) { assert(auth_name); SANITIZE_CTX(ctx); @@ -2020,7 +2018,7 @@ void proj_string_list_destroy(PROJ_STRING_LIST list) { * @return Object of type SingleOperation that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_crs_get_coordoperation(PJ_CONTEXT *ctx, const PJ *crs) { +PJ *proj_crs_get_coordoperation(PJ_CONTEXT *ctx, const PJ *crs) { SANITIZE_CTX(ctx); assert(crs); SingleOperationPtr co; @@ -2234,12 +2232,14 @@ static GeodeticReferenceFrameNNPtr createGeodeticReferenceFrame( * @return Object of type GeographicCRS that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_geographic_crs( - PJ_CONTEXT *ctx, const char *crs_name, const char *datum_name, - const char *ellps_name, double semi_major_metre, double inv_flattening, - const char *prime_meridian_name, double prime_meridian_offset, - const char *pm_angular_units, double pm_angular_units_conv, - PJ *ellipsoidal_cs) { +PJ *proj_create_geographic_crs(PJ_CONTEXT *ctx, const char *crs_name, + const char *datum_name, const char *ellps_name, + double semi_major_metre, double inv_flattening, + const char *prime_meridian_name, + double prime_meridian_offset, + const char *pm_angular_units, + double pm_angular_units_conv, + PJ *ellipsoidal_cs) { SANITIZE_CTX(ctx); auto cs = std::dynamic_pointer_cast(ellipsoidal_cs->iso_obj); @@ -2276,10 +2276,8 @@ PJ *proj_obj_create_geographic_crs( * @return Object of type GeographicCRS that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_geographic_crs_from_datum(PJ_CONTEXT *ctx, - const char *crs_name, - PJ *datum, - PJ *ellipsoidal_cs) { +PJ *proj_create_geographic_crs_from_datum(PJ_CONTEXT *ctx, const char *crs_name, + PJ *datum, PJ *ellipsoidal_cs) { SANITIZE_CTX(ctx); auto l_datum = @@ -2332,7 +2330,7 @@ PJ *proj_obj_create_geographic_crs_from_datum(PJ_CONTEXT *ctx, * @return Object of type GeodeticCRS that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_geocentric_crs( +PJ *proj_create_geocentric_crs( PJ_CONTEXT *ctx, const char *crs_name, const char *datum_name, const char *ellps_name, double semi_major_metre, double inv_flattening, const char *prime_meridian_name, double prime_meridian_offset, @@ -2376,11 +2374,10 @@ PJ *proj_obj_create_geocentric_crs( * @return Object of type GeodeticCRS that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_geocentric_crs_from_datum(PJ_CONTEXT *ctx, - const char *crs_name, - const PJ *datum, - const char *linear_units, - double linear_units_conv) { +PJ *proj_create_geocentric_crs_from_datum(PJ_CONTEXT *ctx, const char *crs_name, + const PJ *datum, + const char *linear_units, + double linear_units_conv) { SANITIZE_CTX(ctx); try { const UnitOfMeasure linearUnit( @@ -2420,10 +2417,9 @@ PJ *proj_obj_create_geocentric_crs_from_datum(PJ_CONTEXT *ctx, * @return Object of type VerticalCRS that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_vertical_crs(PJ_CONTEXT *ctx, const char *crs_name, - const char *datum_name, - const char *linear_units, - double linear_units_conv) { +PJ *proj_create_vertical_crs(PJ_CONTEXT *ctx, const char *crs_name, + const char *datum_name, const char *linear_units, + double linear_units_conv) { SANITIZE_CTX(ctx); try { @@ -2457,8 +2453,8 @@ PJ *proj_obj_create_vertical_crs(PJ_CONTEXT *ctx, const char *crs_name, * @return Object of type CompoundCRS that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_compound_crs(PJ_CONTEXT *ctx, const char *crs_name, - PJ *horiz_crs, PJ *vert_crs) { +PJ *proj_create_compound_crs(PJ_CONTEXT *ctx, const char *crs_name, + PJ *horiz_crs, PJ *vert_crs) { assert(horiz_crs); assert(vert_crs); @@ -2499,8 +2495,7 @@ PJ *proj_obj_create_compound_crs(PJ_CONTEXT *ctx, const char *crs_name, * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ PROJ_DLL *proj_obj_alter_name(PJ_CONTEXT *ctx, const PJ *obj, - const char *name) { +PJ PROJ_DLL *proj_alter_name(PJ_CONTEXT *ctx, const PJ *obj, const char *name) { SANITIZE_CTX(ctx); auto crs = dynamic_cast(obj->iso_obj.get()); if (!crs) { @@ -2532,8 +2527,8 @@ PJ PROJ_DLL *proj_obj_alter_name(PJ_CONTEXT *ctx, const PJ *obj, * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ PROJ_DLL *proj_obj_alter_id(PJ_CONTEXT *ctx, const PJ *obj, - const char *auth_name, const char *code) { +PJ PROJ_DLL *proj_alter_id(PJ_CONTEXT *ctx, const PJ *obj, + const char *auth_name, const char *code) { SANITIZE_CTX(ctx); auto crs = dynamic_cast(obj->iso_obj.get()); if (!crs) { @@ -2568,8 +2563,8 @@ PJ PROJ_DLL *proj_obj_alter_id(PJ_CONTEXT *ctx, const PJ *obj, * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_crs_alter_geodetic_crs(PJ_CONTEXT *ctx, const PJ *obj, - const PJ *new_geod_crs) { +PJ *proj_crs_alter_geodetic_crs(PJ_CONTEXT *ctx, const PJ *obj, + const PJ *new_geod_crs) { SANITIZE_CTX(ctx); auto l_new_geod_crs = std::dynamic_pointer_cast(new_geod_crs->iso_obj); @@ -2585,8 +2580,8 @@ PJ *proj_obj_crs_alter_geodetic_crs(PJ_CONTEXT *ctx, const PJ *obj, } try { - return pj_obj_create(ctx, - crs->alterGeodeticCRS(NN_NO_CHECK(l_new_geod_crs))); + return pj_obj_create( + ctx, crs->alterGeodeticCRS(NN_NO_CHECK(l_new_geod_crs))); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); return nullptr; @@ -2614,14 +2609,14 @@ PJ *proj_obj_crs_alter_geodetic_crs(PJ_CONTEXT *ctx, const PJ *obj, * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx, const PJ *obj, - const char *angular_units, - double angular_units_conv, - const char *unit_auth_name, - const char *unit_code) { +PJ *proj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx, const PJ *obj, + const char *angular_units, + double angular_units_conv, + const char *unit_auth_name, + const char *unit_code) { SANITIZE_CTX(ctx); - auto geodCRS = proj_obj_crs_get_geodetic_crs(ctx, obj); + auto geodCRS = proj_crs_get_geodetic_crs(ctx, obj); if (!geodCRS) { return nullptr; } @@ -2635,10 +2630,11 @@ PJ *proj_obj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx, const PJ *obj, try { const UnitOfMeasure angUnit(createAngularUnit( angular_units, angular_units_conv, unit_auth_name, unit_code)); - geogCRSAltered = pj_obj_create(ctx, GeographicCRS::create( - createPropertyMapName(proj_obj_get_name(geodCRS)), geogCRS->datum(), - geogCRS->datumEnsemble(), - geogCRS->coordinateSystem()->alterAngularUnit(angUnit))); + geogCRSAltered = pj_obj_create( + ctx, GeographicCRS::create( + createPropertyMapName(proj_get_name(geodCRS)), + geogCRS->datum(), geogCRS->datumEnsemble(), + geogCRS->coordinateSystem()->alterAngularUnit(angUnit))); proj_destroy(geodCRS); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); @@ -2646,7 +2642,7 @@ PJ *proj_obj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx, const PJ *obj, return nullptr; } - auto ret = proj_obj_crs_alter_geodetic_crs(ctx, obj, geogCRSAltered); + auto ret = proj_crs_alter_geodetic_crs(ctx, obj, geogCRSAltered); proj_destroy(geogCRSAltered); return ret; } @@ -2673,11 +2669,11 @@ PJ *proj_obj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx, const PJ *obj, * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_crs_alter_cs_linear_unit(PJ_CONTEXT *ctx, const PJ *obj, - const char *linear_units, - double linear_units_conv, - const char *unit_auth_name, - const char *unit_code) { +PJ *proj_crs_alter_cs_linear_unit(PJ_CONTEXT *ctx, const PJ *obj, + const char *linear_units, + double linear_units_conv, + const char *unit_auth_name, + const char *unit_code) { SANITIZE_CTX(ctx); auto crs = dynamic_cast(obj->iso_obj.get()); if (!crs) { @@ -2720,10 +2716,12 @@ PJ *proj_obj_crs_alter_cs_linear_unit(PJ_CONTEXT *ctx, const PJ *obj, * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_crs_alter_parameters_linear_unit( - PJ_CONTEXT *ctx, const PJ *obj, const char *linear_units, - double linear_units_conv, const char *unit_auth_name, const char *unit_code, - int convert_to_new_unit) { +PJ *proj_crs_alter_parameters_linear_unit(PJ_CONTEXT *ctx, const PJ *obj, + const char *linear_units, + double linear_units_conv, + const char *unit_auth_name, + const char *unit_code, + int convert_to_new_unit) { SANITIZE_CTX(ctx); auto crs = dynamic_cast(obj->iso_obj.get()); if (!crs) { @@ -2734,7 +2732,7 @@ PJ *proj_obj_crs_alter_parameters_linear_unit( const UnitOfMeasure linearUnit(createLinearUnit( linear_units, linear_units_conv, unit_auth_name, unit_code)); return pj_obj_create(ctx, crs->alterParametersLinearUnit( - linearUnit, convert_to_new_unit == TRUE)); + linearUnit, convert_to_new_unit == TRUE)); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); return nullptr; @@ -2755,14 +2753,15 @@ PJ *proj_obj_crs_alter_parameters_linear_unit( * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ PROJ_DLL *proj_obj_create_engineering_crs(PJ_CONTEXT *ctx, - const char *crs_name) { +PJ PROJ_DLL *proj_create_engineering_crs(PJ_CONTEXT *ctx, + const char *crs_name) { SANITIZE_CTX(ctx); try { - return pj_obj_create(ctx, EngineeringCRS::create( - createPropertyMapName(crs_name), - EngineeringDatum::create(PropertyMap()), - CartesianCS::createEastingNorthing(UnitOfMeasure::METRE))); + return pj_obj_create( + ctx, EngineeringCRS::create( + createPropertyMapName(crs_name), + EngineeringDatum::create(PropertyMap()), + CartesianCS::createEastingNorthing(UnitOfMeasure::METRE))); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); return nullptr; @@ -2862,12 +2861,12 @@ static void setSingleOperationElements( * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_conversion(PJ_CONTEXT *ctx, const char *name, - const char *auth_name, const char *code, - const char *method_name, - const char *method_auth_name, - const char *method_code, int param_count, - const PJ_PARAM_DESCRIPTION *params) { +PJ *proj_create_conversion(PJ_CONTEXT *ctx, const char *name, + const char *auth_name, const char *code, + const char *method_name, + const char *method_auth_name, + const char *method_code, int param_count, + const PJ_PARAM_DESCRIPTION *params) { SANITIZE_CTX(ctx); try { PropertyMap propSingleOp; @@ -2879,8 +2878,8 @@ PJ *proj_obj_create_conversion(PJ_CONTEXT *ctx, const char *name, name, auth_name, code, method_name, method_auth_name, method_code, param_count, params, propSingleOp, propMethod, parameters, values); - return pj_obj_create(ctx, - Conversion::create(propSingleOp, propMethod, parameters, values)); + return pj_obj_create(ctx, Conversion::create(propSingleOp, propMethod, + parameters, values)); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); return nullptr; @@ -2917,12 +2916,14 @@ PJ *proj_obj_create_conversion(PJ_CONTEXT *ctx, const char *name, * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_transformation( - PJ_CONTEXT *ctx, const char *name, const char *auth_name, const char *code, - PJ *source_crs, PJ *target_crs, PJ *interpolation_crs, - const char *method_name, const char *method_auth_name, - const char *method_code, int param_count, - const PJ_PARAM_DESCRIPTION *params, double accuracy) { +PJ *proj_create_transformation(PJ_CONTEXT *ctx, const char *name, + const char *auth_name, const char *code, + PJ *source_crs, PJ *target_crs, + PJ *interpolation_crs, const char *method_name, + const char *method_auth_name, + const char *method_code, int param_count, + const PJ_PARAM_DESCRIPTION *params, + double accuracy) { SANITIZE_CTX(ctx); assert(source_crs); assert(target_crs); @@ -2965,9 +2966,11 @@ PJ *proj_obj_create_transformation( PositionalAccuracy::create(toString(accuracy))); } - return pj_obj_create(ctx, Transformation::create( - propSingleOp, NN_NO_CHECK(l_sourceCRS), NN_NO_CHECK(l_targetCRS), - l_interpolationCRS, propMethod, parameters, values, accuracies)); + return pj_obj_create( + ctx, + Transformation::create(propSingleOp, NN_NO_CHECK(l_sourceCRS), + NN_NO_CHECK(l_targetCRS), l_interpolationCRS, + propMethod, parameters, values, accuracies)); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); return nullptr; @@ -3000,9 +3003,10 @@ PJ *proj_obj_create_transformation( * @return new conversion that must be unreferenced with * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_convert_conversion_to_other_method( - PJ_CONTEXT *ctx, const PJ *conversion, int new_method_epsg_code, - const char *new_method_name) { +PJ *proj_convert_conversion_to_other_method(PJ_CONTEXT *ctx, + const PJ *conversion, + int new_method_epsg_code, + const char *new_method_name) { SANITIZE_CTX(ctx); auto conv = dynamic_cast(conversion->iso_obj.get()); if (!conv) { @@ -3099,8 +3103,8 @@ static CoordinateSystemAxisNNPtr createAxis(const PJ_AXIS_DESCRIPTION &axis) { * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_cs(PJ_CONTEXT *ctx, PJ_COORDINATE_SYSTEM_TYPE type, - int axis_count, const PJ_AXIS_DESCRIPTION *axis) { +PJ *proj_create_cs(PJ_CONTEXT *ctx, PJ_COORDINATE_SYSTEM_TYPE type, + int axis_count, const PJ_AXIS_DESCRIPTION *axis) { try { switch (type) { case PJ_CS_TYPE_UNKNOWN: @@ -3108,31 +3112,37 @@ PJ *proj_obj_create_cs(PJ_CONTEXT *ctx, PJ_COORDINATE_SYSTEM_TYPE type, case PJ_CS_TYPE_CARTESIAN: { if (axis_count == 2) { - return pj_obj_create(ctx, CartesianCS::create( - PropertyMap(), createAxis(axis[0]), createAxis(axis[1]))); + return pj_obj_create( + ctx, CartesianCS::create(PropertyMap(), createAxis(axis[0]), + createAxis(axis[1]))); } else if (axis_count == 3) { - return pj_obj_create(ctx, CartesianCS::create( - PropertyMap(), createAxis(axis[0]), createAxis(axis[1]), - createAxis(axis[2]))); + return pj_obj_create( + ctx, CartesianCS::create(PropertyMap(), createAxis(axis[0]), + createAxis(axis[1]), + createAxis(axis[2]))); } break; } case PJ_CS_TYPE_ELLIPSOIDAL: { if (axis_count == 2) { - return pj_obj_create(ctx, EllipsoidalCS::create( - PropertyMap(), createAxis(axis[0]), createAxis(axis[1]))); + return pj_obj_create( + ctx, + EllipsoidalCS::create(PropertyMap(), createAxis(axis[0]), + createAxis(axis[1]))); } else if (axis_count == 3) { - return pj_obj_create(ctx, EllipsoidalCS::create( - PropertyMap(), createAxis(axis[0]), createAxis(axis[1]), - createAxis(axis[2]))); + return pj_obj_create( + ctx, EllipsoidalCS::create( + PropertyMap(), createAxis(axis[0]), + createAxis(axis[1]), createAxis(axis[2]))); } break; } case PJ_CS_TYPE_VERTICAL: { if (axis_count == 1) { - return pj_obj_create(ctx, + return pj_obj_create( + ctx, VerticalCS::create(PropertyMap(), createAxis(axis[0]))); } break; @@ -3140,16 +3150,18 @@ PJ *proj_obj_create_cs(PJ_CONTEXT *ctx, PJ_COORDINATE_SYSTEM_TYPE type, case PJ_CS_TYPE_SPHERICAL: { if (axis_count == 3) { - return pj_obj_create(ctx, EllipsoidalCS::create( - PropertyMap(), createAxis(axis[0]), createAxis(axis[1]), - createAxis(axis[2]))); + return pj_obj_create( + ctx, EllipsoidalCS::create( + PropertyMap(), createAxis(axis[0]), + createAxis(axis[1]), createAxis(axis[2]))); } break; } case PJ_CS_TYPE_PARAMETRIC: { if (axis_count == 1) { - return pj_obj_create(ctx, + return pj_obj_create( + ctx, ParametricCS::create(PropertyMap(), createAxis(axis[0]))); } break; @@ -3161,29 +3173,33 @@ PJ *proj_obj_create_cs(PJ_CONTEXT *ctx, PJ_COORDINATE_SYSTEM_TYPE type, axisVector.emplace_back(createAxis(axis[i])); } - return pj_obj_create(ctx, OrdinalCS::create(PropertyMap(), axisVector)); + return pj_obj_create(ctx, + OrdinalCS::create(PropertyMap(), axisVector)); } case PJ_CS_TYPE_DATETIMETEMPORAL: { if (axis_count == 1) { - return pj_obj_create(ctx, DateTimeTemporalCS::create( - PropertyMap(), createAxis(axis[0]))); + return pj_obj_create( + ctx, DateTimeTemporalCS::create(PropertyMap(), + createAxis(axis[0]))); } break; } case PJ_CS_TYPE_TEMPORALCOUNT: { if (axis_count == 1) { - return pj_obj_create(ctx, TemporalCountCS::create( - PropertyMap(), createAxis(axis[0]))); + return pj_obj_create( + ctx, TemporalCountCS::create(PropertyMap(), + createAxis(axis[0]))); } break; } case PJ_CS_TYPE_TEMPORALMEASURE: { if (axis_count == 1) { - return pj_obj_create(ctx, TemporalMeasureCS::create( - PropertyMap(), createAxis(axis[0]))); + return pj_obj_create( + ctx, TemporalMeasureCS::create(PropertyMap(), + createAxis(axis[0]))); } break; } @@ -3214,33 +3230,35 @@ PJ *proj_obj_create_cs(PJ_CONTEXT *ctx, PJ_COORDINATE_SYSTEM_TYPE type, * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_cartesian_2D_cs(PJ_CONTEXT *ctx, - PJ_CARTESIAN_CS_2D_TYPE type, - const char *unit_name, - double unit_conv_factor) { +PJ *proj_create_cartesian_2D_cs(PJ_CONTEXT *ctx, PJ_CARTESIAN_CS_2D_TYPE type, + const char *unit_name, + double unit_conv_factor) { try { switch (type) { case PJ_CART2D_EASTING_NORTHING: - return pj_obj_create(ctx, CartesianCS::createEastingNorthing( - createLinearUnit(unit_name, unit_conv_factor))); + return pj_obj_create( + ctx, CartesianCS::createEastingNorthing( + createLinearUnit(unit_name, unit_conv_factor))); case PJ_CART2D_NORTHING_EASTING: - return pj_obj_create(ctx, CartesianCS::createNorthingEasting( - createLinearUnit(unit_name, unit_conv_factor))); + return pj_obj_create( + ctx, CartesianCS::createNorthingEasting( + createLinearUnit(unit_name, unit_conv_factor))); case PJ_CART2D_NORTH_POLE_EASTING_SOUTH_NORTHING_SOUTH: - return pj_obj_create(ctx, - CartesianCS::createNorthPoleEastingSouthNorthingSouth( - createLinearUnit(unit_name, unit_conv_factor))); + return pj_obj_create( + ctx, CartesianCS::createNorthPoleEastingSouthNorthingSouth( + createLinearUnit(unit_name, unit_conv_factor))); case PJ_CART2D_SOUTH_POLE_EASTING_NORTH_NORTHING_NORTH: - return pj_obj_create(ctx, - CartesianCS::createSouthPoleEastingNorthNorthingNorth( - createLinearUnit(unit_name, unit_conv_factor))); + return pj_obj_create( + ctx, CartesianCS::createSouthPoleEastingNorthNorthingNorth( + createLinearUnit(unit_name, unit_conv_factor))); case PJ_CART2D_WESTING_SOUTHING: - return pj_obj_create(ctx, CartesianCS::createWestingSouthing( - createLinearUnit(unit_name, unit_conv_factor))); + return pj_obj_create( + ctx, CartesianCS::createWestingSouthing( + createLinearUnit(unit_name, unit_conv_factor))); } } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); @@ -3265,19 +3283,21 @@ PJ *proj_obj_create_cartesian_2D_cs(PJ_CONTEXT *ctx, * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx, - PJ_ELLIPSOIDAL_CS_2D_TYPE type, - const char *unit_name, - double unit_conv_factor) { +PJ *proj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx, + PJ_ELLIPSOIDAL_CS_2D_TYPE type, + const char *unit_name, + double unit_conv_factor) { try { switch (type) { case PJ_ELLPS2D_LONGITUDE_LATITUDE: - return pj_obj_create(ctx, EllipsoidalCS::createLongitudeLatitude( - createAngularUnit(unit_name, unit_conv_factor))); + return pj_obj_create( + ctx, EllipsoidalCS::createLongitudeLatitude( + createAngularUnit(unit_name, unit_conv_factor))); case PJ_ELLPS2D_LATITUDE_LONGITUDE: - return pj_obj_create(ctx, EllipsoidalCS::createLatitudeLongitude( - createAngularUnit(unit_name, unit_conv_factor))); + return pj_obj_create( + ctx, EllipsoidalCS::createLatitudeLongitude( + createAngularUnit(unit_name, unit_conv_factor))); } } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); @@ -3303,10 +3323,9 @@ PJ *proj_obj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx, * proj_destroy(), or NULL in case of error. */ -PJ *proj_obj_create_projected_crs(PJ_CONTEXT *ctx, const char *crs_name, - const PJ *geodetic_crs, - const PJ *conversion, - const PJ *coordinate_system) { +PJ *proj_create_projected_crs(PJ_CONTEXT *ctx, const char *crs_name, + const PJ *geodetic_crs, const PJ *conversion, + const PJ *coordinate_system) { SANITIZE_CTX(ctx); auto geodCRS = std::dynamic_pointer_cast(geodetic_crs->iso_obj); @@ -3323,9 +3342,10 @@ PJ *proj_obj_create_projected_crs(PJ_CONTEXT *ctx, const char *crs_name, return nullptr; } try { - return pj_obj_create(ctx, ProjectedCRS::create( - createPropertyMapName(crs_name), NN_NO_CHECK(geodCRS), - NN_NO_CHECK(conv), NN_NO_CHECK(cs))); + return pj_obj_create( + ctx, ProjectedCRS::create(createPropertyMapName(crs_name), + NN_NO_CHECK(geodCRS), NN_NO_CHECK(conv), + NN_NO_CHECK(cs))); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3336,8 +3356,8 @@ PJ *proj_obj_create_projected_crs(PJ_CONTEXT *ctx, const char *crs_name, //! @cond Doxygen_Suppress -static PJ *proj_obj_create_conversion(PJ_CONTEXT* ctx, - const ConversionNNPtr &conv) { +static PJ *proj_create_conversion(PJ_CONTEXT *ctx, + const ConversionNNPtr &conv) { return pj_obj_create(ctx, conv); } @@ -3355,11 +3375,11 @@ static PJ *proj_obj_create_conversion(PJ_CONTEXT* ctx, * Linear parameters are expressed in (linear_unit_name, * linear_unit_conv_factor). */ -PJ *proj_obj_create_conversion_utm(PJ_CONTEXT *ctx, int zone, int north) { +PJ *proj_create_conversion_utm(PJ_CONTEXT *ctx, int zone, int north) { SANITIZE_CTX(ctx); try { auto conv = Conversion::createUTM(PropertyMap(), zone, north != 0); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3376,7 +3396,7 @@ PJ *proj_obj_create_conversion_utm(PJ_CONTEXT *ctx, int zone, int north) { * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_transverse_mercator( +PJ *proj_create_conversion_transverse_mercator( PJ_CONTEXT *ctx, double center_lat, double center_long, double scale, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -3392,7 +3412,7 @@ PJ *proj_obj_create_conversion_transverse_mercator( Angle(center_long, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3410,7 +3430,7 @@ PJ *proj_obj_create_conversion_transverse_mercator( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_gauss_schreiber_transverse_mercator( +PJ *proj_create_conversion_gauss_schreiber_transverse_mercator( PJ_CONTEXT *ctx, double center_lat, double center_long, double scale, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -3426,7 +3446,7 @@ PJ *proj_obj_create_conversion_gauss_schreiber_transverse_mercator( Angle(center_long, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3444,7 +3464,7 @@ PJ *proj_obj_create_conversion_gauss_schreiber_transverse_mercator( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_transverse_mercator_south_oriented( +PJ *proj_create_conversion_transverse_mercator_south_oriented( PJ_CONTEXT *ctx, double center_lat, double center_long, double scale, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -3460,7 +3480,7 @@ PJ *proj_obj_create_conversion_transverse_mercator_south_oriented( Angle(center_long, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3477,7 +3497,7 @@ PJ *proj_obj_create_conversion_transverse_mercator_south_oriented( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_two_point_equidistant( +PJ *proj_create_conversion_two_point_equidistant( PJ_CONTEXT *ctx, double latitude_first_point, double longitude_first_point, double latitude_second_point, double longitude_secon_point, double false_easting, double false_northing, const char *ang_unit_name, @@ -3496,7 +3516,7 @@ PJ *proj_obj_create_conversion_two_point_equidistant( Angle(longitude_secon_point, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3513,7 +3533,7 @@ PJ *proj_obj_create_conversion_two_point_equidistant( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_tunisia_mapping_grid( +PJ *proj_create_conversion_tunisia_mapping_grid( PJ_CONTEXT *ctx, double center_lat, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -3528,7 +3548,7 @@ PJ *proj_obj_create_conversion_tunisia_mapping_grid( PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3545,7 +3565,7 @@ PJ *proj_obj_create_conversion_tunisia_mapping_grid( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_albers_equal_area( +PJ *proj_create_conversion_albers_equal_area( PJ_CONTEXT *ctx, double latitude_false_origin, double longitude_false_origin, double latitude_first_parallel, double latitude_second_parallel, double easting_false_origin, @@ -3565,7 +3585,7 @@ PJ *proj_obj_create_conversion_albers_equal_area( Angle(latitude_second_parallel, angUnit), Length(easting_false_origin, linearUnit), Length(northing_false_origin, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3582,7 +3602,7 @@ PJ *proj_obj_create_conversion_albers_equal_area( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_lambert_conic_conformal_1sp( +PJ *proj_create_conversion_lambert_conic_conformal_1sp( PJ_CONTEXT *ctx, double center_lat, double center_long, double scale, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -3598,7 +3618,7 @@ PJ *proj_obj_create_conversion_lambert_conic_conformal_1sp( Angle(center_long, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3615,7 +3635,7 @@ PJ *proj_obj_create_conversion_lambert_conic_conformal_1sp( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp( +PJ *proj_create_conversion_lambert_conic_conformal_2sp( PJ_CONTEXT *ctx, double latitude_false_origin, double longitude_false_origin, double latitude_first_parallel, double latitude_second_parallel, double easting_false_origin, @@ -3635,7 +3655,7 @@ PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp( Angle(latitude_second_parallel, angUnit), Length(easting_false_origin, linearUnit), Length(northing_false_origin, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3653,7 +3673,7 @@ PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan( +PJ *proj_create_conversion_lambert_conic_conformal_2sp_michigan( PJ_CONTEXT *ctx, double latitude_false_origin, double longitude_false_origin, double latitude_first_parallel, double latitude_second_parallel, double easting_false_origin, @@ -3674,7 +3694,7 @@ PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan( Length(easting_false_origin, linearUnit), Length(northing_false_origin, linearUnit), Scale(ellipsoid_scaling_factor)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3692,7 +3712,7 @@ PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium( +PJ *proj_create_conversion_lambert_conic_conformal_2sp_belgium( PJ_CONTEXT *ctx, double latitude_false_origin, double longitude_false_origin, double latitude_first_parallel, double latitude_second_parallel, double easting_false_origin, @@ -3712,7 +3732,7 @@ PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium( Angle(latitude_second_parallel, angUnit), Length(easting_false_origin, linearUnit), Length(northing_false_origin, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3729,7 +3749,7 @@ PJ *proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_azimuthal_equidistant( +PJ *proj_create_conversion_azimuthal_equidistant( PJ_CONTEXT *ctx, double latitude_nat_origin, double longitude_nat_origin, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -3745,7 +3765,7 @@ PJ *proj_obj_create_conversion_azimuthal_equidistant( Angle(longitude_nat_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3762,7 +3782,7 @@ PJ *proj_obj_create_conversion_azimuthal_equidistant( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_guam_projection( +PJ *proj_create_conversion_guam_projection( PJ_CONTEXT *ctx, double latitude_nat_origin, double longitude_nat_origin, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -3778,7 +3798,7 @@ PJ *proj_obj_create_conversion_guam_projection( Angle(longitude_nat_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3795,11 +3815,13 @@ PJ *proj_obj_create_conversion_guam_projection( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_bonne( - PJ_CONTEXT *ctx, double latitude_nat_origin, double longitude_nat_origin, - double false_easting, double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_bonne(PJ_CONTEXT *ctx, double latitude_nat_origin, + double longitude_nat_origin, + double false_easting, double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -3811,7 +3833,7 @@ PJ *proj_obj_create_conversion_bonne( Angle(longitude_nat_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3829,7 +3851,7 @@ PJ *proj_obj_create_conversion_bonne( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_lambert_cylindrical_equal_area_spherical( +PJ *proj_create_conversion_lambert_cylindrical_equal_area_spherical( PJ_CONTEXT *ctx, double latitude_first_parallel, double longitude_nat_origin, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, @@ -3845,7 +3867,7 @@ PJ *proj_obj_create_conversion_lambert_cylindrical_equal_area_spherical( Angle(longitude_nat_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3862,7 +3884,7 @@ PJ *proj_obj_create_conversion_lambert_cylindrical_equal_area_spherical( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_lambert_cylindrical_equal_area( +PJ *proj_create_conversion_lambert_cylindrical_equal_area( PJ_CONTEXT *ctx, double latitude_first_parallel, double longitude_nat_origin, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, @@ -3878,7 +3900,7 @@ PJ *proj_obj_create_conversion_lambert_cylindrical_equal_area( Angle(longitude_nat_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3895,7 +3917,7 @@ PJ *proj_obj_create_conversion_lambert_cylindrical_equal_area( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_cassini_soldner( +PJ *proj_create_conversion_cassini_soldner( PJ_CONTEXT *ctx, double center_lat, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -3910,7 +3932,7 @@ PJ *proj_obj_create_conversion_cassini_soldner( PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3927,7 +3949,7 @@ PJ *proj_obj_create_conversion_cassini_soldner( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_equidistant_conic( +PJ *proj_create_conversion_equidistant_conic( PJ_CONTEXT *ctx, double center_lat, double center_long, double latitude_first_parallel, double latitude_second_parallel, double false_easting, double false_northing, const char *ang_unit_name, @@ -3946,7 +3968,7 @@ PJ *proj_obj_create_conversion_equidistant_conic( Angle(latitude_second_parallel, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3963,13 +3985,12 @@ PJ *proj_obj_create_conversion_equidistant_conic( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_eckert_i(PJ_CONTEXT *ctx, double center_long, - double false_easting, - double false_northing, - const char *ang_unit_name, - double ang_unit_conv_factor, - const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_eckert_i(PJ_CONTEXT *ctx, double center_long, + double false_easting, double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -3980,7 +4001,7 @@ PJ *proj_obj_create_conversion_eckert_i(PJ_CONTEXT *ctx, double center_long, PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -3997,11 +4018,13 @@ PJ *proj_obj_create_conversion_eckert_i(PJ_CONTEXT *ctx, double center_long, * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_eckert_ii( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_eckert_ii(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4012,7 +4035,7 @@ PJ *proj_obj_create_conversion_eckert_ii( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4029,11 +4052,13 @@ PJ *proj_obj_create_conversion_eckert_ii( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_eckert_iii( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_eckert_iii(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4044,7 +4069,7 @@ PJ *proj_obj_create_conversion_eckert_iii( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4061,11 +4086,13 @@ PJ *proj_obj_create_conversion_eckert_iii( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_eckert_iv( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_eckert_iv(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4076,7 +4103,7 @@ PJ *proj_obj_create_conversion_eckert_iv( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4093,13 +4120,12 @@ PJ *proj_obj_create_conversion_eckert_iv( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_eckert_v(PJ_CONTEXT *ctx, double center_long, - double false_easting, - double false_northing, - const char *ang_unit_name, - double ang_unit_conv_factor, - const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_eckert_v(PJ_CONTEXT *ctx, double center_long, + double false_easting, double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4110,7 +4136,7 @@ PJ *proj_obj_create_conversion_eckert_v(PJ_CONTEXT *ctx, double center_long, PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4127,11 +4153,13 @@ PJ *proj_obj_create_conversion_eckert_v(PJ_CONTEXT *ctx, double center_long, * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_eckert_vi( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_eckert_vi(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4142,7 +4170,7 @@ PJ *proj_obj_create_conversion_eckert_vi( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4159,7 +4187,7 @@ PJ *proj_obj_create_conversion_eckert_vi( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_equidistant_cylindrical( +PJ *proj_create_conversion_equidistant_cylindrical( PJ_CONTEXT *ctx, double latitude_first_parallel, double longitude_nat_origin, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, @@ -4175,7 +4203,7 @@ PJ *proj_obj_create_conversion_equidistant_cylindrical( Angle(longitude_nat_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4193,7 +4221,7 @@ PJ *proj_obj_create_conversion_equidistant_cylindrical( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_equidistant_cylindrical_spherical( +PJ *proj_create_conversion_equidistant_cylindrical_spherical( PJ_CONTEXT *ctx, double latitude_first_parallel, double longitude_nat_origin, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, @@ -4209,7 +4237,7 @@ PJ *proj_obj_create_conversion_equidistant_cylindrical_spherical( Angle(longitude_nat_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4226,13 +4254,12 @@ PJ *proj_obj_create_conversion_equidistant_cylindrical_spherical( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_gall(PJ_CONTEXT *ctx, double center_long, - double false_easting, - double false_northing, - const char *ang_unit_name, - double ang_unit_conv_factor, - const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_gall(PJ_CONTEXT *ctx, double center_long, + double false_easting, double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4243,7 +4270,7 @@ PJ *proj_obj_create_conversion_gall(PJ_CONTEXT *ctx, double center_long, Conversion::createGall(PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4260,11 +4287,13 @@ PJ *proj_obj_create_conversion_gall(PJ_CONTEXT *ctx, double center_long, * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_goode_homolosine( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_goode_homolosine(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4275,7 +4304,7 @@ PJ *proj_obj_create_conversion_goode_homolosine( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4292,7 +4321,7 @@ PJ *proj_obj_create_conversion_goode_homolosine( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_interrupted_goode_homolosine( +PJ *proj_create_conversion_interrupted_goode_homolosine( PJ_CONTEXT *ctx, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4307,7 +4336,7 @@ PJ *proj_obj_create_conversion_interrupted_goode_homolosine( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4325,7 +4354,7 @@ PJ *proj_obj_create_conversion_interrupted_goode_homolosine( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_geostationary_satellite_sweep_x( +PJ *proj_create_conversion_geostationary_satellite_sweep_x( PJ_CONTEXT *ctx, double center_long, double height, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4340,7 +4369,7 @@ PJ *proj_obj_create_conversion_geostationary_satellite_sweep_x( PropertyMap(), Angle(center_long, angUnit), Length(height, linearUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4358,7 +4387,7 @@ PJ *proj_obj_create_conversion_geostationary_satellite_sweep_x( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_geostationary_satellite_sweep_y( +PJ *proj_create_conversion_geostationary_satellite_sweep_y( PJ_CONTEXT *ctx, double center_long, double height, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4373,7 +4402,7 @@ PJ *proj_obj_create_conversion_geostationary_satellite_sweep_y( PropertyMap(), Angle(center_long, angUnit), Length(height, linearUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4390,11 +4419,13 @@ PJ *proj_obj_create_conversion_geostationary_satellite_sweep_y( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_gnomonic( - PJ_CONTEXT *ctx, double center_lat, double center_long, - double false_easting, double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_gnomonic(PJ_CONTEXT *ctx, double center_lat, + double center_long, double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4405,7 +4436,7 @@ PJ *proj_obj_create_conversion_gnomonic( PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4423,7 +4454,7 @@ PJ *proj_obj_create_conversion_gnomonic( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_hotine_oblique_mercator_variant_a( +PJ *proj_create_conversion_hotine_oblique_mercator_variant_a( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_projection_centre, double azimuth_initial_line, double angle_from_rectified_to_skrew_grid, double scale, @@ -4443,7 +4474,7 @@ PJ *proj_obj_create_conversion_hotine_oblique_mercator_variant_a( Angle(angle_from_rectified_to_skrew_grid, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4461,7 +4492,7 @@ PJ *proj_obj_create_conversion_hotine_oblique_mercator_variant_a( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_hotine_oblique_mercator_variant_b( +PJ *proj_create_conversion_hotine_oblique_mercator_variant_b( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_projection_centre, double azimuth_initial_line, double angle_from_rectified_to_skrew_grid, double scale, @@ -4481,7 +4512,7 @@ PJ *proj_obj_create_conversion_hotine_oblique_mercator_variant_b( Angle(angle_from_rectified_to_skrew_grid, angUnit), Scale(scale), Length(easting_projection_centre, linearUnit), Length(northing_projection_centre, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4499,8 +4530,7 @@ PJ *proj_obj_create_conversion_hotine_oblique_mercator_variant_b( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ * -proj_obj_create_conversion_hotine_oblique_mercator_two_point_natural_origin( +PJ *proj_create_conversion_hotine_oblique_mercator_two_point_natural_origin( PJ_CONTEXT *ctx, double latitude_projection_centre, double latitude_point1, double longitude_point1, double latitude_point2, double longitude_point2, double scale, double easting_projection_centre, @@ -4522,7 +4552,7 @@ proj_obj_create_conversion_hotine_oblique_mercator_two_point_natural_origin( Angle(longitude_point2, angUnit), Scale(scale), Length(easting_projection_centre, linearUnit), Length(northing_projection_centre, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4540,7 +4570,7 @@ proj_obj_create_conversion_hotine_oblique_mercator_two_point_natural_origin( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_laborde_oblique_mercator( +PJ *proj_create_conversion_laborde_oblique_mercator( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_projection_centre, double azimuth_initial_line, double scale, double false_easting, double false_northing, @@ -4558,7 +4588,7 @@ PJ *proj_obj_create_conversion_laborde_oblique_mercator( Angle(azimuth_initial_line, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4576,7 +4606,7 @@ PJ *proj_obj_create_conversion_laborde_oblique_mercator( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_international_map_world_polyconic( +PJ *proj_create_conversion_international_map_world_polyconic( PJ_CONTEXT *ctx, double center_long, double latitude_first_parallel, double latitude_second_parallel, double false_easting, double false_northing, const char *ang_unit_name, @@ -4594,7 +4624,7 @@ PJ *proj_obj_create_conversion_international_map_world_polyconic( Angle(latitude_second_parallel, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4611,7 +4641,7 @@ PJ *proj_obj_create_conversion_international_map_world_polyconic( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_krovak_north_oriented( +PJ *proj_create_conversion_krovak_north_oriented( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_of_origin, double colatitude_cone_axis, double latitude_pseudo_standard_parallel, @@ -4633,7 +4663,7 @@ PJ *proj_obj_create_conversion_krovak_north_oriented( Scale(scale_factor_pseudo_standard_parallel), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4650,7 +4680,7 @@ PJ *proj_obj_create_conversion_krovak_north_oriented( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_krovak( +PJ *proj_create_conversion_krovak( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_of_origin, double colatitude_cone_axis, double latitude_pseudo_standard_parallel, @@ -4672,7 +4702,7 @@ PJ *proj_obj_create_conversion_krovak( Scale(scale_factor_pseudo_standard_parallel), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4689,7 +4719,7 @@ PJ *proj_obj_create_conversion_krovak( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_lambert_azimuthal_equal_area( +PJ *proj_create_conversion_lambert_azimuthal_equal_area( PJ_CONTEXT *ctx, double latitude_nat_origin, double longitude_nat_origin, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4705,7 +4735,7 @@ PJ *proj_obj_create_conversion_lambert_azimuthal_equal_area( Angle(longitude_nat_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4722,7 +4752,7 @@ PJ *proj_obj_create_conversion_lambert_azimuthal_equal_area( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_miller_cylindrical( +PJ *proj_create_conversion_miller_cylindrical( PJ_CONTEXT *ctx, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4737,7 +4767,7 @@ PJ *proj_obj_create_conversion_miller_cylindrical( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4754,7 +4784,7 @@ PJ *proj_obj_create_conversion_miller_cylindrical( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_mercator_variant_a( +PJ *proj_create_conversion_mercator_variant_a( PJ_CONTEXT *ctx, double center_lat, double center_long, double scale, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4770,7 +4800,7 @@ PJ *proj_obj_create_conversion_mercator_variant_a( Angle(center_long, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4787,7 +4817,7 @@ PJ *proj_obj_create_conversion_mercator_variant_a( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_mercator_variant_b( +PJ *proj_create_conversion_mercator_variant_b( PJ_CONTEXT *ctx, double latitude_first_parallel, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4802,7 +4832,7 @@ PJ *proj_obj_create_conversion_mercator_variant_b( PropertyMap(), Angle(latitude_first_parallel, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4820,7 +4850,7 @@ PJ *proj_obj_create_conversion_mercator_variant_b( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_popular_visualisation_pseudo_mercator( +PJ *proj_create_conversion_popular_visualisation_pseudo_mercator( PJ_CONTEXT *ctx, double center_lat, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4835,7 +4865,7 @@ PJ *proj_obj_create_conversion_popular_visualisation_pseudo_mercator( PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4852,11 +4882,13 @@ PJ *proj_obj_create_conversion_popular_visualisation_pseudo_mercator( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_mollweide( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_mollweide(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -4867,7 +4899,7 @@ PJ *proj_obj_create_conversion_mollweide( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4884,7 +4916,7 @@ PJ *proj_obj_create_conversion_mollweide( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_new_zealand_mapping_grid( +PJ *proj_create_conversion_new_zealand_mapping_grid( PJ_CONTEXT *ctx, double center_lat, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4899,7 +4931,7 @@ PJ *proj_obj_create_conversion_new_zealand_mapping_grid( PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4916,7 +4948,7 @@ PJ *proj_obj_create_conversion_new_zealand_mapping_grid( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_oblique_stereographic( +PJ *proj_create_conversion_oblique_stereographic( PJ_CONTEXT *ctx, double center_lat, double center_long, double scale, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4932,7 +4964,7 @@ PJ *proj_obj_create_conversion_oblique_stereographic( Angle(center_long, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4949,7 +4981,7 @@ PJ *proj_obj_create_conversion_oblique_stereographic( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_orthographic( +PJ *proj_create_conversion_orthographic( PJ_CONTEXT *ctx, double center_lat, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4964,7 +4996,7 @@ PJ *proj_obj_create_conversion_orthographic( PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -4981,7 +5013,7 @@ PJ *proj_obj_create_conversion_orthographic( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_american_polyconic( +PJ *proj_create_conversion_american_polyconic( PJ_CONTEXT *ctx, double center_lat, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -4996,7 +5028,7 @@ PJ *proj_obj_create_conversion_american_polyconic( PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5013,7 +5045,7 @@ PJ *proj_obj_create_conversion_american_polyconic( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_polar_stereographic_variant_a( +PJ *proj_create_conversion_polar_stereographic_variant_a( PJ_CONTEXT *ctx, double center_lat, double center_long, double scale, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -5029,7 +5061,7 @@ PJ *proj_obj_create_conversion_polar_stereographic_variant_a( Angle(center_long, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5046,7 +5078,7 @@ PJ *proj_obj_create_conversion_polar_stereographic_variant_a( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_polar_stereographic_variant_b( +PJ *proj_create_conversion_polar_stereographic_variant_b( PJ_CONTEXT *ctx, double latitude_standard_parallel, double longitude_of_origin, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, @@ -5062,7 +5094,7 @@ PJ *proj_obj_create_conversion_polar_stereographic_variant_b( Angle(longitude_of_origin, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5079,13 +5111,12 @@ PJ *proj_obj_create_conversion_polar_stereographic_variant_b( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_robinson(PJ_CONTEXT *ctx, double center_long, - double false_easting, - double false_northing, - const char *ang_unit_name, - double ang_unit_conv_factor, - const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_robinson(PJ_CONTEXT *ctx, double center_long, + double false_easting, double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5096,7 +5127,7 @@ PJ *proj_obj_create_conversion_robinson(PJ_CONTEXT *ctx, double center_long, PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5113,11 +5144,13 @@ PJ *proj_obj_create_conversion_robinson(PJ_CONTEXT *ctx, double center_long, * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_sinusoidal( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_sinusoidal(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5128,7 +5161,7 @@ PJ *proj_obj_create_conversion_sinusoidal( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5145,7 +5178,7 @@ PJ *proj_obj_create_conversion_sinusoidal( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_stereographic( +PJ *proj_create_conversion_stereographic( PJ_CONTEXT *ctx, double center_lat, double center_long, double scale, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -5161,7 +5194,7 @@ PJ *proj_obj_create_conversion_stereographic( Angle(center_long, angUnit), Scale(scale), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5178,11 +5211,13 @@ PJ *proj_obj_create_conversion_stereographic( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_van_der_grinten( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_van_der_grinten(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5193,7 +5228,7 @@ PJ *proj_obj_create_conversion_van_der_grinten( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5210,13 +5245,12 @@ PJ *proj_obj_create_conversion_van_der_grinten( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_wagner_i(PJ_CONTEXT *ctx, double center_long, - double false_easting, - double false_northing, - const char *ang_unit_name, - double ang_unit_conv_factor, - const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_wagner_i(PJ_CONTEXT *ctx, double center_long, + double false_easting, double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5227,7 +5261,7 @@ PJ *proj_obj_create_conversion_wagner_i(PJ_CONTEXT *ctx, double center_long, PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5244,11 +5278,13 @@ PJ *proj_obj_create_conversion_wagner_i(PJ_CONTEXT *ctx, double center_long, * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_wagner_ii( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_wagner_ii(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5259,7 +5295,7 @@ PJ *proj_obj_create_conversion_wagner_ii( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5276,7 +5312,7 @@ PJ *proj_obj_create_conversion_wagner_ii( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_wagner_iii( +PJ *proj_create_conversion_wagner_iii( PJ_CONTEXT *ctx, double latitude_true_scale, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -5291,7 +5327,7 @@ PJ *proj_obj_create_conversion_wagner_iii( PropertyMap(), Angle(latitude_true_scale, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5308,11 +5344,13 @@ PJ *proj_obj_create_conversion_wagner_iii( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_wagner_iv( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_wagner_iv(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5323,7 +5361,7 @@ PJ *proj_obj_create_conversion_wagner_iv( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5340,13 +5378,12 @@ PJ *proj_obj_create_conversion_wagner_iv( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_wagner_v(PJ_CONTEXT *ctx, double center_long, - double false_easting, - double false_northing, - const char *ang_unit_name, - double ang_unit_conv_factor, - const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_wagner_v(PJ_CONTEXT *ctx, double center_long, + double false_easting, double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5357,7 +5394,7 @@ PJ *proj_obj_create_conversion_wagner_v(PJ_CONTEXT *ctx, double center_long, PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5374,11 +5411,13 @@ PJ *proj_obj_create_conversion_wagner_v(PJ_CONTEXT *ctx, double center_long, * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_wagner_vi( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_wagner_vi(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5389,7 +5428,7 @@ PJ *proj_obj_create_conversion_wagner_vi( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5406,11 +5445,13 @@ PJ *proj_obj_create_conversion_wagner_vi( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_wagner_vii( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_wagner_vii(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5421,7 +5462,7 @@ PJ *proj_obj_create_conversion_wagner_vii( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5439,7 +5480,7 @@ PJ *proj_obj_create_conversion_wagner_vii( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_quadrilateralized_spherical_cube( +PJ *proj_create_conversion_quadrilateralized_spherical_cube( PJ_CONTEXT *ctx, double center_lat, double center_long, double false_easting, double false_northing, const char *ang_unit_name, double ang_unit_conv_factor, const char *linear_unit_name, @@ -5454,7 +5495,7 @@ PJ *proj_obj_create_conversion_quadrilateralized_spherical_cube( PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5471,7 +5512,7 @@ PJ *proj_obj_create_conversion_quadrilateralized_spherical_cube( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_spherical_cross_track_height( +PJ *proj_create_conversion_spherical_cross_track_height( PJ_CONTEXT *ctx, double peg_point_lat, double peg_point_long, double peg_point_heading, double peg_point_height, const char *ang_unit_name, double ang_unit_conv_factor, @@ -5486,7 +5527,7 @@ PJ *proj_obj_create_conversion_spherical_cross_track_height( PropertyMap(), Angle(peg_point_lat, angUnit), Angle(peg_point_long, angUnit), Angle(peg_point_heading, angUnit), Length(peg_point_height, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5503,11 +5544,13 @@ PJ *proj_obj_create_conversion_spherical_cross_track_height( * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). */ -PJ *proj_obj_create_conversion_equal_earth( - PJ_CONTEXT *ctx, double center_long, double false_easting, - double false_northing, const char *ang_unit_name, - double ang_unit_conv_factor, const char *linear_unit_name, - double linear_unit_conv_factor) { +PJ *proj_create_conversion_equal_earth(PJ_CONTEXT *ctx, double center_long, + double false_easting, + double false_northing, + const char *ang_unit_name, + double ang_unit_conv_factor, + const char *linear_unit_name, + double linear_unit_conv_factor) { SANITIZE_CTX(ctx); try { UnitOfMeasure linearUnit( @@ -5518,7 +5561,7 @@ PJ *proj_obj_create_conversion_equal_earth( PropertyMap(), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); - return proj_obj_create_conversion(ctx, conv); + return proj_create_conversion(ctx, conv); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); } @@ -5541,8 +5584,8 @@ PJ *proj_obj_create_conversion_equal_earth( int proj_coordoperation_is_instanciable(PJ_CONTEXT *ctx, const PJ *coordoperation) { assert(coordoperation); - auto op = - dynamic_cast(coordoperation->iso_obj.get()); + auto op = dynamic_cast( + coordoperation->iso_obj.get()); if (!op) { proj_log_error(ctx, __FUNCTION__, "Object is not a CoordinateOperation"); @@ -5569,7 +5612,8 @@ int proj_coordoperation_get_param_count(PJ_CONTEXT *ctx, const PJ *coordoperation) { SANITIZE_CTX(ctx); assert(coordoperation); - auto op = dynamic_cast(coordoperation->iso_obj.get()); + auto op = + dynamic_cast(coordoperation->iso_obj.get()); if (!op) { proj_log_error(ctx, __FUNCTION__, "Object is not a SingleOperation"); return 0; @@ -5594,7 +5638,8 @@ int proj_coordoperation_get_param_index(PJ_CONTEXT *ctx, SANITIZE_CTX(ctx); assert(coordoperation); assert(name); - auto op = dynamic_cast(coordoperation->iso_obj.get()); + auto op = + dynamic_cast(coordoperation->iso_obj.get()); if (!op) { proj_log_error(ctx, __FUNCTION__, "Object is not a SingleOperation"); return -1; @@ -5643,15 +5688,15 @@ int proj_coordoperation_get_param_index(PJ_CONTEXT *ctx, */ int proj_coordoperation_get_param( - PJ_CONTEXT *ctx, const PJ *coordoperation, int index, - const char **out_name, const char **out_auth_name, const char **out_code, - double *out_value, const char **out_value_string, - double *out_unit_conv_factor, const char **out_unit_name, - const char **out_unit_auth_name, const char **out_unit_code, - const char **out_unit_category) { + PJ_CONTEXT *ctx, const PJ *coordoperation, int index, const char **out_name, + const char **out_auth_name, const char **out_code, double *out_value, + const char **out_value_string, double *out_unit_conv_factor, + const char **out_unit_name, const char **out_unit_auth_name, + const char **out_unit_code, const char **out_unit_category) { SANITIZE_CTX(ctx); assert(coordoperation); - auto op = dynamic_cast(coordoperation->iso_obj.get()); + auto op = + dynamic_cast(coordoperation->iso_obj.get()); if (!op) { proj_log_error(ctx, __FUNCTION__, "Object is not a SingleOperation"); return false; @@ -5807,8 +5852,8 @@ int proj_coordoperation_get_grid_used_count(PJ_CONTEXT *ctx, const PJ *coordoperation) { SANITIZE_CTX(ctx); assert(coordoperation); - auto co = - dynamic_cast(coordoperation->iso_obj.get()); + auto co = dynamic_cast( + coordoperation->iso_obj.get()); if (!co) { proj_log_error(ctx, __FUNCTION__, "Object is not a CoordinateOperation"); @@ -6254,11 +6299,12 @@ void proj_operation_factory_context_set_allowed_intermediate_crs( * @param target_crs source CRS. Must not be NULL. * @param operationContext Search context. Must not be NULL. * @return a result set that must be unreferenced with - * proj_obj_list_destroy(), or NULL in case of error. + * proj_list_destroy(), or NULL in case of error. */ -PJ_OBJ_LIST *proj_obj_create_operations( - PJ_CONTEXT *ctx, const PJ *source_crs, const PJ *target_crs, - const PJ_OPERATION_FACTORY_CONTEXT *operationContext) { +PJ_OBJ_LIST * +proj_create_operations(PJ_CONTEXT *ctx, const PJ *source_crs, + const PJ *target_crs, + const PJ_OPERATION_FACTORY_CONTEXT *operationContext) { SANITIZE_CTX(ctx); assert(source_crs); assert(target_crs); @@ -6297,7 +6343,7 @@ PJ_OBJ_LIST *proj_obj_create_operations( * * @param result Objet of type PJ_OBJ_LIST (must not be NULL) */ -int proj_obj_list_get_count(const PJ_OBJ_LIST *result) { +int proj_list_get_count(const PJ_OBJ_LIST *result) { assert(result); return static_cast(result->objects.size()); } @@ -6317,11 +6363,10 @@ int proj_obj_list_get_count(const PJ_OBJ_LIST *result) { * or nullptr in case of error. */ -PJ *proj_obj_list_get(PJ_CONTEXT *ctx, const PJ_OBJ_LIST *result, - int index) { +PJ *proj_list_get(PJ_CONTEXT *ctx, const PJ_OBJ_LIST *result, int index) { SANITIZE_CTX(ctx); assert(result); - if (index < 0 || index >= proj_obj_list_get_count(result)) { + if (index < 0 || index >= proj_list_get_count(result)) { proj_log_error(ctx, __FUNCTION__, "Invalid index"); return nullptr; } @@ -6337,7 +6382,7 @@ PJ *proj_obj_list_get(PJ_CONTEXT *ctx, const PJ_OBJ_LIST *result, * * @param result Object, or NULL. */ -void proj_obj_list_destroy(PJ_OBJ_LIST *result) { delete result; } +void proj_list_destroy(PJ_OBJ_LIST *result) { delete result; } // --------------------------------------------------------------------------- @@ -6351,8 +6396,8 @@ double proj_coordoperation_get_accuracy(PJ_CONTEXT *ctx, const PJ *coordoperation) { SANITIZE_CTX(ctx); assert(coordoperation); - auto co = - dynamic_cast(coordoperation->iso_obj.get()); + auto co = dynamic_cast( + coordoperation->iso_obj.get()); if (!co) { proj_log_error(ctx, __FUNCTION__, "Object is not a CoordinateOperation"); @@ -6382,7 +6427,7 @@ double proj_coordoperation_get_accuracy(PJ_CONTEXT *ctx, * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error (or if there is no datum) */ -PJ *proj_obj_crs_get_datum(PJ_CONTEXT *ctx, const PJ *crs) { +PJ *proj_crs_get_datum(PJ_CONTEXT *ctx, const PJ *crs) { SANITIZE_CTX(ctx); assert(crs); auto l_crs = dynamic_cast(crs->iso_obj.get()); @@ -6410,7 +6455,7 @@ PJ *proj_obj_crs_get_datum(PJ_CONTEXT *ctx, const PJ *crs) { * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error. */ -PJ *proj_obj_crs_get_coordinate_system(PJ_CONTEXT *ctx, const PJ *crs) { +PJ *proj_crs_get_coordinate_system(PJ_CONTEXT *ctx, const PJ *crs) { SANITIZE_CTX(ctx); assert(crs); auto l_crs = dynamic_cast(crs->iso_obj.get()); @@ -6429,8 +6474,7 @@ PJ *proj_obj_crs_get_coordinate_system(PJ_CONTEXT *ctx, const PJ *crs) { * @param cs Objet of type CoordinateSystem (must not be NULL) * @return type, or PJ_CS_TYPE_UNKNOWN in case of error. */ -PJ_COORDINATE_SYSTEM_TYPE proj_obj_cs_get_type(PJ_CONTEXT *ctx, - const PJ *cs) { +PJ_COORDINATE_SYSTEM_TYPE proj_cs_get_type(PJ_CONTEXT *ctx, const PJ *cs) { SANITIZE_CTX(ctx); assert(cs); auto l_cs = dynamic_cast(cs->iso_obj.get()); @@ -6476,7 +6520,7 @@ PJ_COORDINATE_SYSTEM_TYPE proj_obj_cs_get_type(PJ_CONTEXT *ctx, * @param cs Objet of type CoordinateSystem (must not be NULL) * @return number of axis, or -1 in case of error. */ -int proj_obj_cs_get_axis_count(PJ_CONTEXT *ctx, const PJ *cs) { +int proj_cs_get_axis_count(PJ_CONTEXT *ctx, const PJ *cs) { SANITIZE_CTX(ctx); assert(cs); auto l_cs = dynamic_cast(cs->iso_obj.get()); @@ -6494,7 +6538,7 @@ int proj_obj_cs_get_axis_count(PJ_CONTEXT *ctx, const PJ *cs) { * @param ctx PROJ context, or NULL for default context * @param cs Objet of type CoordinateSystem (must not be NULL) * @param index Index of the coordinate system (between 0 and - * proj_obj_cs_get_axis_count() - 1) + * proj_cs_get_axis_count() - 1) * @param out_name Pointer to a string value to store the axis name. or NULL * @param out_abbrev Pointer to a string value to store the axis abbreviation. * or NULL @@ -6510,13 +6554,13 @@ int proj_obj_cs_get_axis_count(PJ_CONTEXT *ctx, const PJ *cs) { * unit code. or NULL * @return TRUE in case of success */ -int proj_obj_cs_get_axis_info(PJ_CONTEXT *ctx, const PJ *cs, int index, - const char **out_name, const char **out_abbrev, - const char **out_direction, - double *out_unit_conv_factor, - const char **out_unit_name, - const char **out_unit_auth_name, - const char **out_unit_code) { +int proj_cs_get_axis_info(PJ_CONTEXT *ctx, const PJ *cs, int index, + const char **out_name, const char **out_abbrev, + const char **out_direction, + double *out_unit_conv_factor, + const char **out_unit_name, + const char **out_unit_auth_name, + const char **out_unit_code) { SANITIZE_CTX(ctx); assert(cs); auto l_cs = dynamic_cast(cs->iso_obj.get()); diff --git a/src/proj.h b/src/proj.h index cf42ccd5..a6ab1c92 100644 --- a/src/proj.h +++ b/src/proj.h @@ -491,33 +491,33 @@ typedef enum PJ_GUESSED_WKT_DIALECT PROJ_DLL proj_context_guess_wkt_dialect(PJ_CONTEXT *ctx, const char *wkt); -PJ PROJ_DLL *proj_obj_create_from_user_input(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_from_user_input(PJ_CONTEXT *ctx, const char *text, const char* const *options); -PJ PROJ_DLL *proj_obj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, +PJ PROJ_DLL *proj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, const char* const *options, PROJ_STRING_LIST *out_warnings, PROJ_STRING_LIST *out_grammar_errors); -PJ PROJ_DLL *proj_obj_create_from_proj_string(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_from_proj_string(PJ_CONTEXT *ctx, const char *proj_string, const char* const *options); /** \brief Object category. */ typedef enum { - PJ_OBJ_CATEGORY_ELLIPSOID, - PJ_OBJ_CATEGORY_PRIME_MERIDIAN, - PJ_OBJ_CATEGORY_DATUM, - PJ_OBJ_CATEGORY_CRS, - PJ_OBJ_CATEGORY_COORDINATE_OPERATION -} PJ_OBJ_CATEGORY; - -PJ PROJ_DLL *proj_obj_create_from_database(PJ_CONTEXT *ctx, + PJ_CATEGORY_ELLIPSOID, + PJ_CATEGORY_PRIME_MERIDIAN, + PJ_CATEGORY_DATUM, + PJ_CATEGORY_CRS, + PJ_CATEGORY_COORDINATE_OPERATION +} PJ_CATEGORY; + +PJ PROJ_DLL *proj_create_from_database(PJ_CONTEXT *ctx, const char *auth_name, const char *code, - PJ_OBJ_CATEGORY category, + PJ_CATEGORY category, int usePROJAlternativeGridNames, const char* const *options); @@ -528,63 +528,63 @@ int PROJ_DLL proj_uom_get_info_from_database(PJ_CONTEXT *ctx, double *out_conv_factor, const char **out_category); -PJ PROJ_DLL *proj_obj_clone(PJ_CONTEXT *ctx, const PJ *obj); +PJ PROJ_DLL *proj_clone(PJ_CONTEXT *ctx, const PJ *obj); /** \brief Object type. */ typedef enum { - PJ_OBJ_TYPE_UNKNOWN, + PJ_TYPE_UNKNOWN, - PJ_OBJ_TYPE_ELLIPSOID, + PJ_TYPE_ELLIPSOID, - PJ_OBJ_TYPE_PRIME_MERIDIAN, + PJ_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_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, - /** Abstract type, not returned by proj_obj_get_type() */ - PJ_OBJ_TYPE_CRS, + /** Abstract type, not returned by proj_get_type() */ + PJ_TYPE_CRS, - PJ_OBJ_TYPE_GEODETIC_CRS, - PJ_OBJ_TYPE_GEOCENTRIC_CRS, + PJ_TYPE_GEODETIC_CRS, + PJ_TYPE_GEOCENTRIC_CRS, - /** proj_obj_get_type() will never return that type, but - * PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS or PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS. */ - PJ_OBJ_TYPE_GEOGRAPHIC_CRS, + /** proj_get_type() will never return that type, but + * PJ_TYPE_GEOGRAPHIC_2D_CRS or PJ_TYPE_GEOGRAPHIC_3D_CRS. */ + PJ_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_ENGINEERING_CRS, - PJ_OBJ_TYPE_BOUND_CRS, - PJ_OBJ_TYPE_OTHER_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_ENGINEERING_CRS, + PJ_TYPE_BOUND_CRS, + PJ_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; + PJ_TYPE_CONVERSION, + PJ_TYPE_TRANSFORMATION, + PJ_TYPE_CONCATENATED_OPERATION, + PJ_TYPE_OTHER_COORDINATE_OPERATION, +} PJ_TYPE; -PJ_OBJ_LIST PROJ_DLL *proj_obj_create_from_name(PJ_CONTEXT *ctx, +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); -PJ_OBJ_TYPE PROJ_DLL proj_obj_get_type(const PJ *obj); +PJ_TYPE PROJ_DLL proj_get_type(const PJ *obj); -int PROJ_DLL proj_obj_is_deprecated(const PJ *obj); +int PROJ_DLL proj_is_deprecated(const PJ *obj); -PJ_OBJ_LIST PROJ_DLL *proj_obj_get_non_deprecated(PJ_CONTEXT *ctx, +PJ_OBJ_LIST PROJ_DLL *proj_get_non_deprecated(PJ_CONTEXT *ctx, const PJ *obj); /** Comparison criterion. */ @@ -609,18 +609,18 @@ typedef enum PJ_COMP_EQUIVALENT_EXCEPT_AXIS_ORDER_GEOGCRS, } PJ_COMPARISON_CRITERION; -int PROJ_DLL proj_obj_is_equivalent_to(const PJ *obj, const PJ *other, +int PROJ_DLL proj_is_equivalent_to(const PJ *obj, const PJ *other, PJ_COMPARISON_CRITERION criterion); -int PROJ_DLL proj_obj_is_crs(const PJ *obj); +int PROJ_DLL proj_is_crs(const PJ *obj); -const char PROJ_DLL* proj_obj_get_name(const PJ *obj); +const char PROJ_DLL* proj_get_name(const PJ *obj); -const char PROJ_DLL* proj_obj_get_id_auth_name(const PJ *obj, int index); +const char PROJ_DLL* proj_get_id_auth_name(const PJ *obj, int index); -const char PROJ_DLL* proj_obj_get_id_code(const PJ *obj, int index); +const char PROJ_DLL* proj_get_id_code(const PJ *obj, int index); -int PROJ_DLL proj_obj_get_area_of_use(PJ_CONTEXT *ctx, +int PROJ_DLL proj_get_area_of_use(PJ_CONTEXT *ctx, const PJ *obj, double* out_west_lon_degree, double* out_south_lat_degree, @@ -645,7 +645,7 @@ typedef enum PJ_WKT1_ESRI } PJ_WKT_TYPE; -const char PROJ_DLL* proj_obj_as_wkt(PJ_CONTEXT *ctx, +const char PROJ_DLL* proj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, PJ_WKT_TYPE type, const char* const *options); @@ -658,18 +658,18 @@ typedef enum PJ_PROJ_4 } PJ_PROJ_STRING_TYPE; -const char PROJ_DLL* proj_obj_as_proj_string(PJ_CONTEXT *ctx, +const char PROJ_DLL* proj_as_proj_string(PJ_CONTEXT *ctx, const PJ *obj, PJ_PROJ_STRING_TYPE type, const char* const *options); -PJ PROJ_DLL *proj_obj_get_source_crs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_get_source_crs(PJ_CONTEXT *ctx, const PJ *obj); -PJ PROJ_DLL *proj_obj_get_target_crs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_get_target_crs(PJ_CONTEXT *ctx, const PJ *obj); -PJ_OBJ_LIST PROJ_DLL *proj_obj_identify(PJ_CONTEXT *ctx, +PJ_OBJ_LIST PROJ_DLL *proj_identify(PJ_CONTEXT *ctx, const PJ *obj, const char *auth_name, const char* const *options, @@ -683,7 +683,7 @@ PROJ_STRING_LIST PROJ_DLL proj_get_authorities_from_database(PJ_CONTEXT *ctx); PROJ_STRING_LIST PROJ_DLL proj_get_codes_from_database(PJ_CONTEXT *ctx, const char *auth_name, - PJ_OBJ_TYPE type, + PJ_TYPE type, int allow_deprecated); /* ------------------------------------------------------------------------- */ @@ -791,31 +791,31 @@ void PROJ_DLL proj_operation_factory_context_set_allowed_intermediate_crs( /* ------------------------------------------------------------------------- */ -PJ_OBJ_LIST PROJ_DLL *proj_obj_create_operations( +PJ_OBJ_LIST PROJ_DLL *proj_create_operations( PJ_CONTEXT *ctx, const PJ *source_crs, const PJ *target_crs, const PJ_OPERATION_FACTORY_CONTEXT *operationContext); -int PROJ_DLL proj_obj_list_get_count(const PJ_OBJ_LIST *result); +int PROJ_DLL proj_list_get_count(const PJ_OBJ_LIST *result); -PJ PROJ_DLL *proj_obj_list_get(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_list_get(PJ_CONTEXT *ctx, const PJ_OBJ_LIST *result, int index); -void PROJ_DLL proj_obj_list_destroy(PJ_OBJ_LIST *result); +void PROJ_DLL proj_list_destroy(PJ_OBJ_LIST *result); /* ------------------------------------------------------------------------- */ -PJ PROJ_DLL *proj_obj_crs_get_geodetic_crs(PJ_CONTEXT *ctx, const PJ *crs); +PJ PROJ_DLL *proj_crs_get_geodetic_crs(PJ_CONTEXT *ctx, const PJ *crs); -PJ PROJ_DLL *proj_obj_crs_get_horizontal_datum(PJ_CONTEXT *ctx, const PJ *crs); +PJ PROJ_DLL *proj_crs_get_horizontal_datum(PJ_CONTEXT *ctx, const PJ *crs); -PJ PROJ_DLL *proj_obj_crs_get_sub_crs(PJ_CONTEXT *ctx, const PJ *crs, int index); +PJ PROJ_DLL *proj_crs_get_sub_crs(PJ_CONTEXT *ctx, const PJ *crs, int index); -PJ PROJ_DLL *proj_obj_crs_get_datum(PJ_CONTEXT *ctx, const PJ *crs); +PJ PROJ_DLL *proj_crs_get_datum(PJ_CONTEXT *ctx, const PJ *crs); -PJ PROJ_DLL *proj_obj_crs_get_coordinate_system(PJ_CONTEXT *ctx, const PJ *crs); +PJ PROJ_DLL *proj_crs_get_coordinate_system(PJ_CONTEXT *ctx, const PJ *crs); /** Type of coordinate system. */ typedef enum @@ -833,13 +833,13 @@ typedef enum PJ_CS_TYPE_TEMPORALMEASURE } PJ_COORDINATE_SYSTEM_TYPE; -PJ_COORDINATE_SYSTEM_TYPE PROJ_DLL proj_obj_cs_get_type(PJ_CONTEXT *ctx, +PJ_COORDINATE_SYSTEM_TYPE PROJ_DLL proj_cs_get_type(PJ_CONTEXT *ctx, const PJ *cs); -int PROJ_DLL proj_obj_cs_get_axis_count(PJ_CONTEXT *ctx, +int PROJ_DLL proj_cs_get_axis_count(PJ_CONTEXT *ctx, const PJ *cs); -int PROJ_DLL proj_obj_cs_get_axis_info(PJ_CONTEXT *ctx, +int PROJ_DLL proj_cs_get_axis_info(PJ_CONTEXT *ctx, const PJ *cs, int index, const char **out_name, const char **out_abbrev, @@ -849,26 +849,26 @@ int PROJ_DLL proj_obj_cs_get_axis_info(PJ_CONTEXT *ctx, const char **out_unit_auth_name, const char **out_unit_code); -PJ PROJ_DLL *proj_obj_get_ellipsoid(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_get_ellipsoid(PJ_CONTEXT *ctx, const PJ *obj); -int PROJ_DLL proj_obj_ellipsoid_get_parameters(PJ_CONTEXT *ctx, +int PROJ_DLL proj_ellipsoid_get_parameters(PJ_CONTEXT *ctx, const PJ *ellipsoid, double *out_semi_major_metre, double *out_semi_minor_metre, int *out_is_semi_minor_computed, double *out_inv_flattening); -PJ PROJ_DLL *proj_obj_get_prime_meridian(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_get_prime_meridian(PJ_CONTEXT *ctx, const PJ *obj); -int PROJ_DLL proj_obj_prime_meridian_get_parameters(PJ_CONTEXT *ctx, +int PROJ_DLL proj_prime_meridian_get_parameters(PJ_CONTEXT *ctx, const PJ *prime_meridian, double *out_longitude, double *out_unit_conv_factor, const char **out_unit_name); -PJ PROJ_DLL *proj_obj_crs_get_coordoperation(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_crs_get_coordoperation(PJ_CONTEXT *ctx, const PJ *crs); int PROJ_DLL proj_coordoperation_get_method_info(PJ_CONTEXT *ctx, diff --git a/src/proj_experimental.h b/src/proj_experimental.h index 10faccd4..27547d17 100644 --- a/src/proj_experimental.h +++ b/src/proj_experimental.h @@ -90,7 +90,7 @@ typedef struct PJ_UNIT_TYPE unit_type; } PJ_AXIS_DESCRIPTION; -PJ PROJ_DLL *proj_obj_create_cs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_cs(PJ_CONTEXT *ctx, PJ_COORDINATE_SYSTEM_TYPE type, int axis_count, const PJ_AXIS_DESCRIPTION* axis); @@ -110,7 +110,7 @@ typedef enum PJ_CART2D_WESTING_SOUTHING, } PJ_CARTESIAN_CS_2D_TYPE; -PJ PROJ_DLL *proj_obj_create_cartesian_2D_cs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_cartesian_2D_cs(PJ_CONTEXT *ctx, PJ_CARTESIAN_CS_2D_TYPE type, const char* unit_name, double unit_conv_factor); @@ -125,19 +125,19 @@ typedef enum PJ_ELLPS2D_LATITUDE_LONGITUDE, } PJ_ELLIPSOIDAL_CS_2D_TYPE; -PJ PROJ_DLL *proj_obj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx, PJ_ELLIPSOIDAL_CS_2D_TYPE type, const char* unit_name, double unit_conv_factor); -PJ_OBJ_LIST PROJ_DLL *proj_obj_query_geodetic_crs_from_datum( +PJ_OBJ_LIST PROJ_DLL *proj_query_geodetic_crs_from_datum( PJ_CONTEXT *ctx, const char *crs_auth_name, const char *datum_auth_name, const char *datum_code, const char *crs_type); -PJ PROJ_DLL *proj_obj_create_geographic_crs( +PJ PROJ_DLL *proj_create_geographic_crs( PJ_CONTEXT *ctx, const char *crs_name, const char *datum_name, @@ -149,13 +149,13 @@ PJ PROJ_DLL *proj_obj_create_geographic_crs( double pm_units_conv, PJ* ellipsoidal_cs); -PJ PROJ_DLL *proj_obj_create_geographic_crs_from_datum( +PJ PROJ_DLL *proj_create_geographic_crs_from_datum( PJ_CONTEXT *ctx, const char *crs_name, PJ* datum, PJ* ellipsoidal_cs); -PJ PROJ_DLL *proj_obj_create_geocentric_crs( +PJ PROJ_DLL *proj_create_geocentric_crs( PJ_CONTEXT *ctx, const char *crs_name, const char *datum_name, @@ -168,40 +168,40 @@ PJ PROJ_DLL *proj_obj_create_geocentric_crs( const char *linear_units, double linear_units_conv); -PJ PROJ_DLL *proj_obj_create_geocentric_crs_from_datum( +PJ PROJ_DLL *proj_create_geocentric_crs_from_datum( PJ_CONTEXT *ctx, const char *crs_name, const PJ* datum, const char *linear_units, double linear_units_conv); -PJ PROJ_DLL *proj_obj_alter_name(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_alter_name(PJ_CONTEXT *ctx, const PJ* obj, const char* name); -PJ PROJ_DLL *proj_obj_alter_id(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_alter_id(PJ_CONTEXT *ctx, const PJ* obj, const char* auth_name, const char* code); -PJ PROJ_DLL *proj_obj_crs_alter_geodetic_crs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_crs_alter_geodetic_crs(PJ_CONTEXT *ctx, const PJ* obj, const PJ* new_geod_crs); -PJ PROJ_DLL *proj_obj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx, const PJ* obj, const char *angular_units, double angular_units_conv, const char *unit_auth_name, const char *unit_code); -PJ PROJ_DLL *proj_obj_crs_alter_cs_linear_unit(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_crs_alter_cs_linear_unit(PJ_CONTEXT *ctx, const PJ* obj, const char *linear_units, double linear_units_conv, const char *unit_auth_name, const char *unit_code); -PJ PROJ_DLL *proj_obj_crs_alter_parameters_linear_unit( +PJ PROJ_DLL *proj_crs_alter_parameters_linear_unit( PJ_CONTEXT *ctx, const PJ* obj, const char *linear_units, @@ -210,16 +210,16 @@ PJ PROJ_DLL *proj_obj_crs_alter_parameters_linear_unit( const char *unit_code, int convert_to_new_unit); -PJ PROJ_DLL *proj_obj_create_engineering_crs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_engineering_crs(PJ_CONTEXT *ctx, const char *crsName); -PJ PROJ_DLL *proj_obj_create_vertical_crs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_vertical_crs(PJ_CONTEXT *ctx, const char *crs_name, const char *datum_name, const char *linear_units, double linear_units_conv); -PJ PROJ_DLL *proj_obj_create_compound_crs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_compound_crs(PJ_CONTEXT *ctx, const char *crs_name, PJ* horiz_crs, PJ* vert_crs); @@ -243,7 +243,7 @@ typedef struct PJ_UNIT_TYPE unit_type; } PJ_PARAM_DESCRIPTION; -PJ PROJ_DLL *proj_obj_create_conversion(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_conversion(PJ_CONTEXT *ctx, const char* name, const char* auth_name, const char* code, @@ -253,7 +253,7 @@ PJ PROJ_DLL *proj_obj_create_conversion(PJ_CONTEXT *ctx, int param_count, const PJ_PARAM_DESCRIPTION* params); -PJ PROJ_DLL *proj_obj_create_transformation( +PJ PROJ_DLL *proj_create_transformation( PJ_CONTEXT *ctx, const char* name, const char* auth_name, @@ -268,33 +268,33 @@ PJ PROJ_DLL *proj_obj_create_transformation( const PJ_PARAM_DESCRIPTION* params, double accuracy); -PJ PROJ_DLL *proj_obj_convert_conversion_to_other_method(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_convert_conversion_to_other_method(PJ_CONTEXT *ctx, const PJ *conversion, int new_method_epsg_code, const char *new_method_name); -PJ PROJ_DLL *proj_obj_create_projected_crs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_create_projected_crs(PJ_CONTEXT *ctx, const char* crs_name, const PJ* geodetic_crs, const PJ* conversion, const PJ* coordinate_system); -PJ PROJ_DLL *proj_obj_crs_create_bound_crs(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_crs_create_bound_crs(PJ_CONTEXT *ctx, const PJ *base_crs, const PJ *hub_crs, const PJ *transformation); -PJ PROJ_DLL *proj_obj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx, +PJ PROJ_DLL *proj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx, const PJ *crs, const char *const *options); /* BEGIN: Generated by scripts/create_c_api_projections.py*/ -PJ PROJ_DLL *proj_obj_create_conversion_utm( +PJ PROJ_DLL *proj_create_conversion_utm( PJ_CONTEXT *ctx, int zone, int north); -PJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator( +PJ PROJ_DLL *proj_create_conversion_transverse_mercator( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -304,7 +304,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_gauss_schreiber_transverse_mercator( +PJ PROJ_DLL *proj_create_conversion_gauss_schreiber_transverse_mercator( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -314,7 +314,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_gauss_schreiber_transverse_mercator( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator_south_oriented( +PJ PROJ_DLL *proj_create_conversion_transverse_mercator_south_oriented( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -324,7 +324,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator_south_oriented( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_two_point_equidistant( +PJ PROJ_DLL *proj_create_conversion_two_point_equidistant( PJ_CONTEXT *ctx, double latitude_first_point, double longitude_first_point, @@ -335,7 +335,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_two_point_equidistant( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_tunisia_mapping_grid( +PJ PROJ_DLL *proj_create_conversion_tunisia_mapping_grid( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -344,7 +344,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_tunisia_mapping_grid( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_albers_equal_area( +PJ PROJ_DLL *proj_create_conversion_albers_equal_area( PJ_CONTEXT *ctx, double latitude_false_origin, double longitude_false_origin, @@ -355,7 +355,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_albers_equal_area( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_1sp( +PJ PROJ_DLL *proj_create_conversion_lambert_conic_conformal_1sp( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -365,7 +365,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_1sp( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp( +PJ PROJ_DLL *proj_create_conversion_lambert_conic_conformal_2sp( PJ_CONTEXT *ctx, double latitude_false_origin, double longitude_false_origin, @@ -376,7 +376,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan( +PJ PROJ_DLL *proj_create_conversion_lambert_conic_conformal_2sp_michigan( PJ_CONTEXT *ctx, double latitude_false_origin, double longitude_false_origin, @@ -388,7 +388,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium( +PJ PROJ_DLL *proj_create_conversion_lambert_conic_conformal_2sp_belgium( PJ_CONTEXT *ctx, double latitude_false_origin, double longitude_false_origin, @@ -399,7 +399,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_azimuthal_equidistant( +PJ PROJ_DLL *proj_create_conversion_azimuthal_equidistant( PJ_CONTEXT *ctx, double latitude_nat_origin, double longitude_nat_origin, @@ -408,7 +408,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_azimuthal_equidistant( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_guam_projection( +PJ PROJ_DLL *proj_create_conversion_guam_projection( PJ_CONTEXT *ctx, double latitude_nat_origin, double longitude_nat_origin, @@ -417,7 +417,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_guam_projection( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_bonne( +PJ PROJ_DLL *proj_create_conversion_bonne( PJ_CONTEXT *ctx, double latitude_nat_origin, double longitude_nat_origin, @@ -426,7 +426,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_bonne( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area_spherical( +PJ PROJ_DLL *proj_create_conversion_lambert_cylindrical_equal_area_spherical( PJ_CONTEXT *ctx, double latitude_first_parallel, double longitude_nat_origin, @@ -435,7 +435,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area_spherical const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area( +PJ PROJ_DLL *proj_create_conversion_lambert_cylindrical_equal_area( PJ_CONTEXT *ctx, double latitude_first_parallel, double longitude_nat_origin, @@ -444,7 +444,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_cassini_soldner( +PJ PROJ_DLL *proj_create_conversion_cassini_soldner( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -453,7 +453,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_cassini_soldner( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_equidistant_conic( +PJ PROJ_DLL *proj_create_conversion_equidistant_conic( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -464,7 +464,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_equidistant_conic( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_eckert_i( +PJ PROJ_DLL *proj_create_conversion_eckert_i( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -472,7 +472,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_eckert_i( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_eckert_ii( +PJ PROJ_DLL *proj_create_conversion_eckert_ii( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -480,7 +480,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_eckert_ii( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_eckert_iii( +PJ PROJ_DLL *proj_create_conversion_eckert_iii( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -488,7 +488,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_eckert_iii( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_eckert_iv( +PJ PROJ_DLL *proj_create_conversion_eckert_iv( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -496,7 +496,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_eckert_iv( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_eckert_v( +PJ PROJ_DLL *proj_create_conversion_eckert_v( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -504,7 +504,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_eckert_v( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_eckert_vi( +PJ PROJ_DLL *proj_create_conversion_eckert_vi( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -512,7 +512,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_eckert_vi( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical( +PJ PROJ_DLL *proj_create_conversion_equidistant_cylindrical( PJ_CONTEXT *ctx, double latitude_first_parallel, double longitude_nat_origin, @@ -521,7 +521,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical_spherical( +PJ PROJ_DLL *proj_create_conversion_equidistant_cylindrical_spherical( PJ_CONTEXT *ctx, double latitude_first_parallel, double longitude_nat_origin, @@ -530,7 +530,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical_spherical( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_gall( +PJ PROJ_DLL *proj_create_conversion_gall( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -538,7 +538,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_gall( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_goode_homolosine( +PJ PROJ_DLL *proj_create_conversion_goode_homolosine( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -546,7 +546,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_goode_homolosine( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_interrupted_goode_homolosine( +PJ PROJ_DLL *proj_create_conversion_interrupted_goode_homolosine( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -554,7 +554,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_interrupted_goode_homolosine( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_x( +PJ PROJ_DLL *proj_create_conversion_geostationary_satellite_sweep_x( PJ_CONTEXT *ctx, double center_long, double height, @@ -563,7 +563,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_x( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_y( +PJ PROJ_DLL *proj_create_conversion_geostationary_satellite_sweep_y( PJ_CONTEXT *ctx, double center_long, double height, @@ -572,7 +572,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_y( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_gnomonic( +PJ PROJ_DLL *proj_create_conversion_gnomonic( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -581,7 +581,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_gnomonic( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_a( +PJ PROJ_DLL *proj_create_conversion_hotine_oblique_mercator_variant_a( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_projection_centre, @@ -593,7 +593,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_a( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_b( +PJ PROJ_DLL *proj_create_conversion_hotine_oblique_mercator_variant_b( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_projection_centre, @@ -605,7 +605,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_b( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_two_point_natural_origin( +PJ PROJ_DLL *proj_create_conversion_hotine_oblique_mercator_two_point_natural_origin( PJ_CONTEXT *ctx, double latitude_projection_centre, double latitude_point1, @@ -618,7 +618,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_two_point_natura const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_laborde_oblique_mercator( +PJ PROJ_DLL *proj_create_conversion_laborde_oblique_mercator( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_projection_centre, @@ -629,7 +629,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_laborde_oblique_mercator( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_international_map_world_polyconic( +PJ PROJ_DLL *proj_create_conversion_international_map_world_polyconic( PJ_CONTEXT *ctx, double center_long, double latitude_first_parallel, @@ -639,7 +639,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_international_map_world_polyconic( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_krovak_north_oriented( +PJ PROJ_DLL *proj_create_conversion_krovak_north_oriented( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_of_origin, @@ -651,7 +651,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_krovak_north_oriented( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_krovak( +PJ PROJ_DLL *proj_create_conversion_krovak( PJ_CONTEXT *ctx, double latitude_projection_centre, double longitude_of_origin, @@ -663,7 +663,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_krovak( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_lambert_azimuthal_equal_area( +PJ PROJ_DLL *proj_create_conversion_lambert_azimuthal_equal_area( PJ_CONTEXT *ctx, double latitude_nat_origin, double longitude_nat_origin, @@ -672,7 +672,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_lambert_azimuthal_equal_area( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_miller_cylindrical( +PJ PROJ_DLL *proj_create_conversion_miller_cylindrical( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -680,7 +680,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_miller_cylindrical( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_a( +PJ PROJ_DLL *proj_create_conversion_mercator_variant_a( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -690,7 +690,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_a( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_b( +PJ PROJ_DLL *proj_create_conversion_mercator_variant_b( PJ_CONTEXT *ctx, double latitude_first_parallel, double center_long, @@ -699,7 +699,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_b( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_popular_visualisation_pseudo_mercator( +PJ PROJ_DLL *proj_create_conversion_popular_visualisation_pseudo_mercator( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -708,7 +708,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_popular_visualisation_pseudo_mercator( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_mollweide( +PJ PROJ_DLL *proj_create_conversion_mollweide( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -716,7 +716,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_mollweide( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_new_zealand_mapping_grid( +PJ PROJ_DLL *proj_create_conversion_new_zealand_mapping_grid( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -725,7 +725,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_new_zealand_mapping_grid( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_oblique_stereographic( +PJ PROJ_DLL *proj_create_conversion_oblique_stereographic( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -735,7 +735,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_oblique_stereographic( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_orthographic( +PJ PROJ_DLL *proj_create_conversion_orthographic( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -744,7 +744,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_orthographic( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_american_polyconic( +PJ PROJ_DLL *proj_create_conversion_american_polyconic( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -753,7 +753,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_american_polyconic( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_a( +PJ PROJ_DLL *proj_create_conversion_polar_stereographic_variant_a( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -763,7 +763,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_a( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_b( +PJ PROJ_DLL *proj_create_conversion_polar_stereographic_variant_b( PJ_CONTEXT *ctx, double latitude_standard_parallel, double longitude_of_origin, @@ -772,7 +772,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_b( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_robinson( +PJ PROJ_DLL *proj_create_conversion_robinson( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -780,7 +780,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_robinson( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_sinusoidal( +PJ PROJ_DLL *proj_create_conversion_sinusoidal( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -788,7 +788,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_sinusoidal( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_stereographic( +PJ PROJ_DLL *proj_create_conversion_stereographic( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -798,7 +798,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_stereographic( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_van_der_grinten( +PJ PROJ_DLL *proj_create_conversion_van_der_grinten( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -806,7 +806,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_van_der_grinten( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_wagner_i( +PJ PROJ_DLL *proj_create_conversion_wagner_i( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -814,7 +814,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_wagner_i( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_wagner_ii( +PJ PROJ_DLL *proj_create_conversion_wagner_ii( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -822,7 +822,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_wagner_ii( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_wagner_iii( +PJ PROJ_DLL *proj_create_conversion_wagner_iii( PJ_CONTEXT *ctx, double latitude_true_scale, double center_long, @@ -831,7 +831,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_wagner_iii( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_wagner_iv( +PJ PROJ_DLL *proj_create_conversion_wagner_iv( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -839,7 +839,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_wagner_iv( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_wagner_v( +PJ PROJ_DLL *proj_create_conversion_wagner_v( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -847,7 +847,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_wagner_v( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_wagner_vi( +PJ PROJ_DLL *proj_create_conversion_wagner_vi( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -855,7 +855,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_wagner_vi( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_wagner_vii( +PJ PROJ_DLL *proj_create_conversion_wagner_vii( PJ_CONTEXT *ctx, double center_long, double false_easting, @@ -863,7 +863,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_wagner_vii( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_quadrilateralized_spherical_cube( +PJ PROJ_DLL *proj_create_conversion_quadrilateralized_spherical_cube( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -872,7 +872,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_quadrilateralized_spherical_cube( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_spherical_cross_track_height( +PJ PROJ_DLL *proj_create_conversion_spherical_cross_track_height( PJ_CONTEXT *ctx, double peg_point_lat, double peg_point_long, @@ -881,7 +881,7 @@ PJ PROJ_DLL *proj_obj_create_conversion_spherical_cross_track_height( const char* ang_unit_name, double ang_unit_conv_factor, const char* linear_unit_name, double linear_unit_conv_factor); -PJ PROJ_DLL *proj_obj_create_conversion_equal_earth( +PJ PROJ_DLL *proj_create_conversion_equal_earth( PJ_CONTEXT *ctx, double center_long, double false_easting, 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_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_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()), -- cgit v1.2.3