X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/89b06fa64f3d896a7fc60324ca1d3e699830e160..ff044920428608b2c04507ad52d6ab52c9d6555f:/cookbooks/tile/files/default/ruby/expire.rb

diff --git a/cookbooks/tile/files/default/ruby/expire.rb b/cookbooks/tile/files/default/ruby/expire.rb
index 8fb0033cd..8bd448a88 100755
--- a/cookbooks/tile/files/default/ruby/expire.rb
+++ b/cookbooks/tile/files/default/ruby/expire.rb
@@ -9,11 +9,11 @@ require 'mmap'
 
 module Expire
   # projection object to go from latlon -> spherical mercator
-  PROJ = Proj4::Projection.new(["+proj=merc", "+a=6378137", "+b=6378137", 
+  PROJ = Proj4::Projection.new(["+proj=merc", "+a=6378137", "+b=6378137",
                                 "+lat_ts=0.0", "+lon_0=0.0", "+x_0=0.0",
-                                "+y_0=0", "+k=1.0", "+units=m", 
+                                "+y_0=0", "+k=1.0", "+units=m",
                                 "+nadgrids=@null", "+no_defs +over"])
-  
+
   # width/height of the spherical mercator projection
   SIZE=40075016.6855784
   # the size of the meta tile blocks
@@ -22,7 +22,7 @@ module Expire
   HASH_ROOT = "/tiles/default/"
   # node cache file
   NODE_CACHE_FILE="/store/database/nodes"
-  
+
   # turns a spherical mercator coord into a tile coord
   def Expire.tile_from_merc(point, zoom)
     # renormalise into unit space [0,1]
@@ -34,35 +34,35 @@ module Expire
     # chop of the fractional parts
     [point.x.to_int, point.y.to_int, zoom]
   end
-  
+
   # turns a latlon -> tile x,y given a zoom level
   def Expire.tile_from_latlon(latlon, zoom)
     # first convert to spherical mercator
     point = PROJ.forward(latlon)
     tile_from_merc(point, zoom)
   end
-  
+
   # this must match the definition of xyz_to_meta in mod_tile
   def Expire.xyz_to_meta(x, y, z)
     # mask off the final few bits
     x &= ~(METATILE - 1)
     y &= ~(METATILE - 1)
     # generate the path
-    hash_path = (0..4).collect { |i| 
-      (((x >> 4*i) & 0xf) << 4) | ((y >> 4*i) & 0xf) 
+    hash_path = (0..4).collect { |i|
+      (((x >> 4*i) & 0xf) << 4) | ((y >> 4*i) & 0xf)
     }.reverse.join('/')
     z.to_s + '/' + hash_path + ".meta"
   end
-  
+
   # time to reset to, some very stupidly early time, before OSM started
   EXPIRY_TIME = Time.parse("2000-01-01 00:00:00")
 
-  # expire the meta tile by setting the modified time back 
+  # expire the meta tile by setting the modified time back
   def Expire.expire_meta(meta)
     puts "Expiring #{meta}"
     File.utime(EXPIRY_TIME, EXPIRY_TIME, meta)
   end
-  
+
   def Expire.expire(change_file, min_zoom, max_zoom, tile_dirs)
     do_expire(change_file, min_zoom, max_zoom) do |set|
       new_set = Set.new
@@ -78,11 +78,11 @@ module Expire
         tile_dirs.each do |tile_dir|
           meta_set.add(tile_dir + "/" + meta) if File.exist?(tile_dir + "/" + meta)
         end
-        
+
         # add the parent into the set for the next round
         new_set.add([xy[0] / 2, xy[1] / 2, xy[2] - 1])
       end
-      
+
       # expire all meta tiles
       meta_set.each do |meta|
         expire_meta(meta)
@@ -93,13 +93,13 @@ module Expire
     end
   end
 
-  def Expire.do_expire(change_file, min_zoom, max_zoom, &block)
+  def Expire.do_expire(change_file, min_zoom, max_zoom, &_)
     # read in the osm change file
     doc = XML::Document.file(change_file)
-    
+
     # hash map to contain all the nodes
     nodes = Hash.new
-    
+
     # we put all the nodes into the hash, as it doesn't matter whether the node was
     # added, deleted or modified - the tile will need updating anyway.
     doc.find('//node').each do |node|
@@ -110,17 +110,17 @@ module Expire
       if lat > 85
         lat = 85
       end
-      point = Proj4::Point.new(Math::PI * node['lon'].to_f / 180, 
+      point = Proj4::Point.new(Math::PI * node['lon'].to_f / 180,
                                Math::PI * lat / 180)
       nodes[node['id'].to_i] = tile_from_latlon(point, max_zoom)
     end
-    
+
     # now we look for all the ways that have changed and put all of their nodes into
     # the hash too. this will add too many nodes, as it is possible a long way will be
     # changed at only a portion of its length. however, due to the non-local way that
     # mapnik does text placement, it may stil not be enough.
     #
-    # also, we miss cases where nodes are deleted from ways where that node is not 
+    # also, we miss cases where nodes are deleted from ways where that node is not
     # itself deleted and the coverage of the point set isn't enough to encompass the
     # change.
     node_cache = NodeCache.new(NODE_CACHE_FILE)
@@ -135,14 +135,14 @@ module Expire
         end
       end
     end
-    
-    # create a set of all the tiles at the maximum zoom level which are touched by 
+
+    # create a set of all the tiles at the maximum zoom level which are touched by
     # any of the nodes we've collected. we'll create the tiles at other zoom levels
     # by a simple recursion.
     set = Set.new nodes.values
-    
+
     # expire tiles and shrink to the set of parents
-    (max_zoom).downto(min_zoom) do |z|
+    (max_zoom).downto(min_zoom) do |_|
       # allow the block to work on the set, returning the set at the next
       # zoom level
       set = yield set