fixes

Author: MatanYadaev

src/Builders/SpatialBuilder.php

@@ -2,7 +2,6 @@
 
 namespace MatanYadaev\EloquentSpatial\Builders;
 
-use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Expression;
 use MatanYadaev\EloquentSpatial\Objects\Geometry;
@@ -20,7 +19,7 @@ public function withDistance(string $column, Geometry | string $geometryOrColumn
         return $this->selectRaw("ST_DISTANCE(`{$column}`, {$geometryOrColumn}) AS {$as}");
     }
 
-    public function whereDistance(string $column, Geometry | string $geometryOrColumn, string $operator, int|float $distance): self
+    public function whereDistance(string $column, Geometry | string $geometryOrColumn, string $operator, int | float $distance): self
     {
         $geometryOrColumn = $this->toExpression($geometryOrColumn);
 
@@ -51,7 +50,7 @@ public function withDistanceSphere(string $column, Geometry | string $geometryOr
         return $this;
     }
 
-    public function whereDistanceSphere(string $column, Geometry | string $geometryOrColumn, string $operator, int|float $distance): self
+    public function whereDistanceSphere(string $column, Geometry | string $geometryOrColumn, string $operator, int | float $distance): self
     {
         $geometryOrColumn = $this->toExpression($geometryOrColumn);
 

src/Factory.php

@@ -5,7 +5,6 @@
 use Collection as geoPHPGeometryCollection;
 use Geometry as geoPHPGeometry;
 use geoPHP;
-use Illuminate\Support\Collection;
 use LineString as geoPHPLineString;
 use MatanYadaev\EloquentSpatial\Objects\Geometry;
 use MatanYadaev\EloquentSpatial\Objects\GeometryCollection;
@@ -25,17 +24,14 @@ class Factory
 {
     public static function parse(string $value): Geometry
     {
-        if (is_json($value)) {
-            /** @var geoPHPGeometry $geoPHPGeometry */
-            $geoPHPGeometry = geoPHP::load($value);
-        } else {
+        if (! is_json($value)) {
             // MySQL adds 4 NULL bytes at the start of the WKB
             $value = substr($value, 4);
-
-            /** @var geoPHPGeometry $geoPHPGeometry */
-            $geoPHPGeometry = geoPHP::load($value);
         }
 
+        /** @var geoPHPGeometry $geoPHPGeometry */
+        $geoPHPGeometry = geoPHP::load($value);
+
         return self::create($geoPHPGeometry);
     }
 
@@ -63,6 +59,7 @@ protected static function create(geoPHPGeometry $geometry): Geometry
             if ($className === geoPHPMultiPolygon::class) {
                 return self::createMultiPolygon($components);
             }
+
             return self::createGeometryCollection($components);
         }
         if ($geometry instanceof geoPHPPoint) {

tests/Builders/SpatialBuilderTest.php

@@ -5,7 +5,6 @@
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use MatanYadaev\EloquentSpatial\Objects\MultiPolygon;
 use MatanYadaev\EloquentSpatial\Objects\Point;
-use MatanYadaev\EloquentSpatial\Objects\Polygon;
 use MatanYadaev\EloquentSpatial\Tests\TestCase;
 use MatanYadaev\EloquentSpatial\Tests\TestModels\TestPlace;
 

tests/Objects/GeometryCollectionTest.php

@@ -5,7 +5,6 @@
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use MatanYadaev\EloquentSpatial\Objects\GeometryCollection;
 use MatanYadaev\EloquentSpatial\Objects\LineString;
-use MatanYadaev\EloquentSpatial\Objects\MultiPolygon;
 use MatanYadaev\EloquentSpatial\Objects\Point;
 use MatanYadaev\EloquentSpatial\Objects\Polygon;
 use MatanYadaev\EloquentSpatial\Tests\TestCase;

tests/Objects/MultiPointTest.php

@@ -3,7 +3,6 @@
 namespace MatanYadaev\EloquentSpatial\Tests\Objects;
 
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use MatanYadaev\EloquentSpatial\Objects\LineString;
 use MatanYadaev\EloquentSpatial\Objects\MultiPoint;
 use MatanYadaev\EloquentSpatial\Objects\Point;
 use MatanYadaev\EloquentSpatial\Tests\TestCase;

tests/Objects/MultiPolygonTest.php

@@ -27,7 +27,7 @@ public function it_stores_multi_polygon()
                         new Point(23.3, 55.7),
                         new Point(23.1, 55.5),
                     ]),
-                ])
+                ]),
             ]),
         ])->fresh();
 
@@ -86,7 +86,7 @@ public function it_generates_multi_polygon_geo_json()
                     new Point(23.3, 55.7),
                     new Point(23.1, 55.5),
                 ]),
-            ])
+            ]),
         ]);
 
         $this->assertEquals('{"type":"MultiPolygon","coordinates":[[[[55.5,23.1],[55.6,23.2],[55.7,23.3],[55.5,23.1]]]]}', $multiPolygon->toJson());