[postgis-commits] svn - r2654 - trunk/regress
postgis-commits at postgis.refractions.net
postgis-commits at postgis.refractions.net
Thu Jul 12 10:20:26 PDT 2007
Author: mleslie
Date: 2007-07-12 10:20:24 -0700 (Thu, 12 Jul 2007)
New Revision: 2654
Modified:
trunk/regress/sql-mm-circularstring.sql
trunk/regress/sql-mm-circularstring_expected.in
trunk/regress/sql-mm-compoundcurve.sql
trunk/regress/sql-mm-compoundcurve_expected.in
trunk/regress/sql-mm-curvepoly.sql
trunk/regress/sql-mm-curvepoly_expected.in
trunk/regress/sql-mm-multicurve.sql
trunk/regress/sql-mm-multicurve_expected.in
trunk/regress/sql-mm-multisurface.sql
trunk/regress/sql-mm-multisurface_expected.in
Log:
Removing the unsnappable test calls to LineToCurve.
Modified: trunk/regress/sql-mm-circularstring.sql
===================================================================
--- trunk/regress/sql-mm-circularstring.sql 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-circularstring.sql 2007-07-12 17:20:24 UTC (rev 2654)
@@ -310,11 +310,6 @@
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;
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;
-SELECT 'ST_LineToCurve01', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.circularstring;
-SELECT 'ST_LineToCurve02', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.circularstring;
-SELECT 'ST_LineToCurve03', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.circularstring;
-SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.circularstring;
-
-- Repeat tests with new function names.
SELECT 'astext01', ST_astext(the_geom_2d) FROM public.circularstring;
SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.circularstring;
Modified: trunk/regress/sql-mm-circularstring_expected.in
===================================================================
--- trunk/regress/sql-mm-circularstring_expected.in 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-circularstring_expected.in 2007-07-12 17:20:24 UTC (rev 2654)
@@ -153,14 +153,6 @@
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)
Modified: trunk/regress/sql-mm-compoundcurve.sql
===================================================================
--- trunk/regress/sql-mm-compoundcurve.sql 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-compoundcurve.sql 2007-07-12 17:20:24 UTC (rev 2654)
@@ -229,11 +229,6 @@
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;
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;
-SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.compoundcurve;
-SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.compoundcurve;
-SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.compoundcurve;
-SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.compoundcurve;
-
-- Repeat tests on new function names.
SELECT 'astext01', ST_astext(the_geom_2d) FROM public.compoundcurve;
SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.compoundcurve;
Modified: trunk/regress/sql-mm-compoundcurve_expected.in
===================================================================
--- trunk/regress/sql-mm-compoundcurve_expected.in 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-compoundcurve_expected.in 2007-07-12 17:20:24 UTC (rev 2654)
@@ -85,10 +85,6 @@
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))
Modified: trunk/regress/sql-mm-curvepoly.sql
===================================================================
--- trunk/regress/sql-mm-curvepoly.sql 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-curvepoly.sql 2007-07-12 17:20:24 UTC (rev 2654)
@@ -373,11 +373,6 @@
SELECT 'interiorRingN-203', asEWKT(interiorRingN(the_geom_3dz, 2)) FROM public.curvepolygon;
SELECT 'interiorRingN-204', asEWKT(interiorRingN(the_geom_4d, 2)) FROM public.curvepolygon;
-SELECT 'ST_LineToCurve01', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.curvepolygon;
-SELECT 'ST_LineToCurve02', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.curvepolygon;
-SELECT 'ST_LineToCurve03', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.curvepolygon;
-SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.curvepolygon;
-
-- Repeat tests with new function names.
SELECT 'astext01', ST_astext(the_geom_2d) FROM public.curvepolygon;
SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.curvepolygon;
Modified: trunk/regress/sql-mm-curvepoly_expected.in
===================================================================
--- trunk/regress/sql-mm-curvepoly_expected.in 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-curvepoly_expected.in 2007-07-12 17:20:24 UTC (rev 2654)
@@ -98,10 +98,6 @@
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))
Modified: trunk/regress/sql-mm-multicurve.sql
===================================================================
--- trunk/regress/sql-mm-multicurve.sql 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-multicurve.sql 2007-07-12 17:20:24 UTC (rev 2654)
@@ -268,11 +268,6 @@
SELECT 'geometryN-303', (asEWKT(geometryN(the_geom_3dz, 3)) is null) FROM public.multicurve;
SELECT 'geometryN-304', (asEWKT(geometryN(the_geom_4d, 3)) is null) FROM public.multicurve;
-SELECT 'ST_LineToCurve01', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.multicurve;
-SELECT 'ST_LineToCurve02', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.multicurve;
-SELECT 'ST_LineToCurve03', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.multicurve;
-SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.multicurve;
-
-- Repeat all tests with the new function names.
SELECT 'astext01', ST_astext(the_geom_2d) FROM public.multicurve;
SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.multicurve;
Modified: trunk/regress/sql-mm-multicurve_expected.in
===================================================================
--- trunk/regress/sql-mm-multicurve_expected.in 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-multicurve_expected.in 2007-07-12 17:20:24 UTC (rev 2654)
@@ -78,10 +78,6 @@
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))
Modified: trunk/regress/sql-mm-multisurface.sql
===================================================================
--- trunk/regress/sql-mm-multisurface.sql 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-multisurface.sql 2007-07-12 17:20:24 UTC (rev 2654)
@@ -482,11 +482,6 @@
SELECT 'geometryN-303', (geometryN(the_geom_3dz, 3) is null) FROM public.multisurface;
SELECT 'geometryN-304', (geometryN(the_geom_4d, 3) is null) FROM public.multisurface;
-SELECT 'ST_LineToCurve01', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_2d))) FROM public.multisurface;
-SELECT 'ST_LineToCurve02', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dm))) FROM public.multisurface;
-SELECT 'ST_LineToCurve03', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_3dz))) FROM public.multisurface;
-SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.multisurface;
-
-- Repeat tests with new function names.
SELECT 'astext01', ST_astext(the_geom_2d) FROM public.multisurface;
SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.multisurface;
Modified: trunk/regress/sql-mm-multisurface_expected.in
===================================================================
--- trunk/regress/sql-mm-multisurface_expected.in 2007-07-11 01:17:29 UTC (rev 2653)
+++ trunk/regress/sql-mm-multisurface_expected.in 2007-07-12 17:20:24 UTC (rev 2654)
@@ -86,10 +86,6 @@
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)))
More information about the postgis-commits
mailing list