From 929151ecc9c31a7609e300ae51f3c19158c577bd Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Sat, 29 Sep 2012 13:59:44 -0400
Subject: [PATCH] Set default bearing correctly.
There is no :method option.
---
lib/geocoder/stores/active_record.rb | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index c57ac8b6..ab36689e 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -122,15 +122,17 @@ module Geocoder::Store
# ATAN2(), DEGREES(), and RADIANS().
#
def full_near_scope_options(latitude, longitude, radius, options)
- options[:bearing] ||= (options[:method] ||
- geocoder_options[:method] ||
- Geocoder::Configuration.distances)
- bearing = Geocoder::Sql.full_bearing(
- latitude, longitude,
- full_column_name(geocoder_options[:latitude]),
- full_column_name(geocoder_options[:longitude]),
- options
- )
+ if !options.include?(:bearing)
+ options[:bearing] = Geocoder::Configuration.distances
+ end
+ if options[:bearing]
+ bearing = Geocoder::Sql.full_bearing(
+ latitude, longitude,
+ full_column_name(geocoder_options[:latitude]),
+ full_column_name(geocoder_options[:longitude]),
+ options
+ )
+ end
options[:units] ||= (geocoder_options[:units] || Geocoder::Configuration.units)
distance = distance_from_sql_options(latitude, longitude, options)
conditions = ["#{distance} <= ?", radius]
@@ -150,10 +152,8 @@ module Geocoder::Store
# only exist for interface consistency--not intended for production!
#
def approx_near_scope_options(latitude, longitude, radius, options)
- unless options.include?(:bearing)
- options[:bearing] = (options[:method] || \
- geocoder_options[:method] || \
- Geocoder::Configuration.distances)
+ if !options.include?(:bearing)
+ options[:bearing] = Geocoder::Configuration.distances
end
if options[:bearing]
bearing = Geocoder::Sql.approx_bearing(
--
GitLab