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

Change format of distance_to/from arguments.

parent c65c8bcb
No related branches found
No related tags found
No related merge requests found
...@@ -21,10 +21,14 @@ module Geocoder ...@@ -21,10 +21,14 @@ module Geocoder
# Takes two floats (latitude, longitude) and a symbol specifying the # Takes two floats (latitude, longitude) and a symbol specifying the
# units to be used (:mi or :km; default is :mi). # units to be used (:mi or :km; default is :mi).
# #
def distance_to(lat, lon, units = :mi) def distance_to(point, *args)
return nil unless geocoded? return nil unless geocoded?
mylat,mylon = to_coordinates units = args.last.is_a?(Symbol) ? args.pop : :mi
Geocoder::Calculations.distance_between(mylat, mylon, lat, lon, :units => units) them = args.size > 0 ? [point, args.first] :
Geocoder::Calculations.extract_coordinates(point)
us = to_coordinates
Geocoder::Calculations.distance_between(
us[0], us[1], them[0], them[1], :units => units)
end end
alias_method :distance_from, :distance_to alias_method :distance_from, :distance_to
......
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