From d5d8fd00f3976cc8e144e794b846d9a3777e6219 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Fri, 30 Dec 2011 15:43:55 +0000 Subject: [PATCH] #1415 -- beginning support for options -- expose the currently useless opts flag git-svn-id: http://svn.osgeo.org/postgis/trunk@8621 b70326c6-7e19-0410-871a-916f4a2858ee --- doc/reference_output.xml | 1 + postgis/postgis.sql.in.c | 4 ++-- postgis/postgis_drop.sql.in.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/reference_output.xml b/doc/reference_output.xml index 98453df12..eb030e099 100644 --- a/doc/reference_output.xml +++ b/doc/reference_output.xml @@ -872,6 +872,7 @@ SELECT ST_AsGML(3, ST_GeomFromEWKT('POLYHEDRALSURFACE( ((0 0 0, 0 0 1, 0 1 1, 0 text ST_AsX3D geometry g1 integer prec=15 + integer opts=0 diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c index 1c7c211c5..6fac997b1 100644 --- a/postgis/postgis.sql.in.c +++ b/postgis/postgis.sql.in.c @@ -4770,9 +4770,9 @@ CREATE OR REPLACE FUNCTION _ST_AsX3D(int4, geometry, int4, int4, text) LANGUAGE 'C' IMMUTABLE; -- ST_AsX3D(geom, precision) -CREATE OR REPLACE FUNCTION ST_AsX3D(geom geometry, prec integer DEFAULT 15) +CREATE OR REPLACE FUNCTION ST_AsX3D(geom geometry, prec integer DEFAULT 15, opts integer DEFAULT 0) RETURNS TEXT - AS $$SELECT _ST_AsX3D(3,$1,$2,1,'');$$ + AS $$SELECT _ST_AsX3D(3,$1,$2,$3,'');$$ LANGUAGE 'sql' IMMUTABLE; COMMIT; diff --git a/postgis/postgis_drop.sql.in.c b/postgis/postgis_drop.sql.in.c index 9013fa055..bacd2dd13 100644 --- a/postgis/postgis_drop.sql.in.c +++ b/postgis/postgis_drop.sql.in.c @@ -28,6 +28,7 @@ DROP FUNCTION IF EXISTS box2d_same(box2d, box2d); DROP FUNCTION IF EXISTS box2d_intersects(box2d, box2d); DROP FUNCTION IF EXISTS st_area(geography); -- this one changed to use default parameters DROP FUNCTION IF EXISTS st_asx3d(geometry); -- this one changed to use default parameters so full function deals with it +DROP FUNCTION IF EXISTS st_asx3d(geometry, int4); -- introduce variant with opts so get rid of other without ops DROP FUNCTION IF EXISTS st_assvg(geometry); -- changed to use default args DROP FUNCTION IF EXISTS st_assvg(geometry,int4); -- changed to use default args DROP FUNCTION IF EXISTS st_assvg(geography); -- changed to use default args -- 2.40.0