Skip to content
Snippets Groups Projects
Commit a80d6cff authored by Alex Reisner's avatar Alex Reisner
Browse files

Merge branch 'master' of git://github.com/gugl/geocoder into gugl-master

parents ab68be10 5e08c5b6
No related branches found
No related tags found
No related merge requests found
...@@ -148,7 +148,7 @@ module Geocoder::Store ...@@ -148,7 +148,7 @@ module Geocoder::Store
distance = full_distance_from_sql(latitude, longitude, options) distance = full_distance_from_sql(latitude, longitude, options)
conditions = ["#{distance} <= ?", radius] conditions = ["#{distance} <= ?", radius]
default_near_scope_options(latitude, longitude, radius, options).merge( default_near_scope_options(latitude, longitude, radius, options).merge(
:select => "#{options[:select] || full_column_name("*")}, " + :select => select_addon(options) +
"#{distance} AS distance" + "#{distance} AS distance" +
(bearing ? ", #{bearing} AS bearing" : ""), (bearing ? ", #{bearing} AS bearing" : ""),
:conditions => add_exclude_condition(conditions, options[:exclude]) :conditions => add_exclude_condition(conditions, options[:exclude])
...@@ -222,13 +222,20 @@ module Geocoder::Store ...@@ -222,13 +222,20 @@ module Geocoder::Store
[b[0], b[2], b[1], b[3] [b[0], b[2], b[1], b[3]
] ]
default_near_scope_options(latitude, longitude, radius, options).merge( default_near_scope_options(latitude, longitude, radius, options).merge(
:select => "#{options[:select] || full_column_name("*")}, " + :select => select_addon(options) +
"#{distance} AS distance" + "#{distance} AS distance" +
(bearing ? ", #{bearing} AS bearing" : ""), (bearing ? ", #{bearing} AS bearing" : ""),
:conditions => add_exclude_condition(conditions, options[:exclude]) :conditions => add_exclude_condition(conditions, options[:exclude])
) )
end end
##
# Select string to add
#
def select_addon(options)
options[:select] == :ignore ? "" : "#{options[:select] || full_column_name("*")}, "
end
## ##
# Options used for any near-like scope. # Options used for any near-like scope.
# #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment