Rename Query::TYPE_GEO_LOCATION to TYPE_GEO_NEAR

doctrine · Jul 11, 2013 · 9d0dde0 · 9d0dde0 · SteveTalbot · Jul 24, 2013
1 parent 298c888
commit 9d0dde0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/Doctrine/MongoDB/Query/Builder.php b/lib/Doctrine/MongoDB/Query/Builder.php
@@ -655,7 +655,7 @@ public function mod($mod)
      */
     public function geoNear($x, $y)
     {
-        $this->query['type'] = Query::TYPE_GEO_LOCATION;
+        $this->query['type'] = Query::TYPE_GEO_NEAR;
         $this->query['geoNear'] = array('near' => array($x, $y));
         return $this;
     }
@@ -685,7 +685,7 @@ public function distanceMultiplier($distanceMultiplier)
      */
     public function maxDistance($maxDistance)
     {
-        if (Query::TYPE_GEO_LOCATION === $this->query['type']) {
+        if (Query::TYPE_GEO_NEAR === $this->query['type']) {
             $this->query['geoNear']['maxDistance'] = $maxDistance;
         } else {
             $this->expr->maxDistance($maxDistance);

diff --git a/lib/Doctrine/MongoDB/Query/Query.php b/lib/Doctrine/MongoDB/Query/Query.php
@@ -45,7 +45,7 @@ class Query implements IteratorAggregate
     const TYPE_GROUP           = 7;
     const TYPE_MAP_REDUCE      = 8;
     const TYPE_DISTINCT_FIELD  = 9;
-    const TYPE_GEO_LOCATION    = 10;
+    const TYPE_GEO_NEAR        = 10;
     const TYPE_COUNT           = 11;
 
     /**
@@ -243,7 +243,7 @@ public function execute()
             case self::TYPE_DISTINCT_FIELD:
                 return $this->collection->distinct($this->query['distinctField'], $this->query['query'], $this->options);
 
-            case self::TYPE_GEO_LOCATION:
+            case self::TYPE_GEO_NEAR:
                 if (isset($this->query['limit']) && $this->query['limit']) {
                     $this->options['num'] = $this->query['limit'];
                 }

diff --git a/tests/Doctrine/MongoDB/Tests/Query/BuilderTest.php b/tests/Doctrine/MongoDB/Tests/Query/BuilderTest.php
@@ -451,7 +451,7 @@ public function testGeoNearQuery()
             ->field('type')->equals('restaurant')
             ->limit(10);
 
-        $this->assertEquals(Query::TYPE_GEO_LOCATION, $qb->getType());
+        $this->assertEquals(Query::TYPE_GEO_NEAR, $qb->getType());
 
         $expectedQuery = array('type' => 'restaurant');
         $this->assertEquals($expectedQuery, $qb->getQueryArray());

diff --git a/tests/Doctrine/MongoDB/Tests/Query/QueryTest.php b/tests/Doctrine/MongoDB/Tests/Query/QueryTest.php
@@ -45,7 +45,7 @@ public function testGeoNearOptionsArePassed()
         $collection = $this->getMockCollection();
 
         $queryArray = array(
-            'type' => Query::TYPE_GEO_LOCATION,
+            'type' => Query::TYPE_GEO_NEAR,
             'geoNear' => array(
                 'near' => array(50, 50),
                 'distanceMultiplier' => 2.5,