Fix broken delete ring tool (fix #12851)

nyalldawson · nyalldawson · commit cde749f1159f · 2015-06-02T13:02:24.000+10:00
diff --git a/src/core/geometry/qgsgeometryeditutils.cpp b/src/core/geometry/qgsgeometryeditutils.cpp
@@ -136,7 +136,7 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome
 
 bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometryV2* geom, int ringNum, int partNum )
 {
-  if ( !geom )
+  if ( !geom || partNum < 0 )
   {
     return false;
   }
@@ -147,14 +147,15 @@ bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometryV2* geom, int ringNum,
   }
 
   QgsAbstractGeometryV2* g = geom;
-  if ( partNum > 0 )
+  QgsGeometryCollectionV2* c = dynamic_cast<QgsGeometryCollectionV2*>( geom );
+  if ( c )
   {
-    QgsMultiSurfaceV2* multiSurface = dynamic_cast<QgsMultiSurfaceV2*>( geom );
-    if ( !multiSurface )
-    {
-      return false;
-    }
-    g = multiSurface->geometryN( partNum );
+    g = c->geometryN( partNum );
+  }
+  else if ( partNum > 0 )
+  {
+    //part num specified, but not a multi part geometry type
+    return false;
   }
 
   QgsCurvePolygonV2* cpoly = dynamic_cast<QgsCurvePolygonV2*>( g );

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome`
`136`	`136`
`137`	`137`	`bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometryV2* geom, int ringNum, int partNum )`
`138`	`138`	`{`
`139`		`- if ( !geom )`
	`139`	`+ if ( !geom \|\| partNum < 0 )`
`140`	`140`	`{`
`141`	`141`	`return false;`
`142`	`142`	`}`
`@@ -147,14 +147,15 @@ bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometryV2* geom, int ringNum,`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`QgsAbstractGeometryV2* g = geom;`
`150`		`- if ( partNum > 0 )`
	`150`	`+ QgsGeometryCollectionV2* c = dynamic_cast<QgsGeometryCollectionV2*>( geom );`
	`151`	`+ if ( c )`
`151`	`152`	`{`
`152`		`- QgsMultiSurfaceV2* multiSurface = dynamic_cast<QgsMultiSurfaceV2*>( geom );`
`153`		`- if ( !multiSurface )`
`154`		`- {`
`155`		`- return false;`
`156`		`- }`
`157`		`- g = multiSurface->geometryN( partNum );`
	`153`	`+ g = c->geometryN( partNum );`
	`154`	`+ }`
	`155`	`+ else if ( partNum > 0 )`
	`156`	`+ {`
	`157`	`+ //part num specified, but not a multi part geometry type`
	`158`	`+ return false;`
`158`	`159`	`}`
`159`	`160`
`160`	`161`	`QgsCurvePolygonV2* cpoly = dynamic_cast<QgsCurvePolygonV2*>( g );`