mormon 0.0.2 → 1.0.0

data/lib/mormon/osm_loader.rb

@@ -1,9 +1,20 @@
 require 'nokogiri'
+require 'tmpdir'
 
 module Mormon
   module OSM
     class Loader
-      attr_reader :options, :routing, :nodes, :ways, :tiles, :routeable_nodes, :route_types
+      
+      @route_types = [:cycle, :car, :train, :foot, :horse]
+      @cache_dir   = File.join Dir.tmpdir, "mormon", "cache"
+      
+      class << self
+        attr_reader   :route_types
+        attr_accessor :cache_dir
+      end
+      
+      attr_reader :options, :routing, :nodes, :ways, :tiles, :routeable_nodes, :route_types,
+                  :osm_filename
 
       def initialize(filename, options = {})
         @options = options
@@ -14,9 +25,8 @@ module Mormon
         
         @routing = {}
         @routeable_nodes = {}
-        @route_types = [:cycle, :car, :train, :foot, :horse]
 
-        @route_types.each do |type|
+        Loader.route_types.each do |type|
           @routing[type] = {}
           @routeable_nodes[type] = {}
         end
@@ -24,35 +34,87 @@ module Mormon
         # @tilename  = Mormon::Tile::Name.new
         # @tiledata  = Mormon::Tile::Data.new
 
-        parse filename
-      end
-
-      def parse(filename)
-        puts "Loading %s.." % filename
-        
-        if !File.exists?(filename)
-          print "No such data file %s" % filename
-          return false
-        end
-        
-        osm = Nokogiri::XML(File.open(filename))
-
-        load_nodes osm
-        load_ways osm
+        @osm_filename = filename
+        @options[:cache] ? load_cached : parse
       end
 
       def report
         report = "Loaded %d nodes,\n" % @nodes.keys.size
         report += "%d ways, and...\n" % @ways.keys.size
         
-        @route_types.each do |type|
+        Loader.route_types.each do |type|
           report += " %d %s routes\n" % [@routing[type].keys.size, type]
         end
 
         report
       end
 
+      def cache_filename
+        File.join Loader.cache_dir, File.basename(@osm_filename) + ".pstore"
+      end
+      
       private
+        def load_cached
+          require "pstore"
+            
+          store_path = cache_filename
+
+          FileUtils.mkdir_p Loader.cache_dir
+          FileUtils.touch store_path
+          
+          store = PStore.new store_path
+          
+          if !File.zero? store_path
+            puts "Loading from cache %s..." % store.path
+
+            store.transaction(true) do
+              @tiles = store[:tiles]
+              @nodes = store[:nodes]
+              @ways  = store[:ways]
+              @tiles = store[:tiles]
+
+              Loader.route_types.each do |type|
+                @routing[type]         = store[:routing][type]
+                @routeable_nodes[type] = store[:routeable_nodes][type]
+              end
+            end
+          
+          else
+            puts "Parsing %s..." % @osm_filename
+            parse
+
+            puts "Creating cache %s..." % store.path
+            store.transaction do
+              store[:tiles] = @tiles
+              store[:nodes] = @nodes
+              store[:ways]  = @ways  
+              store[:tiles] = @tiles
+
+              store[:routing]         = {}
+              store[:routeable_nodes] = {}
+
+              Loader.route_types.each do |type|
+                store[:routing][type]         = @routing[type]
+                store[:routeable_nodes][type] = @routeable_nodes[type]
+              end
+            end
+          end
+
+        end
+
+        def parse
+          puts "Loading %s.." % @osm_filename
+          
+          if !File.exists?(@osm_filename)
+            print "No such data file %s" % @osm_filename
+            return false
+          end
+          
+          osm = Nokogiri::XML File.open(@osm_filename)
+
+          load_nodes osm
+          load_ways osm
+        end
 
         def load_nodes(nokosm)
           nokosm.css('node').each do |node|
@@ -121,7 +183,7 @@ module Mormon
           last = -1
           way[:nodes].each do |node|
             if last != -1
-              @route_types.each do |route_type|
+              Loader.route_types.each do |route_type|
                 if access[route_type]
                   weight = Mormon::Weight.get route_type, highway.to_sym
                   add_link(last, node, route_type, weight)

data/lib/mormon/version.rb

@@ -1,3 +1,3 @@
 module Mormon
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/spec/mormon_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'mormon'
+require 'benchmark'
 
 describe Mormon::Weight do
   it "get (transport, way type) must to return a value" do
@@ -36,31 +37,64 @@ describe Mormon::Tile::Name do
   end
 end
 
+def spec_osm_file
+  File.join File.dirname(__FILE__), "spec.osm"
+end
+
 describe Mormon::OSM::Loader do
-  before :each do
-    @loader = Mormon::OSM::Loader.new File.dirname(__FILE__) + "/spec.osm"
+  def common_specs(loader)
+    loader.nodes.keys.size.should eq 534
+    loader.ways.keys.size.should  eq 135
+    
+    loader.routing[:cycle].keys.size.should eq 240
+    loader.routing[:car].keys.size.should   eq 240
+    loader.routing[:train].keys.size.should eq 0
+    loader.routing[:foot].keys.size.should  eq 281
+    loader.routing[:horse].keys.size.should eq 216
   end
 
-  it "should load the correct data" do
-    @loader.nodes.keys.size.should eq 534
-    @loader.ways.keys.size.should  eq 135
-    
-    @loader.routing[:cycle].keys.size.should eq 240
-    @loader.routing[:car].keys.size.should   eq 240
-    @loader.routing[:train].keys.size.should eq 0
-    @loader.routing[:foot].keys.size.should  eq 281
-    @loader.routing[:horse].keys.size.should eq 216
+  describe "whitout cache" do
+    before :each do
+      @loader = Mormon::OSM::Loader.new spec_osm_file
+    end
+
+    it "should load the correct data" do
+      common_specs @loader
+    end
+
+    it "should has the correct nodes" do
+      map = { "448193026" => 1, "448193243" => 1, "448193220" => 1, "318099173" => 1 }
+      @loader.routing[:foot]["448193024"].should eq(map)
+    end
   end
 
-  it "should has the correct nodes" do
-    map = { "448193026" => 1, "448193243" => 1, "448193220" => 1, "318099173" => 1 }
-    @loader.routing[:foot]["448193024"].should eq(map)
+  describe "with cache" do
+    it "should exists the cached version" do
+      @loader = Mormon::OSM::Loader.new spec_osm_file, :cache => true
+      File.exists?(@loader.cache_filename).should eq true
+      File.zero?(@loader.cache_filename).should eq false
+    end
+
+    it "should have stored the same data" do
+      @without_cache = Mormon::OSM::Loader.new spec_osm_file
+      @with_cache    = Mormon::OSM::Loader.new spec_osm_file, :cache => true
+
+      common_specs @without_cache
+      common_specs @with_cache
+
+      @without_cache.nodes.should eq @with_cache.nodes
+      @without_cache.ways.should  eq @with_cache.ways
+      @without_cache.routing.should eq @with_cache.routing
+      @without_cache.routeable_nodes.should eq @with_cache.routeable_nodes
+    end
+
   end
+
 end
 
 describe Mormon::OSM::Router do
   before :each do
-    @loader = Mormon::OSM::Loader.new File.dirname(__FILE__) + "/spec.osm"
+    @loader = Mormon::OSM::Loader.new spec_osm_file
     @router = Mormon::OSM::Router.new @loader
   end
 
@@ -81,7 +115,7 @@ describe Mormon::OSM::Router do
   end
 
   it "should find the route in tandil map" do
-    @loader = Mormon::OSM::Loader.new File.dirname(__FILE__) + "/tandil.osm"
+    @loader = Mormon::OSM::Loader.new File.join(File.dirname(__FILE__), "tandil.osm")
     @router = Mormon::OSM::Router.new @loader
 
     response, route = @router.find_route 1355012894, 1527759159, :car

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mormon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors: