Skip to content

Commit

Permalink
Merge pull request #6859 from wonder-sk/overlay-alg-fixes-3
Browse files Browse the repository at this point in the history
Port Union algorithm to C++ and fix it
  • Loading branch information
wonder-sk committed Apr 26, 2018
2 parents ba02a5e + 5e7719c commit 16a6a90
Show file tree
Hide file tree
Showing 23 changed files with 580 additions and 538 deletions.
15 changes: 15 additions & 0 deletions python/core/processing/qgsprocessingutils.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,21 @@ non-duplicate name.
be truncated when saving to these formats.
%End

static QList<int> fieldNamesToIndices( const QStringList &fieldNames, const QgsFields &fields );
%Docstring
Returns a list of field indices parsed from the given list of field names. Unknown field names are ignored.
If the list of field names is empty, it is assumed that all fields are required.

.. versionadded:: 3.2
%End

static QgsFields indicesToFields( const QList<int> &indices, const QgsFields &fields );
%Docstring
Returns a subset of fields based on the indices of desired fields.

.. versionadded:: 3.2
%End

};

class QgsProcessingFeatureSource : QgsFeatureSource
Expand Down
4 changes: 0 additions & 4 deletions python/plugins/processing/algs/help/qgis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -530,10 +530,6 @@ qgis:truncatetable: >

Warning - this algorithm modifies the layer in place, and deleted features cannot be restored!

qgis:union: >
This algorithm creates a layer containing all the features from both input layers. In the case of polygon layers, separate features are created for overlapping and non-overlapping features. The attribute table of the union layer contains attribute values from the respective input layer for non-overlapping features, and attribute values from both input layers for overlapping features.


qgis:variabledistancebuffer: >
This algorithm computes a buffer area for all the features in an input layer. The size of the buffer for a given feature is defined by an attribute, so it allows different features to have different buffer sizes.

Expand Down
2 changes: 0 additions & 2 deletions python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
from .TinInterpolation import TinInterpolation
from .TopoColors import TopoColor
from .TruncateTable import TruncateTable
from .Union import Union
from .UniqueValues import UniqueValues
from .VariableDistanceBuffer import VariableDistanceBuffer
from .VectorSplit import VectorSplit
Expand Down Expand Up @@ -253,7 +252,6 @@ def getAlgs(self):
TinInterpolation(),
TopoColor(),
TruncateTable(),
Union(),
UniqueValues(),
VariableDistanceBuffer(),
VectorSplit(),
Expand Down
250 changes: 0 additions & 250 deletions python/plugins/processing/algs/qgis/Union.py

This file was deleted.

24 changes: 0 additions & 24 deletions python/plugins/processing/tests/testdata/custom/for_union.gml

This file was deleted.

23 changes: 0 additions & 23 deletions python/plugins/processing/tests/testdata/custom/for_union.xsd

This file was deleted.

24 changes: 0 additions & 24 deletions python/plugins/processing/tests/testdata/expected/difference.gml

This file was deleted.

0 comments on commit 16a6a90

Please sign in to comment.