Fix error when switching geom type in geometry collection

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
MoonE · Aug 26, 2023 · a9d5c84 · a9d5c84
1 parent 00d1774
commit a9d5c84
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 2 deletions.
diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php
@@ -298,7 +298,7 @@ public function prepareRowAsOl($spatial, int $srid, $label, $line_color, array $
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
-        $data_row = $gis_data[$index]['MULTILINESTRING'];
+        $data_row = $gis_data[$index]['MULTILINESTRING'] ?? null;
 
         $no_of_lines = $data_row['no_of_lines'] ?? 1;
         if ($no_of_lines < 1) {

diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php
@@ -377,7 +377,7 @@ private function drawPath($polygon, array $scale_data)
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
-        $data_row = $gis_data[$index]['MULTIPOLYGON'];
+        $data_row = $gis_data[$index]['MULTIPOLYGON'] ?? null;
 
         $no_of_polygons = $data_row['no_of_polygons'] ?? 1;
         if ($no_of_polygons < 1) {

diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php
@@ -116,6 +116,96 @@ public function providerForGenerateWkt(): array
         ];
 
         return [
+            [
+                [
+                    'gis_type' => 'GEOMETRYCOLLECTION',
+                    'srid' => '0',
+                    'GEOMETRYCOLLECTION' => [
+                        'geom_count' => '1',
+                    ],
+                    0 => [
+                        'gis_type' => 'POINT',
+                    ],
+                ],
+                0,
+                null,
+                'GEOMETRYCOLLECTION(POINT( ))',
+            ],
+            [
+                [
+                    'gis_type' => 'GEOMETRYCOLLECTION',
+                    'srid' => '0',
+                    'GEOMETRYCOLLECTION' => [
+                        'geom_count' => '1',
+                    ],
+                    0 => [
+                        'gis_type' => 'LINESTRING',
+                    ],
+                ],
+                0,
+                null,
+                'GEOMETRYCOLLECTION(LINESTRING( , ))',
+            ],
+            [
+                [
+                    'gis_type' => 'GEOMETRYCOLLECTION',
+                    'srid' => '0',
+                    'GEOMETRYCOLLECTION' => [
+                        'geom_count' => '1',
+                    ],
+                    0 => [
+                        'gis_type' => 'POLYGON',
+                    ],
+                ],
+                0,
+                null,
+                'GEOMETRYCOLLECTION(POLYGON(( , , , )))',
+            ],
+            [
+                [
+                    'gis_type' => 'GEOMETRYCOLLECTION',
+                    'srid' => '0',
+                    'GEOMETRYCOLLECTION' => [
+                        'geom_count' => '1',
+                    ],
+                    0 => [
+                        'gis_type' => 'MULTIPOINT',
+                    ],
+                ],
+                0,
+                null,
+                'GEOMETRYCOLLECTION(MULTIPOINT( ))',
+            ],
+            [
+                [
+                    'gis_type' => 'GEOMETRYCOLLECTION',
+                    'srid' => '0',
+                    'GEOMETRYCOLLECTION' => [
+                        'geom_count' => '1',
+                    ],
+                    0 => [
+                        'gis_type' => 'MULTILINESTRING',
+                    ],
+                ],
+                0,
+                null,
+                'GEOMETRYCOLLECTION(MULTILINESTRING(( , )))',
+            ],
+            [
+                [
+                    'gis_type' => 'GEOMETRYCOLLECTION',
+                    'srid' => '0',
+                    'GEOMETRYCOLLECTION' => [
+                        'geom_count' => '1',
+                    ],
+                    0 => [
+                        'gis_type' => 'MULTIPOLYGON',
+                    ],
+                ],
+                0,
+                null,
+                'GEOMETRYCOLLECTION(MULTIPOLYGON((( , , , ))))',
+            ],
             [
                 $temp1,
                 0,