[geos-commits] [SCM] GEOS branch master updated. 2d2963299472013861e184ca94930b632903a849
git at osgeo.org
git at osgeo.org
Mon Dec 14 19:47:04 PST 2020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via 2d2963299472013861e184ca94930b632903a849 (commit)
from 908b31cb15b8b3138dec2e2ef367330ddfbf7920 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2d2963299472013861e184ca94930b632903a849
Author: Daniel Baston <dbaston at gmail.com>
Date: Fri Dec 11 20:09:08 2020 -0500
Fix some typos
diff --git a/doc/example.cpp b/doc/example.cpp
index 46dc0d9..a011cfb 100644
--- a/doc/example.cpp
+++ b/doc/example.cpp
@@ -253,7 +253,7 @@ create_ushaped_linestring(double xoffset, double yoffset, double side)
}
// This function will create a LinearRing
-// geometry rapresenting a square with the given origin
+// geometry representing a square with the given origin
// and side
LinearRing*
create_square_linearring(double xoffset, double yoffset, double side)
@@ -281,7 +281,7 @@ create_square_linearring(double xoffset, double yoffset, double side)
}
// This function will create a Polygon
-// geometry rapresenting a square with the given origin
+// geometry representing a square with the given origin
// and side and with a central hole 1/3 sided.
Polygon*
create_square_polygon(double xoffset, double yoffset, double side)
@@ -1001,7 +1001,7 @@ do_all()
// DIFFERENCE
/////////////////////////////////////////////
- // Compute difference of adhiacent geometries
+ // Compute difference of adjacent geometries
newgeoms = new std::vector<const Geometry*>;
for(unsigned int i = 0; i < geoms->size() - 1; i++) {
const Geometry* g1 = (*geoms)[i];
@@ -1034,7 +1034,7 @@ do_all()
// SYMMETRIC DIFFERENCE
/////////////////////////////////////////////
- // Compute symmetric difference of adhiacent geometries
+ // Compute symmetric difference of adjacent geometries
newgeoms = new std::vector<const Geometry*>;
for(unsigned int i = 0; i < geoms->size() - 1; i++) {
const Geometry* g1 = (*geoms)[i];
diff --git a/include/geos/algorithm/Angle.h b/include/geos/algorithm/Angle.h
index c8aec27..29e5e23 100644
--- a/include/geos/algorithm/Angle.h
+++ b/include/geos/algorithm/Angle.h
@@ -93,7 +93,7 @@ public:
///
/// An angle is acute if it is less than 90 degrees.
///
- /// Note: this implementation is not precise (determistic) for
+ /// Note: this implementation is not precise (deterministic) for
/// angles very close to 90 degrees.
///
/// @param p0 an endpoint of the angle
@@ -108,7 +108,7 @@ public:
///
/// An angle is obtuse if it is greater than 90 degrees.
///
- /// Note: this implementation is not precise (determistic) for
+ /// Note: this implementation is not precise (deterministic) for
/// angles very close to 90 degrees.
///
/// @param p0 an endpoint of the angle
diff --git a/include/geos/geomgraph/Depth.h b/include/geos/geomgraph/Depth.h
index 2e12545..736432f 100644
--- a/include/geos/geomgraph/Depth.h
+++ b/include/geos/geomgraph/Depth.h
@@ -43,7 +43,7 @@ class GEOS_DLL Depth {
public:
static int depthAtLocation(geom::Location location);
Depth();
- virtual ~Depth() = default; // FIXME: shoudn't be virtual!
+ virtual ~Depth() = default; // FIXME: shouldn't be virtual!
int getDepth(int geomIndex, int posIndex) const;
void setDepth(int geomIndex, int posIndex, int depthValue);
geom::Location getLocation(int geomIndex, int posIndex) const;
diff --git a/include/geos/geomgraph/EdgeIntersection.h b/include/geos/geomgraph/EdgeIntersection.h
index 7123c66..b215e84 100644
--- a/include/geos/geomgraph/EdgeIntersection.h
+++ b/include/geos/geomgraph/EdgeIntersection.h
@@ -116,7 +116,7 @@ operator< (const EdgeIntersection& ei1, const EdgeIntersection& ei2)
}
// TODO: check if the Coordinate matches, or this will
- // be a robustness issue in computin distance
+ // be a robustness issue in computing distance
// See http://trac.osgeo.org/geos/ticket/350
}
return false;
diff --git a/include/geos/noding/MCIndexNoder.inl b/include/geos/noding/MCIndexNoder.inl
index 5883c4f..0432777 100644
--- a/include/geos/noding/MCIndexNoder.inl
+++ b/include/geos/noding/MCIndexNoder.inl
@@ -37,7 +37,7 @@ MCIndexNoder::getIndex()
INLINE std::vector<SegmentString*>*
MCIndexNoder::getNodedSubstrings() const
{
- assert(nodedSegStrings); // must have colled computeNodes before!
+ assert(nodedSegStrings); // must have called computeNodes before!
return NodedSegmentString::getNodedSubstrings(*nodedSegStrings);
}
diff --git a/include/geos/noding/snapround/MCIndexSnapRounder.h b/include/geos/noding/snapround/MCIndexSnapRounder.h
index e8da0d8..8a55620 100644
--- a/include/geos/noding/snapround/MCIndexSnapRounder.h
+++ b/include/geos/noding/snapround/MCIndexSnapRounder.h
@@ -23,7 +23,7 @@
#include <geos/noding/Noder.h> // for inheritance
#include <geos/noding/NodedSegmentString.h> // for inlines
-#include <geos/noding/snapround/MCIndexPointSnapper.h> // for inines
+#include <geos/noding/snapround/MCIndexPointSnapper.h> // for inlines
#include <geos/algorithm/LineIntersector.h> // for composition
#include <geos/geom/Coordinate.h> // for use in vector
#include <geos/geom/PrecisionModel.h> // for inlines
@@ -71,7 +71,7 @@ namespace snapround { // geos::noding::snapround
* It will function with non-integer precision models, but the
* results are not 100% guaranteed to be correctly noded.
*/
-class GEOS_DLL MCIndexSnapRounder: public Noder { // implments Noder
+class GEOS_DLL MCIndexSnapRounder: public Noder { // implements Noder
public:
diff --git a/include/geos/operation/buffer/BufferBuilder.h b/include/geos/operation/buffer/BufferBuilder.h
index ded0ba7..e1ffe36 100644
--- a/include/geos/operation/buffer/BufferBuilder.h
+++ b/include/geos/operation/buffer/BufferBuilder.h
@@ -198,7 +198,7 @@ private:
* If so, the edge is not inserted, but its label is merged
* with the existing edge.
*
- * The function takes responsability of releasing the Edge parameter
+ * The function takes responsibility of releasing the Edge parameter
* memory when appropriate.
*/
void insertUniqueEdge(geomgraph::Edge* e);
diff --git a/include/geos/operation/buffer/BufferInputLineSimplifier.h b/include/geos/operation/buffer/BufferInputLineSimplifier.h
index 3c19047..f819292 100644
--- a/include/geos/operation/buffer/BufferInputLineSimplifier.h
+++ b/include/geos/operation/buffer/BufferInputLineSimplifier.h
@@ -134,7 +134,7 @@ private:
/**
* Checks for shallowness over a sample of points in the given section.
*
- * This helps prevents the siplification from incrementally
+ * This helps prevents the simplification from incrementally
* "skipping" over points which are in fact non-shallow.
*
* @param p0 start coordinate of section
diff --git a/include/geos/operation/buffer/OffsetCurveSetBuilder.h b/include/geos/operation/buffer/OffsetCurveSetBuilder.h
index abe99d3..40f497b 100644
--- a/include/geos/operation/buffer/OffsetCurveSetBuilder.h
+++ b/include/geos/operation/buffer/OffsetCurveSetBuilder.h
@@ -73,7 +73,7 @@ class GEOS_DLL OffsetCurveSetBuilder {
private:
// To keep track of newly-created Labels.
- // Labels will be relesed by object dtor
+ // Labels will be released by object dtor
std::vector<geomgraph::Label*> newLabels;
const geom::Geometry& inputGeom;
diff --git a/include/geos/operation/union/CascadedPolygonUnion.h b/include/geos/operation/union/CascadedPolygonUnion.h
index bb7db11..95e907e 100644
--- a/include/geos/operation/union/CascadedPolygonUnion.h
+++ b/include/geos/operation/union/CascadedPolygonUnion.h
@@ -154,7 +154,7 @@ public:
/** \brief
* Computes the union of a set of polygonal [Geometrys](@ref geom::Geometry).
*
- * @tparam T an iterator yelding something castable to const Polygon *
+ * @tparam T an iterator yielding something castable to const Polygon *
* @param start start iterator
* @param end end iterator
* @param unionStrategy strategy to apply
diff --git a/src/geom/Envelope.cpp b/src/geom/Envelope.cpp
index f5cd212..5c615fb 100644
--- a/src/geom/Envelope.cpp
+++ b/src/geom/Envelope.cpp
@@ -122,7 +122,7 @@ Envelope::Envelope(const std::string& str)
// now split apart the string on : and , characters
std::vector<std::string> values = split(coordString, ":,");
- // create a new envelopet
+ // create a new envelope
init(strtod(values[0].c_str(), nullptr),
strtod(values[1].c_str(), nullptr),
strtod(values[2].c_str(), nullptr),
diff --git a/src/geom/HeuristicOverlay.cpp b/src/geom/HeuristicOverlay.cpp
index 04c4041..10d5cc3 100644
--- a/src/geom/HeuristicOverlay.cpp
+++ b/src/geom/HeuristicOverlay.cpp
@@ -381,7 +381,7 @@ HeuristicOverlay(const Geometry* g0, const Geometry* g1, int opCode)
* other nodes and lines, leaving all the rest undisturbed, for a very
* clean result, if it manages to create one.
* If a result is found with no exception, return.
-* 3. Peform overlay operation using a PrecisionModel(scale), which
+* 3. Perform overlay operation using a PrecisionModel(scale), which
* uses a SnapRoundingNoder. Every vertex will be noded to the snapping
* grid, resulting in a modified geometry. The SnapRoundingNoder approach
* reliably produces results, assuming valid inputs.
diff --git a/src/geom/prep/AbstractPreparedPolygonContains.cpp b/src/geom/prep/AbstractPreparedPolygonContains.cpp
index 314a3bd..ef5537e 100644
--- a/src/geom/prep/AbstractPreparedPolygonContains.cpp
+++ b/src/geom/prep/AbstractPreparedPolygonContains.cpp
@@ -124,7 +124,7 @@ AbstractPreparedPolygonContains::eval(const geom::Geometry* geom)
// Check if there is any intersection between the line segments
// in target and test.
- // In some important cases, finding a proper interesection implies that the
+ // In some important cases, finding a proper intersection implies that the
// test geometry is NOT contained.
// These cases are:
// - If the test geometry is polygonal
@@ -152,7 +152,7 @@ AbstractPreparedPolygonContains::eval(const geom::Geometry* geom)
//
// (If non-proper (vertex) intersections ARE found, this may indicate
// a situation where two shells touch at a single vertex, which admits
- // the case where a line could cross between the shells and still be wholely contained in them.
+ // the case where a line could cross between the shells and still be wholly contained in them.
if(hasSegmentIntersection && !hasNonProperIntersection) {
return false;
}
@@ -182,7 +182,7 @@ AbstractPreparedPolygonContains::eval(const geom::Geometry* geom)
}
bool AbstractPreparedPolygonContains::evalPointTestGeom(const Geometry *geom, Location outermostLoc) {
- // If we had a point on the ourside of the polygon,
+ // If we had a point on the outside of the polygon,
// we aren't covered or contained.
if (outermostLoc == Location::EXTERIOR) {
return false;
diff --git a/src/geomgraph/Edge.cpp b/src/geomgraph/Edge.cpp
index 1638bf2..eff7ea7 100644
--- a/src/geomgraph/Edge.cpp
+++ b/src/geomgraph/Edge.cpp
@@ -269,8 +269,8 @@ Edge::print() const
return ss.str();
}
-// Dunno how to implemente this in terms of operator<<
std::string
+// Dunno how to implement this in terms of operator<<
Edge::printReverse() const
{
testInvariant();
diff --git a/src/geomgraph/GeometryGraph.cpp b/src/geomgraph/GeometryGraph.cpp
index 1d82492..2d7d824 100644
--- a/src/geomgraph/GeometryGraph.cpp
+++ b/src/geomgraph/GeometryGraph.cpp
@@ -130,7 +130,7 @@ GeometryGraph::getBoundaryPoints()
{
if(! boundaryPoints.get()) {
- // Collection will be destroied by GeometryGraph dtor
+ // Collection will be destroyed by GeometryGraph dtor
std::vector<Node*>* coll = getBoundaryNodes();
boundaryPoints.reset(new CoordinateArraySequence(coll->size()));
std::size_t i = 0;
diff --git a/src/geomgraph/index/MonotoneChainIndexer.cpp b/src/geomgraph/index/MonotoneChainIndexer.cpp
index d627d93..9cc48c7 100644
--- a/src/geomgraph/index/MonotoneChainIndexer.cpp
+++ b/src/geomgraph/index/MonotoneChainIndexer.cpp
@@ -69,4 +69,4 @@ MonotoneChainIndexer::findChainEnd(const CoordinateSequence* pts, std::size_t st
} // namespace geos.geomgraph.index
} // namespace geos.geomgraph
-} // namespage geos
+} // namespace geos
diff --git a/src/index/strtree/STRtree.cpp b/src/index/strtree/STRtree.cpp
index 5a6df0b..0043de5 100644
--- a/src/index/strtree/STRtree.cpp
+++ b/src/index/strtree/STRtree.cpp
@@ -374,7 +374,7 @@ STRtree::insert(const Envelope* itemEnv, void* item)
// then a is less than c,
// and so on.
//
-// For some very low values, this predicate does not fulfill this requiremnet,
+// For some very low values, this predicate does not fulfill this requirement,
// NOTE - strk:
// It seems that the '<' comparison here gives unstable results.
@@ -384,7 +384,7 @@ STRtree::insert(const Envelope* itemEnv, void* item)
// NOTE - mloskot:
// This comparison does not answer if a is "lower" than b
-// what is required for sorting. This comparison only answeres
+// what is required for sorting. This comparison only answers
// if a and b are "almost the same" or different
/*NOTE - cfis
diff --git a/src/noding/MCIndexNoder.cpp b/src/noding/MCIndexNoder.cpp
index 12a8a5c..7db17b0 100644
--- a/src/noding/MCIndexNoder.cpp
+++ b/src/noding/MCIndexNoder.cpp
@@ -102,7 +102,7 @@ MCIndexNoder::add(SegmentString* segStr)
{
std::vector<std::unique_ptr<MonotoneChain>> segChains;
- // segChains will contain nelwy allocated MonotoneChain objects
+ // segChains will contain newly allocated MonotoneChain objects
MonotoneChainBuilder::getChains(segStr->getCoordinates(),
segStr, segChains);
diff --git a/src/operation/buffer/BufferBuilder.cpp b/src/operation/buffer/BufferBuilder.cpp
index 514f219..404e5e2 100644
--- a/src/operation/buffer/BufferBuilder.cpp
+++ b/src/operation/buffer/BufferBuilder.cpp
@@ -161,7 +161,7 @@ BufferBuilder::bufferLineSingleSided(const Geometry* g, double distance,
std::unique_ptr<Geometry> buf;
// This is a (temp?) hack to workaround the fact that
- // BufferBuilder BufferParamaters are immutable after
+ // BufferBuilder BufferParameters are immutable after
// construction, while we want to force the end cap
// style to FLAT for single-sided buffering
{
@@ -268,7 +268,7 @@ BufferBuilder::bufferLineSingleSided(const Geometry* g, double distance,
// included.
//
// Let's try and estimate a more accurate bound instead of just assuming
- // 98%. With 98%, the episilon grows as the buffer distance grows,
+ // 98%. With 98%, the epsilon grows as the buffer distance grows,
// so that at large distance, artifacts may skip through this filter
// Let the length of the line play a factor in the distance, which is still
// going to be bounded by 98%. Take 10% of the length of the line from the buffer distance
@@ -448,7 +448,7 @@ BufferBuilder::buffer(const Geometry* g, double distance)
GEOS_CHECK_FOR_INTERRUPTS();
{
- // scope for earlier PolygonBuilder cleanupt
+ // scope for earlier PolygonBuilder cleanup
PolygonBuilder polyBuilder(geomFact);
buildSubgraphs(subgraphList, polyBuilder);
diff --git a/src/operation/buffer/SubgraphDepthLocater.cpp b/src/operation/buffer/SubgraphDepthLocater.cpp
index 3017a1a..bed29c6 100644
--- a/src/operation/buffer/SubgraphDepthLocater.cpp
+++ b/src/operation/buffer/SubgraphDepthLocater.cpp
@@ -238,7 +238,7 @@ SubgraphDepthLocater::findStabbedSegments(
// It seems that LineSegment is *very* slow... undef this
// to see yourself
// LineSegment has been refactored to be mostly inline, still
-// it makes copies of the given coordinates, while the 'non-LineSemgent'
+// it makes copies of the given coordinates, while the 'non-LineSegment'
// based code below uses pointers instead. I'll kip the SKIP_LS
// defined until LineSegment switches to Coordinate pointers instead.
//
diff --git a/src/operation/predicate/RectangleContains.cpp b/src/operation/predicate/RectangleContains.cpp
index 99310bd..47e4d48 100644
--- a/src/operation/predicate/RectangleContains.cpp
+++ b/src/operation/predicate/RectangleContains.cpp
@@ -50,7 +50,7 @@ RectangleContains::contains(const Geometry& geom)
bool
RectangleContains::isContainedInBoundary(const Geometry& geom)
{
- // polygons can never be wholely contained in the boundary
+ // polygons can never be wholly contained in the boundary
if(dynamic_cast<const geom::Polygon*>(&geom)) {
return false;
}
@@ -140,7 +140,7 @@ RectangleContains::isLineSegmentContainedInBoundary(const Coordinate& p0,
* one of x and y are the same, but the other ordinate
* is not the same as a boundary ordinate
*
- * In either case, the segment is not wholely in the boundary
+ * In either case, the segment is not wholly in the boundary
*/
return false;
}
diff --git a/src/operation/sharedpaths/SharedPathsOp.cpp b/src/operation/sharedpaths/SharedPathsOp.cpp
index d254b19..606f67c 100644
--- a/src/operation/sharedpaths/SharedPathsOp.cpp
+++ b/src/operation/sharedpaths/SharedPathsOp.cpp
@@ -112,7 +112,7 @@ SharedPathsOp::findLinearIntersections(PathList& to)
std::unique_ptr<Geometry> full(OverlayOp::overlayOp(
&_g1, &_g2, OverlayOp::opINTERSECTION));
- // NOTE: intersection of equal lines yelds splitted lines,
+ // NOTE: intersection of equal lines yields splitted lines,
// should we sew them back ?
for(std::size_t i = 0, n = full->getNumGeometries(); i < n; ++i) {
diff --git a/src/operation/union/OverlapUnion.cpp b/src/operation/union/OverlapUnion.cpp
index 1272e0f..ea4fb8c 100644
--- a/src/operation/union/OverlapUnion.cpp
+++ b/src/operation/union/OverlapUnion.cpp
@@ -214,7 +214,7 @@ containsProperly(const Envelope& env, const Coordinate& p0, const Coordinate& p1
return containsProperly(env, p0) && containsProperly(env, p1);
}
-/* privatef */
+/* private */
void
OverlapUnion::extractBorderSegments(const Geometry* geom, const Envelope& penv, std::vector<LineSegment>& psegs)
{
diff --git a/src/operation/union/UnaryUnionOp.cpp b/src/operation/union/UnaryUnionOp.cpp
index 1ad44d7..ba2f4d0 100644
--- a/src/operation/union/UnaryUnionOp.cpp
+++ b/src/operation/union/UnaryUnionOp.cpp
@@ -74,7 +74,7 @@ UnaryUnionOp::Union()
/*
* For points and lines, only a single union operation is
- * required, since the OGC model allowings self-intersecting
+ * required, since the OGC model allows self-intersecting
* MultiPoint and MultiLineStrings.
* This is not the case for polygons, so Cascaded Union is required.
*/
diff --git a/src/operation/valid/MakeValid.cpp b/src/operation/valid/MakeValid.cpp
index afe29db..06f5de4 100644
--- a/src/operation/valid/MakeValid.cpp
+++ b/src/operation/valid/MakeValid.cpp
@@ -240,7 +240,7 @@ static std::unique_ptr<geom::Geometry> MakeValidPoly(const geom::Geometry* geom)
auto new_area = geos::operation::polygonize::BuildArea().build(cut_edges.get());
assert(new_area); // never return nullptr, but exception
if( new_area->isEmpty() ) {
- /* no more rings can be build with thes edges */
+ /* no more rings can be built with these edges */
break;
}
diff --git a/src/planargraph/DirectedEdgeStar.cpp b/src/planargraph/DirectedEdgeStar.cpp
index 5de7442..9ee1ad3 100644
--- a/src/planargraph/DirectedEdgeStar.cpp
+++ b/src/planargraph/DirectedEdgeStar.cpp
@@ -79,7 +79,7 @@ DirectedEdgeStar::end() const
}
/*
- * Returns the coordinate for the node at wich this star is based
+ * Returns the coordinate for the node at which this star is based
*/
Coordinate&
DirectedEdgeStar::getCoordinate() const
diff --git a/src/precision/EnhancedPrecisionOp.cpp b/src/precision/EnhancedPrecisionOp.cpp
index 740584f..e025148 100644
--- a/src/precision/EnhancedPrecisionOp.cpp
+++ b/src/precision/EnhancedPrecisionOp.cpp
@@ -61,7 +61,7 @@ EnhancedPrecisionOp::intersection(
auto resultEP = cbo.intersection(geom0, geom1);
// check that result is a valid geometry after
- // the reshift to orginal precision
+ // the reshift to original precision
if(! resultEP->isValid()) {
#if GEOS_DEBUG
std::cerr << "Reduced operation result is invalid"
@@ -106,7 +106,7 @@ EnhancedPrecisionOp::Union(
auto resultEP = cbo.Union(geom0, geom1);
// check that result is a valid geometry after
- // the reshift to orginal precision
+ // the reshift to original precision
if(! resultEP->isValid()) {
throw originalEx;
}
@@ -142,7 +142,7 @@ EnhancedPrecisionOp::difference(
auto resultEP = cbo.difference(geom0, geom1);
// check that result is a valid geometry after
- // the reshift to orginal precision
+ // the reshift to original precision
if(! resultEP->isValid()) {
throw originalEx;
}
@@ -177,7 +177,7 @@ EnhancedPrecisionOp::symDifference(
auto resultEP = cbo.symDifference(geom0, geom1);
// check that result is a valid geometry after
- // the reshift to orginal precision
+ // the reshift to original precision
if(! resultEP->isValid()) {
throw originalEx;
}
@@ -210,7 +210,7 @@ EnhancedPrecisionOp::buffer(const Geometry* geom, double distance)
auto resultEP = cbo.buffer(geom, distance);
// check that result is a valid geometry
- // after the reshift to orginal precision
+ // after the reshift to original precision
if(! resultEP->isValid()) {
throw originalEx;
}
diff --git a/tests/geostest/geostest.c b/tests/geostest/geostest.c
index 95db390..ff9bb1d 100644
--- a/tests/geostest/geostest.c
+++ b/tests/geostest/geostest.c
@@ -266,7 +266,7 @@ do_all(char *inputfile)
printf("Union: %s\n", ptr);
free(ptr);
- /* PointOnSurcace */
+ /* PointOnSurface */
g4 = GEOSPointOnSurface(g3);
ptr = GEOSGeomToWKT(g4);
printf("PointOnSurface: %s\n", ptr);
diff --git a/tests/unit/algorithm/RobustLineIntersectorTest.cpp b/tests/unit/algorithm/RobustLineIntersectorTest.cpp
index 3ea2bc1..3d673b6 100644
--- a/tests/unit/algorithm/RobustLineIntersectorTest.cpp
+++ b/tests/unit/algorithm/RobustLineIntersectorTest.cpp
@@ -262,7 +262,7 @@ void object::test<13>
}
// Test intersects: point on segment with FLOAT PM
-// X coordinate of 3rd and 4th vertises of the line are not
+// X coordinate of 3rd and 4th vertices of the line are not
// float-point exact with X coordinate of the point.
// The X values differ after 14th decimal place:
// POINT (-23.1094689600055080 50.5195368635957180)
@@ -294,7 +294,7 @@ void object::test<14>
}
// Test intersects: point on segment with FIXED PM
-// X coordinate of 3rd and 4th vertises of the line are not
+// X coordinate of 3rd and 4th vertices of the line are not
// float-point exact with X coordinate of the point.
// The X values differ after 14th decimal place:
// POINT (-23.1094689600055080 50.5195368635957180)
diff --git a/tests/unit/capi/GEOSContainsTest.cpp b/tests/unit/capi/GEOSContainsTest.cpp
index 558e61f..e557c6f 100644
--- a/tests/unit/capi/GEOSContainsTest.cpp
+++ b/tests/unit/capi/GEOSContainsTest.cpp
@@ -128,7 +128,7 @@ template<>
void object::test<4>
()
{
- // Coincident vertives of both polygons at
+ // Coincident vertices of both polygons at
// -700.67089999181 93743.4218587986, -713.450135807349 93754.1677576647,
std::string const
outer("01030000800100000009000000af9dd0005ee585c0f802efbff6e2f6400000000000000000955acde0994b86c039a922afa2e3f64000000000000000002af6fb4f5d1887c07adb1c4071e3f6400000000000000000e5962b388d4f87c0bd3aeda7bae2f640000000000000000087c61344030887c07d585e6ff6e1f6400000000000000000fc8a31b5166186c0230588b20ae1f640000000000000000034733daf050186c0ed9f3ac98ae1f6400000000000000000f190aef659b385c0df2876538ce2f6400000000000000000af9dd0005ee585c0f802efbff6e2f6400000000000000000");
diff --git a/tests/unit/capi/GEOSPreparedGeometryTest.cpp b/tests/unit/capi/GEOSPreparedGeometryTest.cpp
index 040d0d1..0e49304 100644
--- a/tests/unit/capi/GEOSPreparedGeometryTest.cpp
+++ b/tests/unit/capi/GEOSPreparedGeometryTest.cpp
@@ -179,7 +179,7 @@ void object::test<6>
}
// Test PreparedIntersects: point on segment with FLOAT PM
-// X coordinate of 3rd and 4th vertises of the line are not
+// X coordinate of 3rd and 4th vertices of the line are not
// float-point exact with X coordinate of the point.
// The X values differ after 14th decimal place:
// POINT (-23.1094689600055080 50.5195368635957180)
@@ -276,7 +276,7 @@ template<>
void object::test<10>
()
{
- // Coincident vertives of both polygons at
+ // Coincident vertices of both polygons at
// -700.67089999181 93743.4218587986, -713.450135807349 93754.1677576647,
std::string const
outer("01030000800100000009000000af9dd0005ee585c0f802efbff6e2f6400000000000000000955acde0994b86c039a922afa2e3f64000000000000000002af6fb4f5d1887c07adb1c4071e3f6400000000000000000e5962b388d4f87c0bd3aeda7bae2f640000000000000000087c61344030887c07d585e6ff6e1f6400000000000000000fc8a31b5166186c0230588b20ae1f640000000000000000034733daf050186c0ed9f3ac98ae1f6400000000000000000f190aef659b385c0df2876538ce2f6400000000000000000af9dd0005ee585c0f802efbff6e2f6400000000000000000");
@@ -339,7 +339,7 @@ template<>
void object::test<11>
()
{
- // Coincident vertext at -753.167968418005 93709.4279185742
+ // Coincident vertex at -753.167968418005 93709.4279185742
//POLYGON ((-753.167968418005 93754.0955183194,-816.392328351464 93754.0955183194,-816.392328351464 93709.4279185742,-753.167968418005 93709.4279185742,-753.167968418005 93754.0955183194))
std::string const
outer("01030000800100000005000000bd70d3ff578987c09e373e87a1e3f6400000000000000000a9f60b7d238389c09e373e87a1e3f6400000000000000000a9f60b7d238389c09625c1d8d6e0f6400000000000000000bd70d3ff578987c09625c1d8d6e0f6400000000000000000bd70d3ff578987c09e373e87a1e3f6400000000000000000");
diff --git a/tests/unit/geom/CoordinateTest.cpp b/tests/unit/geom/CoordinateTest.cpp
index e0d64e2..7d21c46 100644
--- a/tests/unit/geom/CoordinateTest.cpp
+++ b/tests/unit/geom/CoordinateTest.cpp
@@ -47,7 +47,7 @@ void object::test<1>
ensure("NOTE: Coordinate has no default constructor.", true);
}
-// Test of overriden constructor
+// Test of overridden constructor
template<>
template<>
void object::test<2>
diff --git a/tests/unit/geom/GeometryCollectionTest.cpp b/tests/unit/geom/GeometryCollectionTest.cpp
index 5b25370..3ca8da0 100644
--- a/tests/unit/geom/GeometryCollectionTest.cpp
+++ b/tests/unit/geom/GeometryCollectionTest.cpp
@@ -135,7 +135,7 @@ template<>
void object::test<6>
()
{
- // Heterogenous GeometryCollection does not pass isDimensionString for any input
+ // Heterogeneous GeometryCollection does not pass isDimensionString for any input
auto gc = readWKT("GEOMETRYCOLLECTION(POINT (1 1), LINESTRING (1 1, 2 2))");
ensure(!gc->isDimensionStrict(geos::geom::Dimension::P));
diff --git a/tests/unit/geom/GeometryFactoryTest.cpp b/tests/unit/geom/GeometryFactoryTest.cpp
index bf74681..aee5451 100644
--- a/tests/unit/geom/GeometryFactoryTest.cpp
+++ b/tests/unit/geom/GeometryFactoryTest.cpp
@@ -655,7 +655,7 @@ void object::test<19>
using geos::geom::Coordinate;
const std::size_t size = 7;
- // Create sequence of coordiantes
+ // Create sequence of coordinates
CoordArrayPtr coords = new geos::geom::CoordinateArraySequence(size);
ensure(coords != nullptr);
coords->setAt(Coordinate(0, 10), 0);
@@ -705,7 +705,7 @@ void object::test<20>
const std::size_t exteriorSize = 7;
const std::size_t interiorSize = 5;
- // Create sequence of coordiantes
+ // Create sequence of coordinates
CoordArrayPtr coords = new geos::geom::CoordinateArraySequence(exteriorSize);
ensure(coords != nullptr);
coords->setAt(Coordinate(0, 10), 0);
diff --git a/tests/unit/geom/IntersectionMatrixTest.cpp b/tests/unit/geom/IntersectionMatrixTest.cpp
index 1e52533..05c5372 100644
--- a/tests/unit/geom/IntersectionMatrixTest.cpp
+++ b/tests/unit/geom/IntersectionMatrixTest.cpp
@@ -291,7 +291,7 @@ void object::test<17>
{
using geos::geom::Location;
- // Test on the original p0attern 'FFFFFFFFF' of the 'im_' object
+ // Test on the original pattern 'FFFFFFFFF' of the 'im_' object
ensure_equals(im_.toString(), pattern_false_);
ensure_equals(im_.get(Location::INTERIOR, Location::INTERIOR), geos::geom::Dimension::False);
diff --git a/tests/unit/geom/LinearRingTest.cpp b/tests/unit/geom/LinearRingTest.cpp
index 031fc97..1178092 100644
--- a/tests/unit/geom/LinearRingTest.cpp
+++ b/tests/unit/geom/LinearRingTest.cpp
@@ -85,7 +85,7 @@ void object::test<1>
{
using geos::geom::Coordinate;
- // Non-empty sequence of coordiantes
+ // Non-empty sequence of coordinates
const std::size_t size7 = 7;
CoordArrayPtr coords = new geos::geom::CoordinateArraySequence();
ensure("sequence is null pointer.", coords != nullptr);
@@ -115,7 +115,7 @@ void object::test<1>
}
}
-// Test of copy contructor
+// Test of copy constructor
template<>
template<>
void object::test<2>
diff --git a/tests/unit/geom/PointTest.cpp b/tests/unit/geom/PointTest.cpp
index b296eb1..75ed262 100644
--- a/tests/unit/geom/PointTest.cpp
+++ b/tests/unit/geom/PointTest.cpp
@@ -482,7 +482,7 @@ void object::test<38>
ensure(!p1->equals(p2.get()));
}
-// Test of equals() for non-empty Points with negative coordiantes
+// Test of equals() for non-empty Points with negative coordinates
template<>
template<>
void object::test<39>
diff --git a/tests/unit/geom/PolygonTest.cpp b/tests/unit/geom/PolygonTest.cpp
index 9742415..cd62ae2 100644
--- a/tests/unit/geom/PolygonTest.cpp
+++ b/tests/unit/geom/PolygonTest.cpp
@@ -76,7 +76,7 @@ void object::test<1>
{
using geos::geom::Coordinate;
- // Create non-empty Coordiantes sequence for Exterior LinearRing
+ // Create non-empty Coordinate sequence for Exterior LinearRing
const std::size_t size = 7;
CoordArrayPtr coords = new geos::geom::CoordinateArraySequence();
ensure("sequence is null pointer.", coords != nullptr);
diff --git a/tests/unit/geom/TriangleTest.cpp b/tests/unit/geom/TriangleTest.cpp
index c375819..e5d0d93 100644
--- a/tests/unit/geom/TriangleTest.cpp
+++ b/tests/unit/geom/TriangleTest.cpp
@@ -18,7 +18,7 @@ namespace tut {
// Common data used by tests
struct test_triangle_data {
- // Coordiantes of simple triangle: ABC
+ // Coordinates of simple triangle: ABC
geos::geom::Coordinate a;
geos::geom::Coordinate b;
geos::geom::Coordinate c;
@@ -52,7 +52,7 @@ void object::test<1>
ensure("NOTE: Triangle has no default constructor.", true);
}
-// Test of overriden ctor
+// Test of overridden ctor
template<>
template<>
void object::test<2>
diff --git a/tests/unit/noding/SegmentNodeTest.cpp b/tests/unit/noding/SegmentNodeTest.cpp
index f95019b..50f2139 100644
--- a/tests/unit/noding/SegmentNodeTest.cpp
+++ b/tests/unit/noding/SegmentNodeTest.cpp
@@ -42,7 +42,7 @@ group test_segmentnode_group("geos::noding::SegmentNode");
// Test Cases
//
-// Test of overriden constructor
+// Test of overridden constructor
template<>
template<>
void object::test<1>
diff --git a/tests/unit/noding/snap/SnappingNoderTest.cpp b/tests/unit/noding/snap/SnappingNoderTest.cpp
index 6bad51a..2f2e8b1 100644
--- a/tests/unit/noding/snap/SnappingNoderTest.cpp
+++ b/tests/unit/noding/snap/SnappingNoderTest.cpp
@@ -102,7 +102,7 @@ void object::test<3> ()
checkRounding(wkt1, wkt2, 1, expected);
}
-// testLineCondensePointsp
+// testLineCondensePoints
template<>
template<>
void object::test<4> ()
diff --git a/tests/unit/noding/snapround/HotPixelTest.cpp b/tests/unit/noding/snapround/HotPixelTest.cpp
index e9f1fb0..a7cb0c1 100644
--- a/tests/unit/noding/snapround/HotPixelTest.cpp
+++ b/tests/unit/noding/snapround/HotPixelTest.cpp
@@ -269,7 +269,7 @@ void object::test<23>
//-----------------------------
-// Test segments entering through a corder and terminating inside pixel
+// Test segments entering through a corner and terminating inside pixel
// testCornerULEndInside
template<>
diff --git a/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp b/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp
index 6e500f5..de93d1b 100644
--- a/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp
+++ b/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp
@@ -271,7 +271,7 @@ void object::test<10>
()
{
int npoints = 1000; // vertices in sinstar test shape
- int ncells = 100; // number of colums/rows in test grid square
+ int ncells = 100; // number of columns/rows in test grid square
double radius = 100.0;
double amplitude = 0.3; // how far the sin deviates from perfect circle (0.0)
diff --git a/tests/unit/operation/overlayng/OverlayNGZTest.cpp b/tests/unit/operation/overlayng/OverlayNGZTest.cpp
index b83b49c..b19da3b 100644
--- a/tests/unit/operation/overlayng/OverlayNGZTest.cpp
+++ b/tests/unit/operation/overlayng/OverlayNGZTest.cpp
@@ -162,7 +162,7 @@ void object::test<9> ()
}
// XY Polygon gets Z value from Point
-// testPointPolygonXYUnionn
+// testPointPolygonXYUnion
template<>
template<>
void object::test<10> ()
diff --git a/tests/unit/triangulate/DelaunayTest.cpp b/tests/unit/triangulate/DelaunayTest.cpp
index 50ff9df..200b149 100644
--- a/tests/unit/triangulate/DelaunayTest.cpp
+++ b/tests/unit/triangulate/DelaunayTest.cpp
@@ -77,7 +77,7 @@ void object::test<1>
{
//Create a subdivision centered at (0,0)
QuadEdgeSubdivision sub(Envelope(-100, 100, -100, 100), .00001);
- //make a triagulaor to work on sub
+ //make a triangulator to work on sub
IncrementalDelaunayTriangulator triangulator(&sub);
triangulator.insertSite(Vertex(0, 0));
diff --git a/tests/unit/triangulate/VoronoiTest.cpp b/tests/unit/triangulate/VoronoiTest.cpp
index cdb0474..d764d69 100644
--- a/tests/unit/triangulate/VoronoiTest.cpp
+++ b/tests/unit/triangulate/VoronoiTest.cpp
@@ -56,7 +56,7 @@ readTextOrHex(const char* wkt)
return wktreader.read(wktstr);
}
-//helper function for funning triangulation
+//helper function for running triangulation
void
runVoronoi(const char* sitesWkt, const char* expectedWkt, const double tolerance)
{
diff --git a/tests/unit/util/NodingTestUtil.cpp b/tests/unit/util/NodingTestUtil.cpp
index df741f8..f59739b 100644
--- a/tests/unit/util/NodingTestUtil.cpp
+++ b/tests/unit/util/NodingTestUtil.cpp
@@ -76,7 +76,7 @@ NodingTestUtil::nodeValidated(const Geometry* geom1, const Geometry* geom2, Node
std::vector<SegmentString*> ssList = toSegmentStrings(lines);
ValidatingNoder noderValid(*noder);
- // computeNotes might alster ssList, but ssList still
+ // computeNotes might alter ssList, but ssList still
// holds all memory
noderValid.computeNodes(&ssList);
diff --git a/tests/unit/utility.h b/tests/unit/utility.h
index 08f14e1..1f9ea3f 100644
--- a/tests/unit/utility.h
+++ b/tests/unit/utility.h
@@ -69,7 +69,7 @@ typedef geos::geom::MultiLineString const* MultiLineStringCPtr;
typedef geos::geom::MultiPolygon* MultiPolygonPtr;
typedef geos::geom::MultiPolygon const* MultiPolygonCPtr;
-// prepared geometries always returend as const
+// prepared geometries always returned as const
typedef geos::geom::prep::PreparedGeometry const* PreparedGeometryPtr;
//
-----------------------------------------------------------------------
Summary of changes:
doc/example.cpp | 8 ++++----
include/geos/algorithm/Angle.h | 4 ++--
include/geos/geomgraph/Depth.h | 2 +-
include/geos/geomgraph/EdgeIntersection.h | 2 +-
include/geos/noding/MCIndexNoder.inl | 2 +-
include/geos/noding/snapround/MCIndexSnapRounder.h | 4 ++--
include/geos/operation/buffer/BufferBuilder.h | 2 +-
include/geos/operation/buffer/BufferInputLineSimplifier.h | 2 +-
include/geos/operation/buffer/OffsetCurveSetBuilder.h | 2 +-
include/geos/operation/union/CascadedPolygonUnion.h | 2 +-
src/geom/Envelope.cpp | 2 +-
src/geom/HeuristicOverlay.cpp | 2 +-
src/geom/prep/AbstractPreparedPolygonContains.cpp | 6 +++---
src/geomgraph/Edge.cpp | 2 +-
src/geomgraph/GeometryGraph.cpp | 2 +-
src/geomgraph/index/MonotoneChainIndexer.cpp | 2 +-
src/index/strtree/STRtree.cpp | 4 ++--
src/noding/MCIndexNoder.cpp | 2 +-
src/operation/buffer/BufferBuilder.cpp | 6 +++---
src/operation/buffer/SubgraphDepthLocater.cpp | 2 +-
src/operation/predicate/RectangleContains.cpp | 4 ++--
src/operation/sharedpaths/SharedPathsOp.cpp | 2 +-
src/operation/union/OverlapUnion.cpp | 2 +-
src/operation/union/UnaryUnionOp.cpp | 2 +-
src/operation/valid/MakeValid.cpp | 2 +-
src/planargraph/DirectedEdgeStar.cpp | 2 +-
src/precision/EnhancedPrecisionOp.cpp | 10 +++++-----
tests/geostest/geostest.c | 2 +-
tests/unit/algorithm/RobustLineIntersectorTest.cpp | 4 ++--
tests/unit/capi/GEOSContainsTest.cpp | 2 +-
tests/unit/capi/GEOSPreparedGeometryTest.cpp | 6 +++---
tests/unit/geom/CoordinateTest.cpp | 2 +-
tests/unit/geom/GeometryCollectionTest.cpp | 2 +-
tests/unit/geom/GeometryFactoryTest.cpp | 4 ++--
tests/unit/geom/IntersectionMatrixTest.cpp | 2 +-
tests/unit/geom/LinearRingTest.cpp | 4 ++--
tests/unit/geom/PointTest.cpp | 2 +-
tests/unit/geom/PolygonTest.cpp | 2 +-
tests/unit/geom/TriangleTest.cpp | 4 ++--
tests/unit/noding/SegmentNodeTest.cpp | 2 +-
tests/unit/noding/snap/SnappingNoderTest.cpp | 2 +-
tests/unit/noding/snapround/HotPixelTest.cpp | 2 +-
tests/unit/operation/distance/IndexedFacetDistanceTest.cpp | 2 +-
tests/unit/operation/overlayng/OverlayNGZTest.cpp | 2 +-
tests/unit/triangulate/DelaunayTest.cpp | 2 +-
tests/unit/triangulate/VoronoiTest.cpp | 2 +-
tests/unit/util/NodingTestUtil.cpp | 2 +-
tests/unit/utility.h | 2 +-
48 files changed, 69 insertions(+), 69 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list