From 4147fe80113ea755db555c23a7466597739cde7d Mon Sep 17 00:00:00 2001
From: Shelby Switzer <shelby@voterheads.com>
Date: Tue, 12 Aug 2014 10:35:58 -0400
Subject: [PATCH] remove alternate_ from optional coordinate arguments
---
lib/geocoder/stores/active_record.rb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index 1e120117..c1f4ae85 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -115,8 +115,8 @@ module Geocoder::Store
if options[:units]
options[:units] = options[:units].to_sym
end
- latitude_attribute = options[:alternate_latitude] || geocoder_options[:latitude]
- longitude_attribute = options[:alternate_longitude] || geocoder_options[:longitude]
+ latitude_attribute = options[:latitude] || geocoder_options[:latitude]
+ longitude_attribute = options[:longitude] || geocoder_options[:longitude]
options[:units] ||= (geocoder_options[:units] || Geocoder.config.units)
select_distance = options.fetch(:select_distance, true)
options[:order] = "" if !select_distance && !options.include?(:order)
@@ -159,8 +159,8 @@ module Geocoder::Store
Geocoder::Sql.send(
method_prefix + "_distance",
latitude, longitude,
- full_column_name(options[:alternate_latitude] || geocoder_options[:latitude]),
- full_column_name(options[:alternate_longitude]|| geocoder_options[:longitude]),
+ full_column_name(options[:latitude] || geocoder_options[:latitude]),
+ full_column_name(options[:longitude]|| geocoder_options[:longitude]),
options
)
end
@@ -178,8 +178,8 @@ module Geocoder::Store
Geocoder::Sql.send(
method_prefix + "_bearing",
latitude, longitude,
- full_column_name(options[:alternate_latitude] || geocoder_options[:latitude]),
- full_column_name(options[:alternate_longitude]|| geocoder_options[:longitude]),
+ full_column_name(options[:latitude] || geocoder_options[:latitude]),
+ full_column_name(options[:longitude]|| geocoder_options[:longitude]),
options
)
end
--
GitLab