More pyproj upgrading

Author: drewbo

label_maker/label.py

@@ -9,7 +9,6 @@
 
 import numpy as np
 import mapbox_vector_tile
-import pyproj
 from shapely.geometry import shape, mapping, Polygon
 from shapely.errors import TopologicalError
 from rasterio.features import rasterize
@@ -325,10 +324,3 @@ def _create_empty_label(ml_type, classes):
     elif ml_type == 'segmentation':
         return np.zeros((256, 256), dtype=np.int)
     return None
-
-# Use with 'transform' to project to EPSG:4326
-project = partial(
-    pyproj.transform,
-    pyproj.Proj('epsg:3857'),
-    pyproj.Proj('epsg:4326')
-)

label_maker/utils.py

@@ -4,7 +4,7 @@
 from urllib.parse import urlparse, parse_qs
 
 from mercantile import bounds
-from pyproj import Proj, transform
+from pyproj import Proj, Transformer
 from PIL import Image
 import numpy as np
 import requests
@@ -51,6 +51,7 @@ def get_tile_tif(tile, imagery, folder, kwargs):
         x_res, y_res = src.transform[0], src.transform[4]
         p1 = Proj('epsg:4326')
         p2 = Proj(str(src.crs))
+        transformer = Transformer.from_crs(p1, p2)
 
         # offset our imagery in the "destination pixel" space
         offset_bound = dict()
@@ -63,8 +64,8 @@ def get_tile_tif(tile, imagery, folder, kwargs):
         offset_bound['south'] = bound.south + imagery_offset[1] * deg_per_pix_y
 
         # project tile boundaries from lat/lng to source CRS
-        tile_ul_proj = transform(p1, p2, offset_bound['west'], offset_bound['north'])
-        tile_lr_proj = transform(p1, p2, offset_bound['east'], offset_bound['south'])
+        tile_ul_proj = transformer.transform(offset_bound['west'], offset_bound['north'])
+        tile_lr_proj = transformer.transform(offset_bound['east'], offset_bound['south'])
         # get origin point from the TIF
         tif_ul_proj = (src.bounds.left, src.bounds.top)
 
@@ -108,10 +109,11 @@ def get_tile_wms(tile, imagery, folder, kwargs):
     bound = bounds(*[int(t) for t in tile.split('-')])
     p1 = Proj('epsg:4326')
     p2 = Proj(wms_srs)
+    transformer = Transformer.from_crs(p1, p2)
 
     # project the tile bounding box from lat/lng to WMS SRS
-    tile_ll_proj = transform(p1, p2, bound.west, bound.south)
-    tile_ur_proj = transform(p1, p2, bound.east, bound.north)
+    tile_ll_proj = transformer.transform(bound.west, bound.south)
+    tile_ur_proj = transformer.transform(bound.east, bound.north)
     if wms_version == '1.3.0':
         bbox = tile_ll_proj[::-1] + tile_ur_proj[::-1]
     else: