Skip to content
Snippets Groups Projects
Commit 4147fe80 authored by Shelby Switzer's avatar Shelby Switzer
Browse files

remove alternate_ from optional coordinate arguments

parent 0ad578d4
No related branches found
No related tags found
No related merge requests found
...@@ -115,8 +115,8 @@ module Geocoder::Store ...@@ -115,8 +115,8 @@ module Geocoder::Store
if options[:units] if options[:units]
options[:units] = options[:units].to_sym options[:units] = options[:units].to_sym
end end
latitude_attribute = options[:alternate_latitude] || geocoder_options[:latitude] latitude_attribute = options[:latitude] || geocoder_options[:latitude]
longitude_attribute = options[:alternate_longitude] || geocoder_options[:longitude] longitude_attribute = options[:longitude] || geocoder_options[:longitude]
options[:units] ||= (geocoder_options[:units] || Geocoder.config.units) options[:units] ||= (geocoder_options[:units] || Geocoder.config.units)
select_distance = options.fetch(:select_distance, true) select_distance = options.fetch(:select_distance, true)
options[:order] = "" if !select_distance && !options.include?(:order) options[:order] = "" if !select_distance && !options.include?(:order)
...@@ -159,8 +159,8 @@ module Geocoder::Store ...@@ -159,8 +159,8 @@ module Geocoder::Store
Geocoder::Sql.send( Geocoder::Sql.send(
method_prefix + "_distance", method_prefix + "_distance",
latitude, longitude, latitude, longitude,
full_column_name(options[:alternate_latitude] || geocoder_options[:latitude]), full_column_name(options[:latitude] || geocoder_options[:latitude]),
full_column_name(options[:alternate_longitude]|| geocoder_options[:longitude]), full_column_name(options[:longitude]|| geocoder_options[:longitude]),
options options
) )
end end
...@@ -178,8 +178,8 @@ module Geocoder::Store ...@@ -178,8 +178,8 @@ module Geocoder::Store
Geocoder::Sql.send( Geocoder::Sql.send(
method_prefix + "_bearing", method_prefix + "_bearing",
latitude, longitude, latitude, longitude,
full_column_name(options[:alternate_latitude] || geocoder_options[:latitude]), full_column_name(options[:latitude] || geocoder_options[:latitude]),
full_column_name(options[:alternate_longitude]|| geocoder_options[:longitude]), full_column_name(options[:longitude]|| geocoder_options[:longitude]),
options options
) )
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