Fix OSMF board metaname

[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 4c9d1a31becd76967c0b2727ce403772699fbbc6..f129e35104012a74a65540f6595151650b1f0efb 100755 (executable)
--- a/cookbooks/tile/files/default/ruby/expire.rb
+++ b/cookbooks/tile/files/default/ruby/expire.rb
@@ -1,11 +1,11 @@
 #!/usr/bin/ruby
 
 #!/usr/bin/ruby
 

-require 'rubygems'
-require 'proj4'
-require 'xml/libxml'
-require 'set'
-require 'time'
-require 'mmap'
+require "rubygems"
+require "proj4"
+require "xml/libxml"
+require "set"
+require "time"
+require "mmap"

 
 module Expire
   # projection object to go from latlon -> spherical mercator
 
 module Expire
   # projection object to go from latlon -> spherical mercator


@@ -24,7 +24,7 @@ module Expire
   NODE_CACHE_FILE = "/store/database/nodes"
 
   # turns a spherical mercator coord into a tile coord
   NODE_CACHE_FILE = "/store/database/nodes"
 
   # turns a spherical mercator coord into a tile coord

-  def Expire.tile_from_merc(point, zoom)
+  def self.tile_from_merc(point, zoom)

     # renormalise into unit space [0,1]
     point.x = 0.5 + point.x / SIZE
     point.y = 0.5 - point.y / SIZE
     # renormalise into unit space [0,1]
     point.x = 0.5 + point.x / SIZE
     point.y = 0.5 - point.y / SIZE


@@ -36,34 +36,34 @@ module Expire
   end
 
   # turns a latlon -> tile x,y given a zoom level
   end
 
   # turns a latlon -> tile x,y given a zoom level

-  def Expire.tile_from_latlon(latlon, zoom)
+  def self.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
     # 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)
+  def self.xyz_to_meta(x, y, z)

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

-    hash_path = (0..4).collect { |i|
+    hash_path = (0..4).collect do |i|

       (((x >> 4 * i) & 0xf) << 4) | ((y >> 4 * i) & 0xf)
       (((x >> 4 * i) & 0xf) << 4) | ((y >> 4 * i) & 0xf)

-    }.reverse.join('/')
-    z.to_s + '/' + hash_path + ".meta"
+    end.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
   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

-  def Expire.expire_meta(meta)
+  def self.expire_meta(meta)

     puts "Expiring #{meta}"
     File.utime(EXPIRY_TIME, EXPIRY_TIME, meta)
   end
 
     puts "Expiring #{meta}"
     File.utime(EXPIRY_TIME, EXPIRY_TIME, meta)
   end
 

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


@@ -93,26 +93,26 @@ module Expire
     end
   end
 
     end
   end
 

-  def Expire.do_expire(change_file, min_zoom, max_zoom, &_)
+  def self.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
     # read in the osm change file
     doc = XML::Document.file(change_file)
 
     # hash map to contain all the nodes

-    nodes = Hash.new
+    nodes = {}

 
     # 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.
 
     # 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|
-      lat = node['lat'].to_f
+    doc.find("//node").each do |node|
+      lat = node["lat"].to_f

       if lat < -85
         lat = -85
       end
       if lat > 85
         lat = 85
       end
       if lat < -85
         lat = -85
       end
       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)
                                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


@@ -124,15 +124,16 @@ module Expire
     # itself deleted and the coverage of the point set isn't enough to encompass the
     # change.
     node_cache = NodeCache.new(NODE_CACHE_FILE)
     # itself deleted and the coverage of the point set isn't enough to encompass the
     # change.
     node_cache = NodeCache.new(NODE_CACHE_FILE)

-    doc.find('//way/nd').each do |node|
-      node_id = node['ref'].to_i
-      unless nodes.include? node_id
-        # this is a node referenced but not added, modified or deleted, so it should
-        # still be in the node cache.
-        if entry = node_cache[node_id]
-          point = Proj4::Point.new(entry.lon, entry.lat)
-          nodes[node_id] = tile_from_merc(point, max_zoom)
-        end
+    doc.find("//way/nd").each do |node|
+      node_id = node["ref"].to_i
+
+      next if nodes.include? node_id
+
+      # this is a node referenced but not added, modified or deleted, so it should
+      # still be in the node cache.
+      if (entry = node_cache[node_id])
+        point = Proj4::Point.new(entry.lon, entry.lat)
+        nodes[node_id] = tile_from_merc(point, max_zoom)

       end
     end
 
       end
     end