Fix multi point allowing insertion of non point geometries

nyalldawson · nyalldawson · commit ba50bf043bbe · 2017-09-25T21:20:32.000+10:00
diff --git a/python/core/geometry/qgsmultipoint.sip b/python/core/geometry/qgsmultipoint.sip
@@ -48,6 +48,8 @@ class QgsMultiPointV2: QgsGeometryCollection
 Adds a geometry and takes ownership. Returns true in case of success
  :rtype: bool
 %End
+    virtual bool insertGeometry( QgsAbstractGeometry *g /Transfer/, int index );
+
 
     virtual QgsAbstractGeometry *boundary() const /Factory/;
 
diff --git a/src/core/geometry/qgsmultipoint.cpp b/src/core/geometry/qgsmultipoint.cpp
@@ -127,6 +127,14 @@ bool QgsMultiPointV2::addGeometry( QgsAbstractGeometry *g )
   return QgsGeometryCollection::addGeometry( g );
 }
 
+bool QgsMultiPointV2::insertGeometry( QgsAbstractGeometry *g, int index )
+{
+  if ( !g || QgsWkbTypes::flatType( g->wkbType() ) != QgsWkbTypes::Point )
+    return false;
+
+  return QgsGeometryCollection::insertGeometry( g, index );
+}
+
 QgsAbstractGeometry *QgsMultiPointV2::boundary() const
 {
   return nullptr;
diff --git a/src/core/geometry/qgsmultipoint.h b/src/core/geometry/qgsmultipoint.h
@@ -47,6 +47,7 @@ class CORE_EXPORT QgsMultiPointV2: public QgsGeometryCollection
 
     //! Adds a geometry and takes ownership. Returns true in case of success
     bool addGeometry( QgsAbstractGeometry *g SIP_TRANSFER ) override;
+    bool insertGeometry( QgsAbstractGeometry *g SIP_TRANSFER, int index ) override;
 
     QgsAbstractGeometry *boundary() const override SIP_FACTORY;
 

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,14 @@ bool QgsMultiPointV2::addGeometry( QgsAbstractGeometry *g )`
`127`	`127`	`return QgsGeometryCollection::addGeometry( g );`
`128`	`128`	`}`
`129`	`129`
	`130`	`+bool QgsMultiPointV2::insertGeometry( QgsAbstractGeometry *g, int index )`
	`131`	`+{`
	`132`	`+ if ( !g \|\| QgsWkbTypes::flatType( g->wkbType() ) != QgsWkbTypes::Point )`
	`133`	`+ return false;`
	`134`	`+`
	`135`	`+ return QgsGeometryCollection::insertGeometry( g, index );`
	`136`	`+}`
	`137`	`+`
`130`	`138`	`QgsAbstractGeometry *QgsMultiPointV2::boundary() const`
`131`	`139`	`{`
`132`	`140`	`return nullptr;`