Nothing like experimenting with myself. Change ST_AsX3D to use default parameters...

git-svn-id: http://svn.osgeo.org/postgis/trunk@7177 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/reference_output.xml b/doc/reference_output.xml
index 32544e398a1e910612eacd91d9bc4259ed4c905e..a52c454a7e0246742f2730495d192788bcc3274e 100644 (file)
--- a/doc/reference_output.xml
+++ b/doc/reference_output.xml
@@ -859,11 +859,7 @@ SELECT ST_AsGML(3, ST_GeomFromEWKT('POLYHEDRALSURFACE( ((0 0 0, 0 0 1, 0 1 1, 0
                        <funcprototype>
                                <funcdef>text <function>ST_AsX3D</function></funcdef>
                                <paramdef><type>geometry </type> <parameter>g1</parameter></paramdef>
-                       </funcprototype>
-                       <funcprototype>
-                               <funcdef>text <function>ST_AsX3D</function></funcdef>
-                               <paramdef><type>geometry </type> <parameter>g1</parameter></paramdef>
-                               <paramdef><type>integer </type> <parameter>prec</parameter></paramdef>
+                               <paramdef choice="opt"><type>integer </type> <parameter>prec</parameter></paramdef>
                        </funcprototype>
                </funcsynopsis>
          </refsynopsisdiv>

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 20c4663ff91e28d6401bcbc6aaf7d290a2dfa9e1..663a306f43daf15e89ebf7688aba833b752924ac 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -5271,16 +5271,11 @@ CREATE OR REPLACE FUNCTION _ST_AsX3D(int4, geometry, int4, int4, text)
        LANGUAGE 'C' IMMUTABLE;\r
        \r
 -- ST_AsX3D(geom, precision)\r
-CREATE OR REPLACE FUNCTION ST_AsX3D(geom geometry, prec int4)\r
+CREATE OR REPLACE FUNCTION ST_AsX3D(geom geometry, prec integer DEFAULT 15)\r
        RETURNS TEXT\r
        AS $$SELECT _ST_AsX3D(3,$1,$2,1,'');$$\r
        LANGUAGE 'sql' IMMUTABLE;\r
-       \r
--- ST_AsX3D(geom, precision)\r
-CREATE OR REPLACE FUNCTION ST_AsX3D(geom geometry)\r
-       RETURNS TEXT\r
-       AS $$SELECT _ST_AsX3D(3,$1,15,1,'');$$\r
-       LANGUAGE 'sql' IMMUTABLE;\r
+\r
 COMMIT;\r
 \r
 #include "postgis_drop.sql.in.c"\r

diff --git a/postgis/postgis_drop.sql.in.c b/postgis/postgis_drop.sql.in.c
index 11727f84d1c84469b44d118385c6194479253adb..273f366e4ddc14ac3580ca08e32b055c462e0a8a 100644 (file)
--- a/postgis/postgis_drop.sql.in.c
+++ b/postgis/postgis_drop.sql.in.c
@@ -14,6 +14,7 @@ DROP FUNCTION IF EXISTS box2d_contained(box2d, box2d);
 DROP FUNCTION IF EXISTS box2d_overlap(box2d, box2d);
 DROP FUNCTION IF EXISTS box2d_same(box2d, box2d);
 DROP FUNCTION IF EXISTS box2d_intersects(box2d, box2d);
+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_box2d_overleft(box2d, box2d);
 DROP FUNCTION IF EXISTS st_box2d_overright(box2d, box2d);
 DROP FUNCTION IF EXISTS st_box2d_left(box2d, box2d);
@@ -56,5 +57,3 @@ DROP FUNCTION IF EXISTS geosnoop(geometry);
 DROP FUNCTION IF EXISTS jtsnoop(geometry);
 DROP FUNCTION IF EXISTS st_noop(geometry);
 DROP FUNCTION IF EXISTS st_max_distance(geometry, geometry);
-
-