sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Use MultiPolygon as output wkb type for multi ring buffer (constant)

Browse Source
This commit is contained in:
nirvn 2018-11-26 16:04:06 +07:00 committed by Mathieu Pellerin
parent 1072ebb621
commit 4d5edb2380
4 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
python/plugins/processing/tests/testdata/expected/multiring_buffer.gml vendored
View File

File diff suppressed because one or more lines are too long

2
python/plugins/processing/tests/testdata/expected/multiring_buffer.xsd vendored
View File

@ -15,7 +15,7 @@
<xs:complexContent> <xs:complexContent>
<xs:extension base="gml:AbstractFeatureType"> <xs:extension base="gml:AbstractFeatureType">
<xs:sequence> <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:element name="id" nillable="true" minOccurs="0" maxOccurs="1">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">

1
src/analysis/processing/qgsalgorithmmultiringconstantbuffer.cpp
View File

@ -138,6 +138,7 @@ QgsFeatureList QgsMultiRingConstantBufferAlgorithm::processFeature( const QgsFea
QgsFeature out; QgsFeature out;
currentDistance = i * distance; currentDistance = i * distance;
outputGeometry = feature.geometry().buffer( currentDistance, 40 ); outputGeometry = feature.geometry().buffer( currentDistance, 40 );
outputGeometry.convertToMultiType();
if ( outputGeometry.isNull() ) if ( outputGeometry.isNull() )
{ {
feedback->reportError( QObject::tr( "Error calculating buffer for feature %1" ).arg( feature.id() ) ); feedback->reportError( QObject::tr( "Error calculating buffer for feature %1" ).arg( feature.id() ) );

2
src/analysis/processing/qgsalgorithmmultiringconstantbuffer.h
View File

@ -50,7 +50,7 @@ class QgsMultiRingConstantBufferAlgorithm : public QgsProcessingFeatureBasedAlgo
QgsFields outputFields( const QgsFields &inputFields ) const override; QgsFields outputFields( const QgsFields &inputFields ) const override;
QgsProcessing::SourceType outputLayerType() const override { return QgsProcessing::TypeVectorPolygon; } QgsProcessing::SourceType outputLayerType() const override { return QgsProcessing::TypeVectorPolygon; }
QgsProcessingFeatureSource::Flag sourceFlags() const override; 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; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeatureList processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; QgsFeatureList processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;