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

Rename methods and add descriptive comments.

parent b2ae9f1d
No related branches found
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ module Geocoder::Store ...@@ -73,7 +73,7 @@ module Geocoder::Store
def distance_from_sql(location, *args) def distance_from_sql(location, *args)
latitude, longitude = Geocoder::Calculations.extract_coordinates(location) latitude, longitude = Geocoder::Calculations.extract_coordinates(location)
if Geocoder::Calculations.coordinates_present?(latitude, longitude) if Geocoder::Calculations.coordinates_present?(latitude, longitude)
distance_from_sql_options(latitude, longitude, *args) distance_sql(latitude, longitude, *args)
end end
end end
...@@ -99,8 +99,8 @@ module Geocoder::Store ...@@ -99,8 +99,8 @@ module Geocoder::Store
# #
def near_scope_options(latitude, longitude, radius = 20, options = {}) def near_scope_options(latitude, longitude, radius = 20, options = {})
options[:units] ||= (geocoder_options[:units] || Geocoder::Configuration.units) options[:units] ||= (geocoder_options[:units] || Geocoder::Configuration.units)
bearing = bearing_from_sql_options(latitude, longitude, options) bearing = bearing_sql(latitude, longitude, options)
distance = distance_from_sql_options(latitude, longitude, options) distance = distance_sql(latitude, longitude, options)
if using_sqlite? if using_sqlite?
b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options) b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
args = b + [ args = b + [
...@@ -118,7 +118,11 @@ module Geocoder::Store ...@@ -118,7 +118,11 @@ module Geocoder::Store
} }
end end
def distance_from_sql_options(latitude, longitude, options = {}) ##
# SQL for calculating distance based on the current database's
# capabilities (trig functions?).
#
def distance_sql(latitude, longitude, options = {})
method_prefix = using_sqlite? ? "approx" : "full" method_prefix = using_sqlite? ? "approx" : "full"
Geocoder::Sql.send( Geocoder::Sql.send(
method_prefix + "_distance", method_prefix + "_distance",
...@@ -129,7 +133,11 @@ module Geocoder::Store ...@@ -129,7 +133,11 @@ module Geocoder::Store
) )
end end
def bearing_from_sql_options(latitude, longitude, options = {}) ##
# SQL for calculating bearing based on the current database's
# capabilities (trig functions?).
#
def bearing_sql(latitude, longitude, options = {})
if !options.include?(:bearing) if !options.include?(:bearing)
options[:bearing] = Geocoder::Configuration.distances options[:bearing] = Geocoder::Configuration.distances
end end
......
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