0
@@ -204,6 +204,8 @@ module GeoKit
0
           units = extract_units_from_options(options)
0
           formula = extract_formula_from_options(options)
0
           bounds = extract_bounds_from_options(options)
0
+          # if no explicit bounds were given, try formulating them from the point and distance given
0
+          bounds = formulate_bounds_from_distance(options, origin, units) unless bounds
0
           # Apply select adjustments based upon action.
0
           add_distance_to_select(options, origin, units, formula) if origin && action == :find
0
           # Apply the conditions for a bounding rectangle if applicable
0
@@ -245,6 +247,18 @@ module GeoKit
0
           end
0
         end
0
         
0
+        # If it's a :within query, add a bounding box to improve performance.
0
+        # This only gets called if a :bounds argument is not otherwise supplied. 
0
+        def formulate_bounds_from_distance(options, origin, units)
0
+          distance = options[:within] if options.has_key?(:within)
0
+          distance = options[:range].last-(options[:range].exclude_end?? 1 : 0) if options.has_key?(:range)
0
+          if distance
0
+            res=GeoKit::Bounds.from_point_and_radius(origin,distance,:units=>units)
0
+          else 
0
+            nil
0
+          end
0
+        end
0
+        
0
         # Replace :within, :beyond and :range distance tokens with the appropriate distance 
0
         # where clauses.  Removes these tokens from the options hash.
0
         def apply_distance_scope(options)

0
@@ -399,6 +399,7 @@ module GeoKit
0
       
0
       # returns an instance of bounds which completely encompases the given circle
0
       def from_point_and_radius(point,radius,options={})
0
+        point=LatLng.normalize(point)
0
         p0=point.endpoint(0,radius,options)
0
         p90=point.endpoint(90,radius,options)
0
         p180=point.endpoint(180,radius,options)

0
@@ -65,7 +65,11 @@ class BoundsTest < Test::Unit::TestCase #:nodoc: all
0
   end  
0
   
0
   def test_creation_from_circle
0
-    #TODO -- add this test
0
+    bounds=GeoKit::Bounds.from_point_and_radius([32.939829, -96.951176],2.5)
0
+    inside=GeoKit::LatLng.new 32.9695270000,-96.9901590000
0
+    outside=GeoKit::LatLng.new 32.8951550000,-96.9584440000
0
+    assert bounds.contains?(inside)
0
+    assert !bounds.contains?(outside)
0
   end
0
   
0
 end
0
\ No newline at end of file