#722 more regress fixes for GeomFromText

git-svn-id: http://svn.osgeo.org/postgis/trunk@8646 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Regina Obe 2012-01-02 00:31:55 +00:00
parent 613f4966ef
commit 4fdebd48d7
2 changed files with 29 additions and 29 deletions

View file

@ -100,8 +100,8 @@ select 'distancetest1',
st_astext(st_longestline(a,b)),
st_astext(st_longestline(b,a)) from (
select
geomfromtext('MULTILINESTRING((17 16, 16 17, 17 18, 17 17, 17 16), (28 35,29 39, 30 35))') as a,
geomfromtext('MULTIPOLYGON(((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14)),((33 35,33 40, 35 40, 35 35, 33 35)))') as b
ST_GeomFromText('MULTILINESTRING((17 16, 16 17, 17 18, 17 17, 17 16), (28 35,29 39, 30 35))') as a,
ST_GeomFromText('MULTIPOLYGON(((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14)),((33 35,33 40, 35 40, 35 35, 33 35)))') as b
) as foo;
select 'distancetest2',
@ -114,8 +114,8 @@ select 'distancetest2',
st_astext(st_longestline(a,b)),
st_astext(st_longestline(b,a)) from (
select
geomfromtext('LINESTRING(-40 -20 , 4 2)') as a,
geomfromtext('LINESTRING(-10 20, 1 -2)') as b
ST_GeomFromText('LINESTRING(-40 -20 , 4 2)') as a,
ST_GeomFromText('LINESTRING(-10 20, 1 -2)') as b
) as foo;
select 'distancepoly1',
@ -126,8 +126,8 @@ select 'distancepoly1',
st_astext(st_longestline(a,b)),
st_astext(st_longestline(b,a)) from (
select
geomfromtext('MULTIPOLYGON(((17 16, 16 17, 17 18, 17 17, 17 16)), ((28 35,29 39, 30 35, 28 35)))') as a,
geomfromtext('MULTIPOLYGON(((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14)),((33 35,33 40, 35 40, 35 35, 33 35)))') as b
ST_GeomFromText('MULTIPOLYGON(((17 16, 16 17, 17 18, 17 17, 17 16)), ((28 35,29 39, 30 35, 28 35)))') as a,
ST_GeomFromText('MULTIPOLYGON(((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14)),((33 35,33 40, 35 40, 35 35, 33 35)))') as b
) as foo;
select 'distancepoly2',
@ -137,8 +137,8 @@ select 'distancepoly2',
st_astext(st_shortestline(b,a)),
st_astext(st_longestline(a,b)),
st_astext(st_longestline(b,a)) from (
select geomfromtext('POLYGON((17 14, 16 17, 17 18, 17 17, 17 14))') as a,
geomfromtext('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
select ST_GeomFromText('POLYGON((17 14, 16 17, 17 18, 17 17, 17 14))') as a,
ST_GeomFromText('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
) as foo;
@ -150,8 +150,8 @@ select 'distancepoly3',
st_astext(st_shortestline(b,a)),
st_astext(st_longestline(a,b)),
st_astext(st_longestline(b,a)) from (
select geomfromtext('POLYGON((17 16, 16 17, 17 19, 17 17, 17 16))') as a,
geomfromtext('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
select ST_GeomFromText('POLYGON((17 16, 16 17, 17 19, 17 17, 17 16))') as a,
ST_GeomFromText('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
) as foo;
@ -162,8 +162,8 @@ select 'distancepoly4',
st_astext(st_shortestline(b,a)),
st_astext(st_longestline(a,b)),
st_astext(st_longestline(b,a)) from (
select geomfromtext('POLYGON((17 16, 16 17, 16 20, 18 20, 18 17, 17 16))') as a,
geomfromtext('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
select ST_GeomFromText('POLYGON((17 16, 16 17, 16 20, 18 20, 18 17, 17 16))') as a,
ST_GeomFromText('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
) as foo;
@ -175,8 +175,8 @@ select 'distancepoly5',
st_astext(st_shortestline(b,a)),
st_astext(st_longestline(a,b)),
st_astext(st_longestline(b,a)) from (
select geomfromtext('POLYGON((17 12, 16 17, 17 18, 17 17, 17 12))') as a,
geomfromtext('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
select ST_GeomFromText('POLYGON((17 12, 16 17, 17 18, 17 17, 17 12))') as a,
ST_GeomFromText('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
) as foo;
@ -189,8 +189,8 @@ select 'distancepoly6',
st_astext(st_shortestline(b,a)),
st_astext(st_longestline(a,b)),
st_astext(st_longestline(b,a)) from (
select geomfromtext('POLYGON((2 2, 2 3, 3 3, 3 2, 2 2))') as a,
geomfromtext('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
select ST_GeomFromText('POLYGON((2 2, 2 3, 3 3, 3 2, 2 2))') as a,
ST_GeomFromText('POLYGON((-1 -1, -1 25, 25 25, 25 -1, -1 -1), (14 14,14 19,19 19,19 14,14 14))') as b
) as foo;
--3D Distance functions

View file

@ -1,20 +1,20 @@
SELECT ST_HasArc(geomfromtext('POINT(0 0)'));
SELECT ST_HasArc(geomfromtext('LINESTRING(0 0, 1 1, 1 0)'));
SELECT ST_HasArc(geomfromewkt('CIRCULARSTRING(
SELECT ST_HasArc(ST_GeomFromText('POINT(0 0)'));
SELECT ST_HasArc(ST_GeomFromText('LINESTRING(0 0, 1 1, 1 0)'));
SELECT ST_HasArc(ST_GeomFromEWKT('CIRCULARSTRING(
0 0 0 0,
0.26794919243112270647255365849413 1 3 -2,
0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2)'));
SELECT ST_HasArc(geomfromewkt('COMPOUNDCURVE(CIRCULARSTRING(
SELECT ST_HasArc(ST_GeomFromEWKT('COMPOUNDCURVE(CIRCULARSTRING(
0 0 0 0,
0.26794919243112270647255365849413 1 3 -2,
0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2),
(0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2,
2 0 0 0,
0 0 0 0))'));
SELECT ST_HasArc(geomfromewkt('POLYGON(
SELECT ST_HasArc(ST_GeomFromEWKT('POLYGON(
(-10 -10, 10 -10, 10 10, -10 10, -10 -10),
(5 0, 0 5, -5 0, 0 -5, 5 0))'));
SELECT ST_HasArc(geomfromewkt('CURVEPOLYGON(CIRCULARSTRING(
SELECT ST_HasArc(ST_GeomFromEWKT('CURVEPOLYGON(CIRCULARSTRING(
-2 0 0 0,
-1 -1 1 2,
0 0 2 4,
@ -27,16 +27,16 @@ SELECT ST_HasArc(geomfromewkt('CURVEPOLYGON(CIRCULARSTRING(
1 0 3 6,
0 1 3 4,
-1 0 1 2))'));
SELECT ST_HasArc(geomfromewkt('MULTIPOINT((0 0), (3 2))'));
SELECT ST_HasArc(geomfromewkt('MULTILINESTRING(
SELECT ST_HasArc(ST_GeomFromEWKT('MULTIPOINT((0 0), (3 2))'));
SELECT ST_HasArc(ST_GeomFromEWKT('MULTILINESTRING(
(0 0, 3 2),
(4 8, 9 8),
(2 9, 4 8))'));
SELECT ST_HasArc(geomfromewkt('MULTICURVE(
SELECT ST_HasArc(ST_GeomFromEWKT('MULTICURVE(
(0 0, 3 2),
(4 8, 9 8),
(2 9, 4 8))'));
SELECT ST_HasArc(geomfromewkt('MULTICURVE((
SELECT ST_HasArc(ST_GeomFromEWKT('MULTICURVE((
5 5 1 3,
3 5 2 2,
3 3 3 1,
@ -45,15 +45,15 @@ SELECT ST_HasArc(geomfromewkt('MULTICURVE((
0 0 0 0,
0.26794919243112270647255365849413 1 3 -2,
0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2))'));
SELECT ST_HasArc(geomfromewkt('MULTIPOLYGON(
SELECT ST_HasArc(ST_GeomFromEWKT('MULTIPOLYGON(
((-10 -10, 10 -10, 10 10, -10 10, -10 -10),
(5 0, 0 5, -5 0, 0 -5, 5 0)),
((9 2, 3 8, 9 4, 9 2)))'));
SELECT ST_HasArc(geomfromewkt('MULTISURFACE(
SELECT ST_HasArc(ST_GeomFromEWKT('MULTISURFACE(
((-10 -10, 10 -10, 10 10, -10 10, -10 -10),
(5 0, 0 5, -5 0, 0 -5, 5 0)),
((9 2, 3 8, 9 4, 9 2)))'));
SELECT ST_HasArc(geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
SELECT ST_HasArc(ST_GeomFromEWKT('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
-2 0 0 0,
-1 -1 1 2,
0 0 2 4,