[geos-commits] [SCM] geos branch master updated. aeee1f3f1b8afa9c2ebb151f4dff3dc04a9a43c3

git at osgeo.org git at osgeo.org
Sun Sep 10 02:06:10 PDT 2017


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  aeee1f3f1b8afa9c2ebb151f4dff3dc04a9a43c3 (commit)
      from  6307e6ed87c3703cf50278ad4a96d3e55054313d (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 aeee1f3f1b8afa9c2ebb151f4dff3dc04a9a43c3
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Sep 10 11:05:56 2017 +0200

    Remove unused code and protect debug-only used one

diff --git a/src/operation/overlay/validate/OverlayResultValidator.cpp b/src/operation/overlay/validate/OverlayResultValidator.cpp
index ee099e5..46710bc 100644
--- a/src/operation/overlay/validate/OverlayResultValidator.cpp
+++ b/src/operation/overlay/validate/OverlayResultValidator.cpp
@@ -55,18 +55,7 @@ namespace validate { // geos.operation.overlay.validate
 
 namespace { // anonymous namespace
 
-bool
-isArea(const Geometry& g)
-{
-        GeometryTypeId type = g.getGeometryTypeId();
-        if ( type == GEOS_POLYGON ) return true;
-        if ( type == GEOS_MULTIPOLYGON ) return true;
 #if GEOS_DEBUG
-	cerr << "OverlayResultValidator: one of the geoms being checked is not a POLYGON or MULTIPOLYGON, blindly returning a positive answer (is valid)" << endl;
-#endif
-        return false;
-}
-
 unique_ptr<MultiPoint>
 toMultiPoint(vector<Coordinate>& coords)
 {
@@ -81,6 +70,7 @@ toMultiPoint(vector<Coordinate>& coords)
 
 	return mp;
 }
+#endif
 
 } // anonymous namespace
 
@@ -118,13 +108,6 @@ OverlayResultValidator::OverlayResultValidator(
 bool
 OverlayResultValidator::isValid(OverlayOp::OpCode overlayOp)
 {
-	// The check only works for areal geoms
-#if 0 // now that FuzzyPointLocator extracts polygonal geoms,
-      // there should be no problem here
-	if ( ! isArea(g0) ) return true;
-	if ( ! isArea(g1) ) return true;
-	if ( ! isArea(gres) ) return true;
-#endif
 
 	addTestPts(g0);
 	addTestPts(g1);

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

Summary of changes:
 .../overlay/validate/OverlayResultValidator.cpp     |   19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)


hooks/post-receive
-- 
geos


More information about the geos-commits mailing list