Fix clearing multipoint should reset z/m status

nyalldawson · nyalldawson · commit 97930d13e214 · 2017-09-25T21:20:06.000+10:00
diff --git a/python/core/geometry/qgsmultipoint.sip b/python/core/geometry/qgsmultipoint.sip
@@ -29,6 +29,8 @@ class QgsMultiPointV2: QgsGeometryCollection
 
     virtual bool fromWkt( const QString &wkt );
 
+    virtual void clear();
+
 
     virtual QDomElement asGML2( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const;
 
diff --git a/src/core/geometry/qgsmultipoint.cpp b/src/core/geometry/qgsmultipoint.cpp
@@ -55,6 +55,12 @@ bool QgsMultiPointV2::fromWkt( const QString &wkt )
   return fromCollectionWkt( collectionWkt, QList<QgsAbstractGeometry *>() << new QgsPoint, QStringLiteral( "Point" ) );
 }
 
+void QgsMultiPointV2::clear()
+{
+  QgsGeometryCollection::clear();
+  mWkbType = QgsWkbTypes::MultiPoint;
+}
+
 QDomElement QgsMultiPointV2::asGML2( QDomDocument &doc, int precision, const QString &ns ) const
 {
   QDomElement elemMultiPoint = doc.createElementNS( ns, QStringLiteral( "MultiPoint" ) );
diff --git a/src/core/geometry/qgsmultipoint.h b/src/core/geometry/qgsmultipoint.h
@@ -34,6 +34,7 @@ class CORE_EXPORT QgsMultiPointV2: public QgsGeometryCollection
     QgsMultiPointV2 *toCurveType() const override SIP_FACTORY;
 
     bool fromWkt( const QString &wkt ) override;
+    void clear() override;
 
     // inherited: int wkbSize() const;
     // inherited: unsigned char* asWkb( int& binarySize ) const;

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,12 @@ bool QgsMultiPointV2::fromWkt( const QString &wkt )`
`55`	`55`	`return fromCollectionWkt( collectionWkt, QList<QgsAbstractGeometry *>() << new QgsPoint, QStringLiteral( "Point" ) );`
`56`	`56`	`}`
`57`	`57`
	`58`	`+void QgsMultiPointV2::clear()`
	`59`	`+{`
	`60`	`+ QgsGeometryCollection::clear();`
	`61`	`+ mWkbType = QgsWkbTypes::MultiPoint;`
	`62`	`+}`
	`63`	`+`
`58`	`64`	`QDomElement QgsMultiPointV2::asGML2( QDomDocument &doc, int precision, const QString &ns ) const`
`59`	`65`	`{`
`60`	`66`	`QDomElement elemMultiPoint = doc.createElementNS( ns, QStringLiteral( "MultiPoint" ) );`