mongoid_spacial 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/mongoid_spacial/spacial.rb

@@ -19,15 +19,19 @@ module Mongoid
     LNG_SYMBOLS = [:x, :lon, :long, :lng, :longitude]
     LAT_SYMBOLS = [:y, :lat, :latitude]
 
-    def self.distance(p1,p2,unit = nil, formula = nil)
-      formula ||= @@distance_formula
-
+    def self.distance(p1,p2,opts = {})
+      opts[:formula] ||= (opts[:spherical]) ? @@spherical_distance_formula : :pythagorean_theorem
       p1 = p1.to_lng_lat if p1.respond_to?(:to_lng_lat)
       p2 = p2.to_lng_lat if p2.respond_to?(:to_lng_lat)
 
-      unit = earth_radius[unit] if unit.kind_of?(Symbol) && earth_radius[unit]
-      rads = Formulas.send(formula, p1, p2)
-      (unit.kind_of?(Numeric)) ? unit*rads : rads
+      rads = Formulas.send(opts[:formula], p1, p2)
+
+      if unit = earth_radius[opts[:unit]]
+        opts[:unit] = (rads.instance_variable_get("@radian")) ? unit : unit * RAD_PER_DEG
+      end
+
+      rads *= opts[:unit].to_f if opts[:unit]
+      rads
     end
 
     mattr_accessor :lng_symbols
@@ -39,13 +43,14 @@ module Mongoid
     mattr_accessor :earth_radius
     @@earth_radius = EARTH_RADIUS.dup
 
-    mattr_accessor :distance_formula
-    @@distance_formula = :n_vector
-
-      mattr_accessor :paginator
-      @@paginator = :array
+    mattr_accessor :paginator
+    @@paginator = :array
 
     mattr_accessor :default_per_page
     @@default_per_page = 25
+
+    mattr_accessor :spherical_distance_formula
+    @@spherical_distance_formula = :n_vector
+
   end
 end

data/lib/mongoid_spacial/spacial/document.rb

@@ -21,9 +21,9 @@ module Mongoid
       end
 
       module InstanceMethods #:nodoc:
-        def distance_from(key,p2, unit = nil, formula = nil)
+        def distance_from(key,p2, opts = {})
           p1 = self.send(key)
-          Mongoid::Spacial.distance(p1, p2, unit, formula = nil)
+          Mongoid::Spacial.distance(p1, p2, opts)
         end
       end
     end

data/lib/mongoid_spacial/spacial/formulas.rb

@@ -1,42 +1,51 @@
 module Mongoid
   module Spacial
     module Formulas
+      class << self
+        def n_vector(point1,point2)
+          p1 = point1.map{|deg| deg * RAD_PER_DEG}
+          p2 = point2.map{|deg| deg * RAD_PER_DEG}
 
-      def self.n_vector(point1,point2)
-        p1 = point1.map{|deg| deg * RAD_PER_DEG}
-        p2 = point2.map{|deg| deg * RAD_PER_DEG}
+          sin_x1 = Math.sin(p1[0])
+          cos_x1 = Math.cos(p1[0])
 
-        sin_x1 = Math.sin(p1[0])
-        cos_x1 = Math.cos(p1[0])
+          sin_y1 = Math.sin(p1[1])
+          cos_y1 = Math.cos(p1[1])
 
-        sin_y1 = Math.sin(p1[1])
-        cos_y1 = Math.cos(p1[1])
+          sin_x2 = Math.sin(p2[0])
+          cos_x2 = Math.cos(p2[0])
 
-        sin_x2 = Math.sin(p2[0])
-        cos_x2 = Math.cos(p2[0])
+          sin_y2 = Math.sin(p2[1])
+          cos_y2 = Math.cos(p2[1])
 
-        sin_y2 = Math.sin(p2[1])
-        cos_y2 = Math.cos(p2[1])
+          cross_prod =  (cos_y1*cos_x1 * cos_y2*cos_x2) +
+            (cos_y1*sin_x1 * cos_y2*sin_x2) +
+            (sin_y1        * sin_y2)
 
-        cross_prod =  (cos_y1*cos_x1 * cos_y2*cos_x2) +
-          (cos_y1*sin_x1 * cos_y2*sin_x2) +
-          (sin_y1        * sin_y2)
+          return cross_prod > 0 ? 0 : Math::PI if (cross_prod >= 1 || cross_prod <= -1)
 
-        return cross_prod > 0 ? 0 : Math::PI if (cross_prod >= 1 || cross_prod <= -1) 
+          d = Math.acos(cross_prod)
+          d.instance_variable_set("@radian", true)
+          d
+        end
 
-        Math.acos(cross_prod)
-      end
+        def haversine(point1,point2)
+          p1 = point1.map{|deg| deg * RAD_PER_DEG}
+          p2 = point2.map{|deg| deg * RAD_PER_DEG}
 
-      def self.haversine(point1,point2)
-        p1 = point1.map{|deg| deg * RAD_PER_DEG}
-        p2 = point2.map{|deg| deg * RAD_PER_DEG}
+          dlon = p2[0] - p1[0]
+          dlat = p2[1] - p1[1]
 
-        dlon = p2[0] - p1[0]
-        dlat = p2[1] - p1[1]
+          a = (Math.sin(dlat/2))**2 + Math.cos(p1[1]) * Math.cos(p2[1]) * (Math.sin(dlon/2))**2
 
-        a = (Math.sin(dlat/2))**2 + Math.cos(p1[1]) * Math.cos(p2[1]) * (Math.sin(dlon/2))**2
+          d = 2 * Math.atan2( Math.sqrt(a), Math.sqrt(1-a))
+          d.instance_variable_set("@radian", true)
+          d
+        end
 
-        2 * Math.atan2( Math.sqrt(a), Math.sqrt(1-a))
+        def pythagorean_theorem(p1, p2)
+          Math.sqrt(((p2[0] - p1[0]) ** 2) + ((p2[1] - p1[1]) ** 2))
+        end
       end
     end
   end

data/lib/mongoid_spacial/spacial/geo_near_results.rb

@@ -34,7 +34,7 @@ module Mongoid
             end
             @opts[:calculate].each do |key|
               key = (key.to_s+'_distance').to_sym
-              res.geo[key] = res.distance_from(key,center, @opts[:distance_multiplier])
+              res.geo[key] = res.distance_from(key,center,{:unit =>@opts[:unit] || @opts[:distance_multiplier], :spherical => @opts[:spherical]} )
               res.geo[:distance] = res.geo[key] if primary && key == primary
             end
           end
@@ -51,7 +51,7 @@ module Mongoid
 
       def page(page, options = {})
         new_collection = self.dup
-        
+
         options = self.opts.merge(options)
 
         options[:page] = page || 1

data/mongoid_spacial.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_spacial}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ryan Ong}]
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
     "spec/functional/mongoid/contexts/mongo_spec.rb",
     "spec/functional/mongoid/criterion/inclusion_spec.rb",
     "spec/functional/mongoid/spacial/geo_near_results_spec.rb",
+    "spec/functional/mongoid/spacial_spec.rb",
     "spec/models/account.rb",
     "spec/models/acolyte.rb",
     "spec/models/address.rb",
@@ -122,7 +123,8 @@ Gem::Specification.new do |s|
     "spec/unit/mongoid/criterion/inclusion_spec.rb",
     "spec/unit/mongoid/criterion/near_spacial_spec.rb",
     "spec/unit/mongoid/criterion/within_spacial_spec.rb",
-    "spec/unit/mongoid/spacial/formulas_spec.rb"
+    "spec/unit/mongoid/spacial/formulas_spec.rb",
+    "spec/unit/mongoid/spacial_spec.rb"
   ]
   s.homepage = %q{http://github.com/ryanong/mongoid_spacial}
   s.licenses = [%q{MIT}]

data/spec/functional/mongoid/spacial_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe Mongoid::Spacial do
+  describe '#distance' do
+    it "should calculate 2d by default" do
+      Mongoid::Spacial.distance([0,0],[3,4]).should == 5
+    end
+
+    it "should calculate 2d distances using degrees" do
+      Mongoid::Spacial.distance([0,0],[3,4], :unit=>:mi).should == 5*Mongoid::Spacial::EARTH_RADIUS[:mi]*Mongoid::Spacial::RAD_PER_DEG
+    end
+
+    it "should calculate 3d distances by default" do
+      Mongoid::Spacial.distance([-73.77694444, 40.63861111 ],[-118.40, 33.94],:unit=>:mi, :spherical => true).to_i.should be_within(1).of(2469)
+    end
+  end
+end
+

data/spec/unit/mongoid/spacial_spec.rb

@@ -0,0 +1,6 @@
+require "spec_helper"
+
+describe Mongoid::Spacial do
+  describe '#distance' do
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: mongoid_spacial
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Ryan Ong
@@ -173,6 +173,7 @@ files:
 - spec/functional/mongoid/contexts/mongo_spec.rb
 - spec/functional/mongoid/criterion/inclusion_spec.rb
 - spec/functional/mongoid/spacial/geo_near_results_spec.rb
+- spec/functional/mongoid/spacial_spec.rb
 - spec/models/account.rb
 - spec/models/acolyte.rb
 - spec/models/address.rb
@@ -249,6 +250,7 @@ files:
 - spec/unit/mongoid/criterion/near_spacial_spec.rb
 - spec/unit/mongoid/criterion/within_spacial_spec.rb
 - spec/unit/mongoid/spacial/formulas_spec.rb
+- spec/unit/mongoid/spacial_spec.rb
 homepage: http://github.com/ryanong/mongoid_spacial
 licenses: 
 - MIT
@@ -262,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4489034122612301384
+      hash: 1525314815871723941
       segments: 
       - 0
       version: "0"