aboutsummaryrefslogtreecommitdiff
path: root/src/proj.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/proj.h')
-rw-r--r--src/proj.h152
1 files changed, 76 insertions, 76 deletions
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,
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 15:36:05 +0000