Removed scopeBounding() in favor of scopeIntersects(). Adjusted tests for MySQL 5.6.

Also cleaned up unneeded Dockerfile.

Author: grimzy

.gitignore

@@ -1,4 +1,4 @@
 .idea/
 vendor/
 composer.lock
-_db/
+_db-*/

Dockerfile

@@ -93,11 +93,6 @@ public function scopeDistanceValue($query, $geometry, $column_name)
         $query->selectRaw("st_distance(`{$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}`)");
-    }
-
     public function scopeComparison($query, $geometryColumn, $geometry, $relationship)
     {
         $query->whereRaw("st_{$relationship}(`{$geometryColumn}`, GeomFromText('{$geometry->toWkt()}'))");

php.ini

@@ -194,37 +194,22 @@ public function testDistance()
 
         $a = GeometryModel::distance(2, $loc1->location, 'location')->get();
         $this->assertCount(2, $a);
-        $this->assertTrue($a->contains($loc1));
-        $this->assertTrue($a->contains($loc2));
-        $this->assertFalse($a->contains($loc3));
+        $this->assertTrue($a->contains('location', $loc1->location));
+        $this->assertTrue($a->contains('location', $loc2->location));
+        $this->assertFalse($a->contains('location', $loc3->location));
 
         // Excluding self
         $b = GeometryModel::distance(2, $loc1->location, 'location', true)->get();
         $this->assertCount(1, $b);
-        $this->assertFalse($b->contains($loc1));
-        $this->assertTrue($b->contains($loc2));
-        $this->assertFalse($b->contains($loc3));
+        $this->assertFalse($b->contains('location',$loc1->location));
+        $this->assertTrue($b->contains('location',$loc2->location));
+        $this->assertFalse($b->contains('location',$loc3->location));
 
         $c = GeometryModel::distance(1, $loc1->location, 'location')->get();
         $this->assertCount(1, $c);
-        $this->assertTrue($c->contains($loc1));
-        $this->assertFalse($c->contains($loc2));
-        $this->assertFalse($c->contains($loc3));
-    }
-
-    public function testDistanceSphere()
-    {
-        $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.741406484588
-        $loc2->save();
-
-        $loc3 = new GeometryModel();
-        $loc3->location = new Point(40.761434, -73.977619); // Distance from loc1: 870.06424066202
-        $loc3->save();
+        $this->assertTrue($c->contains('location', $loc1->location));
+        $this->assertFalse($c->contains('location', $loc2->location));
+        $this->assertFalse($c->contains('location', $loc3->location));
     }
 
     public function testDistanceValue()
@@ -242,36 +227,4 @@ public function testDistanceValue()
         $this->assertEquals(0, $a[0]->distance);
         $this->assertEquals(1.4142135623, $a[1]->distance); // PHP floats' 11th+ digits don't matter
     }
-
-    public function testBounding() {
-        $point = new Point(0, 0);
-
-        $linestring1 = \Grimzy\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(1 1, 2 2)");
-        $linestring2 = \Grimzy\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(20 20, 24 24)");
-        $linestring3 = \Grimzy\LaravelMysqlSpatial\Types\LineString::fromWkt("LINESTRING(0 10, 10 10)");
-
-        $geo1 = new GeometryModel();
-        $geo1->location = $point;
-        $geo1->line = $linestring1;
-        $geo1->save();
-
-        $geo2 = new GeometryModel();
-        $geo2->location = $point;
-        $geo2->line = $linestring2;
-        $geo2->save();
-
-        $geo3 = new GeometryModel();
-        $geo3->location = $point;
-        $geo3->line = $linestring3;
-        $geo3->save();
-
-        $polygon = Polygon::fromWKT("POLYGON((0 10,10 10,10 0,0 0,0 10))");
-
-        $result = GeometryModel::Bounding($polygon, 'line')->get();
-        $this->assertCount(2, $result);
-        $this->assertTrue($result->contains($geo1));
-        $this->assertFalse($result->contains($geo2));
-        $this->assertTrue($result->contains($geo3));
-
-    }
 }

src/Eloquent/SpatialTrait.php

@@ -253,15 +253,6 @@ private function buildTestPolygon(){
         return new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2, $linestring3]);
     }
 
-    public function testScopeBounding()
-    {
-        $query = TestModel::Bounding($this->buildTestPolygon(), 'point');
-        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
-        $q = $query->getQuery();
-        $this->assertNotEmpty($q->wheres);
-        $this->assertContains("st_intersects(GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'), `point`)", $q->wheres[0]['sql']);
-    }
-
     public function testScopeComparison()
     {
         $query = TestModel::Comparison('point',$this->buildTestPolygon(),'within');
@@ -357,7 +348,7 @@ class TestModel extends Model
 {
     use \Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
-    protected $spatialFields = ['point'];   // TODO: only required when fetching, not saving
+    protected $spatialFields = ['point'];   // only required when fetching, not saving
 
     public $timestamps = false;