mongoid_geo 0.1.8 → 0.2.0

data/README.textile

@@ -111,9 +111,32 @@ With the new @:geo@ option supplied by _mongoid-geo_ :
   # PURE MAGIC!!!
 </pre>
 
-h2. News update
+h2. News update (March 2)
 
-Added support for setting location attribute using object with either #location or #position attribute that has lat/lng attributes within (see fields spec).
+* Added support for geoNear queries!!!
+
+<pre>
+class Address
+  include Mongoid::Document
+  extend Mongoid::Geo::Near
+
+  field :location, :type => Array, :geo => true
+  ...
+end  
+
+# Find all addresses sorted nearest to a specific address loation 
+nearest_addresses = Address.geoNear(another_address, :location)
+
+class Position
+  include Mongoid::Document
+
+  field :pos, :type => Array, :geo => true
+  ...
+end  
+
+# Find all positions sorted nearest to the address loation 
+nearest_positions = Position.geoNear(another_address.location, :pos)
+</pre>
 
 h2. Mongoid Geo extra inclusions
 

data/lib/mongoid/geo/fields.rb

@@ -7,6 +7,9 @@ module Mongoid #:nodoc
           define_method(meth) { read_attribute(name) }
 
           if options[:type] == Array && options[:geo]
+            puts "geo:"
+            # instance_eval { self.send :extend, Mongoid::Geo::Near }
+            
             lat_meth = options[:lat] || "lat"
             lng_meth = options[:lng] || "lng"
 

data/lib/mongoid/geo/geo_near.rb

@@ -0,0 +1,46 @@
+require 'net/http'
+require 'active_support'
+require 'haversine'
+require 'rack'
+require 'hashie'
+require 'mongoid/geo/haversine'
+
+module Mongoid
+  module Geo
+    module Near
+      def geoNear(center, location_attribute)
+        center = center.respond_to?(:collection) ? center.send(location_attribute) : center
+        query = create_query(self, center)
+        create_result(query_result(self, query, center, location_attribute))
+      end
+
+      protected
+    
+      def create_query clazz, center, mode = :plane
+        BSON::OrderedHash.new.tap do |query|
+          query["geoNear"]    = clazz.to_s.tableize
+          query["near"]       = center
+          # works in mongodb 1.7 but still in beta and not supported by mongodb
+          query["spherical"]  = true if mode == :sphere
+        end
+      end      
+
+      def query_result clazz, query, center, location_attribute
+        lon,lat = center    
+        query_result = clazz.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])
+        end
+      end
+
+      def create_result query_result
+        query_result.inject([]) do |result, qr|
+          res = Hashie::Mash.new(qr['obj'].to_hash)
+          res.dis = qr['distance']
+          res._id = qr['obj']['_id'].to_s
+          result.push(res)
+        end
+      end    
+    end  
+  end
+end

data/lib/mongoid/geo/haversine.rb

@@ -0,0 +1,21 @@
+module Mongoid
+  module Geo
+    class Haversine
+      #EARTH_RADIUS = 3963.19 # miles
+      EARTH_RADIUS = 6371 # kilometers
+      RADIAN_PER_DEGREE = Math::PI / 180.0
+
+      def self.distance(lat1, lng1, lat2, lng2)
+         lat1_radians = lat1 * RADIAN_PER_DEGREE
+         lat2_radians = lat2 * RADIAN_PER_DEGREE
+
+         distance_lat = (lat2-lat1) * RADIAN_PER_DEGREE
+         distance_lng = (lng2-lng1) * RADIAN_PER_DEGREE
+
+         a = Math.sin(distance_lat/2)**2 + Math.cos(lat1_radians) * Math.cos(lat2_radians) * Math.sin(distance_lng/2) ** 2
+         c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a))
+         EARTH_RADIUS * c
+      end
+    end
+  end
+end

data/lib/mongoid/geo/inflections.rb

@@ -12,6 +12,10 @@ module Mongoid #:nodoc:
         # withinCenter
         # - {"$within" : {"$center" : [center, radius]}}})          
 
+        def geoNear
+          Criterion::Complex.new(:operator => 'geoNearSphere', :key => self)
+        end
+
         def nearSphere
           Criterion::Complex.new(:operator => 'nearSphere', :key => self)          
         end

data/lib/mongoid/geo.rb

@@ -6,4 +6,5 @@ end
 require 'mongoid/geo/point'
 require 'mongoid/geo/criteria'
 require 'mongoid/geo/index'
-require 'mongoid/geo/point'
+require 'mongoid/geo/point'
+require 'mongoid/geo/geo_near'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-23 00:00:00.000000000 +01:00
+date: 2011-03-02 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156123600 !ruby/object:Gem::Requirement
+  requirement: &2154720940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2156123600
+  version_requirements: *2154720940
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2156123060 !ruby/object:Gem::Requirement
+  requirement: &2154720340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156123060
+  version_requirements: *2154720340
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2154833320 !ruby/object:Gem::Requirement
+  requirement: &2154719720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,40 @@ dependencies:
         version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *2154833320
+  version_requirements: *2154719720
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: &2154719140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *2154719140
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2154718560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2154718560
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &2154717980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2154717980
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
 email:
 - kmandrup@gmail.com
@@ -59,6 +92,8 @@ files:
 - lib/mongoid/geo/criterion/outer_operator.rb
 - lib/mongoid/geo/criterion/twin_operators.rb
 - lib/mongoid/geo/fields.rb
+- lib/mongoid/geo/geo_near.rb
+- lib/mongoid/geo/haversine.rb
 - lib/mongoid/geo/index.rb
 - lib/mongoid/geo/inflections.rb
 - lib/mongoid/geo/point.rb
@@ -88,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Adds extra convenience methods for geo-spatial operations etc.