sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing][gdal] Fix escaping of delimiter parameter in retile

Browse Source 
algorithm
This commit is contained in:
Nyall Dawson 2021-02-26 11:50:51 +10:00
parent 0a6436402d
commit 33b0dbe761
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/algs/gdal/retile.py
View File

@ -208,7 +208,7 @@ class retile(GdalAlgorithm):
delimiter = self.parameterAsString(parameters, self.DELIMITER, context)
if delimiter:
arguments.append('-csvDelim')
arguments.append('"{}"'.format(delimiter))
arguments.append(delimiter)
arguments.append('-targetDir')
arguments.append(self.parameterAsString(parameters, self.OUTPUT, context))

18
python/plugins/processing/tests/GdalAlgorithmsRasterTest.py
View File

@ -1715,6 +1715,24 @@ class TestGdalRasterAlgorithms(unittest.TestCase, AlgorithmsTestBase.AlgorithmsT
'-ps 256 256 -overlap 0 -levels 1 -s_srs EPSG:3111 -r near -ot Float32 -targetDir {} {}'.format(outdir, source)
])
self.assertEqual(
alg.getConsoleCommands({'INPUT': [source],
'OUTPUT_CSV': 'out.csv',
'DELIMITER': '',
'OUTPUT': outdir}, context, feedback),
['gdal_retile.py',
'-ps 256 256 -overlap 0 -levels 1 -r near -ot Float32 -csv out.csv -targetDir {} '.format(outdir) +
source])
self.assertEqual(
alg.getConsoleCommands({'INPUT': [source],
'OUTPUT_CSV': 'out.csv',
'DELIMITER': ';',
'OUTPUT': outdir}, context, feedback),
['gdal_retile.py',
'-ps 256 256 -overlap 0 -levels 1 -r near -ot Float32 -csv out.csv -csvDelim ";" -targetDir {} '.format(outdir) +
source])
# additional parameters
self.assertEqual(
alg.getConsoleCommands({'INPUT': [source],