archive-gh-me/rasterio
1
0
Fork 0
mirror of https://github.com/rasterio/rasterio.git synced 2026-02-01 14:34:43 +00:00
Code Issues Projects Releases Wiki Activity

shuffle around width and height params

Browse Source
This commit is contained in:
Amit Kapadia 2015-07-01 12:18:28 -07:00
parent a5c9a9cae7
commit c51c227459
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rasterio/warp.py
View File

@ -232,12 +232,12 @@ def reproject(
def calculate_default_transform(
src_crs,
dst_crs,
width,
height,
left,
bottom,
right,
top,
width,
height,
resolution=None,
densify_pts=21):
"""

12
tests/test_warp.py
View File

@ -30,7 +30,7 @@ class ReprojectParams(object):
with rasterio.drivers():
dt, dw, dh = calculate_default_transform(
src_crs, dst_crs, left, bottom, right, top, width, height)
src_crs, dst_crs, width, height, left, bottom, right, top)
self.dst_transform = dt
self.dst_width = dw
self.dst_height = dh
@ -139,7 +139,7 @@ def test_calculate_default_transform():
l, b, r, t = src.bounds
wgs84_crs = {'init': 'EPSG:4326'}
dst_transform, width, height = calculate_default_transform(
src.crs, wgs84_crs, l, b, r, t, src.width, src.height)
src.crs, wgs84_crs, src.width, src.height, l, b, r, t)
assert dst_transform.almost_equals(target_transform)
assert width == 824
@ -156,8 +156,8 @@ def test_calculate_default_transform_single_resolution():
0.0, -target_resolution, 25.550873767433984
)
dst_transform, width, height = calculate_default_transform(
src.crs, {'init': 'EPSG:4326'}, l, b, r, t, src.width,
src.height, resolution=target_resolution
src.crs, {'init': 'EPSG:4326'}, src.width, src.height,
l, b, r, t, resolution=target_resolution
)
assert dst_transform.almost_equals(target_transform)
@ -176,8 +176,8 @@ def test_calculate_default_transform_multiple_resolutions():
)
dst_transform, width, height = calculate_default_transform(
src.crs, {'init': 'EPSG:4326'}, l, b, r, t, src.width,
src.height, resolution=target_resolution
src.crs, {'init': 'EPSG:4326'}, src.width, src.height,
l, b, r, t, resolution=target_resolution
)
assert dst_transform.almost_equals(target_transform)