From 608f08c267aff857eba5bc28ef9fc70fd11abe71 Mon Sep 17 00:00:00 2001
From: Matt Chisholm <matt@theory.org>
Date: Tue, 10 May 2011 12:28:56 +0200
Subject: [PATCH 1/2] Implement spherical geospatial query operators & unit
 tests

fixes https://github.com/hmarr/mongoengine/issues/163
---
 mongoengine/queryset.py |  6 ++++-
 tests/queryset.py       | 52 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset.py b/mongoengine/queryset.py
index 519dda03..008d2406 100644
--- a/mongoengine/queryset.py
+++ b/mongoengine/queryset.py
@@ -475,7 +475,7 @@ class QuerySet(object):
         """
         operators = ['ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 'mod',
                      'all', 'size', 'exists', 'not']
-        geo_operators = ['within_distance', 'within_box', 'near']
+        geo_operators = ['within_distance', 'within_spherical_distance', 'within_box', 'near', 'near_sphere']
         match_operators = ['contains', 'icontains', 'startswith', 
                            'istartswith', 'endswith', 'iendswith', 
                            'exact', 'iexact']
@@ -519,8 +519,12 @@ class QuerySet(object):
                 if op in geo_operators:
                     if op == "within_distance":
                         value = {'$within': {'$center': value}}
+                    elif op == "within_spherical_distance":
+                        value = {'$within': {'$centerSphere': value}}
                     elif op == "near":
                         value = {'$near': value}
+                    elif op == "near_sphere":
+                        value = {'$nearSphere': value}
                     elif op == 'within_box':
                         value = {'$within': {'$box': value}}
                     else:
diff --git a/tests/queryset.py b/tests/queryset.py
index 3592cc69..03256d50 100644
--- a/tests/queryset.py
+++ b/tests/queryset.py
@@ -1357,6 +1357,58 @@ class QuerySetTest(unittest.TestCase):
         
         Event.drop_collection()
 
+    def test_spherical_geospatial_operators(self):
+        """Ensure that spherical geospatial queries are working
+        """
+        class Point(Document):
+            location = GeoPointField()
+
+        Point.drop_collection()
+
+        # These points are one degree apart, which (according to Google Maps)
+        # is about 110 km apart at this place on the Earth.
+        north_point = Point(location=[-122, 38]) # Near Concord, CA
+        south_point = Point(location=[-122, 37]) # Near Santa Cruz, CA
+        north_point.save()
+        south_point.save()
+
+        earth_radius = 6378.009; # in km (needs to be a float for dividing by)
+
+        # Finds both points because they are within 60 km of the reference
+        # point equidistant between them.
+        points = Point.objects(location__near_sphere=[-122, 37.5])
+        self.assertEqual(points.count(), 2)
+
+        # Finds both points, but orders the north point first because it's
+        # closer to the reference point to the north.
+        points = Point.objects(location__near_sphere=[-122, 38.5])
+        self.assertEqual(points.count(), 2)
+        self.assertEqual(points[0].id, north_point.id)
+        self.assertEqual(points[1].id, south_point.id)
+
+        # Finds both points, but orders the south point first because it's
+        # closer to the reference point to the south.
+        points = Point.objects(location__near_sphere=[-122, 36.5])
+        self.assertEqual(points.count(), 2)
+        self.assertEqual(points[0].id, south_point.id)
+        self.assertEqual(points[1].id, north_point.id)
+
+        # Same behavior for _within_spherical_distance
+        points = Point.objects(
+            location__within_spherical_distance=[[-122, 37.5], 60/earth_radius]
+        );
+        self.assertEqual(points.count(), 2)
+
+        # Finds only one point because only the first point is within 60km of
+        # the reference point to the south.
+        points = Point.objects(
+            location__within_spherical_distance=[[-122, 36.5], 60/earth_radius]
+        );
+        self.assertEqual(points.count(), 1)
+        self.assertEqual(points[0].id, south_point.id)
+
+        Point.drop_collection()
+
     def test_custom_querysets(self):
         """Ensure that custom QuerySet classes may be used.
         """

From 6cf0cf9e7d8076773ebfebb60d4e56faa9cd49f8 Mon Sep 17 00:00:00 2001
From: Matt Chisholm <matt@theory.org>
Date: Tue, 10 May 2011 12:31:31 +0200
Subject: [PATCH 2/2] slight reordering of test code for clarity

---
 tests/queryset.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/queryset.py b/tests/queryset.py
index 03256d50..6d4f1619 100644
--- a/tests/queryset.py
+++ b/tests/queryset.py
@@ -1379,6 +1379,12 @@ class QuerySetTest(unittest.TestCase):
         points = Point.objects(location__near_sphere=[-122, 37.5])
         self.assertEqual(points.count(), 2)
 
+        # Same behavior for _within_spherical_distance
+        points = Point.objects(
+            location__within_spherical_distance=[[-122, 37.5], 60/earth_radius]
+        );
+        self.assertEqual(points.count(), 2)
+
         # Finds both points, but orders the north point first because it's
         # closer to the reference point to the north.
         points = Point.objects(location__near_sphere=[-122, 38.5])
@@ -1393,12 +1399,6 @@ class QuerySetTest(unittest.TestCase):
         self.assertEqual(points[0].id, south_point.id)
         self.assertEqual(points[1].id, north_point.id)
 
-        # Same behavior for _within_spherical_distance
-        points = Point.objects(
-            location__within_spherical_distance=[[-122, 37.5], 60/earth_radius]
-        );
-        self.assertEqual(points.count(), 2)
-
         # Finds only one point because only the first point is within 60km of
         # the reference point to the south.
         points = Point.objects(