Some GeoJSON fixes

Author: mevdschee

src/Tqdev/PhpCrudApi/GeoJson/FeatureCollection.php

@@ -5,21 +5,27 @@ class FeatureCollection implements \JsonSerializable
 {
     private $features;
 
-    public function __construct(array $features)
+    private $results;
+
+    public function __construct(array $features, int $results)
     {
         $this->features = $features;
+        $this->results = $results;
     }
 
     public function serialize()
     {
         return [
             'type' => 'FeatureCollection',
             'features' => $this->features,
+            'results' => $this->results,
         ];
     }
 
     public function jsonSerialize()
     {
-        return $this->serialize();
+        return array_filter($this->serialize(), function ($v) {
+            return $v !== 0;
+        });
     }
 }

src/Tqdev/PhpCrudApi/GeoJson/GeoJsonService.php

@@ -61,7 +61,7 @@ public function _list(string $tableName, array $params): FeatureCollection
         foreach ($records->getRecords() as $record) {
             $features[] = $this->convertRecordToFeature($record, $geometryColumnName);
         }
-        return new FeatureCollection($features);
+        return new FeatureCollection($features, $records->getResults());
     }
 
     public function read(string $tableName, string $id, array $params): Feature

tests/functional/001_records/083_list_users_as_geojson.log

@@ -5,3 +5,11 @@ Content-Type: application/json
 Content-Length: 269
 
 {"type":"FeatureCollection","features":[{"type":"Feature","properties":{"id":1,"username":"user1","password":"testtest2"},"geometry":{"type":"Point","coordinates":[30,20]}},{"type":"Feature","properties":{"id":2,"username":"user2","password":"pass2"},"geometry":null}]}
+===
+GET /geojson/users?page=1,1
+===
+200
+Content-Type: application/json
+Content-Length: 186
+
+{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"id":1,"username":"user1","password":"testtest2"},"geometry":{"type":"Point","coordinates":[30,20]}}],"results":2}