aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-10-25 16:18:58 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-10-25 16:18:58 +0100
commit64312b33672a1c24feefa5127f91666f3b25f583 (patch)
tree6e51c947c0b610664d41045a107be6f7ef334625
parent32f92851c0028e1ff6d5203d34c7ded1ffe1951a (diff)
downloadPROJ-64312b33672a1c24feefa5127f91666f3b25f583.tar.gz
PROJ-64312b33672a1c24feefa5127f91666f3b25f583.zip
Fix typos spotted by scripts/fix_typos.sh
-rw-r--r--docs/source/community/rfc/rfc-6.rst2
-rw-r--r--docs/source/operations/projections/tmerc.rst2
-rw-r--r--src/iso19111/coordinateoperation.cpp2
-rw-r--r--src/iso19111/factory.cpp4
-rw-r--r--src/projections/ortho.cpp2
-rw-r--r--src/transformations/defmodel.hpp6
-rw-r--r--src/transformations/defmodel_impl.hpp4
-rw-r--r--src/transformations/tinshift.hpp2
-rw-r--r--test/gie/builtins.gie10
9 files changed, 17 insertions, 17 deletions
diff --git a/docs/source/community/rfc/rfc-6.rst b/docs/source/community/rfc/rfc-6.rst
index a4437962..ed8115df 100644
--- a/docs/source/community/rfc/rfc-6.rst
+++ b/docs/source/community/rfc/rfc-6.rst
@@ -182,7 +182,7 @@ single triangle:
"authority": {
"name": "Authority name",
"url": "http://example.com",
- "address": "Adress",
+ "address": "Address",
"email": "test@example.com"
},
"links": [
diff --git a/docs/source/operations/projections/tmerc.rst b/docs/source/operations/projections/tmerc.rst
index 899c6ac0..3a18904f 100644
--- a/docs/source/operations/projections/tmerc.rst
+++ b/docs/source/operations/projections/tmerc.rst
@@ -122,7 +122,7 @@ to Krüger :cite:`Krueger1912` who gave the series expansions accurate to
:math:`n^4`, where :math:`n = (a-b)/(a+b)` is the third flattening.
These series were extended to sixth order by Engsager and Poder in
:cite:`Poder1998` and :cite:`Engsager2007`. This gives full
-double-precision accuracy withing 3900 km of the central meridian (about
+double-precision accuracy within 3900 km of the central meridian (about
57% of the surface of the earth) :cite:`Karney2011tm`. The error is
less than 0.1 mm within 7000 km of the central meridian (about 89% of
the surface of the earth).
diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp
index 82ec4f30..19586a59 100644
--- a/src/iso19111/coordinateoperation.cpp
+++ b/src/iso19111/coordinateoperation.cpp
@@ -11453,7 +11453,7 @@ struct SortFunction {
// "Amersfoort to WGS 84 (3)", which is probably a better guess.
// Except for French NTF (Paris) to NTF, where the (1) conversion
- // should be preferred because in the remarks of (2), it is mentionned
+ // should be preferred because in the remarks of (2), it is mentioned
// OGP prefers value from IGN Paris (code 1467)...
if (a_name.find("NTF (Paris) to NTF (1)") != std::string::npos &&
b_name.find("NTF (Paris) to NTF (2)") != std::string::npos) {
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 08b627b2..5d02aeea 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -5703,9 +5703,9 @@ AuthorityFactory::createObjectsFromName(
//! @cond Doxygen_Suppress
/** \brief Return a list of objects, identifier by their name, with the name
- * on which the match occured.
+ * on which the match occurred.
*
- * The name on which the match occured might be different from the object name,
+ * The name on which the match occurred might be different from the object name,
* if the match has been done on an alias name of that object.
*
* @param searchedName Searched name. Must be at least 2 character long.
diff --git a/src/projections/ortho.cpp b/src/projections/ortho.cpp
index 75b8199d..8dcfb53c 100644
--- a/src/projections/ortho.cpp
+++ b/src/projections/ortho.cpp
@@ -223,7 +223,7 @@ static PJ_LP ortho_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inver
// Using Q->sinph0 * sinphi + Q->cosph0 * cosphi * coslam == 0 (visibity
// condition of the forward case) in the forward equations, and a lot of
- // substition games...
+ // substitution games...
PJ_XY xy_recentered;
xy_recentered.x = xy.x;
xy_recentered.y = (xy.y - Q->y_shift) / Q->y_scale;
diff --git a/src/transformations/defmodel.hpp b/src/transformations/defmodel.hpp
index 642213b7..1b0005b1 100644
--- a/src/transformations/defmodel.hpp
+++ b/src/transformations/defmodel.hpp
@@ -181,7 +181,7 @@ class Component {
/** Get the spatial model. */
const SpatialModel &spatialModel() const { return mSpatialModel; }
- /** Generic type for a type functon */
+ /** Generic type for a type function */
struct TimeFunction {
std::string type{};
@@ -369,13 +369,13 @@ class MasterFile {
* models. Typically "EPSG:XXXX" */
const std::string &definitionCRS() const { return mDefinitionCRS; }
- /** Get the nominal reference epoch of the deformation model. Formated
+ /** Get the nominal reference epoch of the deformation model. Formatted
* as a ISO-8601 date-time. This is not necessarily used to calculate
* the deformation model - each component defines its own time function. */
const std::string &referenceEpoch() const { return mReferenceEpoch; }
/** Get the epoch at which the uncertainties of the deformation model
- * are calculated. Formated as a ISO-8601 date-time. */
+ * are calculated. Formatted as a ISO-8601 date-time. */
const std::string &uncertaintyReferenceEpoch() const {
return mUncertaintyReferenceEpoch;
}
diff --git a/src/transformations/defmodel_impl.hpp b/src/transformations/defmodel_impl.hpp
index a15137d7..abd07286 100644
--- a/src/transformations/defmodel_impl.hpp
+++ b/src/transformations/defmodel_impl.hpp
@@ -1232,7 +1232,7 @@ bool Evaluator<Grid, GridSet, EvaluatorIface>::inverse(
constexpr bool forInverseComputation = true;
for (int i = 0; i < 10; i++) {
#ifdef DEBUG_DEFMODEL
- iface.log("Iteration " + std::to_string(i) + ": before foward: x=" +
+ iface.log("Iteration " + std::to_string(i) + ": before forward: x=" +
toString(x_out) + ", y=" + toString(y_out));
#endif
double x_new;
@@ -1243,7 +1243,7 @@ bool Evaluator<Grid, GridSet, EvaluatorIface>::inverse(
return false;
}
#ifdef DEBUG_DEFMODEL
- iface.log("After foward: x=" + toString(x_new) + ", y=" +
+ iface.log("After forward: x=" + toString(x_new) + ", y=" +
toString(y_new));
#endif
const double dx = x_new - x;
diff --git a/src/transformations/tinshift.hpp b/src/transformations/tinshift.hpp
index 7cebab9f..cc8771b3 100644
--- a/src/transformations/tinshift.hpp
+++ b/src/transformations/tinshift.hpp
@@ -239,7 +239,7 @@ class Evaluator {
private:
std::unique_ptr<TINShiftFile> mFile;
- // Reused between invokations to save memory allocations
+ // Reused between invocations to save memory allocations
std::vector<unsigned> mTriangleIndices{};
std::unique_ptr<NS_PROJ::QuadTree::QuadTree<unsigned>> mQuadTreeForward{};
diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
index 02e6766e..cbba686c 100644
--- a/test/gie/builtins.gie
+++ b/test/gie/builtins.gie
@@ -4445,7 +4445,7 @@ tolerance 0.1 mm
accept -90 0
expect -6378137 18504.1253
-# This test is fragile. Note the slighly important tolerance
+# This test is fragile. Note the slightly important tolerance
# direction inverse
# tolerance 100 mm
# accept -6378137 18504.125313223721605027
@@ -4523,7 +4523,7 @@ expect failure errno tolerance_condition
accept -90.00001 0
expect failure errno tolerance_condition
-# Consistant with WGS84 semi-major axis
+# Consistent with WGS84 semi-major axis
accept 90 0
expect 6378137 0
roundtrip 1
@@ -4532,7 +4532,7 @@ accept -90 0
expect -6378137 0
roundtrip 1
-# Consistant with WGS84 semi-minor axis
+# Consistent with WGS84 semi-minor axis
accept 0 90
expect 0 6356752.3142
roundtrip 1
@@ -4577,7 +4577,7 @@ roundtrip 1
accept 0 -0.0000001
expect failure errno tolerance_condition
-# Consistant with WGS84 semi-major axis
+# Consistent with WGS84 semi-major axis
accept 0 0
expect 0 -6378137
roundtrip 1
@@ -4604,7 +4604,7 @@ roundtrip 1
accept 0 0.0000001
expect failure errno tolerance_condition
-# Consistant with WGS84 semi-major axis
+# Consistent with WGS84 semi-major axis
accept 0 0
expect 0 6378137
roundtrip 1