Added $exclude_self param to distance scope. Added functional test for distance.

Author: grimzy

src/Eloquent/SpatialTrait.php

@@ -4,6 +4,7 @@
 use Grimzy\LaravelSpatial\Exceptions\SpatialFieldsNotDefinedException;
 use Grimzy\LaravelSpatial\Types\Geometry;
 use Grimzy\LaravelSpatial\Types\GeometryInterface;
+use Grimzy\LaravelSpatial\Types\Point;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 trait SpatialTrait
@@ -71,12 +72,14 @@ public function getSpatialFields()
         }
     }
 
-    public function scopeDistance($query, $distance, $point, $column_name) {
-        // TODO: check if array, and transform to string delimited by ,
-        // TODO: what about mysql 5.5? distance_sphere? need test
-        return $query
-          ->whereRaw("st_distance_sphere(`{$column_name}`, POINT({$point->getLng()}, {$point->getLat()})) <= {$distance}")
-          ->whereRaw("st_distance_sphere(`{$column_name}`, POINT({$point->getLng()}, {$point->getLat()})) != 0");
+    public function scopeDistance($query, $distance, $geometry, $column_name, $exclude_self = false) {
+        // TODO: what about mysql 5.5?
+        $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 scopeBounding($query, Geometry $bounds, $column_name) {

tests/Feature/SpatialTest.php

@@ -52,10 +52,11 @@ public function tearDown()
 
     protected function assertDatabaseHas($table, array $data, $connection = null)
     {
-        if(method_exists($this, 'seeInDatabase')) {
+        if (method_exists($this, 'seeInDatabase')) {
             $this->seeInDatabase($table, $data, $connection);
+        } else {
+            parent::assertDatabaseHas($table, $data, $connection);
         }
-        parent::assertDatabaseHas($table, $data, $connection);
     }
 
     private function onMigrations(\Closure $closure)
@@ -101,4 +102,37 @@ public function testUpdate()
         $this->assertEquals(2, $updated->location->getLat());
         $this->assertEquals(3, $updated->location->getLng());
     }
+
+    public function testDistance()
+    {
+        $loc1 = new GeometryModel();
+        $loc1->location = new Point(40.767864, -73.971732);
+        $loc1->save();
+
+        $loc2 = new GeometryModel();
+        $loc2->location = new Point(40.767664, -73.971271); // Distance from loc1: 44.7414064845878
+        $loc2->save();
+
+        $loc3 = new GeometryModel();
+        $loc3->location = new Point(40.761434, -73.977619);
+        $loc3->save();
+
+        $a = GeometryModel::distance(45, $loc1->location, 'location')->get();
+        $this->assertCount(2, $a);
+        $this->assertTrue($a->contains($loc1));
+        $this->assertTrue($a->contains($loc2));
+        $this->assertFalse($a->contains($loc3));
+
+        $b = GeometryModel::distance(45, $loc1->location, 'location', true)->get();
+        $this->assertCount(1, $b);
+        $this->assertFalse($b->contains($loc1));
+        $this->assertTrue($b->contains($loc2));
+        $this->assertFalse($b->contains($loc3));
+
+        $c = GeometryModel::distance(44.741406484587, $loc1->location, 'location')->get();
+        $this->assertCount(1, $c);
+        $this->assertTrue($c->contains($loc1));
+        $this->assertFalse($c->contains($loc2));
+        $this->assertFalse($c->contains($loc3));
+    }
 }

tests/Unit/Eloquent/SpatialTraitTest.php

@@ -50,11 +50,10 @@ class TestModel extends Model
 {
     use \Grimzy\LaravelSpatial\Eloquent\SpatialTrait;
 
-    protected $postgisFields = [
+    protected $spatialFields = [
         'point' => Point::class
     ];
 
-
     public static $pdo;
 
     public static function resolveConnection($connection = null)
@@ -96,7 +95,7 @@ class TestPDO extends PDO
     public $queries = [];
     public $counter = 1;
 
-    public function prepare($statement, $driver_options = null)
+    public function prepare($statement, $driver_options = array())
     {
         $this->queries[] = $statement;