mongoid_geo 0.4.1 → 0.4.2

data/README.textile

@@ -110,7 +110,17 @@ With the new @:geo@ option supplied by _mongoid-geo_ :
   p.latitude   = 44
   assert(44 , p.latitude)
 
-  # PURE MAGIC!!!
+  # You can also reverse the lat/lng positioning of the array storage - this is fx useful for spherical calculations
+  
+  Mongoid::Geo.spherical_mode do
+    # Mongoid::Geo.lat_index.should == 1
+    # Mongoid::Geo.lng_index.should == 0
+    address.location = "23.5, -47"
+    address.location.should == [23.5, -47].reverse
+  end  
+
+  # or alternatively 
+  Mongoid::Geo.spherical = true
 </pre>
 
 h2. News update (March 2)

data/lib/mongoid/geo/fields.rb

@@ -14,14 +14,14 @@ module Mongoid #:nodoc
             lat_meth = options[:lat] || "lat"
             lng_meth = options[:lng] || "lng"
 
-            define_method(lat_meth) { read_attribute(name).try(:[],0) }
-            define_method(lng_meth) { read_attribute(name).try(:[],1) }
+            define_method(lat_meth) { read_attribute(name).try(:[], Mongoid::Geo.lat_index) }
+            define_method(lng_meth) { read_attribute(name).try(:[], Mongoid::Geo.lng_index) }
                         
             define_method "#{lat_meth}=" do |value|
-              send(name)[0] = value
+              send(name)[Mongoid::Geo.lat_index] = value
             end            
             define_method "#{lng_meth}=" do |value|
-              send(name)[1] = value
+              send(name)[Mongoid::Geo.lng_index] = value
             end            
           end
 
@@ -36,7 +36,8 @@ module Mongoid #:nodoc
                 !value.nil? ? value.extend(Mongoid::Geo::Point).to_point : value
               end
               value = value[0..1] if !value.nil?
-            end            
+            end
+            value.reverse! if Mongoid::Geo.spherical && value
             write_attribute(name, value) 
           end
 

data/lib/mongoid/geo/geo_near.rb

@@ -7,6 +7,21 @@ module Mongoid
   module Geo
     class << self
       attr_accessor :mongo_db_version
+      attr_accessor :spherical
+      
+      def spherical_mode mode = true, &block
+        @spherical = mode
+        yield if block
+        @spherical = !mode
+      end
+      
+      def lat_index
+        @spherical ? 1 : 0
+      end
+
+      def lng_index
+        @spherical ? 0 : 1
+      end
     end
 
     module Distance

data/lib/mongoid/geo/point.rb

@@ -27,8 +27,13 @@ module Mongoid::Geo
     private
     
     def get_the_location obj
-      return [obj.lat, obj.lng] if obj.respond_to? :lat
-      return [obj.latitude, obj.longitude] if obj.respond_to? :latitude
+      # if Mongoid::Geo.spherical
+      #   return [obj.lng, obj.lat] if obj.respond_to? :lat
+      #   return [obj.longitude, obj.latitude] if obj.respond_to? :latitude
+      # else
+        return [obj.lat, obj.lng] if obj.respond_to? :lat
+        return [obj.latitude, obj.longitude] if obj.respond_to? :latitude
+      # end
       obj.to_f
     end
   end

data/lib/mongoid_geo.rb

@@ -1,3 +1,4 @@
 require 'mongoid/geo'
 
 Mongoid::Geo.mongo_db_version = 1.5
+Mongoid::Geo.spherical = false

metadata

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