From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Jan 2012 09:11:45 +0000 (+0000)
Subject: A CURVEPOLY is also a collection. Fixes #1473.
X-Git-Tag: 2.0.0alpha1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b4c7473288cd62157aff409ba95887ef74978bf;p=postgis

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 37ae6b947..7ae3ed67f 100644
--- 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 8220682c7..a316f28f5 100644
--- 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 f8f17acf9..14e978833 100644
--- 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