Skip to content

Commit c64f03d

Browse files
committed
[processing] keep column names in standard distance matrix (fix #17150)
1 parent bb21395 commit c64f03d

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from builtins import next
20-
from builtins import str
21-
from builtins import range
2219

2320
__author__ = 'Victor Olaya'
2421
__date__ = 'August 2012'
@@ -207,14 +204,15 @@ def linearMatrix(self, parameters, context, source, inField, target_source, targ
207204

208205
def regularMatrix(self, parameters, context, source, inField, target_source, targetField,
209206
nPoints, feedback):
210-
211-
index = QgsSpatialIndex(target_source.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([]).setDestinationCrs(source.sourceCrs())), feedback)
212-
inIdx = source.fields().lookupField(inField)
213-
214207
distArea = QgsDistanceArea()
215208
distArea.setSourceCrs(source.sourceCrs())
216209
distArea.setEllipsoid(context.project().ellipsoid())
217210

211+
inIdx = source.fields().lookupField(inField)
212+
targetIdx = target_source.fields().lookupField(targetField)
213+
214+
index = QgsSpatialIndex(target_source.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([]).setDestinationCrs(source.sourceCrs())), feedback)
215+
218216
first = True
219217
sink = None
220218
dest_id = None
@@ -225,27 +223,28 @@ def regularMatrix(self, parameters, context, source, inField, target_source, tar
225223
break
226224

227225
inGeom = inFeat.geometry()
228-
inID = str(inFeat.attributes()[inIdx])
229-
featList = index.nearestNeighbor(inGeom.asPoint(), nPoints)
230226
if first:
227+
featList = index.nearestNeighbor(inGeom.asPoint(), nPoints)
231228
first = False
232229
fields = QgsFields()
233230
input_id_field = source.fields()[inIdx]
234231
input_id_field.setName('ID')
235232
fields.append(input_id_field)
236-
for i in range(len(featList)):
237-
fields.append(QgsField('DIST_{0}'.format(i + 1), QVariant.Double))
233+
for f in target_source.getFeatures(QgsFeatureRequest().setFilterFids(featList).setSubsetOfAttributes([targetIdx]).setDestinationCrs(source.sourceCrs())):
234+
fields.append(QgsField(str(f[targetField]), QVariant.Double))
235+
238236
(sink, dest_id) = self.parameterAsSink(parameters, self.OUTPUT, context,
239237
fields, source.wkbType(), source.sourceCrs())
240238

241-
data = [inID]
239+
data = [inFeat[inField]]
242240
for target in target_source.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([]).setFilterFids(featList).setDestinationCrs(source.sourceCrs())):
243241
if feedback.isCanceled():
244242
break
245243
outGeom = target.geometry()
246244
dist = distArea.measureLine(inGeom.asPoint(),
247245
outGeom.asPoint())
248-
data.append(float(dist))
246+
data.append(dist)
247+
249248
out_feature = QgsFeature()
250249
out_feature.setGeometry(inGeom)
251250
out_feature.setAttributes(data)

0 commit comments

Comments
 (0)