updated test and some doc comments.

Author: craiggwilson

MongoDB.Driver/Builders/QueryBuilder.cs

@@ -694,21 +694,21 @@ public static IMongoQuery Where(BsonJavaScript javascript)
         /// </summary>
         /// <typeparam name="TCoordinates">The type of the coordinates.</typeparam>
         /// <param name="name">The name of the element to test.</param>
-        /// <param name="geometry">The geometry.</param>
+        /// <param name="polygon">The polygon.</param>
         /// <returns>An IMongoQuery.</returns>
-        public static IMongoQuery Within<TCoordinates>(string name, GeoJsonPolygon<TCoordinates> geometry)
+        public static IMongoQuery Within<TCoordinates>(string name, GeoJsonPolygon<TCoordinates> polygon)
             where TCoordinates : GeoJsonCoordinates
         {
             if (name == null)
             {
                 throw new ArgumentNullException("name");
             }
-            if (geometry == null)
+            if (polygon == null)
             {
-                throw new ArgumentNullException("geometry");
+                throw new ArgumentNullException("polygon");
             }
 
-            var geoDoc = new BsonDocument("$geometry", BsonDocumentWrapper.Create(geometry));
+            var geoDoc = new BsonDocument("$geometry", BsonDocumentWrapper.Create(polygon));
             var condition = new BsonDocument("$within", geoDoc);
 
             return new QueryDocument(name, condition);
@@ -1317,12 +1317,12 @@ public static IMongoQuery Where(Expression<Func<TDocument, bool>> expression)
         /// <typeparam name="TMember">The type of the member.</typeparam>
         /// <typeparam name="TCoordinates">The type of the coordinates.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
-        /// <param name="geometry">The geometry.</param>
+        /// <param name="polygon">The polygon.</param>
         /// <returns>An IMongoQuery.</returns>
-        public static IMongoQuery Within<TMember, TCoordinates>(Expression<Func<TDocument, TMember>> memberExpression, GeoJsonPolygon<TCoordinates> geometry)
+        public static IMongoQuery Within<TMember, TCoordinates>(Expression<Func<TDocument, TMember>> memberExpression, GeoJsonPolygon<TCoordinates> polygon)
             where TCoordinates : GeoJsonCoordinates
         {
-            return new QueryBuilder<TDocument>().Within(memberExpression, geometry);
+            return new QueryBuilder<TDocument>().Within(memberExpression, polygon);
         }
 
         /// <summary>
@@ -2182,22 +2182,22 @@ public IMongoQuery Where(Expression<Func<TDocument, bool>> expression)
         /// <typeparam name="TMember">The type of the member.</typeparam>
         /// <typeparam name="TCoordinates">The type of the coordinates.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
-        /// <param name="geometry">The geometry.</param>
+        /// <param name="polygon">The polygon.</param>
         /// <returns>An IMongoQuery.</returns>
-        public IMongoQuery Within<TMember, TCoordinates>(Expression<Func<TDocument, TMember>> memberExpression, GeoJsonPolygon<TCoordinates> geometry)
+        public IMongoQuery Within<TMember, TCoordinates>(Expression<Func<TDocument, TMember>> memberExpression, GeoJsonPolygon<TCoordinates> polygon)
             where TCoordinates : GeoJsonCoordinates
         {
             if (memberExpression == null)
             {
                 throw new ArgumentNullException("memberExpression");
             }
-            if (geometry == null)
+            if (polygon == null)
             {
-                throw new ArgumentNullException("geometry");
+                throw new ArgumentNullException("polygon");
             }
 
             var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
-            return Query.Within(serializationInfo.ElementName, geometry);
+            return Query.Within(serializationInfo.ElementName, polygon);
         }
 
         /// <summary>

MongoDB.DriverUnitTests/MongoCollectionTests.cs

@@ -903,13 +903,8 @@ public void TestGeoSphericalIndex()
                 _collection.CreateIndex(IndexKeys.GeoSpatialSpherical("Location"));
 
                 // TODO: add Query builder support for 2dsphere queries
-                var query = new QueryDocument {
-                     { "Location", new BsonDocument {
-                         { "$near", new BsonDocument {
-                             { "$geometry", GeoJson.Point(GeoJson.Geographic(-74.0, 40.74)).ToBsonDocument() }
-                         } }
-                     } }
-                };
+                var query = Query<PlaceGeoJson>.Near(x => x.Location, GeoJson.Point(GeoJson.Geographic(-74.0, 40.74)));
+
                 var cursor = _collection.FindAs<PlaceGeoJson>(query);
                 var hits = cursor.ToArray();