move toFeatureCollectionJson to Geometry

Author: MatanYadaev

phpinsights.php

@@ -96,6 +96,7 @@
         InlineDocCommentDeclarationSniff::class => [
             'exclude' => [
                 'src/Factory.php',
+                'src/Objects/Geometry.php',
             ],
         ],
         UnusedParameterSniff::class => [

src/Objects/Geometry.php

@@ -82,18 +82,27 @@ public function toArray(): array
         ];
     }
 
-    /**
-     * @return array{
-     *   type: string, properties: array<mixed>, geometry: array{type: string, coordinates: array<mixed>}
-     * }
-     */
-    public function toFeature(): array
+    public function toFeatureCollectionJson(): string
     {
-        return [
-            'type' => 'Feature',
-            'properties' => [],
-            'geometry' => $this->toArray(),
-        ];
+        if (static::class === GeometryCollection::class) {
+            /** @var GeometryCollection $this */
+            $geometries = $this->geometries;
+        } else {
+            $geometries = collect([$this]);
+        }
+
+        $features = $geometries->map(static function (self $geometry): array {
+            return [
+                'type' => 'Feature',
+                'properties' => [],
+                'geometry' => $geometry->toArray(),
+            ];
+        });
+
+        return json_encode([
+            'type' => 'FeatureCollection',
+            'features' => $features,
+        ]);
     }
 
     /**

src/Objects/GeometryCollection.php

@@ -78,23 +78,6 @@ public function getGeometries(): array
         return $this->geometries->all();
     }
 
-    public function toFeatureCollectionJson(): string
-    {
-        /** @var Collection<Geometry> $geometries */
-        $geometries = static::class === self::class
-            ? $this->geometries
-            : collect([$this]);
-
-        $features = $geometries->map(static function (Geometry $geometry): array {
-            return $geometry->toFeature();
-        });
-
-        return json_encode([
-            'type' => 'FeatureCollection',
-            'features' => $features,
-        ]);
-    }
-
     /**
      * @throws InvalidArgumentException
      */