Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #52873 from Gustry/processing-update
  • Loading branch information
@m-kuhn
m-kuhn committed Apr 24, 2023
2 parents 8db8acd + 3cab3c4 commit 283a8f5
Show file tree
Hide file tree
Showing 228 changed files with 259 additions and 713 deletions.
6 changes: 2 additions & 4 deletions python/plugins/processing/ProcessingPlugin.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
ProcessingPlugin.py
Expand Down Expand Up @@ -111,7 +109,7 @@ def handleCustomUriDrop(self, uri):
class ProcessingModelItem(QgsDataItem):

def __init__(self, parent, name, path):
super(ProcessingModelItem, self).__init__(QgsDataItem.Custom, parent, name, path)
super().__init__(QgsDataItem.Custom, parent, name, path)
self.setState(QgsDataItem.Populated) # no children
self.setIconName(":/images/themes/default/processingModel.svg")
self.setToolTip(QDir.toNativeSeparators(path))
Expand Down Expand Up @@ -150,7 +148,7 @@ def actions(self, parent):
class ProcessingDataItemProvider(QgsDataItemProvider):

def __init__(self):
super(ProcessingDataItemProvider, self).__init__()
super().__init__()

def name(self):
return 'processing'
Expand Down
2 changes: 0 additions & 2 deletions python/plugins/processing/__init__.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
__init__.py
Expand Down
2 changes: 0 additions & 2 deletions python/plugins/processing/algs/gdal/AssignProjection.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
self.py
Expand Down
10 changes: 4 additions & 6 deletions python/plugins/processing/algs/gdal/Buffer.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
Buffer.py
Expand Down Expand Up @@ -129,12 +127,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
]

if dissolve or fieldName:
sql = 'SELECT ST_Union(ST_Buffer({}, {})) AS {}{} FROM "{}"'.format(geometry, distance, geometry, other_fields, layerName)
sql = f'SELECT ST_Union(ST_Buffer({geometry}, {distance})) AS {geometry}{other_fields} FROM "{layerName}"'
else:
sql = 'SELECT ST_Buffer({}, {}) AS {}{} FROM "{}"'.format(geometry, distance, geometry, other_fields, layerName)
sql = f'SELECT ST_Buffer({geometry}, {distance}) AS {geometry}{other_fields} FROM "{layerName}"'

if fieldName:
sql = '{} GROUP BY "{}"'.format(sql, fieldName)
sql = f'{sql} GROUP BY "{fieldName}"'

arguments.append(sql)

Expand All @@ -145,6 +143,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append(options)

if outputFormat:
arguments.append('-f {}'.format(outputFormat))
arguments.append(f'-f {outputFormat}')

return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
6 changes: 2 additions & 4 deletions python/plugins/processing/algs/gdal/ClipRasterByExtent.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
ClipRasterByExtent.py
Expand Down Expand Up @@ -142,10 +140,10 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):

crs = inLayer.crs()
if override_crs and crs.isValid():
arguments.append('-a_srs {}'.format(GdalUtils.gdal_crs_string(crs)))
arguments.append(f'-a_srs {GdalUtils.gdal_crs_string(crs)}')

if nodata is not None:
arguments.append('-a_nodata {}'.format(nodata))
arguments.append(f'-a_nodata {nodata}')

data_type = self.parameterAsEnum(parameters, self.DATA_TYPE, context)
if data_type:
Expand Down
8 changes: 3 additions & 5 deletions python/plugins/processing/algs/gdal/ClipRasterByMask.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
ClipRasterByMask.py
Expand Down Expand Up @@ -221,12 +219,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append('-tr')
if self.X_RESOLUTION in parameters and parameters[self.X_RESOLUTION] is not None:
xres = self.parameterAsDouble(parameters, self.X_RESOLUTION, context)
arguments.append('{}'.format(xres))
arguments.append(f'{xres}')
else:
arguments.append(str(inLayer.rasterUnitsPerPixelX()))
if self.Y_RESOLUTION in parameters and parameters[self.Y_RESOLUTION] is not None:
yres = self.parameterAsDouble(parameters, self.Y_RESOLUTION, context)
arguments.append('{}'.format(yres))
arguments.append(f'{yres}')
else:
arguments.append(str(-inLayer.rasterUnitsPerPixelY()))
arguments.append('-tap')
Expand All @@ -243,7 +241,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append('-dstalpha')

if nodata is not None:
arguments.append('-dstnodata {}'.format(nodata))
arguments.append(f'-dstnodata {nodata}')

if self.parameterAsBoolean(parameters, self.MULTITHREADING, context):
arguments.append('-multi')
Expand Down
4 changes: 1 addition & 3 deletions python/plugins/processing/algs/gdal/ClipVectorByExtent.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
ClipVectorByExtent.py
Expand Down Expand Up @@ -103,6 +101,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append(options)

if outputFormat:
arguments.append('-f {}'.format(outputFormat))
arguments.append(f'-f {outputFormat}')

return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
4 changes: 1 addition & 3 deletions python/plugins/processing/algs/gdal/ClipVectorByMask.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
ClipVectorByMask.py
Expand Down Expand Up @@ -99,6 +97,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append(options)

if outputFormat:
arguments.append('-f {}'.format(outputFormat))
arguments.append(f'-f {outputFormat}')

return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
2 changes: 0 additions & 2 deletions python/plugins/processing/algs/gdal/ColorRelief.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
ColorRelief.py
Expand Down
8 changes: 3 additions & 5 deletions python/plugins/processing/algs/gdal/Datasources2Vrt.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
Datasources2Vrt.py
Expand Down Expand Up @@ -122,9 +120,9 @@ def processAlgorithm(self, parameters, context, feedback):
basePath = GdalUtils.ogrConnectionStringFromLayer(layer)
layerName = GdalUtils.ogrLayerName(layer.source())

vrt += '<OGRVRTLayer name="{}">'.format(html.escape(layerName, True))
vrt += '<SrcDataSource>{}</SrcDataSource>'.format(html.escape(basePath, True))
vrt += '<SrcLayer>{}</SrcLayer>'.format(html.escape(layerName, True))
vrt += f'<OGRVRTLayer name="{html.escape(layerName, True)}">'
vrt += f'<SrcDataSource>{html.escape(basePath, True)}</SrcDataSource>'
vrt += f'<SrcLayer>{html.escape(layerName, True)}</SrcLayer>'
vrt += '</OGRVRTLayer>'

feedback.setProgress(int(current * total))
Expand Down
12 changes: 5 additions & 7 deletions python/plugins/processing/algs/gdal/Dissolve.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
Dissolve.py
Expand Down Expand Up @@ -142,7 +140,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):

tokens = []
if self.parameterAsBoolean(parameters, self.COUNT_FEATURES, context):
tokens.append('COUNT({}) AS count'.format(geometry))
tokens.append(f'COUNT({geometry}) AS count')

if self.parameterAsBoolean(parameters, self.COMPUTE_AREA, context):
tokens.append('SUM(ST_Area({0})) AS area, ST_Perimeter(ST_Union({0})) AS perimeter'.format(geometry))
Expand All @@ -157,12 +155,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):

group_by = ''
if fieldName:
group_by = ' GROUP BY "{}"'.format(fieldName)
group_by = f' GROUP BY "{fieldName}"'

if self.parameterAsBoolean(parameters, self.KEEP_ATTRIBUTES, context):
sql = 'SELECT ST_Union({}) AS {}{}{} FROM "{}"{}'.format(geometry, geometry, other_fields, params, layerName, group_by)
sql = f'SELECT ST_Union({geometry}) AS {geometry}{other_fields}{params} FROM "{layerName}"{group_by}'
else:
sql = 'SELECT ST_Union({}) AS {}{}{} FROM "{}"{}'.format(geometry, geometry, ', "{}"'.format(fieldName) if fieldName else '',
sql = 'SELECT ST_Union({}) AS {}{}{} FROM "{}"{}'.format(geometry, geometry, f', "{fieldName}"' if fieldName else '',
params, layerName, group_by)

arguments.append(sql)
Expand All @@ -174,6 +172,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append(options)

if outputFormat:
arguments.append('-f {}'.format(outputFormat))
arguments.append(f'-f {outputFormat}')

return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
4 changes: 1 addition & 3 deletions python/plugins/processing/algs/gdal/ExecuteSql.py
View file
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
ExecuteSql.py
Expand Down Expand Up @@ -110,6 +108,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append(options)

if outputFormat:
arguments.append('-f {}'.format(outputFormat))
arguments.append(f'-f {outputFormat}')

return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]