Some GeoJSON fixes

Author: mevdschee

src/Tqdev/PhpCrudApi/GeoJson/Geometry.php

@@ -13,7 +13,7 @@ class Geometry implements \JsonSerializable
         "MultiLineString",
         "Polygon",
         "MultiPolygon",
-        "GeometryCollection",
+        //"GeometryCollection",
     ];
 
     public function __construct(string $type, array $coordinates)
@@ -26,11 +26,16 @@ public static function fromWkt(string $wkt): Geometry
     {
         $bracket = strpos($wkt, '(');
         $type = strtoupper(trim(substr($wkt, 0, $bracket)));
+        $supported = false;
         foreach (Geometry::$types as $typeName) {
             if (strtoupper($typeName) == $type) {
                 $type = $typeName;
+                $supported = true;
             }
         }
+        if (!$supported) {
+            throw new \Exception('Geometry type not supported: ' . $type);
+        }
         $coordinates = substr($wkt, $bracket);
         if (substr($type, -5) != 'Point' || ($type == 'MultiPoint' && $coordinates[1] != '(')) {
             $coordinates = preg_replace('|([0-9\-\.]+ )+([0-9\-\.]+)|', '[\1\2]', $coordinates);
@@ -39,9 +44,8 @@ public static function fromWkt(string $wkt): Geometry
         $json = $coordinates;
         $coordinates = json_decode($coordinates);
         if (!$coordinates) {
-            echo $json;
+            throw new \Exception('Could not decode WKT: ' . $wkt);
         }
-
         return new Geometry($type, $coordinates);
     }
 

tests/fixtures/blog_mysql.sql

@@ -114,7 +114,8 @@ INSERT INTO `countries` (`name`, `shape`) VALUES
 ('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)))'));
+('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)))')),
+('Gcoll', ST_GeomFromText('GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))'));
 
 DROP TABLE IF EXISTS `events`;
 CREATE TABLE `events` (

tests/fixtures/blog_pgsql.sql

@@ -248,7 +248,8 @@ INSERT INTO "countries" ("name", "shape") VALUES
 ('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)))'));
+('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)))')),
+('Gcoll',	ST_GeomFromText('GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))'));
 
 --
 -- Data for Name: events; Type: TABLE DATA; Schema: public; Owner: postgres

tests/fixtures/blog_sqlsrv.sql

@@ -360,6 +360,8 @@ INSERT [countries] ([name], [shape]) VALUES (N'Mpoly1', N'MULTIPOLYGON (((30 20,
 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 [countries] ([name], [shape]) VALUES (N'Gcoll', N'GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))')
+GO
 
 INSERT [events] ([name], [datetime], [visitors]) VALUES (N'Launch', N'2016-01-01 13:01:01', 0)
 GO

tests/functional/001_records/081_read_countries_as_geojson.log

@@ -61,3 +61,11 @@ 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]]]]}}
+===
+GET /geojson/countries/11
+===
+500
+Content-Type: application/json
+Content-Length: 73
+
+{"code":9999,"message":"Geometry type not supported: GEOMETRYCOLLECTION"}