mormon 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: bc716b3e1ce51d7d6bc2da6aebd4015438b5998cfce3d08abcbfccbdf02e467f
+  data.tar.gz: 1fc718d5ec92bdc2ecb824f1c96c27e2fb2e611810ee1c12d5cb82fb69292d54
+SHA512:
+  metadata.gz: b8da4d1df4f858b633fcc476c042dceba19ccfde4c70ed689eb49a18f1f02b15027755084c21b1e8bb1f30ecc9875c9e1b299a5067902cfe113fbd2cd4669d03
+  data.tar.gz: 357cdddb94aff94615e355a5c6a5ce04d268e3695288d83c2f97d027b404cadf08489d8041b9548072240d09df91d57491ec4c5e8afb882fdaf07ce0eadd07f2

data/README.md

@@ -36,11 +36,11 @@ Caching
 =======
 
 You probably wants to cache the parsed osm file:
-      
-      osm_loader = Mormon::OSM::Loader.new "path/to/filename.osm", :cache => true   
+
+      osm_loader = Mormon::OSM::Loader.new "path/to/filename.osm", :cache => true
 
 The previous code generate a filename.pstore file and it's stored in Dir.tmpdir, "mormon", "cache" depending of your so, if you need to change the cache dir try ie:
-      
+
       cache_dir = File.join File.dirname(__FILE__), "cache"
       Mormon::OSM::Loader.cache_dir = cache_dir
       osm_loader = Mormon::OSM::Loader.new "path/to/file.osm", :cache => true
@@ -57,15 +57,15 @@ The default algorithm is A* with weights, but a Random algorithm is available, i
 
 **KNOWN ISSUE**: the actual random algorithm has problems when the different between start and end is enough far, i'm working to fix it.
 
-Breadth in Ramdom algorithm
+Breadth in random algorithm
 -----
 
 The programming technique to find a random route is Backtracking, so in order to don't loop forever we need to narrow the search in neighbors, for that reason i use a breadth value combined with distance between start and end nodes:
-      
+
       max_amplitude = @breadth * distance(start, end)
 
 The default breadth value is 2 but you could change it doing one of:
-    
+
       osm_router = Mormon::OSM::Router.new osm_loader, :algorithm => :random, :breadth => 1.5
       or
       osm_router.algorithm.breath = 2.5
@@ -73,10 +73,4 @@ The default breadth value is 2 but you could change it doing one of:
 License
 =======
 
-Copyright (c) 2012 Hugo Gerónimo Díaz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+LICENSE.txt

data/lib/mormon/osm_loader.rb

@@ -4,15 +4,15 @@ require 'tmpdir'
 module Mormon
   module OSM
     class Loader
-      
+
       @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
 
@@ -22,7 +22,7 @@ module Mormon
         @tiles = {}
         @nodes = {}
         @ways  = {}
-        
+
         @routing = {}
         @routeable_nodes = {}
 
@@ -41,7 +41,7 @@ module Mormon
       def report
         report = "Loaded %d nodes,\n" % @nodes.keys.size
         report += "%d ways, and...\n" % @ways.keys.size
-        
+
         Loader.route_types.each do |type|
           report += " %d %s routes\n" % [@routing[type].keys.size, type]
         end
@@ -52,18 +52,18 @@ module Mormon
       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
 
@@ -78,7 +78,7 @@ module Mormon
                 @routeable_nodes[type] = store[:routeable_nodes][type]
               end
             end
-          
+
           else
             puts "Parsing %s..." % @osm_filename
             parse
@@ -87,7 +87,7 @@ module Mormon
             store.transaction do
               store[:tiles] = @tiles
               store[:nodes] = @nodes
-              store[:ways]  = @ways  
+              store[:ways]  = @ways
               store[:tiles] = @tiles
 
               store[:routing]         = {}
@@ -104,12 +104,12 @@ module Mormon
 
         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
@@ -119,13 +119,13 @@ module Mormon
         def load_nodes(nokosm)
           nokosm.css('node').each do |node|
             node_id = node[:id]
-            
+
             @nodes[node_id] = {
               lat: node[:lat].to_f,
               lon: node[:lon].to_f,
               tags: {}
             }
-            
+
             node.css('tag').each do |t|
               k,v = t[:k].to_sym, t[:v]
               @nodes[node_id][:tags][k] = v unless useless_tags.include?(k)
@@ -136,12 +136,12 @@ module Mormon
         def load_ways(nokosm)
           nokosm.css('way').each do |way|
             way_id = way[:id]
-            
+
             @ways[way_id] = {
               nodes: way.css('nd').map { |nd| nd[:ref] },
               tags: {}
             }
-            
+
             way.css('tag').each do |t|
               k,v = t[:k].to_sym, t[:v]
               @ways[way_id][:tags][k] = v unless useless_tags.include?(k)
@@ -154,31 +154,31 @@ module Mormon
         def useless_tags
           [:created_by]
         end
-    
+
         def way_access(highway, railway)
           access = {}
-          access[:cycle] = [:primary, :secondary, :tertiary, :unclassified, :minor, :cycleway, 
-                            :residential, :track, :service].include? highway.to_sym
-          
-          access[:car]   = [:motorway, :trunk, :primary, :secondary, :tertiary, 
-                            :unclassified, :minor, :residential, :service].include? highway.to_sym
-          
-          access[:train] = [:rail, :light_rail, :subway].include? railway.to_sym
-          access[:foot]  = access[:cycle] || [:footway, :steps].include?(highway.to_sym)
-          access[:horse] = [:track, :unclassified, :bridleway].include? highway.to_sym
+          access[:cycle] = [:primary, :secondary, :tertiary, :unclassified, :minor, :cycleway,
+                            :residential, :track, :service].include?(highway.to_sym)
+
+          access[:car]   = [:motorway, :trunk, :primary, :secondary, :tertiary,
+                            :unclassified, :minor, :residential, :service].include?(highway.to_sym)
+
+          access[:train] = [:rail, :light_rail, :subway].include?(railway.to_sym)
+          access[:foot]  = access[:cycle] || [:footway, :steps, :path].include?(highway.to_sym)
+          access[:horse] = [:track, :unclassified, :bridleway].include?(highway.to_sym)
           access
         end
 
         def store_way(way)
           tags = way[:tags]
-          
+
           highway    = equivalent tags.fetch(:highway, "")
           railway    = equivalent tags.fetch(:railway, "")
           oneway     = tags.fetch(:oneway, "")
           reversible = !['yes','true','1'].include?(oneway)
-          
+
           access = way_access highway, railway
-          
+
           # Store routing information
           last = -1
           way[:nodes].each do |node|
@@ -188,7 +188,7 @@ module Mormon
                   weight = Mormon::Weight.get route_type, highway.to_sym
                   add_link(last, node, route_type, weight)
                   add_link(node, last, route_type, weight) if reversible || route_type == :foot
-                end  
+                end
               end
             end
             last = node
@@ -207,17 +207,8 @@ module Mormon
           @routing[route_type][fr] = { to => weight }
         end
 
-        def way_type(tags)
-          # Look for a variety of tags (priority order - first one found is used)
-          [:highway, :railway, :waterway, :natural].each do |type|
-            value = tags.fetch(type, '')
-            return equivalent(value) if value
-          end
-          nil
-        end
-
         def equivalent(tag)
-          { 
+          {
             primary_link:   "primary",
             trunk:          "primary",
             trunk_link:     "primary",
@@ -230,7 +221,6 @@ module Mormon
             driveway:       "service",
             pedestrian:     "footway",
             bridleway:      "cycleway",
-            track:          "cycleway",
             arcade:         "footway",
             canal:          "river",
             riverbank:      "river",
@@ -239,8 +229,6 @@ module Mormon
             living_street:  "unclassified"
           }[tag.to_sym] || tag
         end
-      
     end
   end
 end
-

data/lib/mormon/osm_router.rb

@@ -23,7 +23,7 @@ module Mormon
 
             lat1, lon1 = node1[:lat], node1[:lon]
             lat2, lon2 = node2[:lat], node2[:lon]
-            
+
             dlat  = lat2 - lat1
             dlon  = lon2 - lon1
 
@@ -44,7 +44,7 @@ module Mormon
           end
 
           closed = [node_start]
-          
+
           # Limit for how long it will search
           (0..10000).each do
             next_item = @queue.shift
@@ -52,7 +52,7 @@ module Mormon
 
             x = next_item[:node_end]
             next if closed.include?(x)
-              
+
             # Found the end node - success
             return ['success', next_item[:nodes]] if x == node_end
 
@@ -65,18 +65,18 @@ module Mormon
 
           'gave_up'
         end
-        
+
         def enqueue(node_start, node_end, node_finish, current_queue, weight = 1)
           # Add another potential route to the queue
-          
+
           # if already in queue
           return if @queue.any? { |other| other[:node_end] == node_end }
 
           distance = distance(node_start, node_end)
-          
+
           return if weight.zero?
           distance = distance / weight
-          
+
           # Create a hash for all the route's attributes
           current_distance = current_queue[:distance]
           nodes = current_queue[:nodes].dup
@@ -88,7 +88,7 @@ module Mormon
             nodes:        nodes,
             node_end:     node_end
           }
-          
+
           # Try to insert, keeping the queue ordered by decreasing worst-case distance
           ix = @queue.find_index { |other| other[:max_distance] > queue_item[:max_distance] } || -1
           @queue.insert(ix, queue_item)
@@ -123,17 +123,17 @@ module Mormon
             if neighbors
               neighbors   = neighbors.keys.map(&:to_i)
               not_visited = neighbors - (neighbors & visited)
-              
+
               # random sort in order to not take the same order for neighbors every time.
               not_visited.sort_by { rand }.each do |neighbor|
                 # limit the width of the route go further more than max_distance the distance between start and end
-                next if distance(neighbor, node_end) > max_amplitude 
+                next if distance(neighbor, node_end) > max_amplitude
                 current_route << neighbor
                 enqueue neighbor, node_end, transport, current_route, visited, max_amplitude
                 current_route.delete neighbor
               end
             end
-            
+
             visited.delete node_start
           end
         end
@@ -143,21 +143,23 @@ module Mormon
 
 
     class Router
-      attr_reader :loader, :queue, :algorithm
+      attr_reader :loader
 
       def initialize(loader, options = {})
-        algorithm = options.delete(:algorithm) || :astar
-        algorithm_class = "Mormon::OSM::Algorithm::#{algorithm.to_s.capitalize}".constantize
-        
         @loader = loader
-        @algorithm = algorithm_class.new self, options
+        @options = options
+
+        algorithm = @options.delete(:algorithm) || :astar
+        @algorithm_class = "Mormon::OSM::Algorithm::#{algorithm.to_s.capitalize}".constantize
       end
 
       def find_route(node_start, node_end, transport)
-        result, nodes = @algorithm.route(node_start.to_i, node_end.to_i, transport.to_sym)
-        
+        algorithm = @algorithm_class.new(self, @options)
+
+        result, nodes = algorithm.route(node_start.to_i, node_end.to_i, transport.to_sym)
+
         return [result,[]] if result != 'success'
-        
+
         nodes.map! do |node|
           data = @loader.nodes[node.to_s]
           [data[:lat], data[:lon]]
@@ -165,7 +167,6 @@ module Mormon
 
         [result, nodes]
       end
-
     end
   end
-end
+end

data/lib/mormon/version.rb

@@ -1,3 +1,3 @@
 module Mormon
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/mormon/weight.rb

@@ -15,6 +15,7 @@ module Mormon
       service:      { cycle: 1, car: 1, foot: 1, horse: 1 },
       bridleway:    { cycle: 0.8, foot: 1, horse: 10, mtb: 3 },
       footway:      { cycle: 0.2, foot: 1 },
+      path:         { foot: 1 },
       steps:        { foot: 1, cycle: 0.3 },
       rail:         { train: 1 },
       light_rail:   { train: 1 },

data/mormon.gemspec

@@ -6,8 +6,8 @@ require 'mormon/version'
 Gem::Specification.new do |gem|
   gem.name          = "mormon"
   gem.version       = Mormon::VERSION
-  gem.authors       = ["Geronimo Diaz", "John Kølle"]
-  gem.email         = ["geronimod@gmail.com", "john.kolle@gmail.com"]
+  gem.author        = "Geronimo Diaz"
+  gem.email         = "geronimod@gmail.com"
   gem.description   = %q{ OSM Router }
   gem.summary       = %q{ OSM Routing with some extra features: reset tiles cache, random routes and distance optimizer for routes with several stops. It's based on Pyroute library. }
   gem.homepage      = "https://github.com/geronimod/mormon"
@@ -18,8 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.rubyforge_project = "mormon"
-  
+
   gem.add_dependency "nokogiri"
   gem.add_development_dependency "rspec"
-  #gem.add_development_dependency "debugger"
 end

metadata

@@ -1,58 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: mormon
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.0.3
 platform: ruby
 authors:
 - Geronimo Diaz
-- John Kølle
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! ' OSM Router '
-email:
-- geronimod@gmail.com
-- john.kolle@gmail.com
+description: " OSM Router "
+email: geronimod@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -79,29 +71,27 @@ files:
 - spec/weight_spec.rb
 homepage: https://github.com/geronimod/mormon
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mormon
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
-summary: ! 'OSM Routing with some extra features: reset tiles cache, random routes
-  and distance optimizer for routes with several stops. It''s based on Pyroute library.'
+rubygems_version: 3.0.9
+signing_key:
+specification_version: 4
+summary: 'OSM Routing with some extra features: reset tiles cache, random routes and
+  distance optimizer for routes with several stops. It''s based on Pyroute library.'
 test_files:
 - spec/distance_optimizer_spec.rb
 - spec/loader_spec.rb