SERVER-19097 Add version 3 to 2dsphere index

1 files changed, 2 insertions, 10 deletions

diff --git a/src/mongo/db/query/expression_index.cpp b/src/mongo/db/query/expression_index.cpp
index 67f06314266..7f86c374a90 100644
--- a/src/mongo/db/query/expression_index.cpp
+++ b/src/mongo/db/query/expression_index.cpp
@@ -92,18 +92,10 @@ void ExpressionMapping::cover2d(const R2Region& region,
     }
 }
 
-// TODO: what should we really pass in for indexInfoObj?
 void ExpressionMapping::cover2dsphere(const S2Region& region,
-                                      const BSONObj& indexInfoObj,
+                                      const S2IndexingParams& indexingParams,
                                       OrderedIntervalList* oilOut) {
-    int coarsestIndexedLevel;
-    BSONElement ce = indexInfoObj["coarsestIndexedLevel"];
-    if (ce.isNumber()) {
-        coarsestIndexedLevel = ce.numberInt();
-    } else {
-        coarsestIndexedLevel = S2::kAvgEdge.GetClosestLevel(100 * 1000.0 / kRadiusOfEarthInMeters);
-    }
-
+    int coarsestIndexedLevel = indexingParams.coarsestIndexedLevel;
     // The min level of our covering is the level whose cells are the closest match to the
     // *area* of the region (or the max indexed level, whichever is smaller) The max level
     // is 4 sizes larger.