Changed scopeDistance() to scopeDistanceSphere(). Added scopeDistance, scopeDistanceValue, scopeDistanceSphereValue. Changed scopeBounding() to use st_intersects() instead of MBRIntersects(). Fixed code around dropping spatial index.

Author: grimzy

src/Connectors/ConnectionFactory.php

@@ -18,7 +18,7 @@ class ConnectionFactory extends \Illuminate\Database\Connectors\ConnectionFactor
     protected function createConnection($driver, $connection, $database, $prefix = '', array $config = [])
     {
         if ($this->container->bound($key = "db.connection.{$driver}")) {
-            return $this->container->make($key, [$connection, $database, $prefix, $config]);
+            return $this->container->make($key, [$connection, $database, $prefix, $config]);    // @codeCoverageIgnore
         }
 
         if ($driver === 'mysql') {

src/Eloquent/Builder.php

@@ -17,12 +17,6 @@ public function update(array $values)
         return parent::update($values);
     }
 
-//    protected function getSpatialFields()
-//    {
-//        return $this->getModel()->getSpatialFields();
-//    }
-
-
     protected function asWKT(GeometryInterface $geometry)
     {
         return $this->getQuery()->raw("GeomFromText('" . $geometry->toWKT() . "')");

src/Eloquent/SpatialTrait.php

@@ -60,7 +60,7 @@ public function setRawAttributes(array $attributes, $sync = false)
             }
         }
 
-        parent::setRawAttributes($attributes, $sync);
+        return parent::setRawAttributes($attributes, $sync);
     }
 
     public function getSpatialFields()
@@ -73,7 +73,15 @@ public function getSpatialFields()
     }
 
     public function scopeDistance($query, $distance, $geometry, $column_name, $exclude_self = false) {
-        // TODO: what about mysql 5.5?
+        $query->whereRaw("st_distance(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) <= {$distance}");
+
+        if($exclude_self) {
+            $query->whereRaw("st_distance(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) != 0");
+        }
+        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) {
@@ -82,7 +90,25 @@ public function scopeDistance($query, $distance, $geometry, $column_name, $exclu
         return $query;
     }
 
+    public function scopeDistanceValue($query, $geometry, $column_name) {
+        $columns = $query->getQuery()->columns;
+
+        if(!$columns) {
+            $query->select('*');
+        }
+        $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("MBRIntersects(GeomFromText('{$bounds->toWkt()}'), `{$column_name}`)");
+        return $query->whereRaw("st_intersects(GeomFromText('{$bounds->toWkt()}'), `{$column_name}`)");
     }
 }

src/Schema/Blueprint.php

@@ -108,7 +108,7 @@ public function spatialIndex($columns, $name = null) {
      * @param  string|array  $index
      * @return \Illuminate\Support\Fluent
      */
-    public function dropSpatial($index)
+    public function dropSpatialIndex($index)
     {
         return $this->dropIndexCommand('dropIndex', 'spatial', $index);
     }

src/Schema/Grammars/MySqlGrammar.php

@@ -105,20 +105,4 @@ public function compileSpatial(Blueprint $blueprint, Fluent $command)
     {
         return $this->compileKey($blueprint, $command, 'spatial');
     }
-
-    /**
-     * Compile a drop index command.
-     *
-     * @param  \Grimzy\LaravelSpatial\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
-     * @return string
-     */
-    public function compileDropSpatial(Blueprint $blueprint, Fluent $command)
-    {
-        $table = $this->wrapTable($blueprint);
-
-        $index = $this->wrap($command->index);
-
-        return "alter table {$table} drop index {$index}";
-    }
 }