[geos-commits] r2437 - in trunk/source: geom headers/geos/geom
svn_geos at osgeo.org
svn_geos at osgeo.org
Thu Apr 30 07:29:05 EDT 2009
Author: strk
Date: 2009-04-30 07:29:05 -0400 (Thu, 30 Apr 2009)
New Revision: 2437
Modified:
trunk/source/geom/MultiPolygon.cpp
trunk/source/headers/geos/geom/MultiPolygon.h
trunk/source/headers/geos/geom/MultiPolygon.inl
Log:
MultiPolygon up to rev 1.34 (getBoundary always returns a MultiLineString now)
Modified: trunk/source/geom/MultiPolygon.cpp
===================================================================
--- trunk/source/geom/MultiPolygon.cpp 2009-04-30 11:19:52 UTC (rev 2436)
+++ trunk/source/geom/MultiPolygon.cpp 2009-04-30 11:29:05 UTC (rev 2437)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: geom/MultiPolygon.java rev 1.34
+ *
**********************************************************************/
#include <geos/geom/Geometry.h>
@@ -60,7 +64,7 @@
Geometry* MultiPolygon::getBoundary() const {
if (isEmpty()) {
- return getFactory()->createGeometryCollection(NULL);
+ return getFactory()->createMultiLineString();
}
vector<Geometry *>* allRings=new vector<Geometry *>();
for (size_t i = 0; i < geometries->size(); i++) {
Modified: trunk/source/headers/geos/geom/MultiPolygon.h
===================================================================
--- trunk/source/headers/geos/geom/MultiPolygon.h 2009-04-30 11:19:52 UTC (rev 2436)
+++ trunk/source/headers/geos/geom/MultiPolygon.h 2009-04-30 11:29:05 UTC (rev 2437)
@@ -12,6 +12,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: geom/MultiPolygon.java rev 1.34
+ *
**********************************************************************/
#ifndef GEOS_GEOS_MULTIPOLYGON_H
@@ -39,7 +43,8 @@
namespace geom { // geos::geom
/// Basic implementation of <code>MultiPolygon</code>.
-class MultiPolygon: public GeometryCollection {
+class MultiPolygon: public GeometryCollection
+{
public:
@@ -53,10 +58,11 @@
/// Returns 1 (MultiPolygon boundary is MultiLineString)
int getBoundaryDimension() const;
- /**
- * \brief
- * Returns a MultiLineString composed of one LineString for
- * each of the composing Polygon's shells and holes.
+ /** \brief
+ * Computes the boundary of this geometry
+ *
+ * @return a lineal geometry (which may be empty)
+ * @see Geometry#getBoundary
*/
Geometry* getBoundary() const;
Modified: trunk/source/headers/geos/geom/MultiPolygon.inl
===================================================================
--- trunk/source/headers/geos/geom/MultiPolygon.inl 2009-04-30 11:19:52 UTC (rev 2436)
+++ trunk/source/headers/geos/geom/MultiPolygon.inl 2009-04-30 11:29:05 UTC (rev 2437)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: geom/MultiPolygon.java rev 1.34
+ *
**********************************************************************/
#ifndef GEOS_GEOM_MULTIPOLYGON_INL
More information about the geos-commits
mailing list