Tile: Switch ridgeback to orm

[chef.git] / 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 1c2993b714af58641a9e619e8ea7f4ce62519607..2a0bce729dfe5ca21c8186ff7b1320737b8649f5 100755 (executable)
--- a/cookbooks/tile/files/default/ruby/expire.rb
+++ b/cookbooks/tile/files/default/ruby/expire.rb
@@ -20,11 +20,6 @@ module Expire
   METATILE = 8
   # the directory root for meta tiles
   HASH_ROOT = "/tiles/default/"
   METATILE = 8
   # the directory root for meta tiles
   HASH_ROOT = "/tiles/default/"

-  # lowest zoom that we want to expire
-  # MIN_ZOOM=12
-  MIN_ZOOM=13
-  # highest zoom that we want to expire
-  MAX_ZOOM=18

   # database parameters
   DBNAME="gis"
   DBHOST=""
   # database parameters
   DBNAME="gis"
   DBHOST=""


@@ -52,7 +47,7 @@ module Expire
   end
   
   # this must match the definition of xyz_to_meta in mod_tile
   end
   
   # this must match the definition of xyz_to_meta in mod_tile

-  def Expire.xyz_to_meta(root, x, y, z)
+  def Expire.xyz_to_meta(x, y, z)

     # mask off the final few bits
     x &= ~(METATILE - 1)
     y &= ~(METATILE - 1)
     # mask off the final few bits
     x &= ~(METATILE - 1)
     y &= ~(METATILE - 1)


@@ -60,7 +55,7 @@ module Expire
     hash_path = (0..4).collect { |i| 
       (((x >> 4*i) & 0xf) << 4) | ((y >> 4*i) & 0xf) 
     }.reverse.join('/')
     hash_path = (0..4).collect { |i| 
       (((x >> 4*i) & 0xf) << 4) | ((y >> 4*i) & 0xf) 
     }.reverse.join('/')

-    root + '/' + z.to_s + '/' + hash_path + ".meta"
+    z.to_s + '/' + hash_path + ".meta"

   end
   
   # time to reset to, some very stupidly early time, before OSM started
   end
   
   # time to reset to, some very stupidly early time, before OSM started


@@ -72,8 +67,8 @@ module Expire
     File.utime(EXPIRY_TIME, EXPIRY_TIME, meta)
   end
   
     File.utime(EXPIRY_TIME, EXPIRY_TIME, meta)
   end
   

-  def Expire.expire(change_file)
-    do_expire(change_file) do |set|
+  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
       meta_set = Set.new
 
       new_set = Set.new
       meta_set = Set.new
 


@@ -81,9 +76,12 @@ module Expire
       # so that we don't expire things multiple times
       set.each do |xy|
         # this has to match the routine in mod_tile
       # so that we don't expire things multiple times
       set.each do |xy|
         # this has to match the routine in mod_tile

-        meta = xyz_to_meta(HASH_ROOT, xy[0], xy[1], xy[2])
-        
-        meta_set.add(meta) if File.exist? meta
+        meta = xyz_to_meta(xy[0], xy[1], xy[2])
+
+        # check each style working out what needs expiring
+        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])
         
         # add the parent into the set for the next round
         new_set.add([xy[0] / 2, xy[1] / 2, xy[2] - 1])


@@ -99,7 +97,7 @@ module Expire
     end
   end
 
     end
   end
 

-  def Expire.do_expire(change_file, &block)
+  def Expire.do_expire(change_file, min_zoom, max_zoom, &block)

     # read in the osm change file
     doc = XML::Document.file(change_file)
     
     # read in the osm change file
     doc = XML::Document.file(change_file)
     


@@ -118,7 +116,7 @@ module Expire
       end
       point = Proj4::Point.new(Math::PI * node['lon'].to_f / 180, 
                                Math::PI * lat / 180)
       end
       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)
+      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
     end
     
     # now we look for all the ways that have changed and put all of their nodes into


@@ -140,7 +138,7 @@ module Expire
         # loop over results, adding tiles to the change set
         res.each do |row|
           point = Proj4::Point.new(row[0].to_f / 100.0, row[1].to_f / 100.0)
         # loop over results, adding tiles to the change set
         res.each do |row|
           point = Proj4::Point.new(row[0].to_f / 100.0, row[1].to_f / 100.0)

-          nodes[node_id] = tile_from_merc(point, MAX_ZOOM)
+          nodes[node_id] = tile_from_merc(point, max_zoom)

         end
 
         # Discard results
         end
 
         # Discard results


@@ -154,7 +152,7 @@ module Expire
     set = Set.new nodes.values
     
     # expire tiles and shrink to the set of parents
     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 |z|

       # allow the block to work on the set, returning the set at the next
       # zoom level
       set = yield set
       # allow the block to work on the set, returning the set at the next
       # zoom level
       set = yield set