[geos-commits] r3422 - in trunk: src/operation/valid tests/xmltester tests/xmltester/tests/ticket

[svn_geos at osgeo.org]

Author: strk
Date: 2011-07-05 03:56:39 -0700 (Tue, 05 Jul 2011)
New Revision: 3422

Removed:
   trunk/tests/xmltester/tests/ticket/bug449.xml
Modified:
   trunk/src/operation/valid/IndexedNestedRingTester.cpp
   trunk/tests/xmltester/Makefile.am
Log:
Revert "When checking for validity, do not abort if every vertex of an hole is also a vertex of another one. Fixes bug #449, including regress testing." (will redo the JTS way)

This reverts commit 7d2306c8dca2f0f1c5722640758578c1d59c7295.

Modified: trunk/src/operation/valid/IndexedNestedRingTester.cpp
===================================================================
--- trunk/src/operation/valid/IndexedNestedRingTester.cpp	2011-07-05 10:53:48 UTC (rev 3421)
+++ trunk/src/operation/valid/IndexedNestedRingTester.cpp	2011-07-05 10:56:39 UTC (rev 3422)
@@ -50,6 +50,7 @@
 		for (size_t j=0, jn=results.size(); j<jn; ++j)
 		{
 			const geom::LinearRing* searchRing = static_cast<const geom::LinearRing*>(results[j]);
+			const geom::CoordinateSequence *searchRingPts=searchRing->getCoordinatesRO();
 
 			if (innerRing==searchRing)
 				continue;
@@ -60,20 +61,15 @@
 				continue;
 			}
 
-			const geom::Coordinate *innerRingPt =
+                        const geom::Coordinate *innerRingPt =
 				IsValidOp::findPtNotNode(innerRingPts,
 							 searchRing,
 							 graph);
 
-			// Unable to find a ring point not a node of
-			// the search ring. Can happen, see
-			// http://trac.osgeo.org/geos/ticket/449
-			// for examples.
-			if ( ! innerRingPt ) {
-			  continue;
-			}
+                        // Unable to find a ring point not a node of
+			// the search ring
+			assert(innerRingPt!=NULL);
 
-			const geom::CoordinateSequence *searchRingPts=searchRing->getCoordinatesRO();
 			bool isInside = algorithm::CGAlgorithms::isPointInRing(	
 					*innerRingPt, searchRingPts);
 

Modified: trunk/tests/xmltester/Makefile.am
===================================================================
--- trunk/tests/xmltester/Makefile.am	2011-07-05 10:53:48 UTC (rev 3421)
+++ trunk/tests/xmltester/Makefile.am	2011-07-05 10:56:39 UTC (rev 3422)
@@ -33,7 +33,6 @@
 	$(srcdir)/tests/ticket/bug392.xml \
 	$(srcdir)/tests/ticket/bug398.xml \
 	$(srcdir)/tests/ticket/bug434.xml \
-	$(srcdir)/tests/ticket/bug449.xml \
 	$(srcdir)/tests/general/TestBoundary.xml \
 	$(srcdir)/tests/general/TestBuffer.xml \
 	$(srcdir)/tests/general/TestBufferMitredJoin.xml \

Deleted: trunk/tests/xmltester/tests/ticket/bug449.xml
===================================================================
--- trunk/tests/xmltester/tests/ticket/bug449.xml	2011-07-05 10:53:48 UTC (rev 3421)
+++ trunk/tests/xmltester/tests/ticket/bug449.xml	2011-07-05 10:56:39 UTC (rev 3422)
@@ -1,21 +0,0 @@
-<run>
-  <precisionModel type="FLOATING" />
-
-<case>
-  <desc>
-http://trac.osgeo.org/geos/ticket/449
-  </desc>
-  <a>
- POLYGON(
- (0 0, 0 5, 6 5, 6 0, 0 0),
- (2 1, 4 1, 3 2, 2 1),
- (2 1, 1 4, 5 4, 4 1, 4 3, 3 2, 2 3, 2 1)
- )
-  </a>
-<test>
- <op name="isValid" arg1="A">false</op>
-</test>
-</case>
-
-
-</run>