Fix clearing multisurface should reset dimensionality

Author: nyalldawson

python/core/geometry/qgsmultipolygon.sip

@@ -22,6 +22,8 @@ class QgsMultiPolygonV2: QgsMultiSurface
     QgsMultiPolygonV2();
     virtual QString geometryType() const;
 
+    virtual void clear();
+
     virtual QgsMultiPolygonV2 *clone() const /Factory/;
 
 

python/core/geometry/qgsmultisurface.sip

@@ -22,6 +22,8 @@ class QgsMultiSurface: QgsGeometryCollection
     QgsMultiSurface();
     virtual QString geometryType() const;
 
+    virtual void clear();
+
     virtual QgsMultiSurface *clone() const /Factory/;
 
     virtual QgsMultiSurface *toCurveType() const /Factory/;

src/core/geometry/qgsmultipolygon.cpp

@@ -33,6 +33,12 @@ QString QgsMultiPolygonV2::geometryType() const
   return QStringLiteral( "MultiPolygon" );
 }
 
+void QgsMultiPolygonV2::clear()
+{
+  QgsMultiSurface::clear();
+  mWkbType = QgsWkbTypes::MultiPolygon;
+}
+
 QgsMultiPolygonV2 *QgsMultiPolygonV2::clone() const
 {
   return new QgsMultiPolygonV2( *this );

src/core/geometry/qgsmultipolygon.h

@@ -30,6 +30,7 @@ class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurface
   public:
     QgsMultiPolygonV2();
     QString geometryType() const override;
+    void clear() override;
     QgsMultiPolygonV2 *clone() const override SIP_FACTORY;
 
     bool fromWkt( const QString &wkt ) override;

src/core/geometry/qgsmultisurface.cpp

@@ -34,6 +34,12 @@ QString QgsMultiSurface::geometryType() const
   return QStringLiteral( "MultiSurface" );
 }
 
+void QgsMultiSurface::clear()
+{
+  QgsGeometryCollection::clear();
+  mWkbType = QgsWkbTypes::MultiSurface;
+}
+
 QgsMultiSurface *QgsMultiSurface::clone() const
 {
   return new QgsMultiSurface( *this );

src/core/geometry/qgsmultisurface.h

@@ -30,6 +30,7 @@ class CORE_EXPORT QgsMultiSurface: public QgsGeometryCollection
   public:
     QgsMultiSurface();
     QString geometryType() const override;
+    void clear() override;
     QgsMultiSurface *clone() const override SIP_FACTORY;
     QgsMultiSurface *toCurveType() const override SIP_FACTORY;
     bool fromWkt( const QString &wkt ) override;