Some GeoJSON fixes

Author: mevdschee

src/Tqdev/PhpCrudApi/GeoJson/Feature.php

@@ -6,7 +6,7 @@ class Feature implements \JsonSerializable
     private $properties;
     private $geometry;
 
-    public function __construct(array $properties, Geometry $geometry)
+    public function __construct(array $properties, /*?Geometry*/ $geometry)
     {
         $this->properties = $properties;
         $this->geometry = $geometry;

src/Tqdev/PhpCrudApi/GeoJson/GeoJsonService.php

@@ -43,9 +43,12 @@ private function getGeometryColumnName(string $tableName, string $geometryParam)
 
     private function convertRecordToFeature( /*object*/$record, string $geometryColumnName)
     {
-        $geometry = Geometry::fromWkt($record[$geometryColumnName]);
-        unset($record[$geometryColumnName]);
-        return new Feature($record, $geometry);
+        $geometry = null;
+        if (isset($record[$geometryColumnName])) {
+            $geometry = Geometry::fromWkt($record[$geometryColumnName]);
+        }
+        $properties = array_diff_key($record, [$geometryColumnName => true]);
+        return new Feature($properties, $geometry);
     }
 
     public function _list(string $tableName, array $params): FeatureCollection
@@ -63,15 +66,11 @@ public function _list(string $tableName, array $params): FeatureCollection
         return new FeatureCollection($features);
     }
 
-    public function read(string $tableName, string $id, array $params) /*: ?Feature*/
+    public function read(string $tableName, string $id, array $params): Feature
     {
         $geometryParam = isset($params['geometry']) ? $params['geometry'] : '';
         $geometryColumnName = $this->getGeometryColumnName($tableName, $geometryParam);
         $record = $this->records->read($tableName, $id, $params);
-        if (!isset($record[$geometryColumnName])) {
-            print_r($record);
-            return null;
-        }
         return $this->convertRecordToFeature($record, $geometryColumnName);
     }
 }