aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/proj/coordinateoperation.hpp2
-rw-r--r--src/apps/cs2cs.cpp8
-rw-r--r--src/apps/projinfo.cpp10
-rw-r--r--src/iso19111/c_api.cpp8
-rw-r--r--src/iso19111/coordinateoperation.cpp2
-rw-r--r--src/iso19111/factory.cpp2
-rw-r--r--src/proj.h2
-rw-r--r--src/proj_symbol_rename.h2
-rw-r--r--test/unit/test_c_api.cpp4
-rw-r--r--test/unit/test_operation.cpp8
10 files changed, 24 insertions, 24 deletions
diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp
index a0883cae..fd737dcc 100644
--- a/include/proj/coordinateoperation.hpp
+++ b/include/proj/coordinateoperation.hpp
@@ -146,7 +146,7 @@ class PROJ_GCC_DLL CoordinateOperation : public common::ObjectUsage,
gridsNeeded(const io::DatabaseContextPtr &databaseContext) const = 0;
PROJ_DLL bool
- isPROJInstanciable(const io::DatabaseContextPtr &databaseContext) const;
+ isPROJInstantiable(const io::DatabaseContextPtr &databaseContext) const;
PROJ_DLL bool hasBallparkTransformation() const;
diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp
index 150548c5..dafd06f8 100644
--- a/src/apps/cs2cs.cpp
+++ b/src/apps/cs2cs.cpp
@@ -206,10 +206,10 @@ static void process(FILE *fid)
}
/************************************************************************/
-/* instanciate_crs() */
+/* instantiate_crs() */
/************************************************************************/
-static PJ *instanciate_crs(const std::string &definition,
+static PJ *instantiate_crs(const std::string &definition,
bool &isGeog, double &toRadians,
bool &isLatFirst) {
PJ *crs = proj_create(nullptr,
@@ -541,7 +541,7 @@ int main(int argc, char **argv) {
PJ *src = nullptr;
if (!fromStr.empty()) {
bool ignored;
- src = instanciate_crs(fromStr, srcIsGeog,
+ src = instantiate_crs(fromStr, srcIsGeog,
srcToRadians, ignored);
if (!src) {
emess(3, "cannot instantiate source coordinate system");
@@ -550,7 +550,7 @@ int main(int argc, char **argv) {
PJ *dst = nullptr;
if (!toStr.empty()) {
- dst = instanciate_crs(toStr, destIsGeog,
+ dst = instantiate_crs(toStr, destIsGeog,
destToRadians, destIsLatLong);
if (!dst) {
emess(3, "cannot instantiate target coordinate system");
diff --git a/src/apps/projinfo.cpp b/src/apps/projinfo.cpp
index 55a8d622..094587e2 100644
--- a/src/apps/projinfo.cpp
+++ b/src/apps/projinfo.cpp
@@ -521,7 +521,7 @@ static void outputOperations(
DatabaseContextPtr dbContext, const std::string &sourceCRSStr,
const std::string &targetCRSStr, const ExtentPtr &bboxFilter,
CoordinateOperationContext::SpatialCriterion spatialCriterion,
- bool spatialCriterionExplictlySpecified,
+ bool spatialCriterionExplicitlySpecified,
CoordinateOperationContext::SourceTargetCRSExtentUse crsExtentUse,
CoordinateOperationContext::GridAvailabilityUse gridAvailabilityUse,
CoordinateOperationContext::IntermediateCRSUse allowUseIntermediateCRS,
@@ -565,7 +565,7 @@ static void outputOperations(
ctxt->setDiscardSuperseded(!showSuperseded);
list = CoordinateOperationFactory::create()->createOperations(
NN_NO_CHECK(sourceCRS), NN_NO_CHECK(targetCRS), ctxt);
- if (!spatialCriterionExplictlySpecified &&
+ if (!spatialCriterionExplicitlySpecified &&
spatialCriterion == CoordinateOperationContext::SpatialCriterion::
STRICT_CONTAINMENT) {
try {
@@ -639,7 +639,7 @@ int main(int argc, char **argv) {
bool summary = false;
ExtentPtr bboxFilter = nullptr;
std::string area;
- bool spatialCriterionExplictlySpecified = false;
+ bool spatialCriterionExplicitlySpecified = false;
CoordinateOperationContext::SpatialCriterion spatialCriterion =
CoordinateOperationContext::SpatialCriterion::STRICT_CONTAINMENT;
CoordinateOperationContext::SourceTargetCRSExtentUse crsExtentUse =
@@ -795,7 +795,7 @@ int main(int argc, char **argv) {
} else if (arg == "--spatial-test" && i + 1 < argc) {
i++;
std::string value(argv[i]);
- spatialCriterionExplictlySpecified = true;
+ spatialCriterionExplicitlySpecified = true;
if (ci_equal(value, "contains")) {
spatialCriterion = CoordinateOperationContext::
SpatialCriterion::STRICT_CONTAINMENT;
@@ -1084,7 +1084,7 @@ int main(int argc, char **argv) {
outputOperations(
dbContext, sourceCRSStr, targetCRSStr, bboxFilter, spatialCriterion,
- spatialCriterionExplictlySpecified, crsExtentUse,
+ spatialCriterionExplicitlySpecified, crsExtentUse,
gridAvailabilityUse, allowUseIntermediateCRS, pivots, authority,
usePROJGridAlternatives, showSuperseded, outputOpt, summary);
}
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index e731615c..f7dcd354 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -1950,7 +1950,7 @@ void proj_string_list_destroy(PROJ_STRING_LIST list) {
// ---------------------------------------------------------------------------
-/** \brief Instanciate a default set of parameters to be used by
+/** \brief Instantiate a default set of parameters to be used by
* proj_get_crs_list().
*
* @return a new object to free with proj_get_crs_list_parameters_destroy() */
@@ -1987,7 +1987,7 @@ void proj_get_crs_list_parameters_destroy(PROJ_CRS_LIST_PARAMETERS *params) {
* entry is NULL. This array should be freed with proj_crs_info_list_destroy()
*
* When no filter parameters are set, this is functionnaly equivalent to
- * proj_get_crs_info_list_from_database(), instanciating a PJ* object for each
+ * proj_get_crs_info_list_from_database(), instantiating a PJ* object for each
* of the proj_create_from_database() and retrieving information with the
* various getters. However this function will be much faster.
*
@@ -5734,7 +5734,7 @@ PJ *proj_create_conversion_equal_earth(PJ_CONTEXT *ctx, double center_long,
* @return TRUE or FALSE.
*/
-int proj_coordoperation_is_instanciable(PJ_CONTEXT *ctx,
+int proj_coordoperation_is_instantiable(PJ_CONTEXT *ctx,
const PJ *coordoperation) {
assert(coordoperation);
auto op = dynamic_cast<const CoordinateOperation *>(
@@ -5746,7 +5746,7 @@ int proj_coordoperation_is_instanciable(PJ_CONTEXT *ctx,
}
auto dbContext = getDBcontextNoException(ctx, __FUNCTION__);
try {
- return op->isPROJInstanciable(dbContext) ? 1 : 0;
+ return op->isPROJInstantiable(dbContext) ? 1 : 0;
} catch (const std::exception &) {
return 0;
}
diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp
index 65588923..224b19ef 100644
--- a/src/iso19111/coordinateoperation.cpp
+++ b/src/iso19111/coordinateoperation.cpp
@@ -715,7 +715,7 @@ void CoordinateOperation::setAccuracies(
* a PROJ pipeline, checking in particular that referenced grids are
* available.
*/
-bool CoordinateOperation::isPROJInstanciable(
+bool CoordinateOperation::isPROJInstantiable(
const io::DatabaseContextPtr &databaseContext) const {
try {
exportToPROJString(io::PROJStringFormatter::create().get());
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 81abcdf1..bafa1b5d 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -3873,7 +3873,7 @@ AuthorityFactory::getDescriptionText(const std::string &code) const {
/** \brief Return a list of information on CRS objects
*
* This is functionnaly equivalent of listing the codes from an authority,
- * instanciating
+ * instantiating
* a CRS object for each of them and getting the information from this CRS
* object, but this implementation has much less overhead.
*
diff --git a/src/proj.h b/src/proj.h
index edbbd798..1f71e115 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -999,7 +999,7 @@ int PROJ_DLL proj_coordoperation_get_method_info(PJ_CONTEXT *ctx,
const char **out_method_auth_name,
const char **out_method_code);
-int PROJ_DLL proj_coordoperation_is_instanciable(PJ_CONTEXT *ctx,
+int PROJ_DLL proj_coordoperation_is_instantiable(PJ_CONTEXT *ctx,
const PJ *coordoperation);
int PROJ_DLL proj_coordoperation_has_ballpark_transformation(PJ_CONTEXT *ctx,
diff --git a/src/proj_symbol_rename.h b/src/proj_symbol_rename.h
index 0ce342fd..b6e887ca 100644
--- a/src/proj_symbol_rename.h
+++ b/src/proj_symbol_rename.h
@@ -115,7 +115,7 @@
#define proj_coordoperation_get_param_count internal_proj_coordoperation_get_param_count
#define proj_coordoperation_get_param_index internal_proj_coordoperation_get_param_index
#define proj_coordoperation_get_towgs84_values internal_proj_coordoperation_get_towgs84_values
-#define proj_coordoperation_is_instanciable internal_proj_coordoperation_is_instanciable
+#define proj_coordoperation_is_instantiable internal_proj_coordoperation_is_instantiable
#define proj_create internal_proj_create
#define proj_create_argv internal_proj_create_argv
#define proj_create_cartesian_2D_cs internal_proj_create_cartesian_2D_cs
diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp
index 7682c072..486ab0c7 100644
--- a/test/unit/test_c_api.cpp
+++ b/test/unit/test_c_api.cpp
@@ -1302,13 +1302,13 @@ TEST_F(CApi, proj_coordoperation_get_grid_used) {
// ---------------------------------------------------------------------------
-TEST_F(CApi, proj_coordoperation_is_instanciable) {
+TEST_F(CApi, proj_coordoperation_is_instantiable) {
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);
+ EXPECT_EQ(proj_coordoperation_is_instantiable(m_ctxt, op), 1);
}
// ---------------------------------------------------------------------------
diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp
index 06c230b0..112b46e3 100644
--- a/test/unit/test_operation.cpp
+++ b/test/unit/test_operation.cpp
@@ -6394,14 +6394,14 @@ TEST(operation, IGNF_LAMB1_TO_EPSG_4326) {
// ---------------------------------------------------------------------------
-TEST(operation, isPROJInstanciable) {
+TEST(operation, isPROJInstantiable) {
{
auto transformation = Transformation::createGeocentricTranslations(
PropertyMap(), GeographicCRS::EPSG_4269, GeographicCRS::EPSG_4326,
1.0, 2.0, 3.0, {});
EXPECT_TRUE(
- transformation->isPROJInstanciable(DatabaseContext::create()));
+ transformation->isPROJInstantiable(DatabaseContext::create()));
}
// Missing grid
@@ -6410,7 +6410,7 @@ TEST(operation, isPROJInstanciable) {
PropertyMap(), GeographicCRS::EPSG_4807, GeographicCRS::EPSG_4326,
"foo.gsb", std::vector<PositionalAccuracyNNPtr>());
EXPECT_FALSE(
- transformation->isPROJInstanciable(DatabaseContext::create()));
+ transformation->isPROJInstantiable(DatabaseContext::create()));
}
// Unsupported method
@@ -6422,7 +6422,7 @@ TEST(operation, isPROJInstanciable) {
std::vector<GeneralParameterValueNNPtr>{},
std::vector<PositionalAccuracyNNPtr>{});
EXPECT_FALSE(
- transformation->isPROJInstanciable(DatabaseContext::create()));
+ transformation->isPROJInstantiable(DatabaseContext::create()));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-16 01:58:06 +0000