Merge pull request #28 from dmyers/elasticsearch-location

Added location support to elasticsearch driver using using geopoint

Author: mmanos

src/Mmanos/Search/Index/Elasticsearch.php

@@ -50,7 +50,7 @@ public function newQuery()
 	{
 		return array(
 			'index' => $this->name,
-			'body'  => array('query' => array('bool' => array())),
+			'body'  => array('query' => array()),
 		);
 	}
 
@@ -71,10 +71,6 @@ public function newQuery()
 	 */
 	public function addConditionToQuery($query, array $condition)
 	{
-		if (array_get($condition, 'lat')) {
-			return $query;
-		}
-		
 		$value = trim(array_get($condition, 'value'));
 		$field = array_get($condition, 'field', '_all');
 
@@ -107,6 +103,19 @@ public function addConditionToQuery($query, array $condition)
 				'min_similarity' => $fuzziness,
 			);
 		}
+		elseif (array_get($condition, 'lat')) {
+			$definition = array(
+				'distance' => $condition['distance'].'m',
+				'_geoloc' => array(
+					'lat' => $condition['lat'],
+					'lon' => $condition['long'],
+				),
+			);
+
+			$query['body']['query']['filtered']['filter']['geo_distance'] = $definition;
+
+			return $query;
+		}
 		else {
 			$is_phrase = (!empty($condition['phrase']) || !empty($condition['filter']));
 			$match_type = 'multi_match';
@@ -117,7 +126,7 @@ public function addConditionToQuery($query, array $condition)
 			);
 		}
 
-		$query['body']['query']['bool'][$occur][][$match_type] = $definition;
+		$query['body']['query']['filtered']['query']['bool'][$occur][][$match_type] = $definition;
 
 		return $query;
 	}