From d0acd446966c8c524859421c5caa85bf00ed9231 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sat, 2 Jul 2011 09:27:54 +0000 Subject: [PATCH] revise wmsservers_new to use new typmod and not directly delete and add to geometry_columns so passes regress git-svn-id: http://svn.osgeo.org/postgis/trunk@7549 b70326c6-7e19-0410-871a-916f4a2858ee --- regress/wmsservers_new.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regress/wmsservers_new.sql b/regress/wmsservers_new.sql index 92dbf6cf1..6237917b3 100644 --- a/regress/wmsservers_new.sql +++ b/regress/wmsservers_new.sql @@ -1,7 +1,7 @@ SELECT 'Starting up MapServer/Geoserver tests...'; -- Set up the data table SELECT 'Setting up the data table...'; -CREATE TABLE wmstest ( id INTEGER, pt GEOMETRY ); +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'); @@ -11,8 +11,8 @@ CREATE INDEX wmstest_geomidx ON wmstest using gist ( pt ); -- Geoserver 2.0 NG tests SELECT 'Running Geoserver 2.0 NG tests...'; -- Run a Geoserver 2.0 NG metadata query ---SELECT 'Geoserver1', 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'; +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); -- Run a Geoserver 2.0 NG KML query -- 2.50.1