Update tile expiry script for pyproj 2.x

[chef.git] / cookbooks / tile / files / default / bin / expire-tiles-single

diff --git a/cookbooks/tile/files/default/bin/expire-tiles-single b/cookbooks/tile/files/default/bin/expire-tiles-single
index 44ba93b03b5bade546a2aec069d78d5151cf46c0..30b41c3436c705890041272b01c19ff55ec4d891 100644 (file)
--- 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.
 """
 """
 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
 
 # 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):
 
 
 class TileCollector(o.SimpleHandler):
 


@@ -29,7 +28,7 @@ class TileCollector(o.SimpleHandler):
             return
 
         lat = max(-85, min(85.0, location.lat))
             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
 
         # renormalise into unit space [0,1]
         x = 0.5 + x / SIZE


@@ -52,7 +51,7 @@ class TileCollector(o.SimpleHandler):
                 self.done_nodes.add(n.ref)
                 try:
                     self.add_tile_from_node(self.node_cache.get(n.ref))
                 self.done_nodes.add(n.ref)
                 try:
                     self.add_tile_from_node(self.node_cache.get(n.ref))

-                except o.NotFoundError:
+                except KeyError:

                     pass # no coordinate
 
 
                     pass # no coordinate