Some GeoJSON fixes

src/Tqdev/PhpCrudApi/GeoJson/FeatureCollection.php

@@ -1,8 +1,6 @@
 <?php
 namespace Tqdev\PhpCrudApi\GeoJson;
 
-use Tqdev\PhpCrudApi\Record\Document\ListDocument;
-
 class FeatureCollection implements \JsonSerializable
 {
     private $features;
@@ -12,19 +10,6 @@ class FeatureCollection implements \JsonSerializable
         $this->features = $features;
     }
 
-    public static function fromListDocument(ListDocument $records, string $geometryColumnName): FeatureCollection
-    {
-        $features = array();
-        foreach ($records->getRecords() as $record) {
-            if (isset($record[$geometryColumnName])) {
-                $geometry = Geometry::fromWkt($record[$geometryColumnName]);
-                unset($record[$geometryColumnName]);
-                $features[] = new Feature($record, $geometry);
-            }
-        }
-        return new FeatureCollection($features);
-    }
-
     public function serialize()
     {
         return [

src/Tqdev/PhpCrudApi/GeoJson/GeoJsonService.php

@@ -21,6 +21,11 @@ class GeoJsonService
         return $this->reflection->hasTable($table);
     }
 
+    public function getType(string $table): string
+    {
+        return $this->reflection->getType($table);
+    }
+
     private function getGeometryColumnName(string $tableName, string $geometryParam): string
     {
         $table = $this->reflection->getTable($tableName);
@@ -36,16 +41,37 @@ class GeoJsonService
         return "";
     }
 
+    private function convertRecordToFeature( /*object*/$record, string $geometryColumnName)
+    {
+        $geometry = Geometry::fromWkt($record[$geometryColumnName]);
+        unset($record[$geometryColumnName]);
+        return new Feature($record, $geometry);
+    }
+
     public function _list(string $tableName, array $params): FeatureCollection
     {
         $geometryParam = isset($params['geometry']) ? $params['geometry'] : '';
         $geometryColumnName = $this->getGeometryColumnName($tableName, $geometryParam);
         $records = $this->records->_list($tableName, $params);
-        return FeatureCollection::fromListDocument($records, $geometryColumnName);
+
+        $features = array();
+        foreach ($records->getRecords() as $record) {
+            if (isset($record[$geometryColumnName])) {
+                $features[] = $this->convertRecordToFeature($record, $geometryColumnName);
+            }
+        }
+        return new FeatureCollection($features);
     }
 
-    public function read(string $tableName, string $id, array $params) /*: ?object*/
+    public function read(string $tableName, string $id, array $params) /*: ?Feature*/
     {
-        return $this->records->read($tableName, $id, $params);
+        $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);
     }
 }

src/Tqdev/PhpCrudApi/GeoJson/Geometry.php

@@ -32,12 +32,16 @@ class Geometry implements \JsonSerializable
             }
         }
         $coordinates = substr($wkt, $bracket);
-        $coordinates = preg_replace('|([0-9\-\.]+ )+([0-9\-\.]+)|', '[\1\2]', $coordinates);
-        $coordinates = str_replace(['(', ')', ' '], ['[', ']', ','], $coordinates);
+        if (substr($type, -5) != 'Point' || ($type == 'MultiPoint' && $coordinates[1] != '(')) {
+            $coordinates = preg_replace('|([0-9\-\.]+ )+([0-9\-\.]+)|', '[\1\2]', $coordinates);
+        }
+        $coordinates = str_replace(['(', ')', ', ', ' '], ['[', ']', ',', ','], $coordinates);
+        $json = $coordinates;
         $coordinates = json_decode($coordinates);
-        if ($type == 'Point') {
-            $coordinates = $coordinates[0];
+        if (!$coordinates) {
+            echo $json;
         }
+
         return new Geometry($type, $coordinates);
     }
 

tests/config/base.php

@@ -3,7 +3,7 @@ $settings = [
     'database' => 'php-crud-api',
     'username' => 'php-crud-api',
     'password' => 'php-crud-api',
-    'controllers' => 'records,columns,cache,openapi',
+    'controllers' => 'records,columns,cache,openapi,geojson',
     'middlewares' => 'cors,jwtAuth,basicAuth,authorization,validation,ipAddress,sanitation,multiTenancy,pageLimits,joinLimits,customization',
     'jwtAuth.mode' => 'optional',
     'jwtAuth.time' => '1538207605',

tests/fixtures/blog_mysql.sql

@@ -100,13 +100,21 @@ DROP TABLE IF EXISTS `countries`;
 CREATE TABLE `countries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(255) NOT NULL,
-  `shape` polygon NOT NULL,
+  `shape` geometry NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 INSERT INTO `countries` (`name`, `shape`) VALUES
 ('Left',	ST_GeomFromText('POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))')),
-('Right',	ST_GeomFromText('POLYGON ((70 10, 80 40, 60 40, 50 20, 70 10))'));
+('Right',	ST_GeomFromText('POLYGON ((70 10, 80 40, 60 40, 50 20, 70 10))')),
+('Point', ST_GeomFromText('POINT (30 10)')),
+('Line', ST_GeomFromText('LINESTRING (30 10, 10 30, 40 40)')),
+('Poly1', ST_GeomFromText('POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))')),
+('Poly2', ST_GeomFromText('POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))')),
+('Mpoint', ST_GeomFromText('MULTIPOINT (10 40, 40 30, 20 20, 30 10)')),
+('Mline', ST_GeomFromText('MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))')),
+('Mpoly1', ST_GeomFromText('MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))')),
+('Mpoly2', ST_GeomFromText('MULTIPOLYGON (((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)))'));
 
 DROP TABLE IF EXISTS `events`;
 CREATE TABLE `events` (

tests/fixtures/blog_pgsql.sql

@@ -240,7 +240,15 @@ INSERT INTO "users" ("username", "password", "location") VALUES
 
 INSERT INTO "countries" ("name", "shape") VALUES
 ('Left',	ST_GeomFromText('POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))')),
-('Right',	ST_GeomFromText('POLYGON ((70 10, 80 40, 60 40, 50 20, 70 10))'));
+('Right',	ST_GeomFromText('POLYGON ((70 10, 80 40, 60 40, 50 20, 70 10))')),
+('Point',	ST_GeomFromText('POINT (30 10)')),
+('Line',	ST_GeomFromText('LINESTRING (30 10, 10 30, 40 40)')),
+('Poly1',	ST_GeomFromText('POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))')),
+('Poly2',	ST_GeomFromText('POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))')),
+('Mpoint',	ST_GeomFromText('MULTIPOINT (10 40, 40 30, 20 20, 30 10)')),
+('Mline',	ST_GeomFromText('MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))')),
+('Mpoly1',	ST_GeomFromText('MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))')),
+('Mpoly2',	ST_GeomFromText('MULTIPOLYGON (((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)))'));
 
 --
 -- Data for Name: events; Type: TABLE DATA; Schema: public; Owner: postgres

tests/fixtures/blog_sqlsrv.sql

@@ -344,6 +344,22 @@ INSERT [countries] ([name], [shape]) VALUES (N'Left', N'POLYGON ((30 10, 40 40,
 GO
 INSERT [countries] ([name], [shape]) VALUES (N'Right', N'POLYGON ((70 10, 80 40, 60 40, 50 20, 70 10))')
 GO
+INSERT [countries] ([name], [shape]) VALUES (N'Point', N'POINT (30 10)')
+GO
+INSERT [countries] ([name], [shape]) VALUES (N'Line', N'LINESTRING (30 10, 10 30, 40 40)')
+GO
+INSERT [countries] ([name], [shape]) VALUES (N'Poly1', N'POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))')
+GO
+INSERT [countries] ([name], [shape]) VALUES (N'Poly2', N'POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))')
+GO
+INSERT [countries] ([name], [shape]) VALUES (N'Mpoint', N'MULTIPOINT (10 40, 40 30, 20 20, 30 10)')
+GO
+INSERT [countries] ([name], [shape]) VALUES (N'Mline', N'MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))')
+GO
+INSERT [countries] ([name], [shape]) VALUES (N'Mpoly1', N'MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))')
+GO
+INSERT [countries] ([name], [shape]) VALUES (N'Mpoly2', N'MULTIPOLYGON (((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)))')
+GO
 
 INSERT [events] ([name], [datetime], [visitors]) VALUES (N'Launch', N'2016-01-01 13:01:01', 0)
 GO