Merge b63b3d9 into 9e5251a

geokit · Oct 12, 2017 · d26e510 · d26e510
2 parents 9e5251a + b63b3d9
commit d26e510
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/geokit-rails/acts_as_mappable.rb b/lib/geokit-rails/acts_as_mappable.rb
@@ -152,8 +152,12 @@ def by_distance(options = {})
         origin  = extract_origin_from_options(options)
         units   = extract_units_from_options(options)
         formula = extract_formula_from_options(options)
-        distance_column_name = distance_sql(origin, units, formula)
-        with_latlng.order("#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}")
+
+        arel = self.is_a?(ActiveRecord::Relation) ? self : self.all
+
+        distance_formula = distance_sql(origin, units, formula).gsub(/\s+/, '')
+        with_latlng.select("#{arel.quoted_table_name}.*", "#{distance_formula} AS #{distance_column_name}")
+                   .order("#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}")
       end
 
       def with_latlng