Skip to content

Commit abc74b4

Browse files
committedMay 10, 2017
[processing] don't apply -te and -te_srs if not requested (fix #16519)
1 parent 883e4f3 commit abc74b4

File tree

1 file changed

+16
-12
lines changed
  • python/plugins/processing/algs/gdal

1 file changed

+16
-12
lines changed
 

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ class warp(GdalAlgorithm):
5353
METHOD = 'METHOD'
5454
TR = 'TR'
5555
NO_DATA = 'NO_DATA'
56-
RAST_EXT = 'RAST_EXT'
57-
EXT_CRS = 'EXT_CRS'
56+
USE_RASTER_EXTENT = 'USE_RASTER_EXTENT'
57+
RASTER_EXTENT = 'RASTER_EXTENT'
58+
EXTENT_CRS = 'EXTENT_CRS'
5859
RTYPE = 'RTYPE'
5960
OPTIONS = 'OPTIONS'
6061
MULTITHREADING = 'MULTITHREADING'
@@ -95,14 +96,16 @@ def defineCharacteristics(self):
9596
self.addParameter(ParameterSelection(self.METHOD,
9697
self.tr('Resampling method'),
9798
self.METHOD_OPTIONS))
98-
self.addParameter(ParameterExtent(self.RAST_EXT,
99+
self.addParameter(ParameterBoolean(self.USE_RASTER_EXTENT,
100+
self.tr('Set georeferenced extents of output file'),
101+
False
102+
))
103+
self.addParameter(ParameterExtent(self.RASTER_EXTENT,
99104
self.tr('Raster extent'),
100105
optional=True))
101-
102-
self.addParameter(ParameterCrs(self.EXT_CRS,
106+
self.addParameter(ParameterCrs(self.EXTENT_CRS,
103107
self.tr('CRS of the raster extent, leave blank for using Destination SRS'),
104108
optional=True))
105-
106109
self.addParameter(ParameterString(self.OPTIONS,
107110
self.tr('Additional creation options'),
108111
optional=True,
@@ -120,8 +123,9 @@ def defineCharacteristics(self):
120123
def getConsoleCommands(self):
121124
srccrs = self.getParameterValue(self.SOURCE_SRS)
122125
dstcrs = self.getParameterValue(self.DEST_SRS)
123-
rastext = self.getParameterValue(self.RAST_EXT)
124-
rastext_crs = self.getParameterValue(self.EXT_CRS)
126+
useRasterExtent = self.getParameterValue(self.USE_RASTER_EXTENT)
127+
rasterExtent = self.getParameterValue(self.RASTER_EXTENT)
128+
extentCrs = self.getParameterValue(self.EXTENT_CRS)
125129
opts = self.getParameterValue(self.OPTIONS)
126130
noData = self.getParameterValue(self.NO_DATA)
127131
multithreading = self.getParameterValue(self.MULTITHREADING)
@@ -155,18 +159,18 @@ def getConsoleCommands(self):
155159
arguments.append(str(self.getParameterValue(self.TR)))
156160
arguments.append(str(self.getParameterValue(self.TR)))
157161

158-
if rastext:
159-
regionCoords = rastext.split(',')
162+
if useRasterExtent:
163+
regionCoords = rasterExtent.split(',')
160164
if len(regionCoords) >= 4:
161165
arguments.append('-te')
162166
arguments.append(regionCoords[0])
163167
arguments.append(regionCoords[2])
164168
arguments.append(regionCoords[1])
165169
arguments.append(regionCoords[3])
166170

167-
if rastext_crs:
171+
if extentCrs:
168172
arguments.append('-te_srs')
169-
arguments.append(rastext_crs)
173+
arguments.append(extentCrs)
170174

171175
if opts:
172176
arguments.append('-co')

0 commit comments

Comments
 (0)
Please sign in to comment.