Skip to content

Commit d1a93e0

Browse files
nyalldawsonnyalldawson
committed
Restore points layer from table algorithm
1 parent 9f5e33a commit d1a93e0

File tree

3 files changed

+75
-58
lines changed

3 files changed

+75
-58
lines changed

‎python/plugins/processing/algs/qgis/PointsLayerFromTable.py

Lines changed: 56 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,16 @@
2828
from qgis.core import (QgsApplication,
2929
QgsWkbTypes,
3030
QgsPoint,
31-
QgsFeatureSink,
3231
QgsCoordinateReferenceSystem,
32+
QgsFeatureRequest,
3333
QgsGeometry,
34-
QgsProcessingUtils)
34+
QgsProcessingUtils,
35+
QgsProcessingParameterDefinition,
36+
QgsProcessingParameterFeatureSink,
37+
QgsProcessingParameterFeatureSource,
38+
QgsProcessingParameterCrs,
39+
QgsProcessingOutputVectorLayer,
40+
QgsProcessingParameterField)
3541
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
3642
from processing.core.parameters import ParameterTable
3743
from processing.core.parameters import ParameterTableField
@@ -50,6 +56,12 @@ class PointsLayerFromTable(QgisAlgorithm):
5056
OUTPUT = 'OUTPUT'
5157
TARGET_CRS = 'TARGET_CRS'
5258

59+
def icon(self):
60+
return QgsApplication.getThemeIcon("/providerQgis.svg")
61+
62+
def svgIconPath(self):
63+
return QgsApplication.iconPath("providerQgis.svg")
64+
5365
def tags(self):
5466
return self.tr('points,create,values,attributes').split(',')
5567

@@ -58,19 +70,22 @@ def group(self):
5870

5971
def __init__(self):
6072
super().__init__()
61-
self.addParameter(ParameterTable(self.INPUT,
62-
self.tr('Input layer')))
63-
self.addParameter(ParameterTableField(self.XFIELD,
64-
self.tr('X field'), self.INPUT, ParameterTableField.DATA_TYPE_ANY))
65-
self.addParameter(ParameterTableField(self.YFIELD,
66-
self.tr('Y field'), self.INPUT, ParameterTableField.DATA_TYPE_ANY))
67-
self.addParameter(ParameterTableField(self.ZFIELD,
68-
self.tr('Z field'), self.INPUT, datatype=ParameterTableField.DATA_TYPE_ANY, optional=True))
69-
self.addParameter(ParameterTableField(self.MFIELD,
70-
self.tr('M field'), self.INPUT, datatype=ParameterTableField.DATA_TYPE_ANY, optional=True))
71-
self.addParameter(ParameterCrs(self.TARGET_CRS,
72-
self.tr('Target CRS'), 'EPSG:4326'))
73-
self.addOutput(OutputVector(self.OUTPUT, self.tr('Points from table'), datatype=[dataobjects.TYPE_VECTOR_POINT]))
73+
74+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), types=[QgsProcessingParameterField.TypeTable]))
75+
76+
self.addParameter(QgsProcessingParameterField(self.XFIELD,
77+
self.tr('X field'), parentLayerParameterName=self.INPUT, type=QgsProcessingParameterField.Any))
78+
self.addParameter(QgsProcessingParameterField(self.YFIELD,
79+
self.tr('Y field'), parentLayerParameterName=self.INPUT, type=QgsProcessingParameterField.Any))
80+
self.addParameter(QgsProcessingParameterField(self.ZFIELD,
81+
self.tr('Z field'), parentLayerParameterName=self.INPUT, type=QgsProcessingParameterField.Any, optional=True))
82+
self.addParameter(QgsProcessingParameterField(self.MFIELD,
83+
self.tr('M field'), parentLayerParameterName=self.INPUT, type=QgsProcessingParameterField.Any, optional=True))
84+
self.addParameter(QgsProcessingParameterCrs(self.TARGET_CRS,
85+
self.tr('Target CRS'), defaultValue='EPSG:4326'))
86+
87+
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Points from table'), type=QgsProcessingParameterDefinition.TypeVectorPoint))
88+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Points from table'), type=QgsProcessingParameterDefinition.TypeVectorPoint))
7489

7590
def name(self):
7691
return 'createpointslayerfromtable'
@@ -79,36 +94,37 @@ def displayName(self):
7994
return self.tr('Create points layer from table')
8095

8196
def processAlgorithm(self, parameters, context, feedback):
82-
source = self.getParameterValue(self.INPUT)
83-
vlayer = QgsProcessingUtils.mapLayerFromString(source, context)
84-
output = self.getOutputFromName(self.OUTPUT)
85-
86-
fields = vlayer.fields()
87-
x_field_index = fields.lookupField(self.getParameterValue(self.XFIELD))
88-
y_field_index = fields.lookupField(self.getParameterValue(self.YFIELD))
89-
z_field_index = None
90-
if self.getParameterValue(self.ZFIELD):
91-
z_field_index = fields.lookupField(self.getParameterValue(self.ZFIELD))
92-
m_field_index = None
93-
if self.getParameterValue(self.MFIELD):
94-
m_field_index = fields.lookupField(self.getParameterValue(self.MFIELD))
97+
source = self.parameterAsSource(parameters, self.INPUT, context)
98+
99+
fields = source.fields()
100+
x_field_index = fields.lookupField(self.parameterAsString(parameters, self.XFIELD, context))
101+
y_field_index = fields.lookupField(self.parameterAsString(parameters, self.YFIELD, context))
102+
z_field_index = -1
103+
if self.parameterAsString(parameters, self.ZFIELD, context):
104+
z_field_index = fields.lookupField(self.parameterAsString(parameters, self.ZFIELD, context))
105+
m_field_index = -1
106+
if self.parameterAsString(parameters, self.MFIELD, context):
107+
m_field_index = fields.lookupField(self.parameterAsString(parameters, self.MFIELD, context))
95108

96109
wkb_type = QgsWkbTypes.Point
97-
if z_field_index is not None:
110+
if z_field_index >= 0:
98111
wkb_type = QgsWkbTypes.addZ(wkb_type)
99-
if m_field_index is not None:
112+
if m_field_index >= 0:
100113
wkb_type = QgsWkbTypes.addM(wkb_type)
101114

102-
crsId = self.getParameterValue(self.TARGET_CRS)
103-
target_crs = QgsCoordinateReferenceSystem()
104-
target_crs.createFromUserInput(crsId)
115+
target_crs = self.parameterAsCrs(parameters, self.TARGET_CRS, context)
105116

106-
writer = output.getVectorWriter(fields, wkb_type, target_crs, context)
117+
(sink, dest_id) = self.parameterAsSink(parameters, self.OUTPUT, context,
118+
fields, wkb_type, target_crs)
107119

108-
features = QgsProcessingUtils.getFeatures(vlayer, context)
109-
total = 100.0 / vlayer.featureCount() if vlayer.featureCount() else 0
120+
request = QgsFeatureRequest().setFlags(QgsFeatureRequest.NoGeometry)
121+
features = source.getFeatures()
122+
total = 100.0 / source.featureCount() if source.featureCount() else 0
110123

111124
for current, feature in enumerate(features):
125+
if feedback.isCanceled():
126+
break
127+
112128
feedback.setProgress(int(current * total))
113129
attrs = feature.attributes()
114130

@@ -118,13 +134,13 @@ def processAlgorithm(self, parameters, context, feedback):
118134

119135
point = QgsPoint(x, y)
120136

121-
if z_field_index is not None:
137+
if z_field_index >= 0:
122138
try:
123139
point.addZValue(float(attrs[z_field_index]))
124140
except:
125141
point.addZValue(0.0)
126142

127-
if m_field_index is not None:
143+
if m_field_index >= 0:
128144
try:
129145
point.addMValue(float(attrs[m_field_index]))
130146
except:
@@ -134,6 +150,6 @@ def processAlgorithm(self, parameters, context, feedback):
134150
except:
135151
pass # no geometry
136152

137-
writer.addFeature(feature, QgsFeatureSink.FastInsert)
153+
sink.addFeature(feature)
138154

139-
del writer
155+
return {self.OUTPUT: dest_id}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
from .ImportIntoPostGIS import ImportIntoPostGIS
6060
from .ImportIntoSpatialite import ImportIntoSpatialite
6161
from .Merge import Merge
62+
from .PointsLayerFromTable import PointsLayerFromTable
6263
from .PostGISExecuteSQL import PostGISExecuteSQL
6364
from .RandomExtract import RandomExtract
6465
from .RandomExtractWithinSubsets import RandomExtractWithinSubsets
@@ -117,7 +118,6 @@
117118
# from .FieldPyculator import FieldsPyculator
118119
# from .JoinAttributes import JoinAttributes
119120
# from .CreateConstantRaster import CreateConstantRaster
120-
# from .PointsLayerFromTable import PointsLayerFromTable
121121
# from .PointsDisplacement import PointsDisplacement
122122
# from .ZonalStatistics import ZonalStatistics
123123
# from .PointsFromPolygons import PointsFromPolygons
@@ -207,7 +207,7 @@ def getAlgs(self):
207207
# GeometryConvert(), FieldsCalculator(),
208208
# JoinAttributes(),
209209
# Explode(), FieldsPyculator(),
210-
# EquivalentNumField(), PointsLayerFromTable(),
210+
# EquivalentNumField(),
211211
# StatisticsByCategories(), ConcaveHull(),
212212
# RasterLayerStatistics(), PointsDisplacement(),
213213
# ZonalStatistics(), PointsFromPolygons(),
@@ -260,6 +260,7 @@ def getAlgs(self):
260260
ImportIntoPostGIS(),
261261
ImportIntoSpatialite(),
262262
Merge(),
263+
PointsLayerFromTable(),
263264
PostGISExecuteSQL(),
264265
RandomExtract(),
265266
RandomExtractWithinSubsets(),

‎python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,22 +1600,22 @@ tests:
16001600
name: expected/delete_column.gml
16011601
type: vector
16021602

1603-
# - algorithm: qgis:createpointslayerfromtable
1604-
# name: Create points from table
1605-
# params:
1606-
# INPUT:
1607-
# name: create_points.gml
1608-
# type: table
1609-
# MFIELD: mcoord
1610-
# TARGET_CRS: EPSG:4326
1611-
# XFIELD: xcoord
1612-
# YFIELD: ycoord
1613-
# ZFIELD: zcoord
1614-
# results:
1615-
# OUTPUT:
1616-
# name: expected/create_points.gml
1617-
# type: vector
1618-
#
1603+
- algorithm: qgis:createpointslayerfromtable
1604+
name: Create points from table
1605+
params:
1606+
INPUT:
1607+
name: create_points.gml
1608+
type: table
1609+
MFIELD: mcoord
1610+
TARGET_CRS: EPSG:4326
1611+
XFIELD: xcoord
1612+
YFIELD: ycoord
1613+
ZFIELD: zcoord
1614+
results:
1615+
OUTPUT:
1616+
name: expected/create_points.gml
1617+
type: vector
1618+
16191619
# - algorithm: qgis:splitwithlines
16201620
# name: Split lines with lines (new alg)
16211621
# params:

0 commit comments

Comments
 (0)