Skip to content

Commit 1e1fa18

Browse files
committed
[processing] don't apply additional parameter if offset curve operation is used (fix #15342)
(cherry picked from commit 1d2b0b4)
1 parent e7d7560 commit 1e1fa18

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

python/plugins/processing/algs/gdal/ogr2ogronesidebuffer.py

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def getConsoleCommands(self):
8585
inLayer = self.getParameterValue(self.INPUT_LAYER)
8686
ogrLayer = ogrConnectionString(inLayer)[1:-1]
8787
layername = "'" + ogrLayerName(inLayer) + "'"
88-
operation = self.OPERATIONLIST[self.getParameterValue(self.OPERATION)]
88+
operation = self.getParameterValue(self.OPERATION)
8989
geometry = unicode(self.getParameterValue(self.GEOMETRY))
9090
distance = unicode(self.getParameterValue(self.RADIUS))
9191
leftright = self.LEFTRIGHTLIST[self.getParameterValue(self.LEFTRIGHT)]
@@ -104,12 +104,12 @@ def getConsoleCommands(self):
104104
arguments.append(ogrLayer)
105105
arguments.append(ogrLayerName(inLayer))
106106
if dissolveall or field != 'None':
107-
if operation == 'Single Side Buffer':
107+
if operation == 0:
108108
arguments.append('-dialect sqlite -sql "SELECT ST_Union(ST_SingleSidedBuffer(')
109109
else:
110110
arguments.append('-dialect sqlite -sql "SELECT ST_Union(ST_OffsetCurve(')
111111
else:
112-
if operation == 'Single Side Buffer':
112+
if operation == 0:
113113
arguments.append('-dialect sqlite -sql "SELECT ST_SingleSidedBuffer(')
114114
else:
115115
arguments.append('-dialect sqlite -sql "SELECT ST_OffsetCurve(')
@@ -118,14 +118,26 @@ def getConsoleCommands(self):
118118
arguments.append(distance)
119119
if dissolveall or field != 'None':
120120
if leftright == 'Left':
121-
arguments.append(',0)),*')
121+
if operation == 0:
122+
arguments.append(',0)),*')
123+
else:
124+
arguments.append(')),*')
122125
else:
123-
arguments.append(',1)),*')
126+
if operation == 0:
127+
arguments.append(',1)),*')
128+
else:
129+
arguments.append(')),*')
124130
else:
125131
if leftright == 'Left':
126-
arguments.append(',0),*')
132+
if operation == 0:
133+
arguments.append(',0),*')
134+
else:
135+
arguments.append('),*')
127136
else:
128-
arguments.append(',1),*')
137+
if operation == 0:
138+
arguments.append(',1),*')
139+
else:
140+
arguments.append('),*')
129141
arguments.append('FROM')
130142
arguments.append(layername)
131143
if field != 'None':

0 commit comments

Comments
 (0)