Skip to content

Commit 6e9631e

Browse files
alexbruyalexbruy
authored
Merge pull request #3701 from alexbruy/processing-ogr-tests
[processsing] tests for GDAL algorithms
2 parents 798bc09 + d81533e commit 6e9631e

File tree

110 files changed

+903
-1975
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+903
-1975
lines changed

‎python/plugins/processing/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
from processing.tools.vector import * # NOQA
3131
from processing.tools.raster import * # NOQA
3232
from processing.tools.system import * # NOQA
33-
from processing.tests.TestData import loadTestData # NOQA
3433

3534

3635
def classFactory(iface):

‎python/plugins/processing/algs/gdal/GdalAlgorithm.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ def processAlgorithm(self, progress):
7474

7575
def shortHelp(self):
7676
return self._formatHelp('''This algorithm is based on the GDAL %s module.
77-
7877
For more info, see the <a href = 'http://www.gdal.org/%s.html'> module help</a>
7978
''' % (self.commandName(), self.commandName()))
8079

‎python/plugins/processing/algs/gdal/offsetcurve.py‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from processing.core.parameters import ParameterVector
2929
from processing.core.parameters import ParameterString
30+
from processing.core.parameters import ParameterNumber
3031
from processing.core.parameters import ParameterBoolean
3132
from processing.core.parameters import ParameterTableField
3233
from processing.core.parameters import ParameterSelection
@@ -46,8 +47,6 @@ class OffsetCurve(GdalAlgorithm):
4647
INPUT_LAYER = 'INPUT_LAYER'
4748
GEOMETRY = 'GEOMETRY'
4849
RADIUS = 'RADIUS'
49-
LEFTRIGHT = 'LEFTRIGHT'
50-
LEFTRIGHTLIST = ['Right', 'Left']
5150
DISSOLVEALL = 'DISSOLVEALL'
5251
FIELD = 'FIELD'
5352
MULTI = 'MULTI'
@@ -62,10 +61,10 @@ def defineCharacteristics(self):
6261
self.addParameter(ParameterString(self.GEOMETRY,
6362
self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
6463
'geometry', optional=False))
65-
self.addParameter(ParameterString(self.RADIUS,
66-
self.tr('Offset distance'), '1000', optional=False))
67-
self.addParameter(ParameterSelection(self.LEFTRIGHT,
68-
self.tr('Offset side'), self.LEFTRIGHTLIST, 0))
64+
self.addParameter(ParameterNumber(self.RADIUS,
65+
self.tr('Offset distance (positive value for left-sided and negative - for right-sided)'),
66+
-99999999.999999, 99999999.999999, 1000.0,
67+
optional=False))
6968
self.addParameter(ParameterBoolean(self.DISSOLVEALL,
7069
self.tr('Dissolve all results'), False))
7170
self.addParameter(ParameterTableField(self.FIELD,
@@ -82,7 +81,6 @@ def getConsoleCommands(self):
8281
inLayer = self.getParameterValue(self.INPUT_LAYER)
8382
geometry = self.getParameterValue(self.GEOMETRY)
8483
distance = self.getParameterValue(self.RADIUS)
85-
leftright = self.getParameterValue(self.LEFTRIGHT)
8684
dissolveall = self.getParameterValue(self.DISSOLVEALL)
8785
field = self.getParameterValue(self.FIELD)
8886
multi = self.getParameterValue(self.MULTI)
@@ -100,15 +98,14 @@ def getConsoleCommands(self):
10098
arguments = []
10199
arguments.append(output)
102100
arguments.append(ogrLayer)
103-
arguments.append(layername)
104101
arguments.append('-dialect')
105102
arguments.append('sqlite')
106103
arguments.append('-sql')
107104

108105
if dissolveall or field is not None:
109-
sql = "SELECT ST_Union(ST_OffsetCurve({}, {}, {})) * FROM '{}'".format(geometry, distance, leftright, layername)
106+
sql = "SELECT ST_Union(ST_OffsetCurve({}, {})) * FROM '{}'".format(geometry, distance, layername)
110107
else:
111-
sql = "SELECT ST_OffsetCurve({}, {}, {}), * FROM '{}'".format(geometry, distance, leftright, layername)
108+
sql = "SELECT ST_OffsetCurve({}, {}), * FROM '{}'".format(geometry, distance, layername)
112109

113110
if field is not None:
114111
sql = '"{} GROUP BY {}"'.format(sql, field)
@@ -118,7 +115,7 @@ def getConsoleCommands(self):
118115
if field is not None and multi:
119116
arguments.append('-explodecollections')
120117

121-
if len(options) > 0:
118+
if options is not None and len(options.strip()) > 0:
122119
arguments.append(options)
123120

124121
commands = []

‎python/plugins/processing/algs/gdal/ogr2ogrbuffer.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from processing.core.parameters import ParameterVector
2929
from processing.core.parameters import ParameterString
30+
from processing.core.parameters import ParameterNumber
3031
from processing.core.parameters import ParameterBoolean
3132
from processing.core.parameters import ParameterTableField
3233
from processing.core.outputs import OutputVector
@@ -59,8 +60,10 @@ def defineCharacteristics(self):
5960
self.addParameter(ParameterString(self.GEOMETRY,
6061
self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
6162
'geometry', optional=False))
62-
self.addParameter(ParameterString(self.DISTANCE,
63-
self.tr('Buffer distance'), '1000', optional=False))
63+
self.addParameter(ParameterNumber(self.DISTANCE,
64+
self.tr('Buffer distance'),
65+
0.0, 99999999.999999, 1000.0,
66+
optional=False))
6467
self.addParameter(ParameterBoolean(self.DISSOLVEALL,
6568
self.tr('Dissolve all results'), False))
6669
self.addParameter(ParameterTableField(self.FIELD,
@@ -93,7 +96,6 @@ def getConsoleCommands(self):
9396
arguments = []
9497
arguments.append(output)
9598
arguments.append(ogrLayer)
96-
arguments.append(ogrLayerName(inLayer))
9799
arguments.append('-dialect')
98100
arguments.append('sqlite')
99101
arguments.append('-sql')
@@ -111,7 +113,7 @@ def getConsoleCommands(self):
111113
if field is not None and multi:
112114
arguments.append('-explodecollections')
113115

114-
if len(options) > 0:
116+
if options is not None and len(options) > 0:
115117
arguments.append(options)
116118

117119
commands = []
@@ -124,4 +126,4 @@ def getConsoleCommands(self):
124126
return commands
125127

126128
def commandName(self):
127-
return "ogr2ogr"
129+
return 'ogr2ogr'

‎python/plugins/processing/algs/gdal/ogr2ogrdissolve.py‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -85,52 +85,56 @@ def defineCharacteristics(self):
8585

8686
def getConsoleCommands(self):
8787
inLayer = self.getParameterValue(self.INPUT_LAYER)
88-
ogrLayer = ogrConnectionString(inLayer)[1:-1]
89-
layername = "'" + ogrLayerName(inLayer) + "'"
90-
geometry = str(self.getParameterValue(self.GEOMETRY))
91-
field = str(self.getParameterValue(self.FIELD))
92-
statsatt = str(self.getParameterValue(self.STATSATT))
93-
stats = self.getParameterValue(self.STATS)
94-
area = self.getParameterValue(self.AREA)
88+
geometry = self.getParameterValue(self.GEOMETRY)
89+
field = self.getParameterValue(self.FIELD)
9590
multi = self.getParameterValue(self.MULTI)
96-
count = self.getParameterValue(self.COUNT)
9791
fields = self.getParameterValue(self.FIELDS)
98-
querystart = '-dialect sqlite -sql "SELECT ST_Union(' + geometry + ')'
99-
queryend = ' FROM ' + layername + ' GROUP BY ' + field + '"'
100-
if fields:
101-
queryfields = ",*"
102-
else:
103-
queryfields = "," + field
104-
if count:
105-
querycount = ", COUNT(" + geometry + ") AS count"
106-
else:
107-
querycount = ""
108-
if stats:
109-
querystats = ", SUM(" + statsatt + ") AS sum_diss, MIN(" + statsatt + ") AS min_diss, MAX(" + statsatt + ") AS max_diss, AVG(" + statsatt + ") AS avg_diss"
110-
else:
111-
querystats = ""
112-
if area:
113-
queryarea = ", SUM(ST_area(" + geometry + ")) AS area_diss, ST_perimeter(ST_union(" + geometry + ")) AS peri_diss"
114-
else:
115-
queryarea = ""
92+
count = self.getParameterValue(self.COUNT)
93+
area = self.getParameterValue(self.AREA)
94+
stats = self.getParameterValue(self.STATS)
95+
statsatt = self.getParameterValue(self.STATSATT)
96+
options = self.getParameterValue(self.OPTIONS)
97+
98+
ogrLayer = ogrConnectionString(inLayer)[1:-1]
99+
layername = ogrLayerName(inLayer)
116100

117-
query = querystart + queryfields + querycount + querystats + queryarea + queryend
118101
output = self.getOutputFromName(self.OUTPUT_LAYER)
119102
outFile = output.value
120103

121104
output = ogrConnectionString(outFile)
122-
options = str(self.getParameterValue(self.OPTIONS))
123105

124106
arguments = []
125107
arguments.append(output)
126108
arguments.append(ogrLayer)
127-
arguments.append(ogrLayerName(inLayer))
128-
arguments.append(query)
109+
arguments.append('-dialect')
110+
arguments.append('sqlite')
111+
arguments.append('-sql')
112+
113+
sql = "SELECT ST_Union('{}')".format(geometry)
114+
115+
sqlOpts = ''
116+
if fields:
117+
sqlOpts += ',*'
118+
else:
119+
sqlOpts += ',{}'.format(field)
120+
121+
if count:
122+
sqlOpts += ", COUNT('{}') AS count".format(geometry)
123+
124+
if stats:
125+
sqlOpts += ", SUM('{0}') AS sum_diss, MIN('{0}') AS min_diss, MAX('{0}') AS max_diss, AVG('{0}') AS avg_diss".format(statsatt)
126+
127+
if area:
128+
sqlOpts += ", SUM(ST_Area('{0}')) AS area_diss, ST_Perimeter(ST_Union('{0}')) AS peri_diss".format(geometry)
129+
130+
sql = '{}{} FROM {} GROUP BY {}'.format(sql, sqlOpts, layername, field)
131+
132+
arguments.append(sql)
129133

130134
if not multi:
131135
arguments.append('-explodecollections')
132136

133-
if len(options) > 0:
137+
if options is not None and len(options) > 0:
134138
arguments.append(options)
135139

136140
commands = []
@@ -143,4 +147,4 @@ def getConsoleCommands(self):
143147
return commands
144148

145149
def commandName(self):
146-
return "ogr2ogr"
150+
return 'ogr2ogr'

‎python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ def getConsoleCommands(self):
8080
arguments = []
8181
arguments.append(output)
8282
arguments.append(ogrLayer)
83-
arguments.append(ogrLayerName(inLayer))
8483

8584
arguments.append('-dialect sqlite -sql "SELECT ST_Line_Interpolate_Point(')
8685
arguments.append(geometry)

‎python/plugins/processing/algs/gdal/onesidebuffer.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from processing.core.parameters import ParameterVector
2929
from processing.core.parameters import ParameterString
30+
from processing.core.parameters import ParameterNumber
3031
from processing.core.parameters import ParameterBoolean
3132
from processing.core.parameters import ParameterTableField
3233
from processing.core.parameters import ParameterSelection
@@ -62,8 +63,10 @@ def defineCharacteristics(self):
6263
self.addParameter(ParameterString(self.GEOMETRY,
6364
self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
6465
'geometry', optional=False))
65-
self.addParameter(ParameterString(self.RADIUS,
66-
self.tr('Buffer distance'), '1000', optional=False))
66+
self.addParameter(ParameterNumber(self.RADIUS,
67+
self.tr('Buffer distance'),
68+
0.0, 99999999.999999, 1000.0,
69+
optional=False))
6770
self.addParameter(ParameterSelection(self.LEFTRIGHT,
6871
self.tr('Buffer side'), self.LEFTRIGHTLIST, 0))
6972
self.addParameter(ParameterBoolean(self.DISSOLVEALL,
@@ -100,7 +103,6 @@ def getConsoleCommands(self):
100103
arguments = []
101104
arguments.append(output)
102105
arguments.append(ogrLayer)
103-
arguments.append(layername)
104106
arguments.append('-dialect')
105107
arguments.append('sqlite')
106108
arguments.append('-sql')
@@ -118,7 +120,7 @@ def getConsoleCommands(self):
118120
if field is not None and multi:
119121
arguments.append('-explodecollections')
120122

121-
if len(options) > 0:
123+
if options is not None and len(options.strip()) > 0:
122124
arguments.append(options)
123125

124126
commands = []

‎python/plugins/processing/algs/grass/GrassUtils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ def checkGrassIsInstalled(ignorePreviousState=False):
383383
points(),
384384
False,
385385
False,
386-
'270778.60198,270855.745301,4458921.97814,4458983.8488',
386+
'None',
387387
-1,
388388
0.0001,
389389
0,

‎python/plugins/processing/algs/grass7/Grass7Utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ def checkGrass7IsInstalled(ignorePreviousState=False):
363363
points(),
364364
False,
365365
False,
366-
'270778.60198,270855.745301,4458921.97814,4458983.8488',
366+
'None',
367367
-1,
368368
0.0001,
369369
0,

‎python/plugins/processing/tests/AlgorithmsTestBase.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ def test_algorithms(self):
7575
This is the main test function. All others will be executed based on the definitions in testdata/algorithm_tests.yaml
7676
"""
7777
ver = processing.version()
78-
print("Processing {}.{}.{}".format(ver / 10000, ver / 100 % 100, ver % 100))
7978
with open(os.path.join(processingTestDataPath(), self.test_definition_file()), 'r') as stream:
8079
algorithm_tests = yaml.load(stream)
8180

0 commit comments

Comments
 (0)