archive-gh-me/rasterio
1
0
Fork 0
mirror of https://github.com/rasterio/rasterio.git synced 2025-12-08 17:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Logic and tests for merge without nodata.

Browse Source 
Closes #240
This commit is contained in:
Sean Gillies 2015-01-07 22:26:38 -07:00
parent 82fe909259
commit fbc3347f73
2 changed files with 69 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rasterio/rio/merge.py
View File

@ -36,31 +36,39 @@ def merge(ctx, files, driver):
with rasterio.open(files[0]) as first:
kwargs = first.meta
kwargs['transform'] = kwargs.pop('affine')
dest = np.empty((first.count,) + first.shape,
dest = np.zeros((first.count,) + first.shape,
dtype=first.dtypes[0])
nodataval = 0.0
if os.path.exists(output):
dst = rasterio.open(output, 'r+')
nodataval = dst.nodatavals[0]
nodataval = dst.nodatavals[0] or nodataval
else:
kwargs['driver'] == driver
dst = rasterio.open(output, 'w', **kwargs)
nodataval = first.nodatavals[0]
nodataval = first.nodatavals[0] or nodataval
dest.fill(nodataval)
if nodataval:
dest.fill(nodataval)
for fname in reversed(files):
with rasterio.open(fname) as src:
data = src.read()
np.copyto(dest, data,
where=np.logical_and(
dest==nodataval, data.mask==False))
try:
where = np.logical_and(
dest==nodataval, data.mask==False)
except AttributeError:
where = dest==nodataval
np.copyto(dest, data, where=where)
if dst.mode == 'r+':
data = dst.read()
np.copyto(dest, data,
where=np.logical_and(
dest==nodataval, data.mask==False))
try:
where = np.logical_and(
dest==nodataval, data.mask==False)
except AttributeError:
where = dest==nodataval
np.copyto(dest, data, where=where)
dst.write(dest)
dst.close()

57
tests/test_rio_merge.py
View File

@ -15,7 +15,7 @@ logging.basicConfig(stream=sys.stderr, level=logging.INFO)
# Fixture to create test datasets within temporary directory
@fixture(scope='function')
def test_data_dir(tmpdir):
def test_data_dir_1(tmpdir):
kwargs = {
"crs": {'init': 'epsg:4326'},
"transform": (-114, 0.2, 0, 46, 0, -0.1),
@ -28,12 +28,13 @@ def test_data_dir(tmpdir):
}
with rasterio.drivers():
with rasterio.open(str(tmpdir.join('one.tif')), 'w', **kwargs) as dst:
with rasterio.open(str(tmpdir.join('a.tif')), 'w', **kwargs) as dst:
data = numpy.zeros((10, 10), dtype=rasterio.uint8)
data[0:6, 0:6] = 255
dst.write_band(1, data)
with rasterio.open(str(tmpdir.join('two.tif')), 'w', **kwargs) as dst:
with rasterio.open(str(tmpdir.join('b.tif')), 'w', **kwargs) as dst:
data = numpy.zeros((10, 10), dtype=rasterio.uint8)
data[4:8, 4:8] = 254
dst.write_band(1, data)
@ -41,9 +42,53 @@ def test_data_dir(tmpdir):
return tmpdir
def test_merge(test_data_dir):
outputname = str(test_data_dir.join('merged.tif'))
inputs = [str(x) for x in test_data_dir.listdir()]
@fixture(scope='function')
def test_data_dir_2(tmpdir):
kwargs = {
"crs": {'init': 'epsg:4326'},
"transform": (-114, 0.2, 0, 46, 0, -0.1),
"count": 1,
"dtype": rasterio.uint8,
"driver": "GTiff",
"width": 10,
"height": 10
}
with rasterio.drivers():
with rasterio.open(str(tmpdir.join('a.tif')), 'w', **kwargs) as dst:
data = numpy.zeros((10, 10), dtype=rasterio.uint8)
data[0:6, 0:6] = 255
dst.write_band(1, data)
with rasterio.open(str(tmpdir.join('b.tif')), 'w', **kwargs) as dst:
data = numpy.zeros((10, 10), dtype=rasterio.uint8)
data[4:8, 4:8] = 254
dst.write_band(1, data)
return tmpdir
def test_merge_with_nodata(test_data_dir_1):
outputname = str(test_data_dir_1.join('merged.tif'))
inputs = [str(x) for x in test_data_dir_1.listdir()]
inputs.sort()
runner = CliRunner()
result = runner.invoke(merge, inputs + [outputname])
assert result.exit_code == 0
assert os.path.exists(outputname)
with rasterio.open(outputname) as out:
assert out.count == 1
data = out.read_band(1, masked=False)
expected = numpy.zeros((10, 10), dtype=rasterio.uint8)
expected[0:6, 0:6] = 255
expected[4:8, 4:8] = 254
assert numpy.all(data == expected)
def test_merge_without_nodata(test_data_dir_2):
outputname = str(test_data_dir_2.join('merged.tif'))
inputs = [str(x) for x in test_data_dir_2.listdir()]
inputs.sort()
runner = CliRunner()
result = runner.invoke(merge, inputs + [outputname])