Merge pull request #78 from fxjung/master

Fix zoom level argument of mercantile.tiles()

mercantile/__init__.py

@@ -1,6 +1,7 @@
 """Web mercator XYZ tile utilities"""
 
 from collections import namedtuple
+from collections import Sequence
 import math
 
 
@@ -314,6 +315,9 @@ def tiles(west, south, east, north, zooms, truncate=False):
         e = min(180.0, e)
         n = min(85.051129, n)
 
+        if not isinstance(zooms, Sequence):
+            zooms = [zooms]
+
         for z in zooms:
             ll = tile(w, s, z)
             ur = tile(e, n, z)

tests/test_funcs.py

@@ -113,6 +113,14 @@ def test_tiles():
     assert sorted(tiles) == sorted(expect)
 
 
+def test_tiles_single_zoom():
+    bounds = (-105, 39.99, -104.99, 40)
+    tiles = list(mercantile.tiles(*bounds, zooms=14))
+    expect = [mercantile.Tile(x=3413, y=6202, z=14),
+              mercantile.Tile(x=3413, y=6203, z=14)]
+    assert sorted(tiles) == sorted(expect)
+
+
 def test_tiles_truncate():
     """Input is truncated"""
     assert list(mercantile.tiles(-181.0, 0.0, -170.0, 10.0, zooms=[2], truncate=True)) \