Removing the unsnappable test calls to LineToCurve.

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

diff --git a/regress/sql-mm-circularstring.sql b/regress/sql-mm-circularstring.sql
index 356877c49af6a48d7fa53562c98d96b7be22d3a8..03e719485acabcea5787a1bb158b784b9918628a 100644 (file)
--- a/regress/sql-mm-circularstring.sql
+++ b/regress/sql-mm-circularstring.sql
@@ -310,11 +310,6 @@ SELECT 'envelope02', asText(snapToGrid(envelope(the_geom_3dm), 'POINT(0 0 0 0)':
 SELECT 'envelope03', asText(snapToGrid(envelope(the_geom_3dz), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.circularstring;\r
 SELECT 'envelope04', asText(snapToGrid(envelope(the_geom_4d), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.circularstring;\r
 \r
-SELECT 'ST_LineToCurve01', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.circularstring;\r
-SELECT 'ST_LineToCurve02', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.circularstring;\r
-SELECT 'ST_LineToCurve03', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.circularstring;\r
-SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.circularstring;\r
-\r
 -- Repeat tests with new function names.\r
 SELECT 'astext01', ST_astext(the_geom_2d) FROM public.circularstring;        \r
 SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.circularstring;        \r

diff --git a/regress/sql-mm-circularstring_expected.in b/regress/sql-mm-circularstring_expected.in
index 3108f0bd2ce184ba8cedb717d7fa354f63082383..8150f27d8f4319baa5fb1bf3a17670c532676778 100644 (file)
--- a/regress/sql-mm-circularstring_expected.in
+++ b/regress/sql-mm-circularstring_expected.in
@@ -153,14 +153,6 @@ envelope03|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0))
 envelope03|POLYGON((-5 0,-5 5,15 5,15 0,-5 0))
 envelope04|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0))
 envelope04|POLYGON((-5 0,-5 5,15 5,15 0,-5 0))
-ST_LineToCurve01|CIRCULARSTRING(0 0,0.152240934977426 0.765366864730177,0.585786437626905 1.4142135623731)
-ST_LineToCurve01|CIRCULARSTRING(-5 0,-1.63471937809218e-14 5,5 0,9.99999999999998 -5,15 0)
-ST_LineToCurve02|CIRCULARSTRINGM(0 0 0,0.152240934977426 0.765366864730177 -1.5,0.585786437626905 1.4142135623731 2)
-ST_LineToCurve02|CIRCULARSTRINGM(-5 0 4,-1.63471937809218e-14 5 3,5 0 2,9.99999999999998 -5 1,15 0 0)
-ST_LineToCurve03|CIRCULARSTRING(0 0 0,0.152240934977426 0.765366864730177 2.24999999999999,0.585786437626905 1.4142135623731 1)
-ST_LineToCurve03|CIRCULARSTRING(-5 0 0,-1.63471937809218e-14 5 0.999999999999998,5 0 2,9.99999999999998 -5 3,15 0 4)
-ST_LineToCurve04|CIRCULARSTRING(0 0 0 0,0.152240934977426 0.765366864730177 2.24999999999999 -1.5,0.585786437626905 1.4142135623731 1 2)
-ST_LineToCurve04|CIRCULARSTRING(-5 0 0 4,-1.63471937809218e-14 5 0.999999999999998 3,5 0 2 2,9.99999999999998 -5 3 1,15 0 4 0)
 astext01|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)
 astext01|CIRCULARSTRING(-5 0,0 5,5 0,10 -5,15 0)
 astext02|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)

diff --git a/regress/sql-mm-compoundcurve.sql b/regress/sql-mm-compoundcurve.sql
index 692d595fa852cc8ca71fc92c3fae15b9e3aca2cd..42b66902b944bc5d47959d9a6cdd9f8e68cb23be 100644 (file)
--- a/regress/sql-mm-compoundcurve.sql
+++ b/regress/sql-mm-compoundcurve.sql
@@ -229,11 +229,6 @@ SELECT 'envelope02', asText(snapToGrid(envelope(the_geom_3dm), 'POINT(0 0 0 0)':
 SELECT 'envelope03', asText(snapToGrid(envelope(the_geom_3dz), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.compoundcurve;\r
 SELECT 'envelope04', asText(snapToGrid(envelope(the_geom_4d), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.compoundcurve;\r
 \r
-SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.compoundcurve;\r
-SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.compoundcurve;\r
-SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.compoundcurve;\r
-SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.compoundcurve;\r
-\r
 -- Repeat tests on new function names.\r
 SELECT 'astext01', ST_astext(the_geom_2d) FROM public.compoundcurve;\r
 SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.compoundcurve;\r

diff --git a/regress/sql-mm-compoundcurve_expected.in b/regress/sql-mm-compoundcurve_expected.in
index 5f68d4a92a8bfa0fe5447eb9b29a65a8691c4b94..95af152059343e22989f177ca15d9c2e5d37871c 100644 (file)
--- a/regress/sql-mm-compoundcurve_expected.in
+++ b/regress/sql-mm-compoundcurve_expected.in
@@ -85,10 +85,6 @@ envelope01|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0))
 envelope02|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0))
 envelope03|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0))
 envelope04|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0))
-ST_LineToCurve|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.152240934977426 0.765366864730177,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
-ST_LineToCurve|COMPOUNDCURVEM(CIRCULARSTRING(0 0 0,0.152240934977426 0.765366864730177 -1.5,0.585786437626905 1.4142135623731 2),(0.585786437626905 1.4142135623731 2,2 0 0,0 0 0))
-ST_LineToCurve|COMPOUNDCURVE(CIRCULARSTRING(0 0 0,0.152240934977426 0.765366864730177 2.24999999999999,0.585786437626905 1.4142135623731 1),(0.585786437626905 1.4142135623731 1,2 0 0,0 0 0))
-ST_LineToCurve|COMPOUNDCURVE(CIRCULARSTRING(0 0 0 0,0.152240934977426 0.765366864730177 2.24999999999999 -1.5,0.585786437626905 1.4142135623731 1 2),(0.585786437626905 1.4142135623731 1 2,2 0 0 0,0 0 0 0))
 astext01|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
 astext02|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
 astext03|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))

diff --git a/regress/sql-mm-curvepoly.sql b/regress/sql-mm-curvepoly.sql
index c157b6267b19af857a476690a3b2aa2320e73a28..56cd66166cf0b5d74279f5e5cf9bd7bdb5d8ce0c 100644 (file)
--- a/regress/sql-mm-curvepoly.sql
+++ b/regress/sql-mm-curvepoly.sql
@@ -373,11 +373,6 @@ SELECT 'interiorRingN-202', asEWKT(interiorRingN(the_geom_3dm, 2)) FROM public.c
 SELECT 'interiorRingN-203', asEWKT(interiorRingN(the_geom_3dz, 2)) FROM public.curvepolygon;\r
 SELECT 'interiorRingN-204', asEWKT(interiorRingN(the_geom_4d, 2)) FROM public.curvepolygon;\r
 \r
-SELECT 'ST_LineToCurve01', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.curvepolygon;\r
-SELECT 'ST_LineToCurve02', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.curvepolygon;\r
-SELECT 'ST_LineToCurve03', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.curvepolygon;\r
-SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.curvepolygon;\r
-\r
 -- Repeat tests with new function names.\r
 SELECT 'astext01', ST_astext(the_geom_2d) FROM public.curvepolygon;\r
 SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.curvepolygon;\r

diff --git a/regress/sql-mm-curvepoly_expected.in b/regress/sql-mm-curvepoly_expected.in
index decb02a224924e66b0390e3767f86732c0e0cbfe..3fa78dcaa40c2acb2a9540ee06baa8a540fe199b 100644 (file)
--- a/regress/sql-mm-curvepoly_expected.in
+++ b/regress/sql-mm-curvepoly_expected.in
@@ -98,10 +98,6 @@ interiorRingN-201|
 interiorRingN-202|
 interiorRingN-203|
 interiorRingN-204|
-ST_LineToCurve01|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,0.999999999999997 -1,2 0,1.41421356237309 1.4142135623731,-2.09798541386808e-15 2,-1.4142135623731 1.41421356237309,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
-ST_LineToCurve02|CURVEPOLYGONM(CIRCULARSTRING(-2 0 0,-1 -1 2,0 0 4,0.999999999999997 -1 6,2 0 8,1.41421356237309 1.4142135623731 6,-2.09798541386808e-15 2 4,-1.4142135623731 1.41421356237309 2,-2 0 0),(-1 0 2,0 0.5 4,1 0 6,0 1 4,-1 0 2))
-ST_LineToCurve03|CURVEPOLYGON(CIRCULARSTRING(-2 0 0,-1 -1 0.999999999999998,0 0 2,0.999999999999997 -1 3,2 0 4,1.41421356237309 1.4142135623731 3,-2.09798541386808e-15 2 2,-1.4142135623731 1.41421356237309 0.999999999999999,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1))
-ST_LineToCurve04|CURVEPOLYGON(CIRCULARSTRING(-2 0 0 0,-1 -1 0.999999999999998 2,0 0 2 4,0.999999999999997 -1 3 6,2 0 4 8,1.41421356237309 1.4142135623731 3 6,-2.09798541386808e-15 2 2 4,-1.4142135623731 1.41421356237309 0.999999999999999 2,-2 0 0 0),(-1 0 1 2,0 0.5 2 4,1 0 3 6,0 1 3 4,-1 0 1 2))
 astext01|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
 astext02|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
 astext03|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))

diff --git a/regress/sql-mm-multicurve.sql b/regress/sql-mm-multicurve.sql
index 7c8fd0fca62bfcc388fc6ea7f95b1c158f601390..7f67526fbe7e190b139637ad0cf7fbeec129aa85 100644 (file)
--- a/regress/sql-mm-multicurve.sql
+++ b/regress/sql-mm-multicurve.sql
@@ -268,11 +268,6 @@ SELECT 'geometryN-302', (asEWKT(geometryN(the_geom_3dm, 3)) is null) FROM public
 SELECT 'geometryN-303', (asEWKT(geometryN(the_geom_3dz, 3)) is null) FROM public.multicurve;\r
 SELECT 'geometryN-304', (asEWKT(geometryN(the_geom_4d, 3)) is null) FROM public.multicurve;\r
 \r
-SELECT 'ST_LineToCurve01', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.multicurve;\r
-SELECT 'ST_LineToCurve02', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.multicurve;\r
-SELECT 'ST_LineToCurve03', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.multicurve;\r
-SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.multicurve;\r
-\r
 -- Repeat all tests with the new function names.\r
 SELECT 'astext01', ST_astext(the_geom_2d) FROM public.multicurve;\r
 SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.multicurve;\r

diff --git a/regress/sql-mm-multicurve_expected.in b/regress/sql-mm-multicurve_expected.in
index b9b179576938d87a6c053f5c1ecd636992e45dea..af33701a4303e3b7cdc8da7a0c545ae4911d9007 100644 (file)
--- a/regress/sql-mm-multicurve_expected.in
+++ b/regress/sql-mm-multicurve_expected.in
@@ -78,10 +78,6 @@ geometryN-301|t
 geometryN-302|t
 geometryN-303|t
 geometryN-304|t
-ST_LineToCurve01|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.152240934977426 0.765366864730177,0.585786437626905 1.4142135623731))
-ST_LineToCurve02|MULTICURVEM((5 5 3,3 5 2,3 3 1,0 3 1),CIRCULARSTRING(0 0 0,0.152240934977426 0.765366864730177 -1.5,0.585786437626905 1.4142135623731 2))
-ST_LineToCurve03|MULTICURVE((5 5 1,3 5 2,3 3 3,0 3 1),CIRCULARSTRING(0 0 0,0.152240934977426 0.765366864730177 2.24999999999999,0.585786437626905 1.4142135623731 1))
-ST_LineToCurve04|MULTICURVE((5 5 1 3,3 5 2 2,3 3 3 1,0 3 1 1),CIRCULARSTRING(0 0 0 0,0.152240934977426 0.765366864730177 2.24999999999999 -1.5,0.585786437626905 1.4142135623731 1 2))
 astext01|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731))
 astext02|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731))
 astext03|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731))

diff --git a/regress/sql-mm-multisurface.sql b/regress/sql-mm-multisurface.sql
index 7b4c139b2fe23d78b55b68624c45276086defcea..39bf08445521223cf419ea7f7ab1fcb2e5c35c42 100644 (file)
--- a/regress/sql-mm-multisurface.sql
+++ b/regress/sql-mm-multisurface.sql
@@ -482,11 +482,6 @@ SELECT 'geometryN-302', (geometryN(the_geom_3dm, 3) is null) FROM public.multisu
 SELECT 'geometryN-303', (geometryN(the_geom_3dz, 3) is null) FROM public.multisurface;\r
 SELECT 'geometryN-304', (geometryN(the_geom_4d, 3) is null) FROM public.multisurface;\r
 \r
-SELECT 'ST_LineToCurve01', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.multisurface;\r
-SELECT 'ST_LineToCurve02', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.multisurface;\r
-SELECT 'ST_LineToCurve03', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.multisurface;\r
-SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.multisurface;\r
-\r
 -- Repeat tests with new function names.\r
 SELECT 'astext01', ST_astext(the_geom_2d) FROM public.multisurface;\r
 SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.multisurface;\r

diff --git a/regress/sql-mm-multisurface_expected.in b/regress/sql-mm-multisurface_expected.in
index 386e4a95a463d440edc7fd6b158a224183a3163d..7d9b6d1dbcd36b8c6ace6c92507455171cadda98 100644 (file)
--- a/regress/sql-mm-multisurface_expected.in
+++ b/regress/sql-mm-multisurface_expected.in
@@ -86,10 +86,6 @@ geometryN-301|t
 geometryN-302|t
 geometryN-303|t
 geometryN-304|t
-ST_LineToCurve01|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,0.999999999999997 -1,2 0,1.41421356237309 1.4142135623731,-2.09798541386808e-15 2,-1.4142135623731 1.41421356237309,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
-ST_LineToCurve02|MULTISURFACEM(CURVEPOLYGON(CIRCULARSTRING(-2 0 0,-1 -1 2,0 0 4,0.999999999999997 -1 6,2 0 8,1.41421356237309 1.4142135623731 6,-2.09798541386808e-15 2 4,-1.4142135623731 1.41421356237309 2,-2 0 0),(-1 0 2,0 0.5 4,1 0 6,0 1 4,-1 0 2)),((7 8 8,10 10 5,6 14 1,4 11 6,7 8 8)))
-ST_LineToCurve03|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0 0,-1 -1 0.999999999999998,0 0 2,0.999999999999997 -1 3,2 0 4,1.41421356237309 1.4142135623731 3,-2.09798541386808e-15 2 2,-1.4142135623731 1.41421356237309 0.999999999999999,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1)),((7 8 7,10 10 5,6 14 3,4 11 4,7 8 7)))
-ST_LineToCurve04|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0 0 0,-1 -1 0.999999999999998 2,0 0 2 4,0.999999999999997 -1 3 6,2 0 4 8,1.41421356237309 1.4142135623731 3 6,-2.09798541386808e-15 2 2 4,-1.4142135623731 1.41421356237309 0.999999999999999 2,-2 0 0 0),(-1 0 1 2,0 0.5 2 4,1 0 3 6,0 1 3 4,-1 0 1 2)),((7 8 7 8,10 10 5 5,6 14 3 1,4 11 4 6,7 8 7 8)))
 astext01|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
 astext02|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
 astext03|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))