[geos-commits] [SCM] GEOS branch master updated. 37618c9d5967db805ddb4779ac2e7cf1d4d00c36

[git at osgeo.org]

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  37618c9d5967db805ddb4779ac2e7cf1d4d00c36 (commit)
      from  5ffe865a2b2ee253901ca207dd2e77f30476faaf (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 37618c9d5967db805ddb4779ac2e7cf1d4d00c36
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Nov 18 11:53:49 2020 -0800

    Switch MCIndexNoder and MCIndexSegmentSetMutualIntersector over to
    use the SimpleSTRtree implementation.

diff --git a/include/geos/noding/MCIndexNoder.h b/include/geos/noding/MCIndexNoder.h
index 857f141..f5b450f 100644
--- a/include/geos/noding/MCIndexNoder.h
+++ b/include/geos/noding/MCIndexNoder.h
@@ -25,7 +25,7 @@
 
 #include <geos/index/chain/MonotoneChainOverlapAction.h> // for inheritance
 #include <geos/noding/SinglePassNoder.h> // for inheritance
-#include <geos/index/strtree/STRtree.h> // for composition
+#include <geos/index/strtree/SimpleSTRtree.h> // for composition
 #include <geos/util.h>
 
 #include <vector>
@@ -66,7 +66,7 @@ class GEOS_DLL MCIndexNoder : public SinglePassNoder {
 
 private:
     std::vector<index::chain::MonotoneChain*> monoChains;
-    index::strtree::STRtree index;
+    index::strtree::SimpleSTRtree index;
     int idCounter;
     std::vector<SegmentString*>* nodedSegStrings;
     // statistics
diff --git a/src/noding/MCIndexSegmentSetMutualIntersector.cpp b/src/noding/MCIndexSegmentSetMutualIntersector.cpp
index 40580ef..a8e07a6 100644
--- a/src/noding/MCIndexSegmentSetMutualIntersector.cpp
+++ b/src/noding/MCIndexSegmentSetMutualIntersector.cpp
@@ -24,7 +24,7 @@
 #include <geos/index/chain/MonotoneChain.h>
 #include <geos/index/chain/MonotoneChainBuilder.h>
 #include <geos/index/chain/MonotoneChainOverlapAction.h>
-#include <geos/index/strtree/STRtree.h>
+#include <geos/index/strtree/SimpleSTRtree.h>
 // std
 #include <cstddef>
 
@@ -94,7 +94,7 @@ MCIndexSegmentSetMutualIntersector::addToMonoChains(SegmentString* segStr)
 /* public */
 MCIndexSegmentSetMutualIntersector::MCIndexSegmentSetMutualIntersector()
     :	monoChains(),
-      index(new geos::index::strtree::STRtree()),
+      index(new geos::index::strtree::SimpleSTRtree()),
       indexCounter(0),
       processCounter(0),
       nOverlaps(0)

-----------------------------------------------------------------------

Summary of changes:
 include/geos/noding/MCIndexNoder.h                | 4 ++--
 src/noding/MCIndexSegmentSetMutualIntersector.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS