[geos-commits] [SCM] GEOS branch master updated. 5b8e312eaf314976ae3a3084f29912d83c6b6300
git at osgeo.org
git at osgeo.org
Mon Oct 26 15:51:38 PDT 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 5b8e312eaf314976ae3a3084f29912d83c6b6300 (commit)
via 0b1bf8725b9431945c3e7dcf8f16337622e05df4 (commit)
from daf8e341becbf7e6bc80735ccbd4e49780848b3e (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 5b8e312eaf314976ae3a3084f29912d83c6b6300
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Oct 26 15:51:29 2020 -0700
Avoid doxygen linking errors
diff --git a/include/geos/operation/overlayng/OverlayNG.h b/include/geos/operation/overlayng/OverlayNG.h
index 559ea7b..505e918 100644
--- a/include/geos/operation/overlayng/OverlayNG.h
+++ b/include/geos/operation/overlayng/OverlayNG.h
@@ -83,9 +83,9 @@ namespace overlayng { // geos.operation.overlayng
* - Lines and Points resulting from topology collapses are not included
* in the result
* - Result geometry is homogeneous for the
- * {@link INTERSECTION} and {@link DIFFERENCE} operations.
+ * INTERSECTION and DIFFERENCE operations.
* - Result geometry is homogeneous for the
- * {@link UNION} and {@link SYMDIFFERENCE} operations if
+ * UNION and SYMDIFFERENCE operations if
* the inputs have the same dimension.
*
* Strict mode has the following benefits:
@@ -97,7 +97,7 @@ namespace overlayng { // geos.operation.overlayng
* The original JTS overlay semantics correspond to non-strict mode.
*
*
- * If a robustness error occurs, a {@link TopologyException} is thrown.
+ * If a robustness error occurs, a TopologyException is thrown.
* These are usually caused by numerical rounding causing the noding
* output to not be fully noded.
* For robust computation with full-precision {@link OverlayNGRobust}
commit 0b1bf8725b9431945c3e7dcf8f16337622e05df4
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Oct 26 15:51:18 2020 -0700
Randomize input to kdtree to avoid unbalanced tree
diff --git a/src/noding/snapround/HotPixelIndex.cpp b/src/noding/snapround/HotPixelIndex.cpp
index dc49fad..3d493c9 100644
--- a/src/noding/snapround/HotPixelIndex.cpp
+++ b/src/noding/snapround/HotPixelIndex.cpp
@@ -99,8 +99,14 @@ HotPixelIndex::add(const CoordinateSequence *pts)
void
HotPixelIndex::add(const std::vector<geom::Coordinate>& pts)
{
- for (auto pt: pts) {
- add(pt);
+ std::vector<int> idxs;
+ for (size_t i = 0, sz = pts.size(); i < sz; i++)
+ idxs.push_back(i);
+
+ std::random_shuffle(idxs.begin(), idxs.end());
+
+ for (auto i : idxs) {
+ add(pts[i]);
}
}
-----------------------------------------------------------------------
Summary of changes:
include/geos/operation/overlayng/OverlayNG.h | 6 +++---
src/noding/snapround/HotPixelIndex.cpp | 10 ++++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list