[geos-commits] [SCM] GEOS branch master updated. 48a603ba15d0048120d2106171ad69117f12341c

[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  48a603ba15d0048120d2106171ad69117f12341c (commit)
      from  3347cba78997d52b91a2a43bffb875d151dc1c85 (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 48a603ba15d0048120d2106171ad69117f12341c
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Thu Nov 26 16:50:40 2020 -0800

    Remove OverlapUnion from CascadedPolygonUnion

diff --git a/include/geos/operation/union/OverlapUnion.h b/include/geos/operation/union/OverlapUnion.h
index d6d073c..e0f1db0 100644
--- a/include/geos/operation/union/OverlapUnion.h
+++ b/include/geos/operation/union/OverlapUnion.h
@@ -89,6 +89,8 @@ namespace geounion {  // geos::operation::geounion
  * in other APIs (e.g. GEOS) due to more aggressive snapping.
  * And it will be more likely to happen if a snap-rounding overlay is used.
  *
+ * DEPRECATED: This optimization has been removed, since it impairs performance.
+ *
  * @author mbdavis
  *
  */
diff --git a/src/operation/union/CascadedPolygonUnion.cpp b/src/operation/union/CascadedPolygonUnion.cpp
index 5b7361c..d4a99b8 100644
--- a/src/operation/union/CascadedPolygonUnion.cpp
+++ b/src/operation/union/CascadedPolygonUnion.cpp
@@ -262,13 +262,7 @@ geom::Geometry*
 CascadedPolygonUnion::unionActual(geom::Geometry* g0, geom::Geometry* g1)
 {
     std::unique_ptr<geom::Geometry> ug;
-    if (unionFunction->isFloatingPrecision()) {
-        OverlapUnion unionOp(g0, g1, unionFunction);
-        ug = unionOp.doUnion();
-    }
-    else {
-        ug = unionFunction->Union(g0, g1);
-    }
+    ug = unionFunction->Union(g0, g1);
     return restrictToPolygons(std::move(ug)).release();
 }
 

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

Summary of changes:
 include/geos/operation/union/OverlapUnion.h  | 2 ++
 src/operation/union/CascadedPolygonUnion.cpp | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS