A CURVEPOLY is also a collection. Fixes #1473.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8827 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index 37ae6b94751c170aff18638ac1b243e6a86ae647..7ae3ed67f54b5d0780fe9235b36d61a5b7d4d33e 100644 (file)
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -833,6 +833,7 @@ lwtype_is_collection(uint8_t type)
        case MULTILINETYPE:
        case MULTIPOLYGONTYPE:
        case COLLECTIONTYPE:
+       case CURVEPOLYTYPE:
        case COMPOUNDTYPE:
        case MULTICURVETYPE:
        case MULTISURFACETYPE:

diff --git a/regress/tickets.sql b/regress/tickets.sql
index 8220682c7db9ca06741e7b79f9521300d57f44c4..a316f28f5849be377ac52184f2a93a46617e48f3 100644 (file)
--- a/regress/tickets.sql
+++ b/regress/tickets.sql
@@ -511,6 +511,9 @@ SELECT '#1453.2', ST_OrderingEquals('POINT EMPTY', 'POINT Z EMPTY');
 with inp as ( select 'MULTILINESTRING((0 0, 2 0))'::geometry as g )
 SELECT '#1454', st_orderingequals(g,g) from inp;
 
+-- #1414
+SELECT '#1414', st_astext(st_force_3dz('CURVEPOLYGON EMPTY'));
+
 -- Clean up
 DELETE FROM spatial_ref_sys;
 

diff --git a/regress/tickets_expected b/regress/tickets_expected
index f8f17acf93ce3ee6511b03ee054b0c9343a20fe3..14e9788337c80c8c868739691ffdd169f4d6d154 100644 (file)
--- a/regress/tickets_expected
+++ b/regress/tickets_expected
@@ -172,3 +172,4 @@ ERROR:  MultiSurface cannot contain MultiPoint element
 #1453.1|t
 #1453.2|f
 #1454|t
+#1414|CURVEPOLYGON Z EMPTY