From: Tom Hughes <tom@compton.nu>
Date: Thu, 16 Jul 2020 16:52:44 +0000 (+0100)
Subject: Update tile expiry script for pyproj 2.x
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fb3022d7a7139bed87a118e7f7928681c886b1fd

Update tile expiry script for pyproj 2.x
---

diff --git a/cookbooks/tile/files/default/bin/expire-tiles-single b/cookbooks/tile/files/default/bin/expire-tiles-single
index 219c45dd4..30b41c343 100644
--- a/cookbooks/tile/files/default/bin/expire-tiles-single
+++ b/cookbooks/tile/files/default/bin/expire-tiles-single
@@ -12,8 +12,7 @@ EXPIRY_TIME = 946681200 # 2000-01-01 00:00:00
 # width/height of the spherical mercator projection
 SIZE = 40075016.6855784
 
-proj_wsg84 = pyproj.Proj(init='epsg:4326')
-proj_merc = pyproj.Proj(init='epsg:3857')
+proj_transformer = pyproj.Transformer.from_crs('epsg:4326', 'epsg:3857', always_xy = True)
 
 class TileCollector(o.SimpleHandler):
 
@@ -29,7 +28,7 @@ class TileCollector(o.SimpleHandler):
             return
 
         lat = max(-85, min(85.0, location.lat))
-        x, y = pyproj.transform(proj_wsg84, proj_merc, location.lon, lat)
+        x, y = proj_transformer.transform(location.lon, lat)
 
         # renormalise into unit space [0,1]
         x = 0.5 + x / SIZE