Changed namespace from Grimzy\LaravelSpatial to Grimzy\LaravelMysqlSp…

…atial
grimzy · Jun 4, 2017 · b5a90c6 · b5a90c6
1 parent 422e3f3
commit b5a90c6
Show file tree

Hide file tree

Showing 40 changed files with 201 additions and 191 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Grimzy\\LaravelSpatial\\": "src/"
+            "Grimzy\\LaravelMysqlSpatial\\": "src/"
         }
     },
     "autoload-dev" : {

diff --git a/src/Connectors/ConnectionFactory.php b/src/Connectors/ConnectionFactory.php
@@ -1,7 +1,8 @@
 <?php
-namespace Grimzy\LaravelSpatial\Connectors;
 
-use Grimzy\LaravelSpatial\MysqlConnection;
+namespace Grimzy\LaravelMysqlSpatial\Connectors;
+
+use Grimzy\LaravelMysqlSpatial\MysqlConnection;
 use PDO;
 
 class ConnectionFactory extends \Illuminate\Database\Connectors\ConnectionFactory

diff --git a/src/Eloquent/Builder.php b/src/Eloquent/Builder.php
@@ -1,7 +1,8 @@
 <?php
-namespace Grimzy\LaravelSpatial\Eloquent;
 
-use Grimzy\LaravelSpatial\Types\GeometryInterface;
+namespace Grimzy\LaravelMysqlSpatial\Eloquent;
+
+use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 class Builder extends EloquentBuilder
@@ -19,6 +20,6 @@ public function update(array $values)
 
     protected function asWKT(GeometryInterface $geometry)
     {
-        return $this->getQuery()->raw("GeomFromText('" . $geometry->toWKT() . "')");
+        return $this->getQuery()->raw("GeomFromText('".$geometry->toWKT()."')");
     }
 }
diff --git a/src/Eloquent/SpatialTrait.php b/src/Eloquent/SpatialTrait.php
@@ -1,10 +1,10 @@
 <?php
-namespace Grimzy\LaravelSpatial\Eloquent;
 
-use Grimzy\LaravelSpatial\Exceptions\SpatialFieldsNotDefinedException;
-use Grimzy\LaravelSpatial\Types\Geometry;
-use Grimzy\LaravelSpatial\Types\GeometryInterface;
-use Grimzy\LaravelSpatial\Types\Point;
+namespace Grimzy\LaravelMysqlSpatial\Eloquent;
+
+use Grimzy\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException;
+use Grimzy\LaravelMysqlSpatial\Types\Geometry;
+use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 trait SpatialTrait
@@ -25,7 +25,7 @@ trait SpatialTrait
      *
      * @param  \Illuminate\Database\Query\Builder $query
      *
-     * @return \Grimzy\LaravelSpatial\Eloquent\Builder
+     * @return \Grimzy\LaravelMysqlSpatial\Eloquent\Builder
      */
     public function newEloquentBuilder($query)
     {
@@ -68,47 +68,54 @@ public function getSpatialFields()
         if (property_exists($this, 'spatialFields')) {
             return $this->spatialFields;
         } else {
-            throw new SpatialFieldsNotDefinedException(__CLASS__ . ' has to define $spatialFields');
+            throw new SpatialFieldsNotDefinedException(__CLASS__.' has to define $spatialFields');
         }
     }
 
-    public function scopeDistance($query, $distance, $geometry, $column_name, $exclude_self = false) {
+    public function scopeDistance($query, $distance, $geometry, $column_name, $exclude_self = false)
+    {
         $query->whereRaw("st_distance(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) <= {$distance}");
 
-        if($exclude_self) {
+        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) {
+    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) {
+        if ($exclude_self) {
             $query->whereRaw("st_distance_sphere(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) != 0");
         }
+
         return $query;
     }
 
-    public function scopeDistanceValue($query, $geometry, $column_name) {
+    public function scopeDistanceValue($query, $geometry, $column_name)
+    {
         $columns = $query->getQuery()->columns;
 
-        if(!$columns) {
+        if (! $columns) {
             $query->select('*');
         }
         $query->selectRaw("st_distance(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) as distance");
     }
 
-    public function scopeDistanceSphereValue($query, $geometry, $column_name) {
+    public function scopeDistanceSphereValue($query, $geometry, $column_name)
+    {
         $columns = $query->getQuery()->columns;
 
-        if(!$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) {
+    public function scopeBounding($query, Geometry $bounds, $column_name)
+    {
         return $query->whereRaw("st_intersects(GeomFromText('{$bounds->toWkt()}'), `{$column_name}`)");
     }
 }
diff --git a/src/Exceptions/SpatialFieldsNotDefinedException.php b/src/Exceptions/SpatialFieldsNotDefinedException.php
@@ -1,5 +1,6 @@
 <?php
-namespace Grimzy\LaravelSpatial\Exceptions;
+
+namespace Grimzy\LaravelMysqlSpatial\Exceptions;
 
 class SpatialFieldsNotDefinedException extends \RuntimeException
 {

diff --git a/src/Exceptions/UnknownWKTTypeException.php b/src/Exceptions/UnknownWKTTypeException.php
@@ -1,5 +1,6 @@
 <?php
-namespace Grimzy\LaravelSpatial\Exceptions;
+
+namespace Grimzy\LaravelMysqlSpatial\Exceptions;
 
 class UnknownWKTTypeException extends \RuntimeException
 {

diff --git a/src/MysqlConnection.php b/src/MysqlConnection.php
@@ -1,5 +1,6 @@
 <?php
-namespace Grimzy\LaravelSpatial;
+
+namespace Grimzy\LaravelMysqlSpatial;
 
 class MysqlConnection extends \Illuminate\Database\MySqlConnection
 {
@@ -21,7 +22,6 @@ protected function getDefaultSchemaGrammar()
         return $this->withTablePrefix(new Schema\Grammars\MySqlGrammar());
     }
 
-
     public function getSchemaBuilder()
     {
         if (is_null($this->schemaGrammar)) {

diff --git a/src/Schema/Blueprint.php b/src/Schema/Blueprint.php
@@ -1,5 +1,6 @@
 <?php
-namespace Grimzy\LaravelSpatial\Schema;
+
+namespace Grimzy\LaravelMysqlSpatial\Schema;
 
 class Blueprint extends \Illuminate\Database\Schema\Blueprint
 {
@@ -94,18 +95,19 @@ public function geometryCollection($column)
     /**
      * Specify a spatial index for the table
      *
-     * @param  string|array  $columns
-     * @param  string  $name
+     * @param  string|array $columns
+     * @param  string $name
      * @return \Illuminate\Support\Fluent
      */
-    public function spatialIndex($columns, $name = null) {
+    public function spatialIndex($columns, $name = null)
+    {
         return $this->indexCommand('spatial', $columns, $name);
     }
 
     /**
      * Indicate that the given index should be dropped.
      *
-     * @param  string|array  $index
+     * @param  string|array $index
      * @return \Illuminate\Support\Fluent
      */
     public function dropSpatialIndex($index)

diff --git a/src/Schema/Builder.php b/src/Schema/Builder.php
@@ -1,5 +1,6 @@
 <?php
-namespace Grimzy\LaravelSpatial\Schema;
+
+namespace Grimzy\LaravelMysqlSpatial\Schema;
 
 use Closure;
 use Illuminate\Database\Schema\MySqlBuilder;

diff --git a/src/Schema/Grammars/MySqlGrammar.php b/src/Schema/Grammars/MySqlGrammar.php
@@ -1,7 +1,8 @@
 <?php
-namespace Grimzy\LaravelSpatial\Schema\Grammars;
 
-use Grimzy\LaravelSpatial\Schema\Blueprint;
+namespace Grimzy\LaravelMysqlSpatial\Schema\Grammars;
+
+use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
 use Illuminate\Support\Fluent;
 
 class MySqlGrammar extends \Illuminate\Database\Schema\Grammars\MySqlGrammar
@@ -97,8 +98,8 @@ public function typeGeometrycollection(Fluent $column)
     /**
      * Compile a spatial index key command.
      *
-     * @param  \Grimzy\LaravelSpatial\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Grimzy\LaravelMysqlSpatial\Schema\Blueprint $blueprint
+     * @param  \Illuminate\Support\Fluent $command
      * @return string
      */
     public function compileSpatial(Blueprint $blueprint, Fluent $command)

diff --git a/src/SpatialServiceProvider.php b/src/SpatialServiceProvider.php
@@ -1,17 +1,18 @@
 <?php
-namespace Grimzy\LaravelSpatial;
 
-use Grimzy\LaravelSpatial\Connectors\ConnectionFactory;
+namespace Grimzy\LaravelMysqlSpatial;
+
+use Grimzy\LaravelMysqlSpatial\Connectors\ConnectionFactory;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Database\DatabaseServiceProvider;
 
 /**
  * Class DatabaseServiceProvider
- * @package Grimzy\LaravelSpatial
+ *
+ * @package Grimzy\LaravelMysqlSpatial
  */
 class SpatialServiceProvider extends DatabaseServiceProvider
 {
-
     /**
      * Register the service provider.
      *

diff --git a/src/Types/Factory.php b/src/Types/Factory.php
@@ -1,5 +1,6 @@
 <?php
-namespace Grimzy\LaravelSpatial\Types;
+
+namespace Grimzy\LaravelMysqlSpatial\Types;
 
 class Factory implements \GeoIO\Factory
 {
@@ -42,5 +43,4 @@ public function createGeometryCollection($dimension, array $geometries, $srid =
     {
         return new GeometryCollection($geometries);
     }
-
 }
diff --git a/src/Types/Geometry.php b/src/Types/Geometry.php
@@ -1,8 +1,9 @@
 <?php
-namespace Grimzy\LaravelSpatial\Types;
+
+namespace Grimzy\LaravelMysqlSpatial\Types;
 
 use GeoIO\WKB\Parser\Parser;
-use Grimzy\LaravelSpatial\Exceptions\UnknownWKTTypeException;
+use Grimzy\LaravelMysqlSpatial\Exceptions\UnknownWKTTypeException;
 
 abstract class Geometry implements GeometryInterface, \JsonSerializable
 {
@@ -13,7 +14,7 @@ abstract class Geometry implements GeometryInterface, \JsonSerializable
         4 => MultiPoint::class,
         5 => MultiLineString::class,
         6 => MultiPolygon::class,
-        7 => GeometryCollection::class
+        7 => GeometryCollection::class,
     ];
 
     public static function getWKTArgument($value)
@@ -45,7 +46,7 @@ public static function getWKTClass($value)
             case 'GEOMETRYCOLLECTION':
                 return GeometryCollection::class;
             default:
-                throw new UnknownWKTTypeException('Type was ' . $type);
+                throw new UnknownWKTTypeException('Type was '.$type);
         }
     }
 
@@ -58,6 +59,7 @@ public static function fromWKB($wkb)
         }
 
         $parser = new Parser(new Factory());
+
         return $parser->parse($wkb);
     }
 

diff --git a/src/Types/GeometryCollection.php b/src/Types/GeometryCollection.php
@@ -1,8 +1,8 @@
 <?php
-namespace Grimzy\LaravelSpatial\Types;
+
+namespace Grimzy\LaravelMysqlSpatial\Types;
 
 use Countable;
-use GeoJson\GeoJson;
 use InvalidArgumentException;
 
 class GeometryCollection extends Geometry implements Countable
@@ -36,37 +36,25 @@ public function getGeometries()
 
     public function toWKT()
     {
-        return sprintf('GEOMETRYCOLLECTION(%s)', (string)$this);
+        return sprintf('GEOMETRYCOLLECTION(%s)', (string) $this);
     }
 
     public function __toString()
     {
-        return implode(
-            ',',
-            array_map(
-                function (GeometryInterface $geometry) {
-                    return $geometry->toWKT();
-                },
-                $this->geometries
-            )
-        );
+        return implode(',', array_map(function (GeometryInterface $geometry) {
+                return $geometry->toWKT();
+            }, $this->geometries));
     }
 
     public static function fromString($wktArgument)
     {
         $geometry_strings = preg_split('/,\s*(?=[A-Za-z])/', $wktArgument);
 
-        return new static(
-            array_map(
-                function ($geometry_string) {
-                    $klass = Geometry::getWKTClass($geometry_string);
-
-                    return call_user_func($klass . '::fromWKT', $geometry_string);
+        return new static(array_map(function ($geometry_string) {
+                $klass = Geometry::getWKTClass($geometry_string);
 
-                },
-                $geometry_strings
-            )
-        );
+                return call_user_func($klass.'::fromWKT', $geometry_string);
+            }, $geometry_strings));
     }
 
     public function count()

diff --git a/src/Types/GeometryInterface.php b/src/Types/GeometryInterface.php
@@ -1,5 +1,6 @@
 <?php
-namespace Grimzy\LaravelSpatial\Types;
+
+namespace Grimzy\LaravelMysqlSpatial\Types;
 
 interface GeometryInterface
 {
@@ -10,5 +11,4 @@ public static function fromWKT($wkt);
     public function __toString();
 
     public static function fromString($wktArgument);
-
 }
diff --git a/src/Types/LineString.php b/src/Types/LineString.php
@@ -1,5 +1,6 @@
 <?php
-namespace Grimzy\LaravelSpatial\Types;
+
+namespace Grimzy\LaravelMysqlSpatial\Types;
 
 class LineString extends PointCollection implements GeometryInterface
 {