geo_shape queries: Add test for circle intersects

Author: seljin

examples/simple/books/models/publisher.py

@@ -52,11 +52,23 @@ def location_field_indexing(self):
 
     @property
     def location_shape_indexing(self):
-        """Location for indexing.
-
+        """
+        Indexing point geo_shape.
         Used in Elasticsearch indexing/tests of `geo_shape` native filter.
         """
         return {
             'type': 'point',
             'coordinates': [self.latitude, self.longitude],
         }
+
+    @property
+    def location_circle_indexing(self):
+        """
+        Indexing circle geo_shape with 10km radius.
+        Used in Elasticsearch indexing/tests of `geo_shape` native filter.
+        """
+        return {
+            'type': 'circle',
+            'coordinates': [self.latitude, self.longitude],
+            'radius': '10km',
+        }

examples/simple/search_indexes/documents/publisher.py

@@ -80,6 +80,8 @@ class PublisherDocument(Document):
 
     location_shape = fields.GeoShapeField(strategy='recursive',
                                           attr='location_shape_indexing')
+    location_circle = fields.GeoShapeField(strategy='recursive',
+                                           attr='location_circle_indexing')
 
     class Django(object):
         model = Publisher  # The model associate with this Document

src/django_elasticsearch_dsl_drf/tests/test_filtering_geo_spatial.py

@@ -444,6 +444,7 @@ def _test_field_filter_geo_shape(self, points, count, gs_coordinates, gs_relatio
             __params
         )
 
+        print(url)
         publishers = []
         for __lat, __lon in points:
             publishers.append(
@@ -491,22 +492,44 @@ def test_field_filter_geo_shape_circle(self):
 
         :return:
         """
-        valid_points = [
+        points = [
             (49.0999832, 6.153041),
             (49.061012, 6.1529298),
             # outside circle
             (48.6937223, 6.1834097),
         ]
 
         return self._test_field_filter_geo_shape(
-            points=valid_points,
+            points=points,
             count=2,
             gs_coordinates=[['49.119696', '6.176355']],
             gs_relation='within',
             gs_type='circle',
             gs_extra='radius,10km',
         )
 
+    @pytest.mark.webtest
+    def test_field_filter_geo_shape_circle_intersects(self):
+        """Test field filter geo-shape.
+
+        :return:
+        """
+        points = [
+            # intersects with query's circle
+            (48.584614, 7.7507127),
+            # do not intersects with query's circle
+            (48.5419351, 7.4924679),
+        ]
+
+        return self._test_field_filter_geo_shape(
+            points=points,
+            count=1,
+            gs_coordinates=[['48.5728929', '7.8109768']],
+            gs_relation='intersects',
+            gs_type='circle',
+            gs_extra='radius,10km',
+        )
+
 
 if __name__ == '__main__':
     unittest.main()