Merge pull request #11137 from jpountz/enhancement/geo_queries

Query DSL: Make geo filters queries.
elastic · May 13, 2015 · b64e54c · b64e54c
2 parents 869baee + f22935b
commit b64e54c
Show file tree

Hide file tree

Showing 13 changed files with 326 additions and 769 deletions.
diff --git a/src/main/java/org/elasticsearch/common/lucene/docset/AndDocIdSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/AndDocIdSet.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java b/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java
@@ -29,8 +29,8 @@
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
-import org.elasticsearch.index.search.geo.InMemoryGeoBoundingBoxFilter;
-import org.elasticsearch.index.search.geo.IndexedGeoBoundingBoxFilter;
+import org.elasticsearch.index.search.geo.InMemoryGeoBoundingBoxQuery;
+import org.elasticsearch.index.search.geo.IndexedGeoBoundingBoxQuery;
 
 import java.io.IOException;
 
@@ -173,10 +173,10 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
 
         Query filter;
         if ("indexed".equals(type)) {
-            filter = IndexedGeoBoundingBoxFilter.create(topLeft, bottomRight, geoMapper);
+            filter = IndexedGeoBoundingBoxQuery.create(topLeft, bottomRight, geoMapper);
         } else if ("memory".equals(type)) {
             IndexGeoPointFieldData indexFieldData = parseContext.getForField(mapper);
-            filter = new InMemoryGeoBoundingBoxFilter(topLeft, bottomRight, indexFieldData);
+            filter = new InMemoryGeoBoundingBoxQuery(topLeft, bottomRight, indexFieldData);
         } else {
             throw new QueryParsingException(parseContext, "geo bounding box type [" + type
                     + "] not supported, either 'indexed' or 'memory' are allowed");

diff --git a/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java b/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java
@@ -31,7 +31,7 @@
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
-import org.elasticsearch.index.search.geo.GeoDistanceFilter;
+import org.elasticsearch.index.search.geo.GeoDistanceRangeQuery;
 
 import java.io.IOException;
 
@@ -160,7 +160,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
 
 
         IndexGeoPointFieldData indexFieldData = parseContext.getForField(mapper);
-        Query query = new GeoDistanceFilter(point.lat(), point.lon(), distance, geoDistance, indexFieldData, geoMapper, optimizeBbox);
+        Query query = new GeoDistanceRangeQuery(point, null, distance, true, false, geoDistance, geoMapper, indexFieldData, optimizeBbox);
         if (queryName != null) {
             parseContext.addNamedQuery(queryName, query);
         }

diff --git a/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java b/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java
@@ -31,7 +31,7 @@
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
-import org.elasticsearch.index.search.geo.GeoDistanceRangeFilter;
+import org.elasticsearch.index.search.geo.GeoDistanceRangeQuery;
 
 import java.io.IOException;
 
@@ -199,7 +199,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         GeoPointFieldMapper geoMapper = ((GeoPointFieldMapper) mapper);
 
         IndexGeoPointFieldData indexFieldData = parseContext.getForField(mapper);
-        Query query = new GeoDistanceRangeFilter(point, from, to, includeLower, includeUpper, geoDistance, geoMapper, indexFieldData, optimizeBbox);
+        Query query = new GeoDistanceRangeQuery(point, from, to, includeLower, includeUpper, geoDistance, geoMapper, indexFieldData, optimizeBbox);
         if (queryName != null) {
             parseContext.addNamedQuery(queryName, query);
         }

diff --git a/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java b/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java
@@ -31,7 +31,7 @@
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
-import org.elasticsearch.index.search.geo.GeoPolygonFilter;
+import org.elasticsearch.index.search.geo.GeoPolygonQuery;
 
 import java.io.IOException;
 import java.util.List;
@@ -147,7 +147,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         }
 
         IndexGeoPointFieldData indexFieldData = parseContext.getForField(mapper);
-        Query query = new GeoPolygonFilter(indexFieldData, shell.toArray(new GeoPoint[shell.size()]));
+        Query query = new GeoPolygonQuery(indexFieldData, shell.toArray(new GeoPoint[shell.size()]));
         if (queryName != null) {
             parseContext.addNamedQuery(queryName, query);
         }