Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #5131 from nyalldawson/location_algs
Rework Select by Location algorithm
  • Loading branch information
nyalldawson committed Sep 11, 2017
2 parents 7f5bd00 + 02e8f1e commit a650681
Show file tree
Hide file tree
Showing 29 changed files with 680 additions and 417 deletions.
6 changes: 6 additions & 0 deletions python/core/qgsfeaturesource.sip
Expand Up @@ -114,6 +114,12 @@ class QgsFeatureSource
:rtype: QgsRectangle
%End

virtual QgsFeatureIds allFeatureIds() const;
%Docstring
Returns a list of all feature IDs for features present in the source.
:rtype: QgsFeatureIds
%End

};


Expand Down
6 changes: 0 additions & 6 deletions python/core/qgsvectorlayer.sip
Expand Up @@ -576,12 +576,6 @@ Select not selected features and deselect selected ones
Select all the features
%End

QgsFeatureIds allFeatureIds() const;
%Docstring
Get all feature Ids
:rtype: QgsFeatureIds
%End

void invertSelectionInRectangle( QgsRectangle &rect );
%Docstring
Invert selection of features found within the search rectangle (in layer's coordinates)
Expand Down
7 changes: 0 additions & 7 deletions python/plugins/processing/algs/help/qgis.yaml
Expand Up @@ -189,9 +189,6 @@ qgis:extractbyexpression: >

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

qgis:extractbylocation: >
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.

qgis:extractnodes: >
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.

Expand Down Expand Up @@ -519,10 +516,6 @@ qgis:selectbyexpression: >

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


qgis:selectbylocation: >
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.

qgis:setmvalue: >
This algorithm sets the M value for geometries in a layer.

Expand Down
141 changes: 0 additions & 141 deletions python/plugins/processing/algs/qgis/ExtractByLocation.py

This file was deleted.

4 changes: 0 additions & 4 deletions python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
Expand Up @@ -166,8 +166,6 @@
from .VoronoiPolygons import VoronoiPolygons
from .ZonalStatistics import ZonalStatistics

# from .ExtractByLocation import ExtractByLocation
# from .SelectByLocation import SelectByLocation
# from .SpatialJoin import SpatialJoin

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

def getAlgs(self):
# algs = [
# SelectByLocation(),
# ExtractByLocation(),
# SpatialJoin(),
# ]
algs = [AddTableField(),
Expand Down
156 changes: 0 additions & 156 deletions python/plugins/processing/algs/qgis/SelectByLocation.py

This file was deleted.

2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/SetRasterStyle.py
Expand Up @@ -2,7 +2,7 @@

"""
***************************************************************************
SelectByLocation.py
SetRasterStyle.py
---------------------
Date : August 2012
Copyright : (C) 2012 by Victor Olaya
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/SetVectorStyle.py
Expand Up @@ -2,7 +2,7 @@

"""
***************************************************************************
SelectByLocation.py
SetVectorStyle.py
---------------------
Date : August 2012
Copyright : (C) 2012 by Victor Olaya
Expand Down

0 comments on commit a650681

Please sign in to comment.