support tiles in GeoJSON

api.php

@@ -4477,22 +4477,25 @@ class TypeConverter
 
 class Feature implements \JsonSerializable
 {
+    private $id;
     private $properties;
     private $geometry;
 
-    public function __construct(array $properties, /*?Geometry*/ $geometry)
+    public function __construct(string $id, array $properties, /*?Geometry*/ $geometry)
     {
+        $this->id = $id;
         $this->properties = $properties;
         $this->geometry = $geometry;
     }
 
     public function serialize()
     {
-        return [
+        return array_filter([
             'type' => 'Feature',
+            'id' => $this->id,
             'properties' => $this->properties,
             'geometry' => $this->geometry,
-        ];
+        ]);
     }
 
     public function jsonSerialize()
@@ -4586,38 +4589,61 @@ class GeoJsonService
             }
             $params['filter'][] = "$geometryColumnName,sin,POLYGON(($c[0] $c[1],$c[2] $c[1],$c[2] $c[3],$c[0] $c[3],$c[0] $c[1]))";
         }
-        /*
         $tile = isset($params['tile']) ? $params['tile'][0] : '';
         if ($tile) {
-            
-            $n = pow(2, $zoom);
-            $lon_deg = $xtile / $n * 360.0 - 180.0;
-            $lat_deg = rad2deg(atan(sinh(pi() * (1 - 2 * $ytile / $n))));
-
-            calculates upperleft corner
+            $zxy = explode(',', $tile);
+            if (count($zxy) == 3) {
+                list($z, $x, $y) = $zxy;
+                $c = array();
+                $c = array_merge($c, $this->convertTileToLatLonOfUpperLeftCorner($z, $x, $y));
+                $c = array_merge($c, $this->convertTileToLatLonOfUpperLeftCorner($z, $x + 1, $y + 1));
+                $params['filter'][] = "$geometryColumnName,sin,POLYGON(($c[0] $c[1],$c[2] $c[1],$c[2] $c[3],$c[0] $c[3],$c[0] $c[1]))";
+            }
+        }
+    }
 
-            $params['filter'][] = "$geometryColumnName,sin,POLYGON(($c[0] $c[1],$c[2] $c[1],$c[2] $c[3],$c[0] $c[3],$c[0] $c[1]))";
-        }*/
+    private function convertTileToLatLonOfUpperLeftCorner($z, $x, $y): array
+    {
+        $n = pow(2, $z);
+        $lon = $x / $n * 360.0 - 180.0;
+        $lat = rad2deg(atan(sinh(pi() * (1 - 2 * $y / $n))));
+        return [$lon, $lat];
     }
 
-    private function convertRecordToFeature( /*object*/$record, string $geometryColumnName)
+    private function convertRecordToFeature( /*object*/$record, string $primaryKeyColumnName, string $geometryColumnName)
     {
+        $id = '';
+        if ($primaryKeyColumnName) {
+            $id = $record[$primaryKeyColumnName];
+        }
         $geometry = null;
         if (isset($record[$geometryColumnName])) {
             $geometry = Geometry::fromWkt($record[$geometryColumnName]);
         }
-        $properties = array_diff_key($record, [$geometryColumnName => true]);
-        return new Feature($properties, $geometry);
+        $properties = array_diff_key($record, [$primaryKeyColumnName => true, $geometryColumnName => true]);
+        return new Feature($id, $properties, $geometry);
+    }
+
+    private function getPrimaryKeyColumnName(string $tableName, array &$params): string
+    {
+        $primaryKeyColumn = $this->reflection->getTable($tableName)->getPk();
+        if (!$primaryKeyColumn) {
+            return '';
+        }
+        $primaryKeyColumnName = $primaryKeyColumn->getName();
+        $params['mandatory'][] = $tableName . "." . $primaryKeyColumnName;
+        return $primaryKeyColumnName;
     }
 
     public function _list(string $tableName, array $params): FeatureCollection
     {
         $geometryColumnName = $this->getGeometryColumnName($tableName, $params);
         $this->setBoudingBoxFilter($geometryColumnName, $params);
+        $primaryKeyColumnName = $this->getPrimaryKeyColumnName($tableName, $params);
         $records = $this->records->_list($tableName, $params);
         $features = array();
         foreach ($records->getRecords() as $record) {
-            $features[] = $this->convertRecordToFeature($record, $geometryColumnName);
+            $features[] = $this->convertRecordToFeature($record, $primaryKeyColumnName, $geometryColumnName);
         }
         return new FeatureCollection($features, $records->getResults());
     }
@@ -4626,8 +4652,9 @@ class GeoJsonService
     {
         $geometryColumnName = $this->getGeometryColumnName($tableName, $params);
         $this->setBoudingBoxFilter($geometryColumnName, $params);
+        $primaryKeyColumnName = $this->getPrimaryKeyColumnName($tableName, $params);
         $record = $this->records->read($tableName, $id, $params);
-        return $this->convertRecordToFeature($record, $geometryColumnName);
+        return $this->convertRecordToFeature($record, $primaryKeyColumnName, $geometryColumnName);
     }
 }
 

src/Tqdev/PhpCrudApi/GeoJson/Feature.php

@@ -3,22 +3,25 @@ namespace Tqdev\PhpCrudApi\GeoJson;
 
 class Feature implements \JsonSerializable
 {
+    private $id;
     private $properties;
     private $geometry;
 
-    public function __construct(array $properties, /*?Geometry*/ $geometry)
+    public function __construct(string $id, array $properties, /*?Geometry*/ $geometry)
     {
+        $this->id = $id;
         $this->properties = $properties;
         $this->geometry = $geometry;
     }
 
     public function serialize()
     {
-        return [
+        return array_filter([
             'type' => 'Feature',
+            'id' => $this->id,
             'properties' => $this->properties,
             'geometry' => $this->geometry,
-        ];
+        ]);
     }
 
     public function jsonSerialize()

src/Tqdev/PhpCrudApi/GeoJson/GeoJsonService.php

@@ -57,38 +57,61 @@ class GeoJsonService
             }
             $params['filter'][] = "$geometryColumnName,sin,POLYGON(($c[0] $c[1],$c[2] $c[1],$c[2] $c[3],$c[0] $c[3],$c[0] $c[1]))";
         }
-        /*
         $tile = isset($params['tile']) ? $params['tile'][0] : '';
         if ($tile) {
-            
-            $n = pow(2, $zoom);
-            $lon_deg = $xtile / $n * 360.0 - 180.0;
-            $lat_deg = rad2deg(atan(sinh(pi() * (1 - 2 * $ytile / $n))));
-
-            calculates upperleft corner
+            $zxy = explode(',', $tile);
+            if (count($zxy) == 3) {
+                list($z, $x, $y) = $zxy;
+                $c = array();
+                $c = array_merge($c, $this->convertTileToLatLonOfUpperLeftCorner($z, $x, $y));
+                $c = array_merge($c, $this->convertTileToLatLonOfUpperLeftCorner($z, $x + 1, $y + 1));
+                $params['filter'][] = "$geometryColumnName,sin,POLYGON(($c[0] $c[1],$c[2] $c[1],$c[2] $c[3],$c[0] $c[3],$c[0] $c[1]))";
+            }
+        }
+    }
 
-            $params['filter'][] = "$geometryColumnName,sin,POLYGON(($c[0] $c[1],$c[2] $c[1],$c[2] $c[3],$c[0] $c[3],$c[0] $c[1]))";
-        }*/
+    private function convertTileToLatLonOfUpperLeftCorner($z, $x, $y): array
+    {
+        $n = pow(2, $z);
+        $lon = $x / $n * 360.0 - 180.0;
+        $lat = rad2deg(atan(sinh(pi() * (1 - 2 * $y / $n))));
+        return [$lon, $lat];
     }
 
-    private function convertRecordToFeature( /*object*/$record, string $geometryColumnName)
+    private function convertRecordToFeature( /*object*/$record, string $primaryKeyColumnName, string $geometryColumnName)
     {
+        $id = '';
+        if ($primaryKeyColumnName) {
+            $id = $record[$primaryKeyColumnName];
+        }
         $geometry = null;
         if (isset($record[$geometryColumnName])) {
             $geometry = Geometry::fromWkt($record[$geometryColumnName]);
         }
-        $properties = array_diff_key($record, [$geometryColumnName => true]);
-        return new Feature($properties, $geometry);
+        $properties = array_diff_key($record, [$primaryKeyColumnName => true, $geometryColumnName => true]);
+        return new Feature($id, $properties, $geometry);
+    }
+
+    private function getPrimaryKeyColumnName(string $tableName, array &$params): string
+    {
+        $primaryKeyColumn = $this->reflection->getTable($tableName)->getPk();
+        if (!$primaryKeyColumn) {
+            return '';
+        }
+        $primaryKeyColumnName = $primaryKeyColumn->getName();
+        $params['mandatory'][] = $tableName . "." . $primaryKeyColumnName;
+        return $primaryKeyColumnName;
     }
 
     public function _list(string $tableName, array $params): FeatureCollection
     {
         $geometryColumnName = $this->getGeometryColumnName($tableName, $params);
         $this->setBoudingBoxFilter($geometryColumnName, $params);
+        $primaryKeyColumnName = $this->getPrimaryKeyColumnName($tableName, $params);
         $records = $this->records->_list($tableName, $params);
         $features = array();
         foreach ($records->getRecords() as $record) {
-            $features[] = $this->convertRecordToFeature($record, $geometryColumnName);
+            $features[] = $this->convertRecordToFeature($record, $primaryKeyColumnName, $geometryColumnName);
         }
         return new FeatureCollection($features, $records->getResults());
     }
@@ -97,7 +120,8 @@ class GeoJsonService
     {
         $geometryColumnName = $this->getGeometryColumnName($tableName, $params);
         $this->setBoudingBoxFilter($geometryColumnName, $params);
+        $primaryKeyColumnName = $this->getPrimaryKeyColumnName($tableName, $params);
         $record = $this->records->read($tableName, $id, $params);
-        return $this->convertRecordToFeature($record, $geometryColumnName);
+        return $this->convertRecordToFeature($record, $primaryKeyColumnName, $geometryColumnName);
     }
 }