Some GeoJSON fixes

Author: mevdschee

src/Tqdev/PhpCrudApi/GeoJson/GeoJsonService.php

@@ -53,7 +53,7 @@ private function convertRecordToFeature( /*object*/$record, string $geometryColu
 
     public function _list(string $tableName, array $params): FeatureCollection
     {
-        $geometryParam = isset($params['geometry']) ? $params['geometry'] : '';
+        $geometryParam = isset($params['geometry']) ? $params['geometry'][0] : '';
         $geometryColumnName = $this->getGeometryColumnName($tableName, $geometryParam);
         $records = $this->records->_list($tableName, $params);
 
@@ -66,7 +66,7 @@ public function _list(string $tableName, array $params): FeatureCollection
 
     public function read(string $tableName, string $id, array $params): Feature
     {
-        $geometryParam = isset($params['geometry']) ? $params['geometry'] : '';
+        $geometryParam = isset($params['geometry']) ? $params['geometry'][0] : '';
         $geometryColumnName = $this->getGeometryColumnName($tableName, $geometryParam);
         $record = $this->records->read($tableName, $id, $params);
         return $this->convertRecordToFeature($record, $geometryColumnName);

tests/functional/001_records/083_list_users_as_geojson.log

@@ -6,6 +6,22 @@ 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?geometry=location
+===
+200
+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?geometry=notlocation
+===
+200
+Content-Type: application/json
+Content-Length: 277
+
+{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"id":1,"username":"user1","password":"testtest2","location":"POINT(30 20)"},"geometry":null},{"type":"Feature","properties":{"id":2,"username":"user2","password":"pass2","location":null},"geometry":null}]}
+===
 GET /geojson/users?page=1,1
 ===
 200