Merge 37287c2 into 178d714

lib/geokit-rails/acts_as_mappable.rb

@@ -108,7 +108,7 @@ def adapter
       def within(distance, options = {})
         options[:within] = distance
         #geo_scope(options)
-        where(distance_conditions(options))
+        with_latlng.where(distance_conditions(options))
       end
       alias inside within
 
@@ -140,7 +140,11 @@ def by_distance(options = {})
         bounds  = extract_bounds_from_options(options)
         distance_column_name = distance_sql(origin, units, formula)
         #geo_scope(options).order("#{distance_column_name} asc")
-        order("#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}")
+        with_latlng.order("#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}")
+      end
+
+      def with_latlng
+        where("#{qualified_lat_column_name} IS NOT NULL AND #{qualified_lng_column_name} IS NOT NULL")
       end
 
       def closest(options = {})

test/acts_as_mappable_test.rb

@@ -449,7 +449,7 @@ def test_find_with_through_with_hash
   end
 
   def test_sort_by_distance_from
-    locations = Location.all
+    locations = Location.with_latlng.all
     unsorted = [locations(:a), locations(:b), locations(:c), locations(:d), locations(:e), locations(:f)]
     sorted   = [locations(:a), locations(:b), locations(:c), locations(:f), locations(:d), locations(:e)]
     assert_equal sorted, locations.sort_by{|l| l.distance_to(locations(:a))}

test/fixtures/custom_locations.yml

@@ -51,4 +51,11 @@ f:
   state: TX
   postal_code: 75039
   latitude: 32.895155
-  longitude: -96.958444
+  longitude: -96.958444
+g:
+  id: 7
+  company_id: 2
+  street: 4711 N Macarthur Blvd # 160
+  city: Nowhere
+  state: TX
+  postal_code: 12345

test/fixtures/locations.yml

@@ -51,4 +51,11 @@ f:
   state: TX
   postal_code: 75039
   lat: 32.895155
-  lng: -96.958444
+  lng: -96.958444
+g:
+  id: 7
+  company_id: 2
+  street: 4711 N Macarthur Blvd # 160
+  city: Nowhere
+  state: TX
+  postal_code: 12345