[geos-commits] r2435 - in trunk/source: geom headers/geos/geom
svn_geos at osgeo.org
svn_geos at osgeo.org
Thu Apr 30 07:15:12 EDT 2009
Author: strk
Date: 2009-04-30 07:15:12 -0400 (Thu, 30 Apr 2009)
New Revision: 2435
Modified:
trunk/source/geom/GeometryCollection.cpp
trunk/source/headers/geos/geom/GeometryCollection.h
trunk/source/headers/geos/geom/GeometryCollection.inl
Log:
Port info. It's at 1.41 now, JTS is at 1.42
Modified: trunk/source/geom/GeometryCollection.cpp
===================================================================
--- trunk/source/geom/GeometryCollection.cpp 2009-04-30 11:03:09 UTC (rev 2434)
+++ trunk/source/geom/GeometryCollection.cpp 2009-04-30 11:15:12 UTC (rev 2435)
@@ -12,6 +12,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: geom/GeometryCollection.java rev. 1.41
+ *
**********************************************************************/
#include <geos/geom/GeometryCollection.h>
@@ -156,6 +160,9 @@
GeometryCollection::isSimple() const
{
throw util::IllegalArgumentException("Operation not supported by GeometryCollection\n");
+ checkNotGeometryCollection(this);
+ abort(); // never reached...
+ return false;
}
Geometry*
@@ -328,6 +335,8 @@
(*geometries)[i]->apply_ro(filter);
if (filter.isDone()) break;
}
+
+ assert(!filter.isGeometryChanged()); // read-only filter...
//if (filter.isGeometryChanged()) geometryChanged();
}
Modified: trunk/source/headers/geos/geom/GeometryCollection.h
===================================================================
--- trunk/source/headers/geos/geom/GeometryCollection.h 2009-04-30 11:03:09 UTC (rev 2434)
+++ trunk/source/headers/geos/geom/GeometryCollection.h 2009-04-30 11:15:12 UTC (rev 2435)
@@ -12,6 +12,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: geom/GeometryCollection.java rev. 1.41
+ *
**********************************************************************/
#ifndef GEOS_GEOS_GEOMETRYCOLLECTION_H
@@ -62,6 +66,12 @@
const_iterator end() const;
+ /**
+ * Creates and returns a full copy of this GeometryCollection object.
+ * (including all coordinates contained by it).
+ *
+ * @return a clone of this instance
+ */
virtual Geometry *clone() const {
return new GeometryCollection(*this);
}
Modified: trunk/source/headers/geos/geom/GeometryCollection.inl
===================================================================
--- trunk/source/headers/geos/geom/GeometryCollection.inl 2009-04-30 11:03:09 UTC (rev 2434)
+++ trunk/source/headers/geos/geom/GeometryCollection.inl 2009-04-30 11:15:12 UTC (rev 2435)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: geom/GeometryCollection.java rev. 1.41
+ *
**********************************************************************/
#ifndef GEOS_GEOMETRYCOLLECTION_INL
More information about the geos-commits
mailing list