[geos-commits] [SCM] geos branch svn-3.6 updated. 6a2a2b2ae71413b882a8614bfee2096b5a15a8dc

[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, svn-3.6 has been updated
       via  6a2a2b2ae71413b882a8614bfee2096b5a15a8dc (commit)
      from  24e4daeaa64c015006e2531985a30db6c5268746 (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 6a2a2b2ae71413b882a8614bfee2096b5a15a8dc
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 8dbeeaa..9221b04 100644
--- a/src/operation/overlay/validate/OverlayResultValidator.cpp
+++ b/src/operation/overlay/validate/OverlayResultValidator.cpp
@@ -7,7 +7,7 @@
  *
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation. 
+ * by the Free Software Foundation.
  * See the COPYING file for more information.
  *
  ***********************************************************************
@@ -55,23 +55,12 @@ 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;
-}
-
 auto_ptr<MultiPoint>
 toMultiPoint(vector<Coordinate>& coords)
 {
 	const GeometryFactory& gf = *(GeometryFactory::getDefaultInstance());
-	const CoordinateSequenceFactory& csf = 
+	const CoordinateSequenceFactory& csf =
 			*(gf.getCoordinateSequenceFactory());
 
 	auto_ptr< vector<Coordinate> > nc ( new 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    |   23 +++-----------------
 1 file changed, 3 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
geos