rails-geocoder 0.8.9 → 0.9.0

data/CHANGELOG.rdoc

@@ -2,6 +2,10 @@
 
 Per-release changes to Geocoder.
 
+== 0.9.0 (2010 Apr 2)
+
+* Fix bug in PostgreSQL support (caused "PGError: ERROR:  column "distance" does not exist"), reported by developish.
+
 == 0.8.9 (2010 Feb 11)
 
 * Add Rails 3 compatibility.

data/README.rdoc

@@ -113,7 +113,7 @@ SQLite's lack of trigonometric functions means Geocoder's default implementation
 
 There are few options for finding objects near a given point in SQLite without installing extensions:
 
-1. Use a square instead of a circle for finding nearby points. For example, if you want to find points near 40.71, 100.23, search for objects with latitude between 39.71 and 41.71 and longitude between 99.23 and 101.23. One degree of latitude or longitude is at most 69 miles so divide your radius (in miles) by 69.0 to get the amount to add and subtract from your center coordinates to get the upper and lower bounds. The results will not be very accurate (you'll get points outside the desired radius), but you will get all the points within the required radius.
+1. Use a square instead of a circle for finding nearby points. For example, if you want to find points near 40.71, 100.23, search for objects with latitude between 39.71 and 41.71 and longitude between 99.23 and 101.23. One degree of latitude or longitude is at most 69 miles so divide your radius (in miles) by 69.0 to get the amount to add and subtract from your center coordinates to get the upper and lower bounds. The results will not be very accurate (you'll get points outside the desired radius--at worst 29% farther away), but you will get all the points within the required radius.
 
 2. Load all objects into memory and compute distances between them using the <tt>Geocoder.distance_between</tt> method. This will produce accurate results but will be very slow (and use a lot of memory) if you have a lot of objects in your database.
 

data/VERSION

@@ -1 +1 @@
-0.8.9
+0.9.0

data/lib/geocoder.rb

@@ -67,47 +67,28 @@ module Geocoder
     ##
     # Named scope options hash for use with a database that supports POWER(),
     # SQRT(), PI(), and trigonometric functions (SIN(), COS(), and ASIN()).
-    #
+    # 
     # Taken from the excellent tutorial at:
     # http://www.scribd.com/doc/2569355/Geo-Distance-Search-with-MySQL
     #
     def full_near_scope_options(latitude, longitude, radius, options)
-
-      # set defaults/clean up arguments
       options[:order] ||= 'distance ASC'
-      radius            = radius.to_i
-
-      # constrain search to a (radius x radius) square
-      factor = (Math::cos(latitude * Math::PI / 180.0) * 69.0).abs
-      lon_lo = longitude - (radius / factor);
-      lon_hi = longitude + (radius / factor);
-      lat_lo = latitude  - (radius / 69.0);
-      lat_hi = latitude  + (radius / 69.0);
-
-      # build limit clause
-      limit = nil
-      if options[:limit] or options[:offset]
-        options[:offset] ||= 0
-        limit = "#{options[:offset]},#{options[:limit]}"
-      end
-      
-      # generate hash
       lat_attr = geocoder_options[:latitude]
       lon_attr = geocoder_options[:longitude]
+      distance = "3956 * 2 * ASIN(SQRT(" +
+        "POWER(SIN((#{latitude} - #{lat_attr}) * " +
+        "PI() / 180 / 2), 2) + COS(#{latitude} * PI()/180) * " +
+        "COS(#{lat_attr} * PI() / 180) * " +
+        "POWER(SIN((#{longitude} - #{lon_attr}) * " +
+        "PI() / 180 / 2), 2) ))"
       {
-        :select => "*, 3956 * 2 * ASIN(SQRT(" +
-          "POWER(SIN((#{latitude} - #{lat_attr}) * " +
-          "PI() / 180 / 2), 2) + COS(#{latitude} * PI()/180) * " +
-          "COS(#{lat_attr} * PI() / 180) * " +
-          "POWER(SIN((#{longitude} - #{lon_attr}) * " +
-          "PI() / 180 / 2), 2) )) as distance",
-        :conditions => [
-          "#{lat_attr} BETWEEN ? AND ? AND " +
-          "#{lon_attr} BETWEEN ? AND ?",
-          lat_lo, lat_hi, lon_lo, lon_hi],
-        :having => "distance <= #{radius}",
+        :select => "*, #{distance} AS distance",
+        :conditions => \
+          ["#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] +
+          coordinate_bounds(latitude, longitude, radius),
+        :having => "#{distance} <= #{radius}",
         :order  => options[:order],
-        :limit  => limit
+        :limit  => limit_clause(options)
       }
     end
 
@@ -118,36 +99,42 @@ module Geocoder
     # objects outside the given radius).
     #
     def approx_near_scope_options(latitude, longitude, radius, options)
-
-      # set defaults/clean up arguments
-      radius = radius.to_i
-
-      # constrain search to a (radius x radius) square
-      factor = (Math::cos(latitude * Math::PI / 180.0) * 69.0).abs
-      lon_lo = longitude - (radius / factor);
-      lon_hi = longitude + (radius / factor);
-      lat_lo = latitude  - (radius / 69.0);
-      lat_hi = latitude  + (radius / 69.0);
-
-      # build limit clause
-      limit = nil
-      if options[:limit] or options[:offset]
-        options[:offset] ||= 0
-        limit = "#{options[:offset]},#{options[:limit]}"
-      end
-      
-      # generate hash
       lat_attr = geocoder_options[:latitude]
       lon_attr = geocoder_options[:longitude]
       {
-        :conditions => [
-          "#{lat_attr} BETWEEN ? AND ? AND " +
-          "#{lon_attr} BETWEEN ? AND ?",
-          lat_lo, lat_hi, lon_lo, lon_hi],
+        :conditions => \
+          ["#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] +
+          coordinate_bounds(latitude, longitude, radius),
         :order  => options[:order],
-        :limit  => limit
+        :limit  => limit_clause(options)
       }
     end
+    
+    ##
+    # Get the rough high/low lat/long bounds for a geographic point and
+    # radius. Returns an array: <tt>[lat_lo, lat_hi, lon_lo, lon_hi]</tt>.
+    # Used to constrain search to a (radius x radius) square.
+    #
+    def coordinate_bounds(latitude, longitude, radius)
+      radius = radius.to_f
+      factor = (Math::cos(latitude * Math::PI / 180.0) * 69.0).abs
+      [
+        latitude  - (radius / 69.0),
+        latitude  + (radius / 69.0),
+        longitude - (radius / factor),
+        longitude + (radius / factor)
+      ]
+    end
+    
+    ##
+    # Build the limit clause for a query based on the same options hash
+    # passed to the x_near_scope_options methods.
+    #
+    def limit_clause(options)
+      if options[:limit] or options[:offset]
+        "#{options[:offset].to_i},#{options[:limit].to_i}"
+      end
+    end
   end
 
   ##

data/rails-geocoder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-geocoder}
-  s.version = "0.8.9"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Reisner"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-04-02}
   s.description = %q{Geocoder adds object geocoding and database-agnostic distance calculations to Ruby on Rails. It does not rely on proprietary database functions so finding geocoded objects in a given area is easily done using out-of-the-box MySQL or even SQLite.}
   s.email = %q{alex@alexreisner.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/alexreisner/geocoder}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Add geocoding functionality to Rails models.}
   s.test_files = [
     "test/geocoder_test.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails-geocoder
 version: !ruby/object:Gem::Version 
-  version: 0.8.9
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Alex Reisner
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -05:00
+date: 2010-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -50,18 +55,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Add geocoding functionality to Rails models.