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

[svn_geos at osgeo.org]

Author: strk
Date: 2009-04-30 07:42:05 -0400 (Thu, 30 Apr 2009)
New Revision: 2439

Modified:
   trunk/source/geom/MultiPoint.cpp
   trunk/source/headers/geos/geom/MultiPoint.h
Log:
MultiPoint up to rev 1.30 (drop isSimple override)


Modified: trunk/source/geom/MultiPoint.cpp
===================================================================
--- trunk/source/geom/MultiPoint.cpp	2009-04-30 11:36:52 UTC (rev 2438)
+++ trunk/source/geom/MultiPoint.cpp	2009-04-30 11:42:05 UTC (rev 2439)
@@ -12,11 +12,14 @@
  * by the Free Software Foundation. 
  * See the COPYING file for more information.
  *
+ **********************************************************************
+ *
+ * Last port: geom/MultiPoint.java rev. 1.30
+ *
  **********************************************************************/
 
 #include <geos/geom/MultiPoint.h>
 #include <geos/geom/GeometryFactory.h>
-#include <geos/operation/IsSimpleOp.h>
 #include <geos/geom/Dimension.h>
 
 #include <vector>
@@ -52,21 +55,9 @@
 }
 
 Geometry* MultiPoint::getBoundary() const {
-	return getFactory()->createGeometryCollection(NULL);
+	return getFactory()->createGeometryCollection();
 }
 
-bool MultiPoint::isSimple() const {
-	operation::IsSimpleOp iso;
-	return iso.isSimple(this);
-	
-	//Geometry *in = toInternalGeometry(this);
-	//bool issimple = iso.isSimple((MultiPoint *)in);
-	//if ( (MultiPoint *)in != this ) delete(in);
-	//return issimple;
-}
-
-//bool MultiPoint::isValid() const { return true; }
-
 bool
 MultiPoint::equalsExact(const Geometry *other, double tolerance) const
 {

Modified: trunk/source/headers/geos/geom/MultiPoint.h
===================================================================
--- trunk/source/headers/geos/geom/MultiPoint.h	2009-04-30 11:36:52 UTC (rev 2438)
+++ trunk/source/headers/geos/geom/MultiPoint.h	2009-04-30 11:42:05 UTC (rev 2439)
@@ -12,6 +12,10 @@
  * by the Free Software Foundation. 
  * See the COPYING file for more information.
  *
+ **********************************************************************
+ *
+ * Last port: geom/MultiPoint.java rev. 1.30
+ *
  **********************************************************************/
 
 #ifndef GEOS_GEOS_MULTIPOINT_H
@@ -54,17 +58,21 @@
 	/// Returns Dimension::False (Point has no boundary)
 	int getBoundaryDimension() const;
 
-	/// Returns an EMPTY Geometry
+	/** \brief
+	 * Gets the boundary of this geometry.
+	 *
+	 * Zero-dimensional geometries have no boundary by definition,
+	 * so an empty GeometryCollection is returned.
+	 *
+	 * @return an empty GeometryCollection
+	 * @see Geometry#getBoundary
+	 */
 	Geometry* getBoundary() const;
 
 	std::string getGeometryType() const;
 
 	virtual GeometryTypeId getGeometryTypeId() const;
 
-	//bool isValid() const;
-
-	bool isSimple() const;
-
 	bool equalsExact(const Geometry *other, double tolerance=0) const;
 
 	Geometry *clone() const { return new MultiPoint(*this); };