Merge pull request #26 from mapbox/upgrayedd

[WIP] updates for rasterio 1.0 and python 3

Author: dnomadb

circle.yml

@@ -1,21 +1,17 @@
-machine:
-    python:
-        version: 2.7.11
-
 dependencies:
     pre:
         - sudo add-apt-repository -y ppa:ubuntugis/ppa
         - sudo apt-get update
         - sudo apt-get -y --no-install-recommends --force-yes install python-numpy libgdal1h gdal-bin libgdal-dev
     override:
+        - pip install tox tox-pyenv
+        - pyenv local 2.7.10 3.4.3 3.5.0
         - pip install -U pip
         - pip install numpy
         - pip install -r requirements.txt
         - pip install -e ".[test]"
 
 test:
-    override:
-        - py.test --cov raster_tester --cov-report term-missing --ignore=venv
     post:
         - codecov -t afb96efd-4a17-4272-a1bf-33317cad5462
         - codecov

raster_tester/aligned.py

@@ -6,7 +6,7 @@ def tiled(sources, equal_blocks=True):
     optionally assert that their block sizes are equal (default: True)
     """
     blocksize = None
-    with rasterio.drivers():
+    with rasterio.Env():
         for source in sources:
             with rasterio.open(source) as src:
 
@@ -32,7 +32,7 @@ def aligned(sources):
     """
     atransform = None
     shape = None
-    with rasterio.drivers():
+    with rasterio.Env():
         for source in sources:
             with rasterio.open(source) as src:
 

raster_tester/compare.py

@@ -4,7 +4,11 @@
 import click
 import numpy as np
 import rasterio
-from rasterio.warp import reproject, RESAMPLING
+from rasterio.warp import reproject
+try:
+    from rasterio.warp import RESAMPLING
+except ImportError:
+    from rasterio.enums import Resampling as RESAMPLING
 from rasterio.coords import BoundingBox
 
 from .utils import exception_raiser
@@ -58,8 +62,8 @@ def make_fill_array(height, width, downsample, dtype):
 def compare_properties(src1, src2, properties, tol=1e-6):
     noMatch = []
     for prop in properties:
-        a = src1.__getattribute__(prop)
-        b = src2.__getattribute__(prop)
+        a = getattr(src1, prop)
+        b = getattr(src2, prop)
         equal = True
         if isinstance(a, BoundingBox) and isinstance(b, BoundingBox):
             for coord_a, coord_b in zip(tuple(a), tuple(b)):
@@ -89,91 +93,92 @@ def compare_properties(src1, src2, properties, tol=1e-6):
 
 def compare(srcpath1, srcpath2, max_px_diff=0, upsample=1, downsample=1,
             compare_masked=True, no_stderr=False, debug=False, flex_mode=False):
-    with rasterio.open(srcpath1) as src1:
-        with rasterio.open(srcpath2) as src2:
-
-            count1 = src1.count
-            count2 = src2.count
-            compareAlpha = 1
-
-            if flex_mode and [count1, count2].count(3) != 0:
-                props = ['crs', 'driver', 'bounds', 'height', 'width', 'shape']
-                if src1.count * src2.count != 12 or src1.count + src2.count != 7:
-                    exception_raiser(
-                        "In flex mode, %s and %s must 3 and 4, or 4 and 3 bands "
-                        "respectively (received %s and %s)" % (
-                            srcpath1, srcpath2, src1.count, src2.count), no_stderr)
-            else:
-                props = ['count', 'crs', 'dtypes', 'driver', 'bounds',
-                         'height', 'width', 'shape', 'nodatavals']
-            propCompare = compare_properties(src1, src2, props)
-
-            if propCompare:
-                exception_raiser(propCompare, no_stderr)
-
-            if compare_masked and src1.count == 4 and not flex_mode:
-                # create arrays for decimated reading
-                masked_1 = make_fill_array(
-                    src1.height, src1.width, downsample, src1.meta['dtype'])
-                masked_2 = make_fill_array(
-                    src2.height, src2.width, downsample, src2.meta['dtype'])
-
-                src1.read(4, out=masked_1, masked=False)
-                src2.read(4, out=masked_2, masked=False)
-                compareAlpha = 0
-                difference, aboveThreshold = array_compare(
-                    masked_1, masked_2, 16, max_px_diff, debug)
-
-                if aboveThreshold:
-                    exception_raiser(
-                        'Mask has %s pixels that vary by more than 16' % (difference), no_stderr)
-
-            elif compare_masked and flex_mode:
-                masked_1 = make_fill_array(
-                    src1.height, src1.width, downsample, src1.meta['dtype'])
-                masked_2 = make_fill_array(
-                    src2.height, src2.width, downsample, src2.meta['dtype'])
-
-                src1.read_masks(1, out=masked_1)
-                src2.read_masks(1, out=masked_2)
-                compareAlpha = 0
-
-                difference, aboveThreshold = array_compare(
-                    masked_1, masked_2, 16, max_px_diff, debug)
-
-                if aboveThreshold:
-                    exception_raiser(
-                        'Mask has %s pixels that vary by more than 16' % (difference),
-                        no_stderr)
-
-            for bidx in range(1, count1 + compareAlpha):
-                # create arrays for decimated reading
-                band1 = make_fill_array(
-                    src1.height, src1.width, downsample, src1.meta['dtype'])
-                band2 = make_fill_array(
-                    src2.height, src2.width, downsample, src2.meta['dtype'])
-
-                src1.read(bidx, out=band1, masked=False)
-                band1 = band1.astype(np.int16)
-
-                src2.read(bidx, out=band2, masked=False)
-                band2 = band2.astype(np.int16)
-
-                if compare_masked and src1.count == 4:
-                    band1[masked_1 != 255] = 0
-                    band2[masked_1 != 255] = 0
-
-                if upsample > 1:
-                    toAff, frAff = affaux(upsample)
-                    band1 = upsample_array(band1, upsample, frAff, toAff)
-                    band2 = upsample_array(band2, upsample, frAff, toAff)
-
-                difference, aboveThreshold = array_compare(
-                    band1, band2, 16, max_px_diff, debug)
-
-                if aboveThreshold:
-                    exception_raiser('Band %s has %s pixels that vary by more than 16' % (
-                        bidx, difference), no_stderr)
+    with rasterio.Env(GTIFF_IMPLICIT_JPEG_OVR=False):
+        with rasterio.open(srcpath1) as src1:
+            with rasterio.open(srcpath2) as src2:
+
+                count1 = src1.count
+                count2 = src2.count
+                compareAlpha = 1
+
+                if flex_mode and [count1, count2].count(3) != 0:
+                    props = ['crs', 'driver', 'bounds', 'height', 'width', 'shape']
+                    if src1.count * src2.count != 12 or src1.count + src2.count != 7:
+                        exception_raiser(
+                            "In flex mode, %s and %s must 3 and 4, or 4 and 3 bands "
+                            "respectively (received %s and %s)" % (
+                                srcpath1, srcpath2, src1.count, src2.count), no_stderr)
+                else:
+                    props = ['count', 'crs', 'dtypes', 'driver', 'bounds',
+                            'height', 'width', 'shape', 'nodatavals']
+                propCompare = compare_properties(src1, src2, props)
+
+                if propCompare:
+                    exception_raiser(propCompare, no_stderr)
+
+                if compare_masked and src1.count == 4 and not flex_mode:
+                    # create arrays for decimated reading
+                    masked_1 = make_fill_array(
+                        src1.height, src1.width, downsample, src1.meta['dtype'])
+                    masked_2 = make_fill_array(
+                        src2.height, src2.width, downsample, src2.meta['dtype'])
+
+                    src1.read(4, out=masked_1, masked=False)
+                    src2.read(4, out=masked_2, masked=False)
+                    compareAlpha = 0
+                    difference, aboveThreshold = array_compare(
+                        masked_1, masked_2, 16, max_px_diff, debug)
+
+                    if aboveThreshold:
+                        exception_raiser(
+                            'Mask has %s pixels that vary by more than 16' % (difference), no_stderr)
+
+                elif compare_masked and flex_mode:
+                    masked_1 = make_fill_array(
+                        src1.height, src1.width, downsample, src1.meta['dtype'])
+                    masked_2 = make_fill_array(
+                        src2.height, src2.width, downsample, src2.meta['dtype'])
+
+                    src1.read_masks(1, out=masked_1)
+                    src2.read_masks(1, out=masked_2)
+                    compareAlpha = 0
+
+                    difference, aboveThreshold = array_compare(
+                        masked_1, masked_2, 16, max_px_diff, debug)
+
+                    if aboveThreshold:
+                        exception_raiser(
+                            'Mask has %s pixels that vary by more than 16' % (difference),
+                            no_stderr)
+
+                for bidx in range(1, count1 + compareAlpha):
+                    # create arrays for decimated reading
+                    band1 = make_fill_array(
+                        src1.height, src1.width, downsample, src1.meta['dtype'])
+                    band2 = make_fill_array(
+                        src2.height, src2.width, downsample, src2.meta['dtype'])
+
+                    src1.read(bidx, out=band1, masked=False)
+                    band1 = band1.astype(np.int16)
+
+                    src2.read(bidx, out=band2, masked=False)
+                    band2 = band2.astype(np.int16)
+
+                    if compare_masked and src1.count == 4:
+                        band1[masked_1 != 255] = 0
+                        band2[masked_1 != 255] = 0
+
+                    if upsample > 1:
+                        toAff, frAff = affaux(upsample)
+                        band1 = upsample_array(band1, upsample, frAff, toAff)
+                        band2 = upsample_array(band2, upsample, frAff, toAff)
+
+                    difference, aboveThreshold = array_compare(
+                        band1, band2, 16, max_px_diff, debug)
+
+                    if aboveThreshold:
+                        exception_raiser('Band %s has %s pixels that vary by more than 16' % (
+                            bidx, difference), no_stderr)
 
     click.echo("ok - %s is similar to within %s pixels of %s" %
                (srcpath1, max_px_diff, srcpath2))

raster_tester/crosses_dateline.py

@@ -2,6 +2,21 @@
 from rasterio import warp
 import numpy as np
 
+def _wrap_x_coord(xcoords):
+    '''
+    Wraps longitude coords beyond -180 / 180
+
+    Parameters
+    -----------
+    xcoords: ndarray or value
+        coordinate or coordinates to wrap.
+
+    Returns
+    --------
+    wrapped: ndarray or value
+        wrapped coordinate(s)
+    '''
+    return ((xcoords + 180) % 360) - 180
 
 def winding_order(boundsArr):
     '''
@@ -48,11 +63,16 @@ def transform_bounds(boundsArr, crs):
     if not crs:
         raise ValueError('Input raster must have a CRS')
 
-    return np.dstack(warp.transform(
-            crs,
-            {'init': 'epsg:4326'},
-            boundsArr[:, 0],
-            boundsArr[:, 1]))[0]
+    if 'init' in crs and crs['init'] == 'epsg:4326':
+        boundsArr[:, 0] = _wrap_x_coord(boundsArr[:, 0])
+    else:
+        boundsArr = np.dstack(warp.transform(
+                crs,
+                {'init': 'epsg:4326'},
+                boundsArr[:, 0],
+                boundsArr[:, 1]))[0]
+
+    return boundsArr
 
 
 def crosses_dateline(fpath):