Removed st_distance_sphere()

Author: grimzy

src/Eloquent/SpatialTrait.php

@@ -83,17 +83,6 @@ public function scopeDistance($query, $distance, $geometry, $column_name, $exclu
         return $query;
     }
 
-    public function scopeDistanceSphere($query, $distance, $geometry, $column_name, $exclude_self = false)
-    {
-        $query->whereRaw("st_distance_sphere(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) <= {$distance}");
-
-        if ($exclude_self) {
-            $query->whereRaw("st_distance_sphere(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) != 0");
-        }
-
-        return $query;
-    }
-
     public function scopeDistanceValue($query, $geometry, $column_name)
     {
         $columns = $query->getQuery()->columns;
@@ -104,16 +93,6 @@ public function scopeDistanceValue($query, $geometry, $column_name)
         $query->selectRaw("st_distance(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) as distance");
     }
 
-    public function scopeDistanceSphereValue($query, $geometry, $column_name)
-    {
-        $columns = $query->getQuery()->columns;
-
-        if (! $columns) {
-            $query->select('*');
-        }
-        $query->selectRaw("st_distance_sphere(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) as distance");
-    }
-
     public function scopeBounding($query, Geometry $bounds, $column_name)
     {
         return $query->whereRaw("st_intersects(GeomFromText('{$bounds->toWkt()}'), `{$column_name}`)");

tests/Unit/Eloquent/SpatialTraitTest.php

@@ -214,29 +214,6 @@ public function testScopeDistanceExcludingSelf()
         $this->assertContains("st_distance(`point`, GeomFromText('POINT(2 1)')) != 0", $q->wheres[1]['sql']);
     }
 
-    public function testScopeDistanceSphere()
-    {
-        $point = new Point(1, 2);
-        $query = TestModel::DistanceSphere(10, $point, 'point');
-
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
-        $q = $query->getQuery();
-        $this->assertNotEmpty($q->wheres);
-        $this->assertContains("st_distance_sphere(`point`, GeomFromText('POINT(2 1)')) <= 10", $q->wheres[0]['sql']);
-    }
-
-    public function testScopeDistanceSphereExcludingSelf()
-    {
-        $point = new Point(1, 2);
-        $query = TestModel::DistanceSphere(10, $point, 'point', true);
-
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
-        $q = $query->getQuery();
-        $this->assertNotEmpty($q->wheres);
-        $this->assertContains("st_distance_sphere(`point`, GeomFromText('POINT(2 1)')) <= 10", $q->wheres[0]['sql']);
-        $this->assertContains("st_distance_sphere(`point`, GeomFromText('POINT(2 1)')) != 0", $q->wheres[1]['sql']);
-    }
-
     public function testScopeDistanceValue()
     {
         $point = new Point(1, 2);
@@ -263,32 +240,6 @@ public function testScopeDistanceValueWithSelect()
         $this->assertContains("st_distance(`point`, GeomFromText('POINT(2 1)')) as distance", $q->columns[1]->getValue());
     }
 
-    public function testScopeDistanceSphereValue()
-    {
-        $point = new Point(1, 2);
-        $query = TestModel::DistanceSphereValue($point, 'point');
-
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
-        $q = $query->getQuery();
-        $this->assertNotEmpty($q->columns);
-        $this->assertContains("*", $q->columns[0]);
-        $this->assertInstanceOf(\Illuminate\Database\Query\Expression::class, $q->columns[1]);
-        $this->assertContains("st_distance_sphere(`point`, GeomFromText('POINT(2 1)')) as distance", $q->columns[1]->getValue());
-    }
-
-    public function testScopeDistanceSphereValueWithSelect()
-    {
-        $point = new Point(1, 2);
-        $query = TestModel::select('some_column')->distanceSphereValue($point, 'point');
-
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
-        $q = $query->getQuery();
-        $this->assertNotEmpty($q->columns);
-        $this->assertContains("some_column", $q->columns[0]);
-        $this->assertInstanceOf(\Illuminate\Database\Query\Expression::class, $q->columns[1]);
-        $this->assertContains("st_distance_sphere(`point`, GeomFromText('POINT(2 1)')) as distance", $q->columns[1]->getValue());
-    }
-
     private function buildTestPolygon(){
         $point1 = new Point(1, 1);
         $point2 = new Point(1, 2);