factor common logic in Distance lookups

Author: timgraham

django_mongodb_backend/gis/operators.py

@@ -49,46 +49,40 @@ def as_mql(self, field, value, params=None):
         }
 
 
-class DistanceGTE(Operator):
-    name = "distance_gte"
+class DistanceLTE(Operator):
+    name = "distance_lte"
 
-    def as_mql(self, field, value, params=None):
-        distance = params[0].m if hasattr(params[0], "m") else params[0]
+    def get_geo_within(self, value, params):
+        distance = params[0]
+        # Get the distance in meters if it's a Distance object.
+        distance = distance.m if hasattr(distance, "m") else distance
         return {
-            field: {
-                "$not": {
-                    "$geoWithin": {
-                        "$centerSphere": [
-                            value["coordinates"],
-                            distance / 6378100,  # radius of earth in meters
-                        ],
-                    }
-                }
+            "$geoWithin": {
+                "$centerSphere": [
+                    value["coordinates"],
+                    distance / 6378100,  # radius of earth in meters
+                ],
             }
         }
 
+    def as_mql(self, field, value, params=None):
+        return {field: self.get_geo_within(value, params)}
 
-class DistanceLTE(Operator):
-    name = "distance_lte"
+
+class DistanceGTE(DistanceLTE):
+    name = "distance_gte"
 
     def as_mql(self, field, value, params=None):
-        distance = params[0].m if hasattr(params[0], "m") else params[0]
-        return {
-            field: {
-                "$geoWithin": {
-                    "$centerSphere": [
-                        value["coordinates"],
-                        distance / 6378100,  # radius of earth in meters
-                    ],
-                }
-            }
-        }
+        return {field: {"$not": self.get_geo_within(value, params)}}
 
 
 class DWithin(Operator):
     name = "dwithin"
 
     def as_mql(self, field, value, params=None):
+        # The parameter is always in degrees. GISOperations.get_distance()
+        # prohibits using Distance objects since MongoDB doesn't support any
+        # projected systems.
         param = radians(params[0])
         return {field: {"$geoWithin": {"$centerSphere": [value["coordinates"], param]}}}