support tiles in GeoJSON

Author: mevdschee

src/Tqdev/PhpCrudApi/GeoJson/Feature.php

@@ -7,7 +7,7 @@ class Feature implements \JsonSerializable
     private $properties;
     private $geometry;
 
-    public function __construct(string $id, array $properties, /*?Geometry*/ $geometry)
+    public function __construct($id, array $properties, /*?Geometry*/ $geometry)
     {
         $this->id = $id;
         $this->properties = $properties;
@@ -16,12 +16,12 @@ public function __construct(string $id, array $properties, /*?Geometry*/ $geomet
 
     public function serialize()
     {
-        return array_filter([
+        return [
             'type' => 'Feature',
             'id' => $this->id,
             'properties' => $this->properties,
             'geometry' => $this->geometry,
-        ]);
+        ];
     }
 
     public function jsonSerialize()

src/Tqdev/PhpCrudApi/GeoJson/GeoJsonService.php

@@ -80,7 +80,7 @@ private function convertTileToLatLonOfUpperLeftCorner($z, $x, $y): array
 
     private function convertRecordToFeature( /*object*/$record, string $primaryKeyColumnName, string $geometryColumnName)
     {
-        $id = '';
+        $id = null;
         if ($primaryKeyColumnName) {
             $id = $record[$primaryKeyColumnName];
         }

tests/functional/001_records/081_read_countries_as_geojson.log

@@ -4,63 +4,63 @@ GET /geojson/countries/3
 Content-Type: application/json
 Content-Length: 105
 
-{"type":"Feature","properties":{"id":3,"name":"Point"},"geometry":{"type":"Point","coordinates":[30,10]}}
+{"type":"Feature","id":3,"properties":{"name":"Point"},"geometry":{"type":"Point","coordinates":[30,10]}}
 ===
 GET /geojson/countries/4
 ===
 200
 Content-Type: application/json
 Content-Length: 127
 
-{"type":"Feature","properties":{"id":4,"name":"Line"},"geometry":{"type":"LineString","coordinates":[[30,10],[10,30],[40,40]]}}
+{"type":"Feature","id":4,"properties":{"name":"Line"},"geometry":{"type":"LineString","coordinates":[[30,10],[10,30],[40,40]]}}
 ===
 GET /geojson/countries/5
 ===
 200
 Content-Type: application/json
 Content-Length: 143
 
-{"type":"Feature","properties":{"id":5,"name":"Poly1"},"geometry":{"type":"Polygon","coordinates":[[[30,10],[40,40],[20,40],[10,20],[30,10]]]}}
+{"type":"Feature","id":5,"properties":{"name":"Poly1"},"geometry":{"type":"Polygon","coordinates":[[[30,10],[40,40],[20,40],[10,20],[30,10]]]}}
 ===
 GET /geojson/countries/6
 ===
 200
 Content-Type: application/json
 Content-Length: 177
 
-{"type":"Feature","properties":{"id":6,"name":"Poly2"},"geometry":{"type":"Polygon","coordinates":[[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}}
+{"type":"Feature","id":6,"properties":{"name":"Poly2"},"geometry":{"type":"Polygon","coordinates":[[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}}
 ===
 GET /geojson/countries/7
 ===
 200
 Content-Type: application/json
 Content-Length: 137
 
-{"type":"Feature","properties":{"id":7,"name":"Mpoint"},"geometry":{"type":"MultiPoint","coordinates":[[10,40],[40,30],[20,20],[30,10]]}}
+{"type":"Feature","id":7,"properties":{"name":"Mpoint"},"geometry":{"type":"MultiPoint","coordinates":[[10,40],[40,30],[20,20],[30,10]]}}
 ===
 GET /geojson/countries/8
 ===
 200
 Content-Type: application/json
 Content-Length: 169
 
-{"type":"Feature","properties":{"id":8,"name":"Mline"},"geometry":{"type":"MultiLineString","coordinates":[[[10,10],[20,20],[10,40]],[[40,40],[30,30],[40,20],[30,10]]]}}
+{"type":"Feature","id":8,"properties":{"name":"Mline"},"geometry":{"type":"MultiLineString","coordinates":[[[10,10],[20,20],[10,40]],[[40,40],[30,30],[40,20],[30,10]]]}}
 ===
 GET /geojson/countries/9
 ===
 200
 Content-Type: application/json
 Content-Length: 184
 
-{"type":"Feature","properties":{"id":9,"name":"Mpoly1"},"geometry":{"type":"MultiPolygon","coordinates":[[[[30,20],[45,40],[10,40],[30,20]]],[[[15,5],[40,10],[10,20],[5,10],[15,5]]]]}}
+{"type":"Feature","id":9,"properties":{"name":"Mpoly1"},"geometry":{"type":"MultiPolygon","coordinates":[[[[30,20],[45,40],[10,40],[30,20]]],[[[15,5],[40,10],[10,20],[5,10],[15,5]]]]}}
 ===
 GET /geojson/countries/10
 ===
 200
 Content-Type: application/json
 Content-Length: 229
 
-{"type":"Feature","properties":{"id":10,"name":"Mpoly2"},"geometry":{"type":"MultiPolygon","coordinates":[[[[40,40],[20,45],[45,30],[40,40]]],[[[20,35],[10,30],[10,10],[30,5],[45,20],[20,35]],[[30,20],[20,15],[20,25],[30,20]]]]}}
+{"type":"Feature","id":10,"properties":{"name":"Mpoly2"},"geometry":{"type":"MultiPolygon","coordinates":[[[[40,40],[20,45],[45,30],[40,40]]],[[[20,35],[10,30],[10,10],[30,5],[45,20],[20,35]],[[30,20],[20,15],[20,25],[30,20]]]]}}
 ===
 GET /geojson/countries/11
 ===

tests/functional/001_records/082_read_users_as_geojson.log

@@ -4,12 +4,12 @@ GET /geojson/users/1
 Content-Type: application/json
 Content-Length: 132
 
-{"type":"Feature","properties":{"id":1,"username":"user1","password":"testtest2"},"geometry":{"type":"Point","coordinates":[30,20]}}
+{"type":"Feature","id":1,"properties":{"username":"user1","password":"testtest2"},"geometry":{"type":"Point","coordinates":[30,20]}}
 ===
 GET /geojson/users/2
 ===
 200
 Content-Type: application/json
 Content-Length: 94
 
-{"type":"Feature","properties":{"id":2,"username":"user2","password":"pass2"},"geometry":null}
+{"type":"Feature","id":2,"properties":{"username":"user2","password":"pass2"},"geometry":null}

tests/functional/001_records/083_list_users_as_geojson.log

@@ -4,36 +4,36 @@ GET /geojson/users
 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}]}
+{"type":"FeatureCollection","features":[{"type":"Feature","id":1,"properties":{"username":"user1","password":"testtest2"},"geometry":{"type":"Point","coordinates":[30,20]}},{"type":"Feature","id":2,"properties":{"username":"user2","password":"pass2"},"geometry":null}]}
 ===
 GET /geojson/users?geometry=location&include=username
 ===
 200
 Content-Type: application/json
-Content-Length: 213
+Content-Length: 227
 
-{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"username":"user1"},"geometry":{"type":"Point","coordinates":[30,20]}},{"type":"Feature","properties":{"username":"user2"},"geometry":null}]}
+{"type":"FeatureCollection","features":[{"type":"Feature","id":1,"properties":{"username":"user1"},"geometry":{"type":"Point","coordinates":[30,20]}},{"type":"Feature","id":2,"properties":{"username":"user2"},"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}]}
+{"type":"FeatureCollection","features":[{"type":"Feature","id":1,"properties":{"username":"user1","password":"testtest2","location":"POINT(30 20)"},"geometry":null},{"type":"Feature","id":2,"properties":{"username":"user2","password":"pass2","location":null},"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}
+{"type":"FeatureCollection","features":[{"type":"Feature","id":1,"properties":{"username":"user1","password":"testtest2"},"geometry":{"type":"Point","coordinates":[30,20]}}],"results":2}
 ===
 GET /geojson/users?bbox=29.99,19.99,30.01,20.01
 ===
 200
 Content-Type: application/json
 Content-Length: 174
 
-{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"id":1,"username":"user1","password":"testtest2"},"geometry":{"type":"Point","coordinates":[30,20]}}]}
+{"type":"FeatureCollection","features":[{"type":"Feature","id":1,"properties":{"username":"user1","password":"testtest2"},"geometry":{"type":"Point","coordinates":[30,20]}}]}