From: Olivier Courtin Date: Sat, 11 May 2013 07:47:18 +0000 (+0000) Subject: #2319 fix. Update SFCGAL regress tests after #1994 functions renaming X-Git-Tag: 2.1.0beta2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7a1c94f0025fd3d94c0926c9715f83382ea69ad;p=postgis #2319 fix. Update SFCGAL regress tests after #1994 functions renaming git-svn-id: http://svn.osgeo.org/postgis/trunk@11418 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/regress/sfcgal/regress.sql b/regress/sfcgal/regress.sql index 969a5289b..db996fbaa 100644 --- a/regress/sfcgal/regress.sql +++ b/regress/sfcgal/regress.sql @@ -235,16 +235,16 @@ select '141', ST_AsEWKT(ST_multi(ST_setsrid('LINESTRING(2 2, 3 3)'::geometry, 4) select '142', ST_AsEWKT(ST_multi(ST_setsrid('LINESTRING(2 2, 3 3)'::geometry, 5))); select '143', ST_AsEWKT(ST_multi(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6))); select '143c1', ST_AsEWKT(ST_multi('CIRCULARSTRING(0 0, 1 1, 2 2)'::geometry)); -select '144', ST_AsEWKT(ST_force_3dm('POINT(1 2 3)')); -select '145', ST_AsEWKT(ST_force_3dz('POINTM(1 2 3)')); -select '146', ST_AsEWKT(ST_force_4d('POINTM(1 2 3)')); -select '147', ST_AsEWKT(ST_force_4d('POINT(1 2 3)')); +select '144', ST_AsEWKT(ST_Force3DM('POINT(1 2 3)')); +select '145', ST_AsEWKT(ST_Force3DZ('POINTM(1 2 3)')); +select '146', ST_AsEWKT(ST_Force4D('POINTM(1 2 3)')); +select '147', ST_AsEWKT(ST_Force4D('POINT(1 2 3)')); select '148', ST_AsText(ST_segmentize('LINESTRING(0 0, 10 0)'::geometry, 5)); select '149', ST_AsText(ST_segmentize('GEOMETRYCOLLECTION EMPTY'::geometry, 0.5)); -select '150', ST_AsEWKT(ST_force_collection(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6))); +select '150', ST_AsEWKT(ST_ForceCollection(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6))); select '151', ST_MakeEnvelope(0, 0, 1, 1, 4326); select '152', ST_SRID(ST_MakeEnvelope(0, 0, 1, 1, 4326)); diff --git a/regress/sfcgal/tickets.sql b/regress/sfcgal/tickets.sql index d3f7c3bca..b6bc2cb17 100644 --- a/regress/sfcgal/tickets.sql +++ b/regress/sfcgal/tickets.sql @@ -73,7 +73,7 @@ SELECT '#69', ST_AsText(ST_Translate(ST_GeomFromText('CIRCULARSTRING(220268 1504 SELECT '#70', ST_NPoints(ST_LinetoCurve(ST_Buffer('POINT(1 2)',3))); -- #73 -- -SELECT '#73', ST_AsText(ST_Force_Collection(ST_GeomFromEWKT('CIRCULARSTRING(1 1, 2 3, 4 5, 6 7, 5 6)'))); +SELECT '#73', ST_AsText(ST_ForceCollection(ST_GeomFromEWKT('CIRCULARSTRING(1 1, 2 3, 4 5, 6 7, 5 6)'))); -- #80 -- SELECT '#80', ST_AsText(ST_Multi('MULTILINESTRING((0 0,1 1))')); @@ -555,7 +555,7 @@ 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')); +SELECT '#1414', st_astext(st_Force3DZ('CURVEPOLYGON EMPTY')); -- #1478 SELECT '#1478', 'SRID=1;POINT EMPTY'::geometry::text::geometry; diff --git a/regress/sfcgal/wmsservers.sql b/regress/sfcgal/wmsservers.sql index 290f456d2..38f1a6371 100644 --- a/regress/sfcgal/wmsservers.sql +++ b/regress/sfcgal/wmsservers.sql @@ -1,10 +1,9 @@ SET postgis.backend = 'sfcgal'; SET client_min_messages TO warning; - SELECT 'Starting up MapServer/Geoserver tests...'; -- Set up the data table SELECT 'Setting up the data table...'; -CREATE TABLE public.wmstest ( id INTEGER, pt GEOMETRY(Polygon,4326) ); +CREATE TABLE wmstest ( id INTEGER, pt GEOMETRY(Polygon,4326) ); INSERT INTO wmstest SELECT lon * 100 + lat AS id, st_setsrid(st_buffer(st_makepoint(lon, lat),1.0),4326) AS pt FROM (select lon, generate_series(-80,80, 5) AS lat FROM (SELECT generate_series(-175, 175, 5) AS lon) AS sq1) AS sq2; --INSERT INTO geometry_columns (f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, type) VALUES ('', 'public','wmstest','pt',2,4326,'POLYGON'); @@ -17,20 +16,20 @@ SELECT 'Running Geoserver 2.0 NG tests...'; SELECT 'Geoserver1', upper(TYPE) As TYPE FROM GEOMETRY_COLUMNS WHERE F_TABLE_SCHEMA = 'public' AND F_TABLE_NAME = 'wmstest' AND F_GEOMETRY_COLUMN = 'pt'; SELECT 'Geoserver2', SRID FROM GEOMETRY_COLUMNS WHERE F_TABLE_SCHEMA = 'public' AND F_TABLE_NAME = 'wmstest' AND F_GEOMETRY_COLUMN = 'pt'; -- Run a Geoserver 2.0 NG WMS query -SELECT 'Geoserver3', "id",substr(encode(ST_AsBinary(ST_Force_2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && ST_GeomFromText('POLYGON ((-6.58216065979069 -0.7685569763184591, -6.58216065979069 0.911225433349509, -3.050569931030911 0.911225433349509, -3.050569931030911 -0.7685569763184591, -6.58216065979069 -0.7685569763184591))', 4326); +SELECT 'Geoserver3', "id",substr(encode(ST_AsBinary(ST_Force2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && ST_GeomFromText('POLYGON ((-6.58216065979069 -0.7685569763184591, -6.58216065979069 0.911225433349509, -3.050569931030911 0.911225433349509, -3.050569931030911 -0.7685569763184591, -6.58216065979069 -0.7685569763184591))', 4326); -- Run a Geoserver 2.0 NG KML query SELECT 'Geoserver4', count(*) FROM "public"."wmstest" WHERE "pt" && ST_GeomFromText('POLYGON ((-1.504017942347938 24.0332272532341, -1.504017942347938 25.99364254836741, 1.736833353559741 25.99364254836741, 1.736833353559741 24.0332272532341, -1.504017942347938 24.0332272532341))', 4326); -SELECT 'Geoserver5', "id",substr(encode(ST_AsBinary(ST_Force_2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && ST_GeomFromText('POLYGON ((-1.504017942347938 24.0332272532341, -1.504017942347938 25.99364254836741, 1.736833353559741 25.99364254836741, 1.736833353559741 24.0332272532341, -1.504017942347938 24.0332272532341))', 4326); -SELECT 'Geoserver6', "id",substr(encode(ST_AsBinary(ST_Force_2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && ST_GeomFromText('POLYGON ((-1.507182836191598 24.031312785172446, -1.507182836191598 25.995557016429064, 1.7399982474034008 25.995557016429064, 1.7399982474034008 24.031312785172446, -1.507182836191598 24.031312785172446))', 4326); +SELECT 'Geoserver5', "id",substr(encode(ST_AsBinary(ST_Force2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && ST_GeomFromText('POLYGON ((-1.504017942347938 24.0332272532341, -1.504017942347938 25.99364254836741, 1.736833353559741 25.99364254836741, 1.736833353559741 24.0332272532341, -1.504017942347938 24.0332272532341))', 4326); +SELECT 'Geoserver6', "id",substr(encode(ST_AsBinary(ST_Force2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && ST_GeomFromText('POLYGON ((-1.507182836191598 24.031312785172446, -1.507182836191598 25.995557016429064, 1.7399982474034008 25.995557016429064, 1.7399982474034008 24.031312785172446, -1.507182836191598 24.031312785172446))', 4326); -- MapServer 5.4 tests select 'MapServer1', attname from pg_attribute, pg_constraint, pg_class where pg_constraint.conrelid = pg_class.oid and pg_class.oid = pg_attribute.attrelid and pg_constraint.contype = 'p' and pg_constraint.conkey[1] = pg_attribute.attnum and pg_class.relname = 'wmstest' and pg_table_is_visible(pg_class.oid) and pg_constraint.conkey[2] is null; -select 'MapServer2', "id",substr(encode(ST_AsBinary(ST_Force_collection(ST_Force_2d("pt")),'NDR'),'base64'),0,16) as geom,"id" from wmstest where pt && ST_GeomFromText('POLYGON((-98.5 32,-98.5 39,-91.5 39,-91.5 32,-98.5 32))',find_srid('','wmstest','pt')); +select 'MapServer2', "id",substr(encode(ST_AsBinary(ST_ForceCollection(ST_Force2d("pt")),'NDR'),'base64'),0,16) as geom,"id" from wmstest where pt && ST_GeomFromText('POLYGON((-98.5 32,-98.5 39,-91.5 39,-91.5 32,-98.5 32))',find_srid('','wmstest','pt')); -- MapServer 5.6 tests select * from wmstest where false limit 0; select 'MapServer3', attname from pg_attribute, pg_constraint, pg_class where pg_constraint.conrelid = pg_class.oid and pg_class.oid = pg_attribute.attrelid and pg_constraint.contype = 'p' and pg_constraint.conkey[1] = pg_attribute.attnum and pg_class.relname = 'wmstest' and pg_table_is_visible(pg_class.oid) and pg_constraint.conkey[2] is null; -select 'MapServer4', "id",substr(encode(ST_AsBinary(ST_Force_collection(ST_Force_2d("pt")),'NDR'),'hex'),0,16) as geom,"id" from wmstest where pt && ST_GeomFromText('POLYGON((-98.5 32,-98.5 39,-91.5 39,-91.5 32,-98.5 32))',find_srid('','wmstest','pt')); +select 'MapServer4', "id",substr(encode(ST_AsBinary(ST_ForceCollection(ST_Force2d("pt")),'NDR'),'hex'),0,16) as geom,"id" from wmstest where pt && ST_GeomFromText('POLYGON((-98.5 32,-98.5 39,-91.5 39,-91.5 32,-98.5 32))',find_srid('','wmstest','pt')); -- Drop the data table SELECT 'Removing the data table...';