Skip to content

Commit 255d510

Browse files
committed
[processing] use complex delimiter for interpolation data to avoid
overlaps with charactes which can be used in the layers source URI (fix #20490) (cherry picked from commit 17fd86e)
1 parent 3de1550 commit 255d510

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def processAlgorithm(self, parameters, context, feedback):
129129

130130
layerData = []
131131
layers = []
132-
for row in interpolationData.split(';'):
132+
for row in interpolationData.split('::|::'):
133133
v = row.split('::~::')
134134
data = QgsInterpolator.LayerData()
135135

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def processAlgorithm(self, parameters, context, feedback):
145145
layerData = []
146146
layers = []
147147
crs = QgsCoordinateReferenceSystem()
148-
for row in interpolationData.split(';'):
148+
for row in interpolationData.split('::|::'):
149149
v = row.split('::~::')
150150
data = QgsInterpolator.LayerData()
151151

python/plugins/processing/algs/qgis/ui/InterpolationWidgets.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ def value(self):
203203
else:
204204
inputType = QgsInterpolator.SourceBreakLines
205205

206-
layers += '{}::~::{:d}::~::{:d}::~::{:d};'.format(layer.source(),
207-
interpolationSource,
208-
fieldIndex,
209-
inputType)
206+
layers += '{}::~::{:d}::~::{:d}::~::{:d}::|::'.format(layer.source(),
207+
interpolationSource,
208+
fieldIndex,
209+
inputType)
210210
return layers[:-1]
211211

212212

0 commit comments

Comments
 (0)