correct cloning of multi-part geometries with GEOS < 3.0

wonder · wonder · commit abe249d9d5d9 · 2008-10-10T13:26:39.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9469 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -142,7 +142,11 @@ static GEOSGeometry *createGeosCollection( int typeId, QVector<GEOSGeometry*> ge
 
 static GEOSGeometry *cloneGeosGeom( const GEOSGeometry *geom )
 {
-  if ( GEOSGeomTypeId(( GEOSGeometry * ) geom ) == GEOS_MULTIPOLYGON )
+  // for GEOS < 3.0 we have own cloning function
+  // because when cloning multipart geometries they're copied into more general geometry collection instance
+  int type = GEOSGeomTypeId(( GEOSGeometry * ) geom );
+       
+  if (type == GEOS_MULTIPOINT || type == GEOS_MULTILINESTRING || type == GEOS_MULTIPOLYGON)
   {
     QVector<GEOSGeometry *> geoms;
 
@@ -152,7 +156,7 @@ static GEOSGeometry *cloneGeosGeom( const GEOSGeometry *geom )
       for ( int i = 0; i < GEOSGetNumGeometries(( GEOSGeometry * )geom ); ++i )
         geoms << GEOSGeom_clone(( GEOSGeometry * ) GEOSGetGeometryN(( GEOSGeometry * ) geom, i ) );
 
-      return createGeosCollection( GEOS_MULTIPOLYGON, geoms );
+      return createGeosCollection( type, geoms );
     }
     catch ( GEOSException &e )
     {
@@ -4508,6 +4512,7 @@ bool QgsGeometry::exportGeosToWkb()
     case GEOS_GEOMETRYCOLLECTION:    // a collection of heterogeneus geometries
     {
       // TODO
+      QgsDebugMsg("geometry collection - not supported");
       break;
     } // case GEOS_GEOM::GEOS_GEOMETRYCOLLECTION
 

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,11 @@ static GEOSGeometry createGeosCollection( int typeId, QVector<GEOSGeometry> ge`
`142`	`142`
`143`	`143`	`static GEOSGeometry cloneGeosGeom( const GEOSGeometry geom )`
`144`	`144`	`{`
`145`		`- if ( GEOSGeomTypeId(( GEOSGeometry * ) geom ) == GEOS_MULTIPOLYGON )`
	`145`	`+ // for GEOS < 3.0 we have own cloning function`
	`146`	`+ // because when cloning multipart geometries they're copied into more general geometry collection instance`
	`147`	`+ int type = GEOSGeomTypeId(( GEOSGeometry * ) geom );`
	`148`	`+`
	`149`	`+ if (type == GEOS_MULTIPOINT \|\| type == GEOS_MULTILINESTRING \|\| type == GEOS_MULTIPOLYGON)`
`146`	`150`	`{`
`147`	`151`	`QVector<GEOSGeometry *> geoms;`
`148`	`152`
`@@ -152,7 +156,7 @@ static GEOSGeometry cloneGeosGeom( const GEOSGeometry geom )`
`152`	`156`	`for ( int i = 0; i < GEOSGetNumGeometries(( GEOSGeometry * )geom ); ++i )`
`153`	`157`	`geoms << GEOSGeom_clone(( GEOSGeometry * ) GEOSGetGeometryN(( GEOSGeometry * ) geom, i ) );`
`154`	`158`
`155`		`- return createGeosCollection( GEOS_MULTIPOLYGON, geoms );`
	`159`	`+ return createGeosCollection( type, geoms );`
`156`	`160`	`}`
`157`	`161`	`catch ( GEOSException &e )`
`158`	`162`	`{`
`@@ -4508,6 +4512,7 @@ bool QgsGeometry::exportGeosToWkb()`
`4508`	`4512`	`case GEOS_GEOMETRYCOLLECTION: // a collection of heterogeneus geometries`
`4509`	`4513`	`{`
`4510`	`4514`	`// TODO`
	`4515`	`+ QgsDebugMsg("geometry collection - not supported");`
`4511`	`4516`	`break;`
`4512`	`4517`	`} // case GEOS_GEOM::GEOS_GEOMETRYCOLLECTION`
`4513`	`4518`