X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/788bbec3f0b560a41228c5b3e286fa6514b7d066..fb3022d7a7139bed87a118e7f7928681c886b1fd:/cookbooks/tile/files/default/bin/expire-tiles-single?ds=sidebyside diff --git a/cookbooks/tile/files/default/bin/expire-tiles-single b/cookbooks/tile/files/default/bin/expire-tiles-single index 995164314..30b41c343 100644 --- a/cookbooks/tile/files/default/bin/expire-tiles-single +++ b/cookbooks/tile/files/default/bin/expire-tiles-single @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Expire meta tiles from a OSM change file by resetting their modified time. """ @@ -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