Do not pass None to len()

This commit is contained in:
Sandro Santilli 2016-10-20 10:51:07 +02:00
parent 06976a2e87
commit 7971815343

View File

@ -143,13 +143,13 @@ class warp(GdalAlgorithm):
arguments = [] arguments = []
arguments.append('-ot') arguments.append('-ot')
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)]) arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
if len(srccrs) > 0: if srccrs:
arguments.append('-s_srs') arguments.append('-s_srs')
arguments.append(srccrs) arguments.append(srccrs)
if len(dstcrs) > 0: if dstcrs:
arguments.append('-t_srs') arguments.append('-t_srs')
arguments.append(dstcrs) arguments.append(dstcrs)
if noData and len(noData) > 0: if noData:
arguments.append('-dstnodata') arguments.append('-dstnodata')
arguments.append(noData) arguments.append(noData)
arguments.append('-r') arguments.append('-r')
@ -165,21 +165,19 @@ class warp(GdalAlgorithm):
extra = self.getParameterValue(self.EXTRA) extra = self.getParameterValue(self.EXTRA)
if extra is not None: if extra is not None:
extra = str(extra) extra = str(extra)
regionCoords = rastext.split(',') if rastext:
try: regionCoords = rastext.split(',')
rastext = [] if len(regionCoords) >= 4:
rastext.append('-te') arguments.append('-te')
rastext.append(regionCoords[0]) arguments.append(regionCoords[0])
rastext.append(regionCoords[2]) arguments.append(regionCoords[2])
rastext.append(regionCoords[1]) arguments.append(regionCoords[1])
rastext.append(regionCoords[3]) arguments.append(regionCoords[3])
except IndexError:
rastext = []
if GdalUtils.version() >= 2000000: if GdalUtils.version() >= 2000000:
if rastext and rastext_crs: if rastext_crs:
arguments.append('-te_srs') arguments.append('-te_srs')
arguments.append(rastext_crs) arguments.append(rastext_crs)
if extra and len(extra) > 0: if extra and len(extra) > 0:
arguments.append(extra) arguments.append(extra)