Resolve #1459

CHANGES.txt

@@ -1,11 +1,12 @@
 Changes
 =======
 
-1.0.4 (2018-09-17)
+1.0.4 (2018-09-14)
 ------------------
 
 Bug fixes:
 
+- A y-directional error in disjoint_bounds (#1459) has been fixed.
 - Missing --aws-no-sign-requests and --aws-requester-pays options added to
   the main rio command (#1460).
 - Add missing bilinear, cubic spline, lanczos resampling modes for overviews

rasterio/__init__.py

@@ -43,7 +43,7 @@ import rasterio.path
 
 
 __all__ = ['band', 'open', 'pad', 'Env']
-__version__ = "1.0.3"
+__version__ = "1.0.4"
 __gdal_version__ = gdal_version()
 
 # Rasterio attaches NullHandler to the 'rasterio' logger and its

rasterio/coords.py

@@ -52,7 +52,7 @@ def disjoint_bounds(bounds1, bounds2):
 
     if bounds1_north_up:
         return (bounds1[0] > bounds2[2] or bounds2[0] > bounds1[2] or
-                bounds1[1] > bounds2[3] or bounds2[1] > bounds2[3])
+                bounds1[1] > bounds2[3] or bounds2[1] > bounds1[3])
     else:
         return (bounds1[0] > bounds2[2] or bounds2[0] > bounds1[2] or
-                bounds1[3] > bounds2[1] or bounds2[3] > bounds2[1])
+                bounds1[3] > bounds2[1] or bounds2[3] > bounds1[1])

tests/test_coords.py

@@ -1,23 +1,41 @@
-import rasterio
 import numpy as np
 
+import rasterio
+from rasterio.coords import BoundingBox, disjoint_bounds
+
+
 def test_bounds():
     with rasterio.open('tests/data/RGB.byte.tif') as src:
         assert src.bounds == (101985.0, 2611485.0, 339315.0, 2826915.0)
 
+
 def test_ul():
     with rasterio.open('tests/data/RGB.byte.tif') as src:
         assert src.xy(0, 0, offset='ul') == (101985.0, 2826915.0)
         assert src.xy(1, 0, offset='ul') == (101985.0, 2826614.95821727)
         assert src.xy(src.height, src.width, offset='ul') == (339315.0, 2611485.0)
 
+
 def test_res():
     with rasterio.open('tests/data/RGB.byte.tif') as src:
         assert tuple(round(v, 6) for v in src.res) == (300.037927, 300.041783)
 
+
 def test_rotated_bounds():
     with rasterio.open('tests/data/rotated.tif') as src:
         assert src.res == (20.0, 10.0)
         np.testing.assert_almost_equal(
             src.bounds,
             (100.0, 70.0961894323342, 348.20508075688775, 300.0))
+
+
+def test_disjoint_bounds_issue1459():
+    a = BoundingBox(left=478038, bottom=57155, right=703888, top=266344)
+    b = BoundingBox(left=584184, bottom=469629, right=740727, top=626172)
+    assert disjoint_bounds(a, b)
+
+
+def test_disjoint_bounds_issue1459_south_up():
+    a = BoundingBox(left=0.0, bottom=1.0, right=1.0, top=0.0)
+    b = BoundingBox(left=0.0, bottom=2.0, right=1.0, top=1.01)
+    assert disjoint_bounds(a, b)