allow adding polygons to multipolygons. fixes split part tool (refs #12799)

jef-n · jef-n · commit 5b2b3a45a7c0 · 2015-06-12T21:26:11.000+02:00
diff --git a/src/core/geometry/qgsgeometryeditutils.cpp b/src/core/geometry/qgsgeometryeditutils.cpp
@@ -110,22 +110,52 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome
   if ( geom->geometryType() == "MultiSurface" || geom->geometryType() == "MultiPolygon" )
   {
     QgsCurveV2* curve = dynamic_cast<QgsCurveV2*>( part );
-    if ( !curve || !curve->isClosed() || curve->numPoints() < 4 )
+    if ( curve && curve->isClosed() && curve->numPoints() >= 4 )
     {
-      delete part; return 2;
+      QgsCurvePolygonV2 *poly = 0;
+      if ( curve->geometryType() == "LineString" )
+      {
+        poly = new QgsPolygonV2();
+      }
+      else
+      {
+        poly = new QgsCurvePolygonV2();
+      }
+      poly->setExteriorRing( curve );
+      added = geomCollection->addGeometry( poly );
     }
-
-    QgsCurvePolygonV2* poly = 0;
-    if ( curve->geometryType() == "LineString" )
+    else if ( part->geometryType() == "Polygon" )
     {
-      poly = new QgsPolygonV2();
+      added = geomCollection->addGeometry( part );
+    }
+    else if ( part->geometryType() == "MultiPolygon" )
+    {
+      QgsGeometryCollectionV2 *parts = dynamic_cast<QgsGeometryCollectionV2*>( part );
+
+      int i;
+      int n = geomCollection->numGeometries();
+      for ( i = 0; i < parts->numGeometries() && geomCollection->addGeometry( parts->geometryN( i ) ); i++ )
+        ;
+
+      added = i == parts->numGeometries();
+      if ( !added )
+      {
+        while ( geomCollection->numGeometries() > n )
+          geomCollection->removeGeometry( n );
+        delete part; return 2;
+      }
+
+      while ( parts->numGeometries() > 0 )
+      {
+        parts->removeGeometry( 0 );
+      }
+
+      delete part;
     }
     else
     {
-      poly = new QgsCurvePolygonV2();
+      delete part; return 2;
     }
-    poly->setExteriorRing( curve );
-    added = geomCollection->addGeometry( poly );
   }
   else
   {
diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
@@ -1150,6 +1150,19 @@ def testAddPart(self):
         wkt = polygon.exportToWkt()
         assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )
 
+        mp = QgsGeometry.fromMultiPolygon( points[:1] )
+        p = QgsGeometry.fromPolygon( points[1] )
+
+        assert mp.addPartGeometry( p ) == 0
+        wkt = mp.exportToWkt()
+        assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )
+
+        mp = QgsGeometry.fromMultiPolygon( points[:1] )
+        mp2 = QgsGeometry.fromMultiPolygon( points[1:] )
+        assert mp.addPartGeometry( mp2 ) == 0
+        wkt = mp.exportToWkt()
+        assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )
+
     def testConvertToType(self):
         # 5-+-4 0-+-9  13-+-+-12
         # |   | |   |  |       |
