Added in top_right and bottom_left for posterity (#1064)

Eric Harrison · Andrew Kane
1 parent 8fc9d462
Showing 3 changed files with 30 additions and 1 deletions Show diff stats
README.md
lib/searchkick/query.rb
test/where_test.rb
@@ -900,6 +900,10 @@ Bounded by a box
 ```ruby
 Restaurant.search "sushi", where: {location: {top_left: {lat: 38, lon: -123}, bottom_right: {lat: 37, lon: -122}}}
 ```
+OR
+```ruby
+Restaurant.search "sushi", where: {location: {top_right: {lat: 38, lon: -122}, bottom_left: {lat: 37, lon: -123}}}
+```
  
 Bounded by a polygon
  
@@ -770,7 +770,7 @@ module Searchkick
           if value.is_a?(Hash)
             value.each do |op, op_value|
               case op
-              when :within, :bottom_right
+              when :within, :bottom_right, :bottom_left
                 # do nothing
               when :near
                 filters << {
@@ -805,6 +805,15 @@ module Searchkick
                     }
                   }
                 }
+              when :top_right
+                filters << {
+                  geo_bounding_box: {
+                    field => {
+                      top_right: location_value(op_value),
+                      bottom_left: location_value(value[:bottom_left])
+                    }
+                  }
+                }
               when :regexp # support for regexp queries without using a regexp ruby object
                 filters << {regexp: {field => {value: op_value}}}
               when :not # not equal
@@ -189,6 +189,22 @@ class WhereTest &lt; Minitest::Test
     assert_search "san", ["San Francisco"], where: {location: {top_left: {lat: 38, lon: -123}, bottom_right: {lat: 37, lon: -122}}}
   end
  
+  def test_top_right_bottom_left
+    store [
+      {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
+      {name: "San Antonio", latitude: 29.4167, longitude: -98.5000}
+    ]
+    assert_search "san", ["San Francisco"], where: {location: {top_right: [38, -122], bottom_left: [37, -123]}}
+  end
+
+  def test_top_right_bottom_left_hash
+    store [
+      {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
+      {name: "San Antonio", latitude: 29.4167, longitude: -98.5000}
+    ]
+    assert_search "san", ["San Francisco"], where: {location: {top_right: {lat: 38, lon: -122}, bottom_left: {lat: 37, lon: -123}}}
+  end
+
   def test_multiple_locations
     store [
       {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
...	...	@@ -900,6 +900,10 @@ Bounded by a box
900	900	```ruby
901	901	Restaurant.search "sushi", where: {location: {top_left: {lat: 38, lon: -123}, bottom_right: {lat: 37, lon: -122}}}
902	902	```
	903	+OR
	904	+```ruby
	905	+Restaurant.search "sushi", where: {location: {top_right: {lat: 38, lon: -122}, bottom_left: {lat: 37, lon: -123}}}
	906	+```
903	907
904	908	Bounded by a polygon
905	909
...	...
...	...	@@ -770,7 +770,7 @@ module Searchkick
770	770	if value.is_a?(Hash)
771	771	value.each do \|op, op_value\|
772	772	case op
773		- when :within, :bottom_right
	773	+ when :within, :bottom_right, :bottom_left
774	774	# do nothing
775	775	when :near
776	776	filters << {
...	...	@@ -805,6 +805,15 @@ module Searchkick
805	805	}
806	806	}
807	807	}
	808	+ when :top_right
	809	+ filters << {
	810	+ geo_bounding_box: {
	811	+ field => {
	812	+ top_right: location_value(op_value),
	813	+ bottom_left: location_value(value[:bottom_left])
	814	+ }
	815	+ }
	816	+ }
808	817	when :regexp # support for regexp queries without using a regexp ruby object
809	818	filters << {regexp: {field => {value: op_value}}}
810	819	when :not # not equal
...	...
...	...	@@ -189,6 +189,22 @@ class WhereTest < Minitest::Test
189	189	assert_search "san", ["San Francisco"], where: {location: {top_left: {lat: 38, lon: -123}, bottom_right: {lat: 37, lon: -122}}}
190	190	end
191	191
	192	+ def test_top_right_bottom_left
	193	+ store [
	194	+ {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
	195	+ {name: "San Antonio", latitude: 29.4167, longitude: -98.5000}
	196	+ ]
	197	+ assert_search "san", ["San Francisco"], where: {location: {top_right: [38, -122], bottom_left: [37, -123]}}
	198	+ end
	199	+
	200	+ def test_top_right_bottom_left_hash
	201	+ store [
	202	+ {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
	203	+ {name: "San Antonio", latitude: 29.4167, longitude: -98.5000}
	204	+ ]
	205	+ assert_search "san", ["San Francisco"], where: {location: {top_right: {lat: 38, lon: -122}, bottom_left: {lat: 37, lon: -123}}}
	206	+ end
	207	+
192	208	def test_multiple_locations
193	209	store [
194	210	{name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
...	...