A CURVEPOLY is also a collection. Fixes #1473.

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

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:

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;
 

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