CSHARP-950: For GeoJson $near queries $maxDistance goes inside $near.

Author: rstam

MongoDB.Driver/Builders/QueryBuilder.cs

@@ -376,13 +376,13 @@ public static IMongoQuery Near<TCoordinates>(string name, GeoJsonPoint<TCoordina
                 throw new ArgumentNullException("point");
             }
 
-            var geoDoc = new BsonDocument("$geometry", BsonDocumentWrapper.Create(point));
             var op = spherical ? "$nearSphere" : "$near";
-            var condition = new BsonDocument(op, geoDoc);
+            var geometry = new BsonDocument("$geometry", BsonDocumentWrapper.Create(point));
             if (maxDistance != double.MaxValue)
             {
-                condition.Add("$maxDistance", maxDistance);
+                geometry.Add("$maxDistance", maxDistance);
             }
+            var condition = new BsonDocument(op, geometry);
 
             return new QueryDocument(name, condition);
         }

MongoDB.DriverUnitTests/Builders/QueryBuilderTests.cs

@@ -470,19 +470,19 @@ public void TestNearWithGeoJsonWithMaxDistance()
         {
             var point = GeoJson.Point(GeoJson.Geographic(40, 18));
             var query = Query.Near("loc", point, 42);
-            var expected = "{ 'loc' : { '$near' : { '$geometry' : { 'type' : 'Point', 'coordinates' : [40.0, 18.0] } }, '$maxDistance' : 42.0 } }".Replace("'", "\"");
-            Assert.AreEqual(expected, query.ToJson());
-            Assert.AreEqual(NegateArbitraryQuery(expected), Query.Not(query).ToJson());
+            var selector = "{ '$near' : { '$geometry' : { 'type' : 'Point', 'coordinates' : [40.0, 18.0] }, '$maxDistance' : 42.0 } }".Replace("'", "\"");
+            Assert.AreEqual(PositiveTest("loc", selector), query.ToJson());
+            Assert.AreEqual(NegativeTest("loc", selector), Query.Not(query).ToJson());
         }
 
         [Test]
         public void TestNearWithGeoJsonWithSpherical()
         {
             var point = GeoJson.Point(GeoJson.Geographic(40, 18));
             var query = Query.Near("loc", point, 42, true);
-            var expected = "{ 'loc' : { '$nearSphere' : { '$geometry' : { 'type' : 'Point', 'coordinates' : [40.0, 18.0] } }, '$maxDistance' : 42.0 } }".Replace("'", "\"");
-            Assert.AreEqual(expected, query.ToJson());
-            Assert.AreEqual(NegateArbitraryQuery(expected), Query.Not(query).ToJson());
+            var selector = "{ '$nearSphere' : { '$geometry' : { 'type' : 'Point', 'coordinates' : [40.0, 18.0] }, '$maxDistance' : 42.0 } }".Replace("'", "\"");
+            Assert.AreEqual(PositiveTest("loc", selector), query.ToJson());
+            Assert.AreEqual(NegativeTest("loc", selector), Query.Not(query).ToJson());
         }
 
         [Test]

MongoDB.DriverUnitTests/Builders/QueryBuilderTypedTests.cs

@@ -682,7 +682,7 @@ public void TestNearWithGeoJsonWithMaxDistance()
         {
             var point = GeoJson.Point(GeoJson.Geographic(40, 18));
             var query = Query<A>.Near(a => a.X, point, 42);
-            var expected = "{ 'x' : { '$near' : { '$geometry' : { 'type' : 'Point', 'coordinates' : [40.0, 18.0] } }, '$maxDistance' : 42.0 } }".Replace("'", "\"");
+            var expected = "{ 'x' : { '$near' : { '$geometry' : { 'type' : 'Point', 'coordinates' : [40.0, 18.0] }, '$maxDistance' : 42.0 } } }".Replace("'", "\"");
             Assert.AreEqual(expected, query.ToJson());
         }
 
@@ -691,7 +691,7 @@ public void TestNearWithGeoJsonWithSpherical()
         {
             var point = GeoJson.Point(GeoJson.Geographic(40, 18));
             var query = Query<A>.Near(a => a.X, point, 42, true);
-            var expected = "{ 'x' : { '$nearSphere' : { '$geometry' : { 'type' : 'Point', 'coordinates' : [40.0, 18.0] } }, '$maxDistance' : 42.0 } }".Replace("'", "\"");
+            var expected = "{ 'x' : { '$nearSphere' : { '$geometry' : { 'type' : 'Point', 'coordinates' : [40.0, 18.0] }, '$maxDistance' : 42.0 } } }".Replace("'", "\"");
             Assert.AreEqual(expected, query.ToJson());
         }