Support $maxDistance on $near query field criteria

Since maxDistance() was already used for the geoNear option with the same name, the method is overloaded based on whether geoNear() has already been called. Fixes #85.
doctrine · Dec 8, 2012 · 59f73cd · 59f73cd
1 parent 150f740
commit 59f73cd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/lib/Doctrine/MongoDB/Query/Builder.php b/lib/Doctrine/MongoDB/Query/Builder.php
@@ -586,14 +586,23 @@ public function distanceMultiplier($distanceMultiplier)
     }
 
     /**
-     * Set the "maxDistance" option for a geoNear command query.
+     * Set the "maxDistance" option for a geoNear command query or add
+     * $maxDistance criteria to the query.
+     *
+     * If the query type is geospatial (i.e. geoNear() was called), the
+     * "maxDistance" command option will be set; otherwise, $maxDistance will be
+     * added to the current expression.
      *
      * @param string $maxDistance
      * @return Builder
      */
     public function maxDistance($maxDistance)
     {
-        $this->query['geoNear']['maxDistance'] = $maxDistance;
+        if (Query::TYPE_GEO_LOCATION === $this->query['type']) {
+            $this->query['geoNear']['maxDistance'] = $maxDistance;
+        } else {
+            $this->expr->maxDistance($maxDistance);
+        }
         return $this;
     }
 

diff --git a/lib/Doctrine/MongoDB/Query/Expr.php b/lib/Doctrine/MongoDB/Query/Expr.php
@@ -217,6 +217,16 @@ public function near($x, $y)
         return $this;
     }
 
+    public function maxDistance($maxDistance)
+    {
+        if ($this->currentField) {
+            $this->query[$this->currentField][$this->cmd . 'maxDistance'] = $maxDistance;
+        } else {
+            $this->query[$this->cmd . 'maxDistance'] = $maxDistance;
+        }
+        return $this;
+    }
+
     public function withinBox($x1, $y1, $x2, $y2)
     {
         if ($this->currentField) {

diff --git a/tests/Doctrine/MongoDB/Tests/Query/BuilderTest.php b/tests/Doctrine/MongoDB/Tests/Query/BuilderTest.php
@@ -454,9 +454,9 @@ public function testGeoNearQuery()
     public function testNear()
     {
         $qb = $this->getTestQueryBuilder()
-            ->field('loc')->near(50, 50);
+            ->field('loc')->near(50, 50)->maxDistance(25);
 
-        $expected = array('loc' => array('$near' => array(50, 50)));
+        $expected = array('loc' => array('$near' => array(50, 50), '$maxDistance' => 25));
         $this->assertEquals($expected, $qb->getQueryArray());
     }