mongoid_geo 0.4.2 → 0.4.3

data/lib/mongoid/geo/criterion/inclusion.rb

@@ -11,7 +11,7 @@ module Mongoid #:nodoc:
       # @param [ Hash ] attributes The fields with lat/long values.
       #
       # @return [ Criteria ] A new criteria with the added selector.
-      def nearSphere(attributes = {})
+      def nearSphere(attributes = {})        
         update_selector(attributes, "$nearSphere")
       end
     end

data/lib/mongoid/geo/geo_near.rb

@@ -10,9 +10,10 @@ module Mongoid
       attr_accessor :spherical
       
       def spherical_mode mode = true, &block
-        @spherical = mode
-        yield if block
-        @spherical = !mode
+        @spherical, old_spherical, result = mode, @spherical, @spherical
+        result = yield if block
+        @spherical = old_spherical
+        result
       end
       
       def lat_index
@@ -71,8 +72,7 @@ module Mongoid
       def create_query klass, center, options = {}
         num                 = options[:num]
         maxDistance         = options[:maxDistance]
-        query               = options[:query]
-        distanceMultiplier  = options[:distanceMultiplier]
+        query               = options[:query]        
         mode                = options[:mode] || :plane
 
         nq = BSON::OrderedHash.new.tap do |near_query|
@@ -80,10 +80,11 @@ module Mongoid
           near_query["near"]         = center
           near_query["num"]          = num if num
           near_query["maxDistance"]  = maxDistance if maxDistance
+
           # mongodb < 1.7 returns degrees but with earth flat. in Mongodb 1.7 you can set sphere and let mongodb calculate the distance in Miles or KM
           # for mongodb < 1.7 we need to run Haversine first before calculating degrees to Km or Miles. See below.
-          near_query["distanceMultiplier"]  = distanceMultiplier if distanceMultiplier && Mongoid::Geo.mongo_db_version >= 1.7
-          near_query["query"]        = query if query
+          near_query["distanceMultiplier"]  = distance_multiplier(options)
+          near_query["query"]               = query if query
 
           # works in mongodb 1.7 but still in beta and not supported by mongodb
           near_query["spherical"]  = true if mode == :sphere && Mongoid::Geo.mongo_db_version >= 1.7
@@ -91,27 +92,85 @@ module Mongoid
         nq
       end
 
-      def query_result klass, query, center, location_attribute, options = {}
-        distanceMultiplier  = options[:distanceMultiplier]
-        lon,lat = center
-        query_result = klass.collection.db.command(query)['results'].sort_by do |r|
-          loc = r['obj'][location_attribute.to_s]
-          r['distance'] = Mongoid::Geo::Haversine.distance(lat, lon, loc[1], loc[0]) if Mongoid::Geo.mongo_db_version < 1.7
+      def query_result klass, query, center, location_attribute, options = {}        
+        query_result = query_results(klass, query).sort_by do |r|          
           # Calculate distance in KM or Miles if mongodb < 1.7
-          r['distance'] = r['distance'] * distanceMultiplier if distanceMultiplier && Mongoid::Geo.mongo_db_version < 1.7
+          r[distance_meth] ||= calc_distance(r, center, location_attribute, options) if Mongoid::Geo.mongo_db_version < 1.7
           r['klass'] = klass
         end
+        query_result
       end
 
-      def create_result query_result
-        query_result.map do |qr|
+      def create_result qres
+        qres.map do |qr|
           res = Hashie::Mash.new(qr['obj'].to_hash).extend(Mongoid::Geo::Model)
           res.klass = qr['klass']
-          res.distance = qr['distance']
+          res.distance = qr[distance_meth]
           res._id = qr['obj']['_id'].to_s
           res
         end
       end
+      
+      private
+
+      def distance_multiplier options
+        distanceMultiplier  = options[:distanceMultiplier]
+        return distanceMultiplier if distanceMultiplier && Mongoid::Geo.mongo_db_version >= 1.7
+
+        return radian_multiplier[options[:unit]] if options[:unit] && Mongoid::Geo.mongo_db_version >= 1.7      
+        unit_multiplier[options[:unit]] if options[:unit]
+      end
+
+      def unit_multiplier
+        {
+          :feet => 0.305,
+          :ft => 0.305,
+          :m => 1,
+          :meters => 1,
+          :meter => 1,
+          :km => 6371,
+          :kms => 6371,
+          :mil => 3959,
+          :mile => 3959,
+          :miles => 3959
+        }
+      end
+
+      def radian_multiplier
+        { 
+          :feet => 364491.8,
+          :ft => 364491.8,
+          :m => 111170,
+          :meter => 111170,
+          :meters => 111170,
+          :km => 111.17,
+          :kms => 111.17,
+          :mil => 69.407,
+          :mile => 69.407,
+          :miles => 69.407
+        }
+      end
+      
+      def query_results klass, query 
+        exec_query(klass, query)['results']
+      end
+
+      def exec_query klass, query
+        klass.collection.db.command(query)
+      end
+
+      def calc_distance r, center, location_attribute, options        
+        distanceMultiplier = distance_multiplier(options)
+        loc     = r['obj'][location_attribute.to_s].extend(Mongoid::Geo::Point).to_points
+        center  = center.extend(Mongoid::Geo::Point).to_points
+        dist    = Mongoid::Geo::Haversine.distance(center.first, center.last, loc.first, loc.last) 
+        dist    *= distanceMultiplier if distanceMultiplier
+        dist
+      end
+      
+      def distance_meth
+        Mongoid::Geo.mongo_db_version >= 1.7 ? 'dis' : 'distance'
+      end
     end
   end
 end

data/lib/mongoid/geo/inflections.rb

@@ -13,11 +13,13 @@ module Mongoid #:nodoc:
         # - {"$within" : {"$center" : [center, radius]}}})          
 
         def geoNear
-          Criterion::Complex.new(:operator => 'geoNearSphere', :key => self)
+          Criterion::Complex.new(:operator => 'geoNearSphere', :key => self)          
         end
 
         def nearSphere
-          Criterion::Complex.new(:operator => 'nearSphere', :key => self)          
+          Mongoid::Geo.spherical_mode do
+            Criterion::Complex.new(:operator => 'nearSphere', :key => self)          
+          end
         end
 
         def nearMax *calcs

data/lib/mongoid/geo/point.rb

@@ -38,6 +38,24 @@ module Mongoid::Geo
     end
   end
 end
+
+module Mongoid::GeoPoint
+  def lat= value
+    self[Mongoid::Geo.lat_index] = value
+  end            
+
+  def lng= value
+    self[Mongoid::Geo.lng_index] = value
+  end            
+
+  def lat
+    self[Mongoid::Geo.lat_index]
+  end            
+  
+  def lng
+    self[Mongoid::Geo.lng_index]
+  end            
+end
          
 module Mongoid::Geo
   module PointConversion
@@ -53,4 +71,10 @@ module Mongoid::Geo
       v.extend(Mongoid::Geo::Point).to_points
     end
   end
-end  
+end  
+
+class Array
+  def to_geopoint                              
+    self.extend(Mongoid::GeoPoint)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-03 00:00:00.000000000Z
+date: 2011-05-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153178360 !ruby/object:Gem::Requirement
+  requirement: &2152917100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2153178360
+  version_requirements: *2152917100
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2153177900 !ruby/object:Gem::Requirement
+  requirement: &2152916640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153177900
+  version_requirements: *2152916640
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2153177440 !ruby/object:Gem::Requirement
+  requirement: &2152916180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153177440
+  version_requirements: *2152916180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153176980 !ruby/object:Gem::Requirement
+  requirement: &2152915720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153176980
+  version_requirements: *2152915720
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2153176520 !ruby/object:Gem::Requirement
+  requirement: &2152931640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153176520
+  version_requirements: *2152931640
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
 email:
 - kmandrup@gmail.com