[geos-commits] r2438 - in trunk/source: geom headers/geos/geom

[svn_geos at osgeo.org]

Author: strk
Date: 2009-04-30 07:36:52 -0400 (Thu, 30 Apr 2009)
New Revision: 2438

Modified:
   trunk/source/geom/MultiLineString.cpp
   trunk/source/headers/geos/geom/MultiLineString.h
   trunk/source/headers/geos/geom/MultiLineString.inl
Log:
MultiLineString port info and sync to 1.40 (don't override isSimple)


Modified: trunk/source/geom/MultiLineString.cpp
===================================================================
--- trunk/source/geom/MultiLineString.cpp	2009-04-30 11:29:05 UTC (rev 2437)
+++ trunk/source/geom/MultiLineString.cpp	2009-04-30 11:36:52 UTC (rev 2438)
@@ -12,9 +12,12 @@
  * by the Free Software Foundation. 
  * See the COPYING file for more information.
  *
+ **********************************************************************
+ *
+ * Last port: geom/MultiLineString.java rev. 1.40
+ *
  **********************************************************************/
 
-#include <geos/operation/IsSimpleOp.h>
 #include <geos/algorithm/CGAlgorithms.h>
 #include <geos/geomgraph/GeometryGraph.h>
 #include <geos/geom/MultiLineString.h>
@@ -75,12 +78,9 @@
 	return true;
 }
 
-bool MultiLineString::isSimple() const {
-	operation::IsSimpleOp iso;
-	return iso.isSimple(this);
-}
-
-Geometry* MultiLineString::getBoundary() const {
+Geometry*
+MultiLineString::getBoundary() const
+{
 	if (isEmpty()) {
 		return getFactory()->createGeometryCollection(NULL);
 	}

Modified: trunk/source/headers/geos/geom/MultiLineString.h
===================================================================
--- trunk/source/headers/geos/geom/MultiLineString.h	2009-04-30 11:29:05 UTC (rev 2437)
+++ trunk/source/headers/geos/geom/MultiLineString.h	2009-04-30 11:36:52 UTC (rev 2438)
@@ -12,6 +12,10 @@
  * by the Free Software Foundation. 
  * See the COPYING file for more information.
  *
+ **********************************************************************
+ *
+ * Last port: geom/MultiLineString.java rev. 1.40
+ *
  **********************************************************************/
 
 #ifndef GEOS_GEOS_MULTILINESTRING_H
@@ -65,8 +69,6 @@
 
 	bool isClosed() const;
 
-	bool isSimple() const;
-
 	bool equalsExact(const Geometry *other, double tolerance=0) const;
 
 	Geometry *clone() const;

Modified: trunk/source/headers/geos/geom/MultiLineString.inl
===================================================================
--- trunk/source/headers/geos/geom/MultiLineString.inl	2009-04-30 11:29:05 UTC (rev 2437)
+++ trunk/source/headers/geos/geom/MultiLineString.inl	2009-04-30 11:36:52 UTC (rev 2438)
@@ -11,6 +11,10 @@
  * by the Free Software Foundation. 
  * See the COPYING file for more information.
  *
+ **********************************************************************
+ *
+ * Last port: geom/MultiLineString.java rev. 1.40
+ *
  **********************************************************************/
 
 #ifndef GEOS_GEOM_MULTILINESTRING_INL