mongoid_spacial 0.2.0 → 0.2.2

data/README.md

@@ -22,17 +22,15 @@ class River
   field :length,            type: Integer
   field :average_discharge, type: Integer
   field :source,            type: Array,    spacial: true
-  # if you want something besides the defaults {bit: 24, min: -180, max: 180} just set index to the options on the index
-  # field :source,            type: Array,    spacial: true
-  # try not set index for this field manually as we record what spacial fields are index for some handy fields later
 
   # set return_array to true if you do not want a hash returned all the time
-  field :mouth,             type: Array,    spacial: {lat: 'latitude', lng: 'longitude', return_array: true }
+  field :mouth,             type: Array,    spacial: {lat: :latitude, lng: :longitude, return_array: true }
 
   # simplified spacial indexing
-  # you can only index one
+  # you can only index one point in mongodb version below 1.9
+  # if you want something besides the defaults {bit: 24, min: -180, max: 180} just set index to the options on the index
   spacial_index :source
-  # alternative 
+
 end
 ```
 
@@ -57,16 +55,18 @@ hudson = River.create(
   # when setting array LONGITUDE MUST BE FIRST LATITUDE MUST BE SECOND
   # source: [-73.935833,44.106667],
   # but we can use hash in any order,
-  # the default keys for latitude and longitude are 'lat' and 'lng' respectively
-  source: {'lat' => 44.106667, 'lng' => -73.935833},
-  # remember keys must be strings
-  mouth: {'latitude' => 40.703056, 'longitude' => -74.026667}
+  # the default keys for latitude and longitude are :lat and :lng respectively
+  source: {:lat => 44.106667, :lng => -73.935833},
+  mouth: {:latitude => 40.703056, :longitude => -74.026667}
 )
 
 # now to access this spacial information we can now do this
-hudson.source #=> {'lng' => -73.935833, 'lat' => 44.106667}
+hudson.source #=> {:lng => -73.935833, :lat => 44.106667}
 hudson.mouth  #=> [-74.026667, 40.703056] # notice how this returned as a lng,lat array because return_array was true
 # notice how the order of lng and lat were switched. it will always come out like this when using spacial.
+# Also adds a handy distance function
+hudson.distance_from(:source, [-74,40], :mi)
+
 ```
 Mongoid Geo has extended all built in spacial symbol extentions
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/mongoid_spacial/contexts/mongo.rb

@@ -42,6 +42,10 @@ module Mongoid #:nodoc:
           opts[:unit] = (opts[:spherical]) ? unit : unit * Mongoid::Spacial::RAD_PER_DEG
         end
 
+        if unit = Mongoid::Spacial.earth_radius[opts[:distance_multiplier]]
+          opts[:distance_multiplier] = (opts[:spherical]) ? unit : unit * Mongoid::Spacial::RAD_PER_DEG
+        end
+
         opts[:distance_multiplier] = opts[:unit] if opts[:unit].kind_of?(Numeric)
   
         # setup paging.

data/lib/mongoid_spacial/criterion/near_spacial.rb

@@ -3,14 +3,14 @@ module Mongoid #:nodoc:
   module Criterion #:nodoc:
 
     # NearSpecial criterion is used when performing #near with symbols to get
-    # get a shorthand syntax for where clauses. 
+    # get a shorthand syntax for where clauses.
     #
     # @example Conversion of a simple to complex criterion.
-    #   { :field => { "$nearSphere" => => [20,30]}, '$maxDistance' => 5 } 
+    #   { :field => { "$nearSphere" => => [20,30]}, '$maxDistance' => 5 }
     #   becomes:
     #   { :field.near(:sphere) => {:point => [20,30], :max => 5, :unit => :km} }
     class NearSpacial < Complex
-      
+
       # Convert input to query for near or nearSphere
       #
       # @example
@@ -23,8 +23,10 @@ module Mongoid #:nodoc:
           v[:point] = v[:point].to_lng_lat if v[:point].respond_to?(:to_lng_lat)
           query = {"$#{operator}" => v[:point] }
           if v[:max]
-            unit = Mongoid::Spacial.earth_radius[v[:unit]]
-            query['$maxDistance'] = (unit) ? v[:max]/unit : v[:max] 
+            if unit = Mongoid::Spacial.earth_radius[v[:unit]]
+              unit = (operator =~ /sphere/i) ? unit : unit * Mongoid::Spacial::RAD_PER_DEG
+              query['$maxDistance'] = v[:max]/unit
+            end
           end
           query
         elsif v.kind_of? Array

data/lib/mongoid_spacial/criterion/within_spacial.rb

@@ -32,8 +32,10 @@ module Mongoid #:nodoc:
             if input[:point]
               input[:point] = input[:point].to_lng_lat if input[:point].respond_to?(:to_lng_lat)
               if input[:max]
-                unit = Mongoid::Spacial.earth_radius[input[:unit]]
-                input[:max] = input[:max]/unit if unit
+                if unit = Mongoid::Spacial.earth_radius[input[:unit]]
+                  unit = (operator =~ /sphere/i) ? unit : unit * Mongoid::Spacial::RAD_PER_DEG
+                  input[:max] = input[:max]/unit
+                end
                 input = [input[:point],input[:max]]
               else
                 input = input[:point]

data/lib/mongoid_spacial/spacial.rb

@@ -20,7 +20,11 @@ module Mongoid
     LAT_SYMBOLS = [:y, :lat, :latitude]
 
     def self.distance(p1,p2,unit = nil, formula = nil)
-      formula ||= self.distance_formula
+      formula ||= @@distance_formula
+
+      p1 = p1.to_lng_lat if p1.respond_to?(:to_lng_lat)
+      p1 = p1.to_lng_lat if p1.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

data/lib/mongoid_spacial/spacial/document.rb

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

data/mongoid_spacial.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_spacial}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ryan Ong}]
-  s.date = %q{2011-06-23}
+  s.date = %q{2011-06-24}
   s.description = %q{A Mongoid Extention that simplifies and adds support for MongoDB Geo Spacial Calculations.}
   s.email = %q{ryanong@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: mongoid_spacial
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan Ong
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 Z
+date: 2011-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -931697683295411699
+      hash: -35115700109095116
       segments: 
       - 0
       version: "0"