Merge pull request #164 from michaelnguyen547/add-relation-to-whereGeoShape

added $relation to whereGeoShape

Author: babenkoivan

src/Builders/FilterBuilder.php

@@ -366,19 +366,21 @@ public function whereGeoPolygon($field, array $points)
     /**
      * Add a whereGeoShape condition.
      *
-     * @see https://www.elastic.co/guide/en/elasticsearch/guide/current/querying-geo-shapes.html Querying Geo Shapes
+     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html Querying Geo Shapes
      *
      * @param string $field
      * @param array $shape
+     * @param string $relation 
      * @return $this
      */
-    public function whereGeoShape($field, array $shape)
+    public function whereGeoShape($field, array $shape, $relation = 'INTERSECTS')
     {
         $this->wheres['must'][] = [
             'geo_shape' => [
                 $field => [
                     'shape' => $shape,
-                ],
+                    'relation' => $relation
+                ]
             ],
         ];
 

tests/Builders/FilterBuilderTest.php

@@ -350,8 +350,10 @@ public function testWhereGeoShape()
             ],
         ];
 
+        $relation = 'WITHIN';
+        
         $builder = (new FilterBuilder($this->mockModel()))
-            ->whereGeoShape('foo', $shape);
+            ->whereGeoShape('foo', $shape, $relation);
 
         $this->assertEquals(
             [
@@ -360,6 +362,7 @@ public function testWhereGeoShape()
                         'geo_shape' => [
                             'foo' => [
                                 'shape' => $shape,
+                                'relation' => $relation
                             ],
                         ],
                     ],