Skip to content
Permalink
Browse files

join by location c++ port

  • Loading branch information
roya0045 authored and nyalldawson committed Dec 19, 2019
1 parent 75ba9b3 commit e9aff0b69564f2effb53df48d2e8ce1714dbcd79
@@ -176,11 +176,6 @@ qgis:importintopostgis: >

Prior to this a connection between QGIS and the PostgreSQL database has to be created (for example with the DB Manager).

qgis:joinattributesbylocation: >
This algorithm takes an input vector layer and creates a new vector layer that is an extended version of the input one, with additional attributes in its attribute table.

The additional attributes and their values are taken from a second vector layer. A spatial criteria is applied to select the values from the second layer that are added to each feature from the first layer in the resulting one.

qgis:joinbylocationsummary: >
This algorithm takes an input vector layer and creates a new vector layer that is an extended version of the input one, with additional attributes in its attribute table.

@@ -86,7 +86,6 @@
from .SetVectorStyle import SetVectorStyle
from .SnapGeometries import SnapGeometriesToLayer
from .SpatialiteExecuteSQL import SpatialiteExecuteSQL
from .SpatialJoin import SpatialJoin
from .SpatialJoinSummary import SpatialJoinSummary
from .StatisticsByCategories import StatisticsByCategories
from .TextToFloat import TextToFloat
@@ -169,7 +168,6 @@ def getAlgs(self):
SetVectorStyle(),
SnapGeometriesToLayer(),
SpatialiteExecuteSQL(),
SpatialJoin(),
SpatialJoinSummary(),
StatisticsByCategories(),
TextToFloat(),

This file was deleted.

@@ -1176,7 +1176,7 @@ tests:
fields:
fid: skip

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location (intersects)
params:
DISCARD_NONMATCHING: false
@@ -1202,7 +1202,7 @@ tests:
fid: skip
fid_2: skip

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location with prefix
params:
DISCARD_NONMATCHING: false
@@ -1229,7 +1229,7 @@ tests:
fid: skip
j_fid: skip

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location (intersects), discard no match
params:
DISCARD_NONMATCHING: true
@@ -1255,7 +1255,7 @@ tests:
fid: skip
fid_2: skip

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location (intersects), first match only
params:
DISCARD_NONMATCHING: false
@@ -1281,7 +1281,7 @@ tests:
id: skip # can't check these - order of match is not predictable
id2: skip

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location (intersects), first match only, discard no match
params:
DISCARD_NONMATCHING: true
@@ -1307,7 +1307,7 @@ tests:
id: skip # can't check these - order of match is not predictable
id2: skip

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location (intersects), subset of fields
params:
DISCARD_NONMATCHING: false
@@ -1334,7 +1334,7 @@ tests:
fid: skip
fid_2: skip

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location (touches)
params:
DISCARD_NONMATCHING: true
@@ -1360,7 +1360,7 @@ tests:
fid: skip
fid_2: skip

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location, unjoinable
params:
DISCARD_NONMATCHING: false
@@ -1379,7 +1379,7 @@ tests:
name: expected/join_by_location_unjoinable.gml
type: vector

- algorithm: qgis:joinattributesbylocation
- algorithm: native:joinattributesbylocation
name: Join by location (equals)
params:
DISCARD_NONMATCHING: true
@@ -75,6 +75,7 @@ SET(QGIS_ANALYSIS_SRCS
processing/qgsalgorithminterpolatepoint.cpp
processing/qgsalgorithmintersection.cpp
processing/qgsalgorithmjoinbyattribute.cpp
processing/qgsalgorithmjoinbylocation.cpp
processing/qgsalgorithmjoinbynearest.cpp
processing/qgsalgorithmjoinwithlines.cpp
processing/qgsalgorithmkmeansclustering.cpp

0 comments on commit e9aff0b

Please sign in to comment.
You can’t perform that action at this time.