Merge pull request #52 from jorisvandenbossche/searchsorted

COMPAT: use numpy searchsorted

Author: darribas

README.md

@@ -23,7 +23,6 @@ the internet into geospatial raster files. Bounding boxes can be passed in both
 
 * `mercantile`
 * `numpy`
-* `pandas`
 - `matplotlib`
 * `pillow`
 * `rasterio`

contextily/tile.py

@@ -6,7 +6,6 @@
 import io
 import os
 import numpy as np
-import pandas as pd
 import rasterio as rio
 from PIL import Image
 from rasterio.transform import from_origin
@@ -258,13 +257,13 @@ def bb2wdw(bb, rtr):
               ((row_start, row_stop), (col_start, col_stop))
     '''
     rbb = rtr.bounds
-    xi = pd.Series(np.linspace(rbb.left, rbb.right, rtr.shape[1]))
-    yi = pd.Series(np.linspace(rbb.bottom, rbb.top, rtr.shape[0]))
+    xi = np.linspace(rbb.left, rbb.right, rtr.shape[1])
+    yi = np.linspace(rbb.bottom, rbb.top, rtr.shape[0])
 
-    window = ((rtr.shape[0] - yi.searchsorted(bb[3])[0],
-              rtr.shape[0] - yi.searchsorted(bb[1])[0]),
-              (xi.searchsorted(bb[0])[0],
-               xi.searchsorted(bb[2])[0])
+    window = ((rtr.shape[0] - yi.searchsorted(bb[3]),
+              rtr.shape[0] - yi.searchsorted(bb[1])),
+              (xi.searchsorted(bb[0]),
+               xi.searchsorted(bb[2]))
               )
     return window
 

requirements.txt

@@ -1,7 +1,6 @@
 geopy
 matplotlib
 mercantile
-pandas
 pillow
 pytest
 rasterio