- PR comments

Author: BorisDog

src/MongoDB.Driver/Search/OperatorSearchDefinitions.cs

@@ -141,8 +141,8 @@ internal sealed class GeoShapeSearchDefinition<TDocument, TCoordinates> : Operat
 
         public GeoShapeSearchDefinition(
             SearchPathDefinition<TDocument> path,
-            GeoJsonGeometry<TCoordinates> geometry,
             GeoShapeRelation relation,
+            GeoJsonGeometry<TCoordinates> geometry,
             SearchScoreDefinition<TDocument> score)
                 : base(OperatorType.GeoShape, path, score)
         {

src/MongoDB.Driver/Search/SearchDefinitionBuilder.cs

@@ -185,11 +185,11 @@ public SearchDefinition<TDocument> Facet(
         /// <returns>A geo shape search definition.</returns>
         public SearchDefinition<TDocument> GeoShape<TCoordinates>(
             SearchPathDefinition<TDocument> path,
-            GeoJsonGeometry<TCoordinates> geometry,
             GeoShapeRelation relation,
+            GeoJsonGeometry<TCoordinates> geometry,
             SearchScoreDefinition<TDocument> score = null)
             where TCoordinates : GeoJsonCoordinates =>
-                new GeoShapeSearchDefinition<TDocument, TCoordinates>(path, geometry, relation, score);
+                new GeoShapeSearchDefinition<TDocument, TCoordinates>(path, relation, geometry, score);
 
         /// <summary>
         /// Creates a search definition that queries for shapes with a given geometry.
@@ -208,14 +208,14 @@ public SearchDefinition<TDocument> GeoShape<TCoordinates>(
         /// <returns>A geo shape search definition.</returns>
         public SearchDefinition<TDocument> GeoShape<TCoordinates, TField>(
             Expression<Func<TDocument, TField>> path,
-            GeoJsonGeometry<TCoordinates> geometry,
             GeoShapeRelation relation,
+            GeoJsonGeometry<TCoordinates> geometry,
             SearchScoreDefinition<TDocument> score = null)
             where TCoordinates : GeoJsonCoordinates =>
                 GeoShape(
                     new ExpressionFieldDefinition<TDocument>(path),
-                    geometry,
                     relation,
+                    geometry,
                     score);
 
         /// <summary>

tests/MongoDB.Driver.Tests/Search/AtlasSearchTests.cs

@@ -167,8 +167,8 @@ public void GeoShape()
             var results = GeoSearch(
                 GeoBuilders.Search.GeoShape(
                     x => x.Address.Location,
-                    __testPolygon,
-                    GeoShapeRelation.Intersects));
+                    GeoShapeRelation.Intersects,
+                    __testPolygon));
 
             results.Count.Should().Be(25);
             results.First().Name.Should().Be("Ribeira Charming Duplex");

tests/MongoDB.Driver.Tests/Search/SearchDefinitionBuilderTests.cs

@@ -297,8 +297,8 @@ public void GeoShape()
             AssertRendered(
                 subject.GeoShape(
                     "location",
-                    __testPolygon,
-                    GeoShapeRelation.Disjoint),
+                    GeoShapeRelation.Disjoint,
+                    __testPolygon),
                 "{ geoShape: { geometry: { type: 'Polygon', coordinates: [[[-161.323242, 22.512557], [-152.446289, 22.065278], [-156.09375, 17.811456], [-161.323242, 22.512557]]] }, path: 'location', relation: 'disjoint' } }");
         }
 
@@ -310,14 +310,14 @@ public void GeoShape_typed()
             AssertRendered(
                 subject.GeoShape(
                     x => x.Location,
-                    __testPolygon,
-                    GeoShapeRelation.Disjoint),
+                    GeoShapeRelation.Disjoint,
+                    __testPolygon),
                 "{ geoShape: { geometry: { type: 'Polygon', coordinates: [[[-161.323242, 22.512557], [-152.446289, 22.065278], [-156.09375, 17.811456], [-161.323242, 22.512557]]] }, path: 'location', relation: 'disjoint' } }");
             AssertRendered(
                 subject.GeoShape(
                     "Location",
-                    __testPolygon,
-                    GeoShapeRelation.Disjoint),
+                    GeoShapeRelation.Disjoint,
+                    __testPolygon),
                 "{ geoShape: { geometry: { type: 'Polygon', coordinates: [[[-161.323242, 22.512557], [-152.446289, 22.065278], [-156.09375, 17.811456], [-161.323242, 22.512557]]] }, path: 'location', relation: 'disjoint' } }");
         }