Remove the whole ring / linestring if number of vertices to small

mhugent · mhugent · commit bf3fbec7553a · 2015-12-28T18:24:32.000+01:00
diff --git a/src/core/geometry/qgscurvepolygonv2.cpp b/src/core/geometry/qgscurvepolygonv2.cpp
@@ -702,7 +702,7 @@ bool QgsCurvePolygonV2::deleteVertex( const QgsVertexId& vId )
 
   QgsCurveV2* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings.at( vId.ring - 1 );
   int n = ring->numPoints();
-  if ( n <= 2 )
+  if ( n <= 4 )
   {
     //no points will be left in ring, so remove whole ring
     if ( vId.ring == 0 )
diff --git a/src/core/geometry/qgslinestringv2.cpp b/src/core/geometry/qgslinestringv2.cpp
@@ -644,6 +644,12 @@ bool QgsLineStringV2::deleteVertex( const QgsVertexId& position )
   {
     mM.remove( position.vertex );
   }
+
+  if( numPoints() == 1 )
+  {
+    clear();
+  }
+
   mBoundingBox = QgsRectangle(); //set bounding box invalid
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ bool QgsCurvePolygonV2::deleteVertex( const QgsVertexId& vId )`
`702`	`702`
`703`	`703`	`QgsCurveV2* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings.at( vId.ring - 1 );`
`704`	`704`	`int n = ring->numPoints();`
`705`		`- if ( n <= 2 )`
	`705`	`+ if ( n <= 4 )`
`706`	`706`	`{`
`707`	`707`	`//no points will be left in ring, so remove whole ring`
`708`	`708`	`if ( vId.ring == 0 )`
Original file line number	Diff line number	Diff line change
`@@ -644,6 +644,12 @@ bool QgsLineStringV2::deleteVertex( const QgsVertexId& position )`
`644`	`644`	`{`
`645`	`645`	`mM.remove( position.vertex );`
`646`	`646`	`}`
	`647`	`+`
	`648`	`+ if( numPoints() == 1 )`
	`649`	`+ {`
	`650`	`+ clear();`
	`651`	`+ }`
	`652`	`+`
`647`	`653`	`mBoundingBox = QgsRectangle(); //set bounding box invalid`
`648`	`654`	`return true;`
`649`	`655`	`}`