[geos-commits] r2936 - in trunk: include/geos/operation/valid src/operation/valid tests/xmltester/tests/general

[svn_geos at osgeo.org]

Author: strk
Date: 2010-03-10 04:34:02 -0500 (Wed, 10 Mar 2010)
New Revision: 2936

Modified:
   trunk/include/geos/operation/valid/IsValidOp.h
   trunk/src/operation/valid/IsValidOp.cpp
   trunk/tests/xmltester/tests/general/TestValid.xml
Log:
Sync TestValid xml from JTS, review IsValidOp to be in sync with current JTS trunk.


Modified: trunk/include/geos/operation/valid/IsValidOp.h
===================================================================
--- trunk/include/geos/operation/valid/IsValidOp.h	2010-03-07 11:39:03 UTC (rev 2935)
+++ trunk/include/geos/operation/valid/IsValidOp.h	2010-03-10 09:34:02 UTC (rev 2936)
@@ -15,7 +15,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/valid/IsValidOp.java rev. 1.41 (JTS-1.10)
+ * Last port: operation/valid/IsValidOp.java rev. 38 (JTS-1.11+)
  *
  **********************************************************************/
 
@@ -65,8 +65,6 @@
 	/// the base Geometry to be validated
 	const geom::Geometry *parentGeometry; 
 
-	bool isChecked;
-
 	// CHECKME: should this really be a pointer ?
 	TopologyValidationError* validErr;
 
@@ -214,7 +212,6 @@
 	IsValidOp(const geom::Geometry *geom)
 		:
 		parentGeometry(geom),
-		isChecked(false),
 		validErr(NULL),
 		isSelfTouchingRingFormingHoleValid(false)
 	{}

Modified: trunk/src/operation/valid/IsValidOp.cpp
===================================================================
--- trunk/src/operation/valid/IsValidOp.cpp	2010-03-07 11:39:03 UTC (rev 2935)
+++ trunk/src/operation/valid/IsValidOp.cpp	2010-03-10 09:34:02 UTC (rev 2936)
@@ -15,7 +15,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/valid/IsValidOp.java rev. 1.41 (JTS-1.10)
+ * Last port: operation/valid/IsValidOp.java rev. 38 (JTS-1.11+)
  *
  **********************************************************************/
 
@@ -115,8 +115,6 @@
 void
 IsValidOp::checkValid(const Geometry *g)
 {
-	if (isChecked) return;
-
         //assert( validErr == NULL );
 	validErr=NULL;
 
@@ -133,7 +131,6 @@
 	else if (0 != (gc=dynamic_cast<const GeometryCollection *>(g)))
 		checkValid(gc);
 	else throw util::UnsupportedOperationException();
-        //isChecked=true;
 }
 
 /*

Modified: trunk/tests/xmltester/tests/general/TestValid.xml
===================================================================
--- trunk/tests/xmltester/tests/general/TestValid.xml	2010-03-07 11:39:03 UTC (rev 2935)
+++ trunk/tests/xmltester/tests/general/TestValid.xml	2010-03-10 09:34:02 UTC (rev 2936)
@@ -78,7 +78,7 @@
    </case>
 
    <case>
-      <desc>L - linestring with two identical points </desc>
+      <desc>mL - MultiLinestring with two identical points in second component</desc>
       <a>MULTILINESTRING((1 1, 0 0), (0 0, 0 0))</a>
       <test>
          <op name="isValid" arg1="A">      false      </op>