mongoid_geo 0.5.0 → 0.5.1

data/README.textile

@@ -155,25 +155,18 @@ Perform distance locations in Speherical mode inside Mongo DB (default is :plane
 
 Other options supported are: @:num, :maxDistance, :distanceMultiplier, :query@
 
-GeoNear distance returns distance in degrees. Use distanceMultiplier to return in Miles or KM.
+GeoNear returns each distance calculated in degrees. Use the :distanceMultiplier or :unit option to return in the unit of your choice (see unit.rb).
 
 Set :distanceMultiplier to 6371 to get distance in KM
 Set :distanceMultiplier to 3963.19 to get distance in Miles
 
 You can also use the :unit option instead like this (supports :feet, :meters, :kms, :miles)
 
-results = Address.geoNear @center.location, :location, :unit => :km
+@results = Address.geoNear @center.location, :location, :unit => :km, :dist_order => :desc@
 
-The query result is returned as an Array of Hashies
+The geoNear query result is returned as Mongoid::Criteria
 
-The result can be then converted to a Mongoid::Criteria if needed
-
-pp results.as_criteria.to_a.map(&:distance)
-pp results.as_criteria(:desc).to_a.map(&:distance)
-
-Or converted to an array of Model instances
-
-pp results.to_models.map(&:distance) 
+@results.desc(:distance).map(&:distance)@
 
 Note that the :fromLocation field, stores the location the distance was last calculated as a hash of the Point it was calculated from
 

data/lib/mongoid/geo/fields.rb

@@ -42,7 +42,7 @@ module Mongoid #:nodoc
               end
               value = value[0..1] if !value.nil?
             end
-            value.reverse! if Mongoid::Geo.spherical && value && !value.kind_of?(BSON::ObjectId)
+            value.reverse! if Mongoid::Geo.spherical && value && value.kind_of?(Array)
             write_attribute(name, value) 
           end
 

data/lib/mongoid/geo/geo_near.rb

@@ -47,10 +47,12 @@ module Mongoid
         ret.sort {|a,b| a.distance <=> b.distance}
       end
 
-      def as_criteria direction = :asc
-        to_models(:save)
-        ids = first.klass.where().map(&:_id)
-        Mongoid::Criteria.new(first.klass).where(:_id.in => ids, :fromLocation => first.fromLocation).send(direction, :distance)
+      def as_criteria direction = nil
+        to_models(:save) 
+        ids = first.klass.all.map(&:_id)
+        crit = Mongoid::Criteria.new(first.klass).where(:_id.in => ids, :fromLocation => first.fromLocation)
+        crit = crit.send(direction, :distance) if direction
+        crit
       end      
       
       def to_criteria
@@ -63,7 +65,7 @@ module Mongoid
       def geoNear(center, location_attribute, options = {})
         center = center.respond_to?(:collection) ? center.send(location_attribute) : center
         query = create_query(self, center, options)
-        create_result(query_result(self, query, center, location_attribute, options)).extend(Mongoid::Geo::Models)
+        create_result(query_result(self, query, center, location_attribute, options)).extend(Mongoid::Geo::Models).as_criteria(options[:dist_order])
       end
 
       protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-05-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152937900 !ruby/object:Gem::Requirement
+  requirement: &2157028960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2152937900
+  version_requirements: *2157028960
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2152965320 !ruby/object:Gem::Requirement
+  requirement: &2157044860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152965320
+  version_requirements: *2157044860
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2152964860 !ruby/object:Gem::Requirement
+  requirement: &2157044400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152964860
+  version_requirements: *2157044400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152964400 !ruby/object:Gem::Requirement
+  requirement: &2157043940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152964400
+  version_requirements: *2157043940
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2152963940 !ruby/object:Gem::Requirement
+  requirement: &2157043480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152963940
+  version_requirements: *2157043480
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
 email:
 - kmandrup@gmail.com