Removed flag exclude_self in favor of new scopes.

Author: grimzy

src/Eloquent/SpatialTrait.php

@@ -72,24 +72,18 @@ public function getSpatialFields()
         }
     }
 
-    public function scopeDistance($query, $geometryColumn, $geometry, $distance, $exclude_self = false)
+    public function scopeDistance($query, $geometryColumn, $geometry, $distance)
     {
         $query->whereRaw("st_distance(`{$geometryColumn}`, ST_GeomFromText('{$geometry->toWkt()}')) <= {$distance}");
 
-        if ($exclude_self) {
-            $query->whereRaw("st_distance(`{$geometryColumn}`, ST_GeomFromText('{$geometry->toWkt()}')) != 0");
-        }
-
         return $query;
     }
 
-    public function scopeDistanceSphere($query, $geometryColumn, $geometry, $distance, $exclude_self = false)
+    public function scopeDistanceExcludingSelf($query, $geometryColumn, $geometry, $distance)
     {
-        $query->whereRaw("st_distance_sphere(`{$geometryColumn}`, ST_GeomFromText('{$geometry->toWkt()}')) <= {$distance}");
+        $query = $this->scopeDistance($query, $geometryColumn, $geometry, $distance);
 
-        if ($exclude_self) {
-            $query->whereRaw("st_distance_sphere(`{$geometryColumn}`, ST_GeomFromText('{$geometry->toWkt()}')) != 0");
-        }
+        $query->whereRaw("st_distance(`{$geometryColumn}`, ST_GeomFromText('{$geometry->toWkt()}')) != 0");
 
         return $query;
     }
@@ -104,6 +98,22 @@ public function scopeDistanceValue($query, $geometryColumn, $geometry)
         $query->selectRaw("st_distance(`{$geometryColumn}`, ST_GeomFromText('{$geometry->toWkt()}')) as distance");
     }
 
+    public function scopeDistanceSphere($query, $geometryColumn, $geometry, $distance)
+    {
+        $query->whereRaw("st_distance_sphere(`{$geometryColumn}`, ST_GeomFromText('{$geometry->toWkt()}')) <= {$distance}");
+
+        return $query;
+    }
+
+    public function scopeDistanceSphereExcludingSelf($query, $geometryColumn, $geometry, $distance)
+    {
+        $query = $this->scopeDistanceSphere($query, $geometryColumn, $geometry, $distance);
+
+        $query->whereRaw("st_distance_sphere(`{$geometryColumn}`, ST_GeomFromText('{$geometry->toWkt()}')) != 0");
+
+        return $query;
+    }
+
     public function scopeDistanceSphereValue($query, $geometryColumn, $geometry)
     {
         $columns = $query->getQuery()->columns;

tests/Integration/SpatialTest.php

@@ -199,7 +199,7 @@ public function testDistance()
         $this->assertFalse($a->contains('location', $loc3->location));
 
         // Excluding self
-        $b = GeometryModel::distance('location', $loc1->location, 2, true)->get();
+        $b = GeometryModel::distanceExcludingSelf('location', $loc1->location, 2)->get();
         $this->assertCount(1, $b);
         $this->assertFalse($b->contains('location', $loc1->location));
         $this->assertTrue($b->contains('location', $loc2->location));
@@ -233,7 +233,7 @@ public function testDistanceSphere()
         $this->assertFalse($a->contains('location', $loc3->location));
 
         // Excluding self
-        $b = GeometryModel::distanceSphere('location', $loc1->location, 200, true)->get();
+        $b = GeometryModel::distanceSphereExcludingSelf('location', $loc1->location, 200)->get();
         $this->assertCount(1, $b);
         $this->assertFalse($b->contains('location', $loc1->location));
         $this->assertTrue($b->contains('location', $loc2->location));

tests/Unit/Eloquent/SpatialTraitTest.php

@@ -205,7 +205,7 @@ public function testScopeDistance()
     public function testScopeDistanceExcludingSelf()
     {
         $point = new Point(1, 2);
-        $query = TestModel::Distance('point', $point, 10, true);
+        $query = TestModel::DistanceExcludingSelf('point', $point, 10);
 
         $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
@@ -228,7 +228,7 @@ public function testScopeDistanceSphere()
     public function testScopeDistanceSphereExcludingSelf()
     {
         $point = new Point(1, 2);
-        $query = TestModel::DistanceSphere('point', $point, 10, true);
+        $query = TestModel::DistanceSphereExcludingSelf('point', $point, 10);
 
         $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();