Fix tile expiry

diff --git a/cookbooks/tile/files/default/ruby/expire.rb b/cookbooks/tile/files/default/ruby/expire.rb
index 1d4a861f4e193dc6cc8e1563007626c1e4c9c724..d695a0bc53de611f3a752fe424292ee1dc3bf560 100755 (executable)
--- 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 "xml/libxml"
 require "set"
 require "time"

-require "simple_mmap"

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


@@ -136,6 +135,7 @@ module Expire
         nodes[node_id] = tile_from_merc(point, max_zoom)
       end
     end
         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
 
     # 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


@@ -164,12 +164,17 @@ module Expire
 
     # open the cache
     def initialize(filename)
 
     # open the cache
     def initialize(filename)

-      @cache = SimpleMmap::FileWindow.open(filename)
+      @cache = File.new(filename, "r")

 
 

-      throw "Unexpected format" unless @cache[0..3].unpack("l").first == 1
-      throw "Unexpected ID size" unless @cache[4..7].unpack("l").first == 8
+      throw "Unexpected format" unless @cache.sysread(4).unpack("l").first == 1
+      throw "Unexpected ID size" unless @cache.sysread(4).unpack("l").first == 8

 
 

-      @max_id = @cache[8..15].unpack("q").first
+      @max_id = @cache.sysread(8).unpack("q").first
+    end
+
+    # close the cache
+    def close
+      @cache.close

     end
 
     # lookup a node
     end
 
     # lookup a node


@@ -177,7 +182,9 @@ module Expire
       if id <= @max_id
         offset = 16 + id * 8
 
       if id <= @max_id
         offset = 16 + id * 8
 

-        lon, lat = @cache[offset..offset + 7].unpack("ll")
+        @cache.sysseek(offset)
+
+        lon, lat = @cache.sysread(8).unpack("ll")

 
         if lon != -2147483648 && lat != -2147483648
           node = Node.new(lon, lat)
 
         if lon != -2147483648 && lat != -2147483648
           node = Node.new(lon, lat)

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index c769563542a96eb0d296bfd39643b24a9c75dfb4..76a4f9b58c209d0d9ec53516ed9baff954678872 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -404,7 +404,6 @@ package "libxml2-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"

-gem_package "simple-mmap"

 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"