CXX-517 nest $maxDistance inside $near and $nearSphere

Author: amidvidy

src/mongo/client/examples/geojson_demo.cpp

@@ -131,6 +131,12 @@ void queryGeoData(DBClientBase* conn) {
     Query q5 = MONGO_QUERY(kLocField << WITHINQUERY(poly.getBoundingBox()));
     Query q6 = MONGO_QUERY(kLocField << INTERSECTSQUERY(poly));
 
+    geo::Coordinates2DGeographic coords(1, 2);
+    geo::coords2dgeographic::Point point(coords);
+
+    Query nearQuery = MONGO_QUERY(kLocField << NEARQUERY(point, 0.5));
+    Query nearSphereQuery = MONGO_QUERY(kLocField << NEARSPHEREQUERY(point, 0.5));
+
     cout << "*** Testing LineString ***" << endl;
 
     auto_ptr<DBClientCursor> cursor = conn->query(kDbCollectionName, q);
@@ -173,6 +179,18 @@ void queryGeoData(DBClientBase* conn) {
         cout << cursor6->next().toString() << endl;
     cout << "---------------" << endl;
 
+    auto_ptr<DBClientCursor> nearQueryCursor = conn->query(kDbCollectionName, nearQuery);
+    cout << "Results from NEAR" << endl;
+    while (nearQueryCursor->more())
+        cout << nearQueryCursor->next().toString() << endl;
+    cout << "---------------" << endl;
+
+    auto_ptr<DBClientCursor> nearSphereQueryCursor = conn->query(kDbCollectionName, nearSphereQuery);
+    cout << "Results from NEARSPHERE" << endl;
+    while (nearSphereQueryCursor->more())
+        cout << nearSphereQueryCursor->next().toString() << endl;
+    cout << "---------------" << endl;
+
 }
 
 int main( int argc, const char **argv ) {

src/mongo/geo/queryutils.h

@@ -50,9 +50,10 @@ namespace geo {
     }
 
     template<typename TCoordinates>
-    inline BSONObj NEARQUERY(const GeoObj<TCoordinates>& geoObj, double distance) {
-        return BSON("$near" << BSON("$geometry" << geoObj.toBSON()) <<
-                    "$maxDistance" << distance);
+    inline BSONObj NEARQUERY(const GeoObj<TCoordinates>& geoObj, double maxDistance) {
+        uassert(0, "$maxDistance param to $near query must be non-negative.", maxDistance >= 0.0);
+        return BSON("$near" << BSON("$geometry" << geoObj.toBSON()
+                                    << "$maxDistance" << maxDistance));
     }
 
     template<typename TCoordinates>
@@ -61,10 +62,11 @@ namespace geo {
     }
 
     template<typename TCoordinates>
-    inline BSONObj NEARSPHEREQUERY(const GeoObj<TCoordinates>& geoObj,
-        double distance) {
-        return BSON("$nearSphere" << BSON("$geometry" << geoObj.toBSON()) <<
-                    "$maxDistance" << distance);
+    inline BSONObj NEARSPHEREQUERY(const GeoObj<TCoordinates>& geoObj, double maxDistance) {
+        uassert(0, "$maxDistance param to $nearSphere query must be non-negative.", maxDistance >= 0.0);
+        return BSON("$nearSphere" << BSON("$geometry" << geoObj.toBSON()
+                                          << "$maxDistance" << maxDistance));
+
     }
 
 } // namespace geo