From: Mark Leslie Date: Tue, 30 Jun 2009 07:35:37 +0000 (+0000) Subject: First swing at ticket 212. X-Git-Tag: 1.5.0b1~612 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38518df9a3e6b82903f9479baa92ec28686413d8;p=postgis First swing at ticket 212. git-svn-id: http://svn.osgeo.org/postgis/trunk@4231 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/liblwgeom/lwgunparse.c b/liblwgeom/lwgunparse.c index 368ca21da..ac0de45ba 100644 --- a/liblwgeom/lwgunparse.c +++ b/liblwgeom/lwgunparse.c @@ -616,7 +616,7 @@ output_wkt(uchar* geom, int supress) if (writeM) write_str("CURVEPOLYGONM"); else write_str("CURVEPOLYGON"); } - geom = output_collection(geom, output_compound,0); + geom = output_collection(geom, output_curvepoly,0); break; case MULTIPOINTTYPE: if ( supress < 2 ) diff --git a/regress/sql-mm-curvepoly_expected b/regress/sql-mm-curvepoly_expected index 93e936f18..16edeee8b 100644 --- a/regress/sql-mm-curvepoly_expected +++ b/regress/sql-mm-curvepoly_expected @@ -156,4 +156,4 @@ valid ewkb curve polygon 1|CURVEPOLYGON((143.620251668383 -30.0374973560768,142. valid ewkb curve polygon 2|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617,146.386972449926 -31.4740639157242,144.843993552527 -31.2612392402209)) valid ewkb curve polygon 3|CURVEPOLYGON(CIRCULARSTRING(143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768)) valid ewkb curve polygon 4|CURVEPOLYGON(CIRCULARSTRING(143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617,146.386972449926 -31.4740639157242,144.843993552527 -31.2612392402209)) -valid ewkb curve polygon 5|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),) +valid ewkb curve polygon 5|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),COMPOUNDCURVE(CIRCULARSTRING(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066),(145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617),CIRCULARSTRING(147.970809936523 -32.0361862182617,146.386972449926 -31.4740639157242,144.843993552527 -31.2612392402209)))