X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0954ecc67240e12aab09be1dabf52c57032b24eb..5fde77fb90280da2c008bb5e8e83f6635b999715:/cookbooks/tile/files/default/ruby/expire.rb?ds=sidebyside

diff --git a/cookbooks/tile/files/default/ruby/expire.rb b/cookbooks/tile/files/default/ruby/expire.rb
index 1d4a861f4..3d693ad5b 100755
--- a/cookbooks/tile/files/default/ruby/expire.rb
+++ b/cookbooks/tile/files/default/ruby/expire.rb
@@ -5,7 +5,6 @@ require "proj4"
 require "xml/libxml"
 require "set"
 require "time"
-require "simple_mmap"
 
 module Expire
   # projection object to go from latlon -> spherical mercator
@@ -19,9 +18,9 @@ module Expire
   # the size of the meta tile blocks
   METATILE = 8
   # the directory root for meta tiles
-  HASH_ROOT = "/tiles/default/"
+  HASH_ROOT = "/tiles/default/".freeze
   # node cache file
-  NODE_CACHE_FILE = "/store/database/nodes"
+  NODE_CACHE_FILE = "/store/database/nodes".freeze
 
   # turns a spherical mercator coord into a tile coord
   def self.tile_from_merc(point, zoom)
@@ -104,12 +103,8 @@ module Expire
     # added, deleted or modified - the tile will need updating anyway.
     doc.find("//node").each do |node|
       lat = node["lat"].to_f
-      if lat < -85
-        lat = -85
-      end
-      if lat > 85
-        lat = 85
-      end
+      lat = -85 if lat < -85
+      lat = 85 if lat > 85
       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)
@@ -136,6 +131,7 @@ module Expire
         nodes[node_id] = tile_from_merc(point, max_zoom)
       end
     end
+    node_cache.close
 
     # 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
@@ -143,7 +139,7 @@ module Expire
     set = Set.new nodes.values
 
     # expire tiles and shrink to the set of parents
-    (max_zoom).downto(min_zoom) do |_|
+    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
@@ -164,12 +160,17 @@ module Expire
 
     # open the cache
     def initialize(filename)
-      @cache = SimpleMmap::FileWindow.open(filename)
+      @cache = File.new(filename, "r")
+
+      throw "Unexpected format" unless @cache.sysread(4).unpack("l").first == 1
+      throw "Unexpected ID size" unless @cache.sysread(4).unpack("l").first == 8
 
-      throw "Unexpected format" unless @cache[0..3].unpack("l").first == 1
-      throw "Unexpected ID size" unless @cache[4..7].unpack("l").first == 8
+      @max_id = @cache.sysread(8).unpack("q").first
+    end
 
-      @max_id = @cache[8..15].unpack("q").first
+    # close the cache
+    def close
+      @cache.close
     end
 
     # lookup a node
@@ -177,11 +178,11 @@ module Expire
       if id <= @max_id
         offset = 16 + id * 8
 
-        lon, lat = @cache[offset..offset + 7].unpack("ll")
+        @cache.sysseek(offset)
 
-        if lon != -2147483648 && lat != -2147483648
-          node = Node.new(lon, lat)
-        end
+        lon, lat = @cache.sysread(8).unpack("ll")
+
+        node = Node.new(lon, lat) if lon != -2147483648 && lat != -2147483648
       end
 
       node