fix feature collection schema

Author: MatanYadaev

src/Objects/Geometry.php

@@ -78,6 +78,15 @@ public function toArray(): array
         ];
     }
 
+    public function toFeature(): array
+    {
+        return [
+            'type' => 'Feature',
+            'properties' => [],
+            'geometry' => $this->toArray()
+        ];
+    }
+
     /**
      * @return array<mixed>
      */

src/Objects/GeometryCollection.php

@@ -80,9 +80,14 @@ public function getGeometries(): array
 
     public function toFeatureCollectionJson(): string
     {
-        $features = static::class === self::class
-            ? $this->toArray()['geometries']
-            : [$this->toArray()];
+        /** @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',

tests/Objects/GeometryCollectionTest.php

@@ -102,7 +102,7 @@ public function it_stores_geometry_collection_from_feature_collection_geo_json()
     {
         /** @var TestPlace $testPlace */
         $testPlace = TestPlace::factory()->create([
-            'geometry_collection' => GeometryCollection::fromJson('{"type":"FeatureCollection","features":[{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2],[3,3],[0,0]]]},{"type":"Point","coordinates":[0,0]}]}'),
+            'geometry_collection' => GeometryCollection::fromJson('{"type":"FeatureCollection","features":[{"type":"Feature","properties":[],"geometry":{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2],[3,3],[0,0]]]}},{"type":"Feature","properties":[],"geometry":{"type":"Point","coordinates":[0,0]}}]}'),
         ])->fresh();
 
         $this->assertTrue($testPlace->geometry_collection instanceof GeometryCollection);
@@ -172,7 +172,7 @@ public function it_generates_geometry_collection_feature_collection_json(): void
         ]);
 
         $this->assertEquals(
-            '{"type":"FeatureCollection","features":[{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2],[3,3],[0,0]]]},{"type":"Point","coordinates":[0,0]}]}',
+            '{"type":"FeatureCollection","features":[{"type":"Feature","properties":[],"geometry":{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2],[3,3],[0,0]]]}},{"type":"Feature","properties":[],"geometry":{"type":"Point","coordinates":[0,0]}}]}',
             $geometryCollection->toFeatureCollectionJson()
         );
     }

tests/Objects/LineStringTest.php

@@ -74,6 +74,6 @@ public function it_generates_line_string_feature_collection_json(): void
             new Point(1, 1),
         ]);
 
-        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"LineString","coordinates":[[0,0],[1,1]]}]}', $lineString->toFeatureCollectionJson());
+        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"Feature","properties":[],"geometry":{"type":"LineString","coordinates":[[0,0],[1,1]]}}]}', $lineString->toFeatureCollectionJson());
     }
 }

tests/Objects/MultiLineStringTest.php

@@ -83,6 +83,6 @@ public function it_generates_multi_line_string_feature_collection_json(): void
             ]),
         ]);
 
-        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"MultiLineString","coordinates":[[[0,0],[1,1]]]}]}', $multiLineString->toFeatureCollectionJson());
+        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"Feature","properties":[],"geometry":{"type":"MultiLineString","coordinates":[[[0,0],[1,1]]]}}]}', $multiLineString->toFeatureCollectionJson());
     }
 }

tests/Objects/MultiPointTest.php

@@ -67,6 +67,6 @@ public function it_generates_multi_point_feature_collection_json(): void
             new Point(0, 0),
         ]);
 
-        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"MultiPoint","coordinates":[[0,0]]}]}', $multiPoint->toFeatureCollectionJson());
+        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"Feature","properties":[],"geometry":{"type":"MultiPoint","coordinates":[[0,0]]}}]}', $multiPoint->toFeatureCollectionJson());
     }
 }

tests/Objects/MultiPolygonTest.php

@@ -113,6 +113,6 @@ public function it_generates_multi_polygon_feature_collection_json(): void
             ]),
         ]);
 
-        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"MultiPolygon","coordinates":[[[[0,0],[1,1],[2,2],[3,3],[0,0]]]]}]}', $multiPolygon->toFeatureCollectionJson());
+        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"Feature","properties":[],"geometry":{"type":"MultiPolygon","coordinates":[[[[0,0],[1,1],[2,2],[3,3],[0,0]]]]}}]}', $multiPolygon->toFeatureCollectionJson());
     }
 }

tests/Objects/PolygonTest.php

@@ -104,6 +104,6 @@ public function it_generates_polygon_feature_collection_json(): void
             ]),
         ]);
 
-        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2],[3,3],[0,0]]]}]}', $polygon->toFeatureCollectionJson());
+        $this->assertEquals('{"type":"FeatureCollection","features":[{"type":"Feature","properties":[],"geometry":{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2],[3,3],[0,0]]]}}]}', $polygon->toFeatureCollectionJson());
     }
 }