qgis · Nov 29, 2018
diff --git a/‎python/plugins/processing/tests/testdata/expected/multiring_buffer.gml
Lines changed: 27 additions & 27 deletions b/‎python/plugins/processing/tests/testdata/expected/multiring_buffer.gml
Lines changed: 27 additions & 27 deletions
diff --git a/‎python/plugins/processing/tests/testdata/expected/multiring_buffer.xsd
Lines changed: 1 addition & 1 deletion b/‎python/plugins/processing/tests/testdata/expected/multiring_buffer.xsd
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/analysis/processing/qgsalgorithmmultiringconstantbuffer.cpp
Lines changed: 1 addition & 0 deletions b/‎src/analysis/processing/qgsalgorithmmultiringconstantbuffer.cpp
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/analysis/processing/qgsalgorithmmultiringconstantbuffer.h
Lines changed: 1 addition & 1 deletion b/‎src/analysis/processing/qgsalgorithmmultiringconstantbuffer.h
Lines changed: 1 addition & 1 deletion
@@ -15,7 +15,7 @@
   <xs:complexContent>
     <xs:extension base="gml:AbstractFeatureType">
       <xs:sequence>
-        <xs:element name="geometryProperty" type="gml:PolygonPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="geometryProperty" type="gml:MultiPolygonPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
         <xs:element name="id" nillable="true" minOccurs="0" maxOccurs="1">
           <xs:simpleType>
             <xs:restriction base="xs:integer">
 
@@ -138,6 +138,7 @@ QgsFeatureList QgsMultiRingConstantBufferAlgorithm::processFeature( const QgsFea
     QgsFeature out;
     currentDistance = i * distance;
     outputGeometry = feature.geometry().buffer( currentDistance, 40 );
+    outputGeometry.convertToMultiType();
     if ( outputGeometry.isNull() )
     {
       feedback->reportError( QObject::tr( "Error calculating buffer for feature %1" ).arg( feature.id() ) );
 
@@ -50,7 +50,7 @@ class QgsMultiRingConstantBufferAlgorithm : public QgsProcessingFeatureBasedAlgo
     QgsFields outputFields( const QgsFields &inputFields ) const override;
     QgsProcessing::SourceType outputLayerType() const override { return QgsProcessing::TypeVectorPolygon; }
     QgsProcessingFeatureSource::Flag sourceFlags() const override;
-    QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override { Q_UNUSED( inputWkbType ); return QgsWkbTypes::Polygon; }
+    QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override { Q_UNUSED( inputWkbType ); return QgsWkbTypes::MultiPolygon; }
     bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
     QgsFeatureList processFeature( const QgsFeature &feature,  QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ QgsFeatureList QgsMultiRingConstantBufferAlgorithm::processFeature( const QgsFea`
`138`	`138`	`QgsFeature out;`
`139`	`139`	`currentDistance = i * distance;`
`140`	`140`	`outputGeometry = feature.geometry().buffer( currentDistance, 40 );`
	`141`	`+ outputGeometry.convertToMultiType();`
`141`	`142`	`if ( outputGeometry.isNull() )`
`142`	`143`	`{`
`143`	`144`	`feedback->reportError( QObject::tr( "Error calculating buffer for feature %1" ).arg( feature.id() ) );`