Revert "Add missing overview resampling algorithms" (#1463)

* Revert "Revert "Use InMemoryRaster to remove duplicate code." (#1461)"

This reverts commit 295e089.

* Revert "Note refactoring"

This reverts commit 11ad6fe.

* Revert "Use InMemoryRaster to remove duplicate code. (#1427)"

This reverts commit 9e1eb3b.

* Revert "Add missing overview resampling algorithms (#1458)"

This reverts commit 6c11627.

CHANGES.txt

@@ -1,19 +1,6 @@
 Changes
 =======
 
-Next
-----
-
-Bug fixes:
-
-- Add missing bilinear, cubic spline, lanczos resampling modes for overviews
-  (#1457).
-
-Refactoring:
-
-- Use of InMemoryRaster eliminates redundant code in the _warp module (#1427,
-  #816).
-
 1.0.3.post1 (2018-09-07)
 ------------------------
 

rasterio/__init__.py

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

rasterio/_io.pyx

@@ -1540,10 +1540,7 @@ cdef class DatasetWriterBase(DatasetReaderBase):
             # (no corresponding member in the warp enum).
             resampling_map = {
                 0: 'NEAREST',
-                1: 'BILINEAR',
                 2: 'CUBIC',
-                3: 'CUBICSPLINE',
-                4: 'LANCZOS',
                 5: 'AVERAGE',
                 6: 'MODE',
                 7: 'GAUSS'}

rasterio/rio/overview.py

@@ -38,7 +38,7 @@ def build_handler(ctx, param, value):
               is_flag=True, default=False)
 @click.option('--resampling', help="Resampling algorithm.",
               type=click.Choice(
-                  [it.name for it in Resampling if it.value in [0, 1, 2, 3, 4, 5, 6, 7]]),
+                  [it.name for it in Resampling if it.value in [0, 2, 5, 6, 7]]),
               default='nearest', show_default=True)
 @click.pass_context
 def overview(ctx, input, build, ls, rebuild, resampling):

tests/test_overviews.py

@@ -8,9 +8,9 @@
 
 import rasterio
 from rasterio.enums import Resampling
-from rasterio.env import GDALVersion
 
-gdal_version = GDALVersion()
+
+logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
 
 
 def test_count_overviews_zero(data):
@@ -40,18 +40,6 @@ def test_build_overviews_two(data):
         assert src.overviews(2) == [2, 4]
         assert src.overviews(3) == [2, 4]
 
-@pytest.mark.xfail(
-    gdal_version < GDALVersion.parse('2.0'),
-    reason="Bilinear resampling not supported by GDAL < 2.0")
-def test_build_overviews_bilinear(data):
-    inputfile = str(data.join('RGB.byte.tif'))
-    with rasterio.open(inputfile, 'r+') as src:
-        overview_factors = [2, 4]
-        src.build_overviews(overview_factors, resampling=Resampling.bilinear)
-        assert src.overviews(1) == [2, 4]
-        assert src.overviews(2) == [2, 4]
-        assert src.overviews(3) == [2, 4]
-
 
 def test_build_overviews_average(data):
     inputfile = str(data.join('RGB.byte.tif'))