Skip to content

Commit a650681

Browse files
authored
Merge pull request #5131 from nyalldawson/location_algs
Rework Select by Location algorithm
2 parents 7f5bd00 + 02e8f1e commit a650681

29 files changed

+680
-417
lines changed

python/core/qgsfeaturesource.sip

+6
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ class QgsFeatureSource
114114
:rtype: QgsRectangle
115115
%End
116116

117+
virtual QgsFeatureIds allFeatureIds() const;
118+
%Docstring
119+
Returns a list of all feature IDs for features present in the source.
120+
:rtype: QgsFeatureIds
121+
%End
122+
117123
};
118124

119125

python/core/qgsvectorlayer.sip

-6
Original file line numberDiff line numberDiff line change
@@ -576,12 +576,6 @@ Select not selected features and deselect selected ones
576576
Select all the features
577577
%End
578578

579-
QgsFeatureIds allFeatureIds() const;
580-
%Docstring
581-
Get all feature Ids
582-
:rtype: QgsFeatureIds
583-
%End
584-
585579
void invertSelectionInRectangle( QgsRectangle &rect );
586580
%Docstring
587581
Invert selection of features found within the search rectangle (in layer's coordinates)

python/plugins/processing/algs/help/qgis.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,6 @@ qgis:extractbyexpression: >
189189

190190
For more information about expressions see the <a href ="{qgisdocs}/user_manual/working_with_vector/expression.html">user manual</a>
191191

192-
qgis:extractbylocation: >
193-
This algorithm creates a new vector layer that only contains matching features from an input layer. The criteria for adding features to the resulting layer is defined based on the spatial relationship between each feature and the features in an additional layer.
194-
195192
qgis:extractnodes: >
196193
This algorithm takes a line or polygon layer and generates a point layer with points representing the nodes in the input lines or polygons. The attributes associated to each point are the same ones associated to the line or polygon that the point belongs to.
197194

@@ -519,10 +516,6 @@ qgis:selectbyexpression: >
519516

520517
For more information about expressions see the <a href ="{qgisdocs}/user_manual/working_with_vector/expression.html">user manual</a>
521518

522-
523-
qgis:selectbylocation: >
524-
This algorithm creates a selection in a vector layer. The criteria for selecting features is based on the spatial relationship between each feature and the features in an additional layer.
525-
526519
qgis:setmvalue: >
527520
This algorithm sets the M value for geometries in a layer.
528521

python/plugins/processing/algs/qgis/ExtractByLocation.py

-141
This file was deleted.

python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py

-4
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@
166166
from .VoronoiPolygons import VoronoiPolygons
167167
from .ZonalStatistics import ZonalStatistics
168168

169-
# from .ExtractByLocation import ExtractByLocation
170-
# from .SelectByLocation import SelectByLocation
171169
# from .SpatialJoin import SpatialJoin
172170

173171
pluginPath = os.path.normpath(os.path.join(
@@ -183,8 +181,6 @@ def __init__(self):
183181

184182
def getAlgs(self):
185183
# algs = [
186-
# SelectByLocation(),
187-
# ExtractByLocation(),
188184
# SpatialJoin(),
189185
# ]
190186
algs = [AddTableField(),

python/plugins/processing/algs/qgis/SelectByLocation.py

-156
This file was deleted.

python/plugins/processing/algs/qgis/SetRasterStyle.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"""
44
***************************************************************************
5-
SelectByLocation.py
5+
SetRasterStyle.py
66
---------------------
77
Date : August 2012
88
Copyright : (C) 2012 by Victor Olaya

python/plugins/processing/algs/qgis/SetVectorStyle.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"""
44
***************************************************************************
5-
SelectByLocation.py
5+
SetVectorStyle.py
66
---------------------
77
Date : August 2012
88
Copyright : (C) 2012 by Victor Olaya

0 commit comments

Comments
 (0)