fix width/height + update tests

Author: jorisvandenbossche

contextily/tile.py

@@ -335,18 +335,18 @@ def _calculate_zoom(w, s, e, n):
 def _merge_tiles(tiles, arrays):
     # create n_tilesx2 array with column of x and y coordinates
     tile_xys = np.array([(t.x, t.y) for t in tiles])
-    
+
     # get indices starting at zero
     indices = tile_xys - tile_xys.min(axis=0)
 
     # the shape of individual tile images
     h, w, d = arrays[0].shape
-    
+
     # number of rows and columns in the merged tile
-    n0, n1 = (indices+1).max(axis=0)
+    n_x, n_y = (indices+1).max(axis=0)
 
     # empty merged tiles array to be filled in
-    img = np.zeros((h*n0, w*n1, d), dtype=np.uint8)
+    img = np.zeros((h * n_y, w * n_x, d), dtype=np.uint8)
 
     for ind, arr in zip(indices, arrays):
         x, y = ind
@@ -356,5 +356,5 @@ def _merge_tiles(tiles, arrays):
     west, south, east, north = (
         min(bounds[:, 0]), min(bounds[:, 1]),
         max(bounds[:, 2]), max(bounds[:, 3]))
-    
+
     return img, (west, south, east, north)

tests/test_ctx.py

@@ -41,8 +41,6 @@ def test_bounds2raster():
     assert rimg.shape == img.shape
     assert rimg.sum() == img.sum()
     assert_array_almost_equal(rimg.mean(), img.mean())
-    assert_array_almost_equal(ext, (0.0, 939258.2035682457, 
-                                    6261721.35712164, 6887893.492833804))
     assert_array_almost_equal(ext, (0.0, 939258.2035682457, 
                                     6261721.35712164, 6887893.492833804))
     rtr_bounds = [-613.0928221724841, 6262334.050013727,
@@ -159,10 +157,10 @@ def test_add_basemap():
     ax_extent = (-11740727.544603072, -11662456.027639052,
                   4852834.0517692715, 4891969.810251278)
     assert_array_almost_equal(ax_extent, ax.images[0].get_extent())
-    assert ax.images[0].get_array().sum() == 75687792
-    assert ax.images[0].get_array().shape == (256, 511, 3)
+    assert ax.images[0].get_array().sum() == 75853866
+    assert ax.images[0].get_array().shape == (256, 512, 3)
     assert_array_almost_equal(ax.images[0].get_array().mean(),
-                              192.86068982387476)
+                              192.90635681152344)
 
     # Test local source
     f, ax = matplotlib.pyplot.subplots(1)
@@ -188,10 +186,10 @@ def test_add_basemap():
     ax_extent = (-11740727.544603072, -11691807.846500559,
                   4852834.0517692715, 4891969.810251278)
     assert_array_almost_equal(ax_extent, ax.images[0].get_extent())
-    assert ax.images[0].get_array().sum() == 719543527
-    assert ax.images[0].get_array().shape == (1021, 1276, 3)
+    assert ax.images[0].get_array().sum() == 723918764
+    assert ax.images[0].get_array().shape == (1024, 1280, 3)
     assert_array_almost_equal(ax.images[0].get_array().mean(),
-                              184.10237852536648)
+                              184.10206197102863)
 
 def test_attribution():
     f, ax = matplotlib.pyplot.subplots(1)