Add GeoDistance filter on ES 2.3

README.md

@@ -100,6 +100,27 @@ const LIMIT = 10;
 $queryBuilder = QueryBuilder::createNew(0, 10, 0.3);
 ```
 
+#### GeoDistance query
+Add property on the index :
+```json
+{
+//...
+    "_source": {
+    //...
+        "field_name" : {
+            "lat" : 40.12,
+            "lon" : -71.34
+        }
+//...
+    }
+}
+```
+
+Add `Filter` in the `QueryBuilder` :
+```php
+$queryBuilder->addFilter(new GeoDistanceFilter('field_name', 'latitude_value', 'longitude_value', 'nb_kilometer'));
+```
+
 > + **TODO** : Use a result formater
 + **TODO** : Filtering results
 
@@ -132,6 +153,8 @@ parameters:
                         analyzer: standard
                     age:
                         type: integer
+                    location:
+                        type: geo_point
 
 services:
     myapp.search.index:

src/Filter/GeoDistanceFilter.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Novaway\ElasticsearchClient\Filter;
+
+use Novaway\ElasticsearchClient\Query\CombiningFactor;
+
+class GeoDistanceFilter implements Filter
+{
+    /** @var string */
+    private $property;
+    /** @var float */
+    private $latitude;
+    /** @var float */
+    private $longitude;
+    /** @var int */
+    private $distance;
+    /** @var string */
+    private $combiningFactor;
+
+    /**
+     * GeoDistanceFilter constructor.
+     * @param string $property
+     * @param float  $latitude
+     * @param float  $longitude
+     * @param int    $distance
+     */
+    public function __construct(string $property, float $latitude, float $longitude, int $distance, string $combiningFactor = CombiningFactor::FILTER)
+    {
+        $this->property  = $property;
+        $this->latitude  = $latitude;
+        $this->longitude = $longitude;
+        $this->distance  = $distance;
+        $this->combiningFactor = $combiningFactor;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCombiningFactor(): string
+    {
+        return $this->combiningFactor;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function formatForQuery(): array
+    {
+        return [
+            'geo_distance' => [
+                'distance'     => sprintf('%dkm', $this->distance),
+                $this->property => [
+                    'lat' => $this->latitude,
+                    'lon' => $this->longitude
+                ]
+            ]
+        ];
+    }
+}