Fix clearing multilinestring should reset dimensionality

nyalldawson · nyalldawson · commit ed72e37f0bd4 · 2017-09-26T06:29:36.000+10:00
diff --git a/python/core/geometry/qgsmultilinestring.sip b/python/core/geometry/qgsmultilinestring.sip
@@ -25,6 +25,8 @@ class QgsMultiLineString: QgsMultiCurve
     virtual QgsMultiLineString *clone() const /Factory/;
 
 
+    virtual void clear();
+
     virtual bool fromWkt( const QString &wkt );
 
 
diff --git a/src/core/geometry/qgsmultilinestring.cpp b/src/core/geometry/qgsmultilinestring.cpp
@@ -38,6 +38,12 @@ QgsMultiLineString *QgsMultiLineString::clone() const
   return new QgsMultiLineString( *this );
 }
 
+void QgsMultiLineString::clear()
+{
+  QgsGeometryCollection::clear();
+  mWkbType = QgsWkbTypes::MultiLineString;
+}
+
 bool QgsMultiLineString::fromWkt( const QString &wkt )
 {
   return fromCollectionWkt( wkt, QList<QgsAbstractGeometry *>() << new QgsLineString, QStringLiteral( "LineString" ) );
diff --git a/src/core/geometry/qgsmultilinestring.h b/src/core/geometry/qgsmultilinestring.h
@@ -32,11 +32,9 @@ class CORE_EXPORT QgsMultiLineString: public QgsMultiCurve
     QString geometryType() const override;
     QgsMultiLineString *clone() const override SIP_FACTORY;
 
+    void clear() override;
     bool fromWkt( const QString &wkt ) override;
 
-    // inherited: int wkbSize() const;
-    // inherited: unsigned char* asWkb( int& binarySize ) const;
-    // inherited: QString asWkt( int precision = 17 ) const;
     QDomElement asGML2( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const override;
     QDomElement asGML3( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const override;
     QString asJSON( int precision = 17 ) const override;

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,12 @@ QgsMultiLineString *QgsMultiLineString::clone() const`
`38`	`38`	`return new QgsMultiLineString( *this );`
`39`	`39`	`}`
`40`	`40`
	`41`	`+void QgsMultiLineString::clear()`
	`42`	`+{`
	`43`	`+ QgsGeometryCollection::clear();`
	`44`	`+ mWkbType = QgsWkbTypes::MultiLineString;`
	`45`	`+}`
	`46`	`+`
`41`	`47`	`bool QgsMultiLineString::fromWkt( const QString &wkt )`
`42`	`48`	`{`
`43`	`49`	`return fromCollectionWkt( wkt, QList<QgsAbstractGeometry *>() << new QgsLineString, QStringLiteral( "LineString" ) );`