aboutsummaryrefslogtreecommitdiff
path: root/src/iso19111
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-03-07 20:29:06 +0100
committerEven Rouault <even.rouault@spatialys.com>2021-03-07 20:31:43 +0100
commitd7a2bdefb8d47e8ca18c8cbceb1a07290cb46ff7 (patch)
treec4dccaa34df9e76d40f510f6519563cbd5212d1a /src/iso19111
parent36a5a178cbd8c338a294ed5528462e65faf20a3d (diff)
downloadPROJ-d7a2bdefb8d47e8ca18c8cbceb1a07290cb46ff7.tar.gz
PROJ-d7a2bdefb8d47e8ca18c8cbceb1a07290cb46ff7.zip
typo fixes
Diffstat (limited to 'src/iso19111')
-rw-r--r--src/iso19111/c_api.cpp4
-rw-r--r--src/iso19111/crs.cpp20
-rw-r--r--src/iso19111/factory.cpp10
-rw-r--r--src/iso19111/io.cpp18
-rw-r--r--src/iso19111/operation/coordinateoperationfactory.cpp4
5 files changed, 28 insertions, 28 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index 0d386e6b..0ea74394 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -2589,7 +2589,7 @@ void proj_get_crs_list_parameters_destroy(PROJ_CRS_LIST_PARAMETERS *params) {
* The returned object is an array of PROJ_CRS_INFO* pointers, whose last
* 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
+ * When no filter parameters are set, this is functionally equivalent to
* proj_get_codes_from_database(), instantiating a PJ* object for each
* of the codes with proj_create_from_database() and retrieving information
* with the various getters. However this function will be much faster.
@@ -7593,7 +7593,7 @@ void proj_operation_factory_context_set_crs_extent_use(
*
* @param ctx PROJ context, or NULL for default context
* @param factory_ctx Operation factory context. must not be NULL
- * @param criterion patial criterion to use
+ * @param criterion spatial criterion to use
*/
void PROJ_DLL proj_operation_factory_context_set_spatial_criterion(
PJ_CONTEXT *ctx, PJ_OPERATION_FACTORY_CONTEXT *factory_ctx,
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp
index 6bf607fa..73c61e2c 100644
--- a/src/iso19111/crs.cpp
+++ b/src/iso19111/crs.cpp
@@ -2208,11 +2208,11 @@ GeodeticCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
};
- const bool unsignificantName = thisName.empty() ||
+ const bool insignificantName = thisName.empty() ||
ci_equal(thisName, "unknown") ||
ci_equal(thisName, "unnamed");
- if (unsignificantName) {
+ if (insignificantName) {
searchByDatumOrEllipsoid();
} else if (hasCodeCompatibleOfAuthorityFactory(this,
authorityFactory)) {
@@ -3277,7 +3277,7 @@ VerticalCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
const io::DatabaseContextNNPtr &dbContext =
authorityFactory->databaseContext();
- const bool unsignificantName = thisName.empty() ||
+ const bool insignificantName = thisName.empty() ||
ci_equal(thisName, "unknown") ||
ci_equal(thisName, "unnamed");
if (hasCodeCompatibleOfAuthorityFactory(this, authorityFactory)) {
@@ -3298,7 +3298,7 @@ VerticalCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
}
}
- } else if (!unsignificantName) {
+ } else if (!insignificantName) {
for (int ipass = 0; ipass < 2; ipass++) {
const bool approximateMatch = ipass == 1;
auto objects = authorityFactory->createObjectsFromName(
@@ -4278,7 +4278,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
if (authorityFactory) {
- const bool unsignificantName = thisName.empty() ||
+ const bool insignificantName = thisName.empty() ||
ci_equal(thisName, "unknown") ||
ci_equal(thisName, "unnamed");
bool foundEquivalentName = false;
@@ -4304,7 +4304,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
}
}
- } else if (!unsignificantName) {
+ } else if (!insignificantName) {
for (int ipass = 0; ipass < 2; ipass++) {
const bool approximateMatch = ipass == 1;
auto objects = authorityFactory->createObjectsFromNameEx(
@@ -4379,7 +4379,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
continue;
}
- addCRS(crs, unsignificantName);
+ addCRS(crs, insignificantName);
}
res.sort(lambdaSort);
@@ -4839,7 +4839,7 @@ CompoundCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
const io::DatabaseContextNNPtr &dbContext =
authorityFactory->databaseContext();
- const bool unsignificantName = thisName.empty() ||
+ const bool insignificantName = thisName.empty() ||
ci_equal(thisName, "unknown") ||
ci_equal(thisName, "unnamed");
bool foundEquivalentName = false;
@@ -4861,7 +4861,7 @@ CompoundCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
}
}
- } else if (!unsignificantName) {
+ } else if (!insignificantName) {
for (int ipass = 0; ipass < 2; ipass++) {
const bool approximateMatch = ipass == 1;
auto objects = authorityFactory->createObjectsFromName(
@@ -4942,7 +4942,7 @@ CompoundCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
if (_isEquivalentTo(crs.get(), crsCriterion, dbContext)) {
- res.emplace_back(crs, unsignificantName ? 90 : 70);
+ res.emplace_back(crs, insignificantName ? 90 : 70);
} else {
res.emplace_back(crs, 25);
}
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 5da9e6e0..62a309c4 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -3827,7 +3827,7 @@ AuthorityFactory::createFromCoordinateReferenceSystemCodes(
* missing grids should be removed from the result set.
* @param considerKnownGridsAsAvailable Whether known grids should be considered
* as available (typically when network is enabled).
- * @param discardSuperseded Whether cordinate operations that are superseded
+ * @param discardSuperseded Whether coordinate operations that are superseded
* (but not deprecated) should be removed from the result set.
* @param tryReverseOrder whether to search in the reverse order too (and thus
* inverse results found that way)
@@ -4200,7 +4200,7 @@ static bool useIrrelevantPivot(const operation::CoordinateOperationNNPtr &op,
* missing grids should be removed from the result set.
* @param considerKnownGridsAsAvailable Whether known grids should be considered
* as available (typically when network is enabled).
- * @param discardSuperseded Whether cordinate operations that are superseded
+ * @param discardSuperseded Whether coordinate operations that are superseded
* (but not deprecated) should be removed from the result set.
* @param intermediateCRSAuthCodes List of (auth_name, code) of CRS that can be
* used as potential intermediate CRS. If the list is empty, the database will
@@ -5587,7 +5587,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,
+ * This is functionally equivalent of listing the codes from an authority,
* instantiating
* a CRS object for each of them and getting the information from this CRS
* object, but this implementation has much less overhead.
@@ -6343,8 +6343,8 @@ AuthorityFactory::createObjectsFromNameEx(
}
// If we found a name that is an exact match, and all objects have the
- // same type, and we are not in approximate mode, only keep the objet(s)
- // with the exact name match.
+ // same type, and we are not in approximate mode, only keep the
+ // object(s) with the exact name match.
if (foundExactMatch && hashCodeFirstMatch != 0 && !approximateMatch) {
std::list<PairObjectName> resTmp;
for (const auto &pair : res) {
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index 51162365..184d992f 100644
--- a/src/iso19111/io.cpp
+++ b/src/iso19111/io.cpp
@@ -1504,15 +1504,15 @@ double WKTParser::Private::asDouble(const WKTNodeNNPtr &node) {
IdentifierPtr WKTParser::Private::buildId(const WKTNodeNNPtr &node,
bool tolerant, bool removeInverseOf) {
const auto *nodeP = node->GP();
- const auto &nodeChidren = nodeP->children();
- if (nodeChidren.size() >= 2) {
- auto codeSpace = stripQuotes(nodeChidren[0]);
+ const auto &nodeChildren = nodeP->children();
+ if (nodeChildren.size() >= 2) {
+ auto codeSpace = stripQuotes(nodeChildren[0]);
if (removeInverseOf && starts_with(codeSpace, "INVERSE(") &&
codeSpace.back() == ')') {
codeSpace = codeSpace.substr(strlen("INVERSE("));
codeSpace.resize(codeSpace.size() - 1);
}
- auto code = stripQuotes(nodeChidren[1]);
+ auto code = stripQuotes(nodeChildren[1]);
auto &citationNode = nodeP->lookForChild(WKTConstants::CITATION);
auto &uriNode = nodeP->lookForChild(WKTConstants::URI);
PropertyMap propertiesId;
@@ -1536,9 +1536,9 @@ IdentifierPtr WKTParser::Private::buildId(const WKTNodeNNPtr &node,
stripQuotes(uriNodeP->children()[0]));
}
}
- if (nodeChidren.size() >= 3 &&
- nodeChidren[2]->GP()->childrenSize() == 0) {
- auto version = stripQuotes(nodeChidren[2]);
+ if (nodeChildren.size() >= 3 &&
+ nodeChildren[2]->GP()->childrenSize() == 0) {
+ auto version = stripQuotes(nodeChildren[2]);
propertiesId.set(Identifier::VERSION_KEY, version);
}
return Identifier::create(code, propertiesId);
@@ -3944,7 +3944,7 @@ WKTParser::Private::buildProjectedCRS(const WKTNodeNNPtr &node) {
// It is likely that the ESRI definition of EPSG:32661 (UPS North) &
// EPSG:32761 (UPS South) uses the easting-northing order, instead
// of the EPSG northing-easting order
- // so don't substitue names to avoid confusion.
+ // so don't substitute names to avoid confusion.
if (projCRSName == "UPS_North") {
props.set(IdentifiedObject::NAME_KEY, "WGS 84 / UPS North (E,N)");
} else if (projCRSName == "UPS_South") {
@@ -6607,7 +6607,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text,
* order and will expect/output coordinates in radians. ProjectedCRS will have
* easting, northing axis order (except the ones with Transverse Mercator South
* Orientated projection). In that mode, the epsg:XXXX syntax will be also
- * interprated the same way.
+ * interpreted the same way.
* @throw ParsingException
*/
BaseObjectNNPtr createFromUserInput(const std::string &text,
diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp
index 4bd68b1d..7509c513 100644
--- a/src/iso19111/operation/coordinateoperationfactory.cpp
+++ b/src/iso19111/operation/coordinateoperationfactory.cpp
@@ -4917,13 +4917,13 @@ void CoordinateOperationFactory::Private::createOperationsCompoundToCompound(
createOperations(sourceCRS, intermGeogSrc, context);
const auto opsGeogToTarget =
createOperations(intermGeogDst, targetCRS, context);
- const bool hasNonTrivalSrcTransf =
+ const bool hasNonTrivialSrcTransf =
!opsSrcToGeog.empty() &&
!opsSrcToGeog.front()->hasBallparkTransformation();
const bool hasNonTrivialTargetTransf =
!opsGeogToTarget.empty() &&
!opsGeogToTarget.front()->hasBallparkTransformation();
- if (hasNonTrivalSrcTransf && hasNonTrivialTargetTransf) {
+ if (hasNonTrivialSrcTransf && hasNonTrivialTargetTransf) {
const auto opsGeogSrcToGeogDst =
createOperations(intermGeogSrc, intermGeogDst, context);
for (const auto &op1 : opsSrcToGeog) {