Skip to content

Commit

Permalink
Rename proj_obj_XXX as proj_XXX and PJ_OBJ_XXX as PJ_XXX
Browse files Browse the repository at this point in the history
  • Loading branch information
@rouault
rouault committed Dec 30, 2018
1 parent a38d9be commit ae53784
Show file tree
Hide file tree
Showing 9 changed files with 1,414 additions and 1,398 deletions.
6 changes: 3 additions & 3 deletions scripts/create_c_api_projections.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def snake_casify(s):
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"
Expand Down Expand Up @@ -157,15 +157,15 @@ def snake_casify(s):
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")
cppfile.write(" return nullptr;\n")
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")
Expand Down
18 changes: 9 additions & 9 deletions src/4D_api.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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");
Expand Down
42 changes: 21 additions & 21 deletions src/apps/cs2cs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit ae53784

Please sign in to comment.