Commit 403f1ba9 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Bugfix for not silencing GeoArray.reproject_to_new_grid() in quit mode

io.raster.GeoArray:
- reproject_to_new_grid(). bugfig for not passfing q to warp_ndarray
- mask_nodata(): bugfix for not passing progress and quiet mode to mask GeoArray
- mask_baddata(): bugfix for not passing progress and quiet mode to mask GeoArray
parent abefb430
......@@ -347,7 +347,7 @@ class GeoArray(object):
"""
if mask is not None:
geoArr_mask = NoDataMask(mask)
geoArr_mask = NoDataMask(mask, progress=self.progress, q=self.q)
geoArr_mask.gt = geoArr_mask.gt if geoArr_mask.gt not in [None, [0, 1, 0, 0, 0, -1]] else self.gt
geoArr_mask.prj = geoArr_mask.prj if geoArr_mask.prj is None else self.prj
imName = "the %s '%s'" %(self.__class__.__name__, self.basename)
......@@ -382,7 +382,7 @@ class GeoArray(object):
"""
if mask is not None:
geoArr_mask = BadDataMask(mask)
geoArr_mask = BadDataMask(mask, progress=self.progress, q=self.q)
geoArr_mask.gt = geoArr_mask.gt if geoArr_mask.gt not in [None, [0, 1, 0, 0, 0, -1]] else self.gt
geoArr_mask.prj = geoArr_mask.prj if geoArr_mask.prj is None else self.prj
imName = "the %s '%s'" %(self.__class__.__name__, self.basename)
......@@ -1103,7 +1103,8 @@ class GeoArray(object):
rspAlg = rspAlg,
in_nodata = self.nodata,
CPUs = None,# if self.mp else 1, # TODO
progress = self.progress)
progress = self.progress,
q = self.q)
if hasattr(self, '_mask_nodata') and self._mask_nodata is not None:
self.mask_nodata.reproject_to_new_grid(prototype = prototype,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment