mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-22 02:02:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #27421 -- Added shape, size, and offset controls to GDALRaster constructor.

Browse source 
Thanks Tim Graham for the review.
This commit is contained in:
Daniel Wiesmann 2016-11-11 12:09:38 +00:00 • committed by Tim Graham
parent 501c993010
commit 2dc07da497
4 changed files with 128 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
django/contrib/gis/gdal/raster/source.py
View file

@ -108,9 +108,22 @@ class GDALRaster(GDALBase):
# Set band data if provided
for i, band_input in enumerate(ds_input.get('bands', [])):
band = self.bands[i]
band.data(band_input['data'])
if 'nodata_value' in band_input:
band.nodata_value = band_input['nodata_value']
# Instantiate band filled with nodata values if only
# partial input data has been provided.
if band.nodata_value is not None and (
'data' not in band_input or
'size' in band_input or
'shape' in band_input):
band.data(data=(band.nodata_value,), shape=(1, 1))
# Set band data values from input.
band.data(
data=band_input.get('data'),
size=band_input.get('size'),
shape=band_input.get('shape'),
offset=band_input.get('offset'),
)
# Set SRID
self.srs = ds_input.get('srid')
@ -339,16 +352,12 @@ class GDALRaster(GDALBase):
if 'datatype' not in ds_input:
ds_input['datatype'] = self.bands[0].datatype()
# Set the number of bands
ds_input['nr_of_bands'] = len(self.bands)
# Instantiate raster bands filled with nodata values.
ds_input['bands'] = [{'nodata_value': bnd.nodata_value} for bnd in self.bands]
# Create target raster
target = GDALRaster(ds_input, write=True)
# Copy nodata values to warped raster
for index, band in enumerate(self.bands):
target.bands[index].nodata_value = band.nodata_value
# Select resampling algorithm
algorithm = GDAL_RESAMPLE_ALGORITHMS[resampling]