Renaming of 3D functions, #817

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

diff --git a/doc/reference_constructor.xml b/doc/reference_constructor.xml
index df1c9c59a8d6e0be0c7d9dbbc0b5df50fa06ef78..2958c763a7dd8072b378417b0c687bb3e0a1b7bf 100644 (file)
--- a/doc/reference_constructor.xml
+++ b/doc/reference_constructor.xml
@@ -1106,9 +1106,9 @@ WHERE the_geom && ST_SetSRID(ST_MakeBox2D(ST_Point(-989502.1875, 528439.
          </refsection>
        </refentry>
 
-       <refentry id="ST_MakeBox3D">
+       <refentry id="ST_3DMakeBox">
          <refnamediv>
-               <refname>ST_MakeBox3D</refname>
+               <refname>ST_3DMakeBox</refname>
 
                <refpurpose>Creates a BOX3D defined by the given 3d point
                        geometries.</refpurpose>
@@ -1117,7 +1117,7 @@ WHERE the_geom &amp;&amp; ST_SetSRID(ST_MakeBox2D(ST_Point(-989502.1875, 528439.
          <refsynopsisdiv>
                <funcsynopsis>
                  <funcprototype>
-                       <funcdef>box3d <function>ST_MakeBox3D</function></funcdef>
+                       <funcdef>box3d <function>ST_3DMakeBox</function></funcdef>
                        <paramdef><type>geometry </type> <parameter>point3DLowLeftBottom</parameter></paramdef>
                        <paramdef><type>geometry </type> <parameter>point3DUpRightTop</parameter></paramdef>
                  </funcprototype>
@@ -1143,7 +1143,7 @@ WHERE the_geom &amp;&amp; ST_SetSRID(ST_MakeBox2D(ST_Point(-989502.1875, 528439.
                <title>Examples</title>
 
                <programlisting>
-SELECT ST_MakeBox3D(ST_MakePoint(-989502.1875, 528439.5625, 10),
+SELECT ST_3DMakeBox(ST_MakePoint(-989502.1875, 528439.5625, 10),
        ST_MakePoint(-987121.375 ,529933.1875, 10)) As abb3d
 
 --bb3d--

diff --git a/doc/reference_measure.xml b/doc/reference_measure.xml
index 85ea348cd0ca3e83f037c904a5ec8bfc1c954c24..911cbe31cf31ede15c12e2e34f6a43751ff2130a 100644 (file)
--- a/doc/reference_measure.xml
+++ b/doc/reference_measure.xml
@@ -2743,13 +2743,13 @@ FROM (SELECT ST_GeographyFromText(
          <refsection>
                <title>See Also</title>
 
-               <para><xref linkend="ST_Length" />, <xref linkend="ST_Length3D" /></para>
+               <para><xref linkend="ST_Length" />, <xref linkend="ST_3DLength" /></para>
          </refsection>
        </refentry>
 
-       <refentry id="ST_Length3D">
+       <refentry id="ST_3DLength">
          <refnamediv>
-               <refname>ST_Length3D</refname>
+               <refname>ST_3DLength</refname>
 
                <refpurpose>Returns the 3-dimensional or 2-dimensional length of the geometry if it is a
                        linestring or multi-linestring. </refpurpose>
@@ -2758,7 +2758,7 @@ FROM (SELECT ST_GeographyFromText(
          <refsynopsisdiv>
                <funcsynopsis>
                  <funcprototype>
-                       <funcdef>float <function>ST_Length3D</function></funcdef>
+                       <funcdef>float <function>ST_3DLength</function></funcdef>
                        <paramdef><type>geometry </type> <parameter>a_3dlinestring</parameter></paramdef>
                  </funcprototype>
                </funcsynopsis>
@@ -2780,9 +2780,9 @@ FROM (SELECT ST_GeographyFromText(
                <para>Return length in feet for a 3D cable. Note this is in feet because 2249 is
                                Mass State Plane Feet</para>
                <programlisting>
-SELECT ST_Length3D(ST_GeomFromText('LINESTRING(743238 2967416 1,743238 2967450 1,743265 2967450 3,
+SELECT ST_3DLength(ST_GeomFromText('LINESTRING(743238 2967416 1,743238 2967450 1,743265 2967450 3,
 743265.625 2967416 3,743238 2967416 3)',2249));
-st_length3d
+ST_3DLength
 -----------
 122.704716741457
                </programlisting>
@@ -2871,7 +2871,7 @@ CAST('SPHEROID["GRS_1980",6378137,298.257222101]' As spheroid) As sph_m)  as foo
          <refsection>
                <title>See Also</title>
 
-               <para><xref linkend="ST_GeometryN" />, <xref linkend="ST_Length" />, <xref linkend="ST_Length3D_Spheroid" /></para>
+               <para><xref linkend="ST_GeometryN" />, <xref linkend="ST_Length" />, <xref linkend="ST_3DLength_Spheroid" /></para>
          </refsection>
        </refentry>
 
@@ -2909,7 +2909,7 @@ CAST('SPHEROID["GRS_1980",6378137,298.257222101]' As spheroid) As sph_m)  as foo
 
                <literallayout>SPHEROID["GRS_1980",6378137,298.257222101]</literallayout>
                <note><para>Will return 0 for anything that is not a MULTILINESTRING or LINESTRING</para></note>
-               <note><para>This is much like <xref linkend="ST_Length_Spheroid" /> and <xref linkend="ST_Length3D_Spheroid" /> except it will throw away the Z coordinate in calculations.</para></note>
+               <note><para>This is much like <xref linkend="ST_Length_Spheroid" /> and <xref linkend="ST_3DLength_Spheroid" /> except it will throw away the Z coordinate in calculations.</para></note>
 
          </refsection>
 
@@ -2950,13 +2950,13 @@ CAST('SPHEROID["GRS_1980",6378137,298.257222101]' As spheroid) As sph_m)  as foo
          <refsection>
                <title>See Also</title>
 
-               <para><xref linkend="ST_GeometryN" />, <xref linkend="ST_Length_Spheroid" />, <xref linkend="ST_Length3D_Spheroid" /></para>
+               <para><xref linkend="ST_GeometryN" />, <xref linkend="ST_Length_Spheroid" />, <xref linkend="ST_3DLength_Spheroid" /></para>
          </refsection>
        </refentry>
 
-       <refentry id="ST_Length3D_Spheroid">
+       <refentry id="ST_3DLength_Spheroid">
          <refnamediv>
-               <refname>ST_Length3D_Spheroid</refname>
+               <refname>ST_3DLength_Spheroid</refname>
 
                <refpurpose>Calculates the length of a geometry on an ellipsoid,
                        taking the elevation into account. This is just an alias for ST_Length_Spheroid. </refpurpose>
@@ -2965,7 +2965,7 @@ CAST('SPHEROID["GRS_1980",6378137,298.257222101]' As spheroid) As sph_m)  as foo
          <refsynopsisdiv>
                <funcsynopsis>
                  <funcprototype>
-                       <funcdef>float <function>ST_Length3D_Spheroid</function></funcdef>
+                       <funcdef>float <function>ST_3DLength_Spheroid</function></funcdef>
                        <paramdef><type>geometry </type> <parameter>a_linestring</parameter></paramdef>
                        <paramdef><type>spheroid </type> <parameter>a_spheroid</parameter></paramdef>
                  </funcprototype>
@@ -3384,9 +3384,9 @@ st_perimeter
          </refsection>
        </refentry>
 
-       <refentry id="ST_Perimeter3D">
+       <refentry id="ST_3DPerimeter">
          <refnamediv>
-               <refname>ST_Perimeter3D</refname>
+               <refname>ST_3DPerimeter</refname>
 
                <refpurpose>Returns the 3-dimensional perimeter of the geometry, if it
                        is a polygon or multi-polygon.</refpurpose>
@@ -3395,7 +3395,7 @@ st_perimeter
          <refsynopsisdiv>
                <funcsynopsis>
                  <funcprototype>
-                       <funcdef>float <function>ST_Perimeter3D</function></funcdef>
+                       <funcdef>float <function>ST_3DPerimeter</function></funcdef>
                        <paramdef><type>geometry </type> <parameter>geomA</parameter></paramdef>
                  </funcprototype>
                </funcsynopsis>
@@ -3414,11 +3414,11 @@ st_perimeter
          <refsection>
                <title>Examples</title>
                <para>Perimeter of a slightly elevated polygon in the air in Massachusetts state plane feet</para>
-               <programlisting>SELECT ST_Perimeter3D(the_geom), ST_Perimeter2d(the_geom), ST_Perimeter(the_geom) FROM
+               <programlisting>SELECT ST_3DPerimeter(the_geom), ST_Perimeter2d(the_geom), ST_Perimeter(the_geom) FROM
                        (SELECT ST_GeomFromEWKT('SRID=2249;POLYGON((743238 2967416 2,743238 2967450 1,
 743265.625 2967416 1,743238 2967416 2))') As the_geom) As foo;
 
-  st_perimeter3d  |  st_perimeter2d  |   st_perimeter
+  ST_3DPerimeter  |  st_perimeter2d  |   st_perimeter
 ------------------+------------------+------------------
  105.465793597674 | 105.432997272188 | 105.432997272188
 

diff --git a/doc/reference_misc.xml b/doc/reference_misc.xml
index fb1ab1524f49ccc3de3aeb9ed42af601f74fe814..089eca586d6d2d5158ad0a92fbc4e9db213ddd4f 100644 (file)
--- a/doc/reference_misc.xml
+++ b/doc/reference_misc.xml
@@ -350,7 +350,7 @@ SELECT ST_Expand(CAST('BOX3D(778783 2951741 1,794875 2970042.61545891 10)' As bo
                </note>
 
                <note>
-                 <para>ST_Extent will return boxes with only an x and y component even with (x,y,z) coordinate geometries.  To maintain x,y,z use ST_Extent3D instead.</para>
+                 <para>ST_Extent will return boxes with only an x and y component even with (x,y,z) coordinate geometries.  To maintain x,y,z use ST_3DExtent instead.</para>
                </note>
                
                <note>
@@ -398,20 +398,20 @@ SELECT ST_SetSRID(ST_Extent(the_geom),2249) as bextent FROM sometable;
 
          <refsection>
                <title>See Also</title>
-               <para><xref linkend="ST_AsEWKT" />, <xref linkend="ST_Extent3D" />, <xref linkend="ST_SetSRID" />, <xref linkend="ST_SRID" /></para>
+               <para><xref linkend="ST_AsEWKT" />, <xref linkend="ST_3DExtent" />, <xref linkend="ST_SetSRID" />, <xref linkend="ST_SRID" /></para>
          </refsection>
        </refentry>
 
-       <refentry id="ST_Extent3D">
+       <refentry id="ST_3DExtent">
          <refnamediv>
-               <refname>ST_Extent3D</refname>
+               <refname>ST_3DExtent</refname>
                <refpurpose>an aggregate function that returns the box3D bounding box that bounds rows of geometries.</refpurpose>
          </refnamediv>
 
          <refsynopsisdiv>
                <funcsynopsis>
                  <funcprototype>
-                       <funcdef>box3d <function>ST_Extent3D</function></funcdef>
+                       <funcdef>box3d <function>ST_3DExtent</function></funcdef>
                        <paramdef><type>geometry set</type> <parameter>geomfield</parameter></paramdef>
                  </funcprototype>
                </funcsynopsis>
@@ -420,13 +420,13 @@ SELECT ST_SetSRID(ST_Extent(the_geom),2249) as bextent FROM sometable;
          <refsection>
                <title>Description</title>
 
-               <para>ST_Extent3D returns a box3d (includes Z coordinate) bounding box that encloses a set of geometries. The ST_Extent3D function is an "aggregate" function in the
+               <para>ST_3DExtent returns a box3d (includes Z coordinate) bounding box that encloses a set of geometries. The ST_3DExtent function is an "aggregate" function in the
                        terminology of SQL. That means that it operates on lists
                        of data, in the same way the SUM() and AVG() functions do.</para>
                <para>Since it returns a bounding box, the spatial Units are in the units of the spatial reference system in use denoted by the SRID</para>
 
                <note>
-                 <para>Since ST_Extent3D returns a bounding box, the SRID meta-data is lost.  Use ST_SetSRID to force it back into
+                 <para>Since ST_3DExtent returns a bounding box, the SRID meta-data is lost.  Use ST_SetSRID to force it back into
                        a geometry with SRID meta data.  The coordinates are in the units of the spatial ref of the orginal geometries.</para>
                </note>
 
@@ -440,7 +440,7 @@ SELECT ST_SetSRID(ST_Extent(the_geom),2249) as bextent FROM sometable;
          <refsection>
                <title>Examples</title>
                <programlisting>
-SELECT ST_Extent3D(foo.the_geom) As b3extent
+SELECT ST_3DExtent(foo.the_geom) As b3extent
 FROM (SELECT ST_MakePoint(x,y,z) As the_geom
        FROM generate_series(1,3) As x
                CROSS JOIN generate_series(1,2) As y
@@ -450,7 +450,7 @@ FROM (SELECT ST_MakePoint(x,y,z) As the_geom
  BOX3D(1 1 0,3 2 2)
 
 --Get the extent of various elevated circular strings
-SELECT ST_Extent3D(foo.the_geom) As b3extent
+SELECT ST_3DExtent(foo.the_geom) As b3extent
 FROM (SELECT ST_Translate(ST_Force_3DZ(ST_LineToCurve(ST_Buffer(ST_MakePoint(x,y),1))),0,0,z) As the_geom
        FROM generate_series(1,3) As x
                CROSS JOIN generate_series(1,2) As y

diff --git a/doc/reference_type.xml b/doc/reference_type.xml
index 25b892584af358c9f2731a6e4c78a9e55c805ea6..6b31ab64195462a71922ae03664849abd819abaa 100644 (file)
--- a/doc/reference_type.xml
+++ b/doc/reference_type.xml
@@ -38,7 +38,7 @@
 
       <refsection>
         <title>Description</title>
-        <para>box3d is a postgis spatial data type used to represent the enclosing box of a geometry or set of geometries. ST_Extent3D returns a box3d object.</para>
+        <para>box3d is a postgis spatial data type used to represent the enclosing box of a geometry or set of geometries. ST_3DExtent returns a box3d object.</para>
       </refsection>
       
       <refsection>

diff --git a/doc/rfc/postgis_rfc_03_sheet.txt b/doc/rfc/postgis_rfc_03_sheet.txt
index 90722414ccdafc0eecb0203b5b51f9669b93f336..6c0fa68ef7d8065faebc491f8b628b9dfe43efc6 100644 (file)
--- a/doc/rfc/postgis_rfc_03_sheet.txt
+++ b/doc/rfc/postgis_rfc_03_sheet.txt
@@ -1 +1 @@
-Type   Name    Visibility      Action  Rename  Notes\rFUNCTION  spheroid_in(cstring)    PRIVATE KEEP            \rFUNCTION       ST_spheroid_in(cstring) PRIVATE DELETE          \rFUNCTION       spheroid_out(spheroid)  PRIVATE KEEP            \rFUNCTION       ST_spheroid_out(spheroid)       PRIVATE DELETE          \rFUNCTION       geometry_in(cstring)    PRIVATE KEEP            \rFUNCTION       ST_geometry_in(cstring) PRIVATE DELETE          \rFUNCTION       geometry_out(geometry)  PRIVATE KEEP            \rFUNCTION       ST_geometry_out(geometry)       PRIVATE DELETE          \rFUNCTION       geometry_analyze(internal)      PRIVATE KEEP            \rFUNCTION       ST_geometry_analyze(internal)   PRIVATE DELETE          \rFUNCTION       geometry_recv(internal) PRIVATE KEEP            \rFUNCTION       ST_geometry_recv(internal)      PRIVATE DELETE          \rFUNCTION       geometry_send(geometry) PRIVATE KEEP            \rFUNCTION       ST_geometry_send(geometry)      PRIVATE DELETE          \rFUNCTION       "Affine(geometry,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8)"  PUBLIC  DEPRECATE               \rFUNCTION       "ST_Affine(geometry,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8)"       PUBLIC  KEEP\rFUNCTION   "Affine(geometry,float8,float8,float8,float8,float8,float8)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_Affine(geometry,float8,float8,float8,float8,float8,float8)" PUBLIC  KEEP\rFUNCTION   "RotateZ(geometry,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_RotateZ(geometry,float8)"   PUBLIC  KEEP\rFUNCTION   "Rotate(geometry,float8)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_Rotate(geometry,float8)"    PUBLIC  KEEP\rFUNCTION   "RotateX(geometry,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_RotateX(geometry,float8)"   PUBLIC  KEEP\rFUNCTION   "RotateY(geometry,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_RotateY(geometry,float8)"   PUBLIC  KEEP\rFUNCTION   "Translate(geometry,float8,float8,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_Translate(geometry,float8,float8,float8)"   PUBLIC  KEEP\rFUNCTION   "Translate(geometry,float8,float8)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_Translate(geometry,float8,float8)"  PUBLIC  KEEP\rFUNCTION   "Scale(geometry,float8,float8,float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_Scale(geometry,float8,float8,float8)"       PUBLIC  KEEP\rFUNCTION   "Scale(geometry,float8,float8)" PUBLIC  DEPRECATE\rFUNCTION      "ST_Scale(geometry,float8,float8)"      PUBLIC  KEEP\rFUNCTION   "transscale(geometry,float8,float8,float8,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_transscale(geometry,float8,float8,float8,float8)"   PUBLIC  KEEP\rFUNCTION   shift_longitude(geometry)       PUBLIC  DEPRECATE\rFUNCTION      ST_shift_longitude(geometry)    PUBLIC  KEEP\rFUNCTION   box3d_in(cstring)       PRIVATE KEEP\rFUNCTION   box3d_out(box3d)        PRIVATE KEEP\rFUNCTION   ST_box3d_in(cstring)    PRIVATE DELETE\rFUNCTION ST_box3d_out(box3d)     PRIVATE DELETE\rFUNCTION xmin(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_XMin(box3d)  PUBLIC  KEEP\rFUNCTION   ymin(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_YMin(box3d)  PUBLIC  KEEP\rFUNCTION   zmin(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_ZMin(box3d)  PUBLIC  KEEP\rFUNCTION   xmax(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_XMax(box3d)  PUBLIC  KEEP\rFUNCTION   ymax(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_YMax(box3d)  PUBLIC  KEEP\rFUNCTION   zmax(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_ZMax(box3d)  PUBLIC  KEEP\rFUNCTION   chip_in(cstring)        PRIVATE KEEP\rFUNCTION   ST_chip_in(cstring)     PRIVATE DELETE\rFUNCTION chip_out(chip)  PRIVATE KEEP\rFUNCTION   ST_chip_out(chip)       PRIVATE DELETE\rFUNCTION box2d_in(cstring)       PRIVATE KEEP\rFUNCTION   ST_box2d_in(cstring)    PRIVATE DELETE\rFUNCTION box2d_out(box2d)        PRIVATE KEEP\rFUNCTION   ST_box2d_out(box2d)     PRIVATE DELETE\rFUNCTION "box2d_overleft(box2d, box2d)"  PRIVATE KEEP\rFUNCTION   "ST_box2d_overleft(box2d, box2d)"       PRIVATE DELETE\rFUNCTION "box2d_overright(box2d, box2d)" PRIVATE KEEP\rFUNCTION   "ST_box2d_overright(box2d, box2d)"      PRIVATE DELETE\rFUNCTION "box2d_left(box2d, box2d)"      PRIVATE KEEP\rFUNCTION   "ST_box2d_left(box2d, box2d)"   PRIVATE DELETE\rFUNCTION "box2d_right(box2d, box2d)"     PRIVATE KEEP\rFUNCTION   "ST_box2d_right(box2d, box2d)"  PRIVATE DELETE\rFUNCTION "box2d_contain(box2d, box2d)"   PRIVATE KEEP\rFUNCTION   "ST_box2d_contain(box2d, box2d)"        PRIVATE DELETE\rFUNCTION "box2d_contained(box2d, box2d)" PRIVATE KEEP\rFUNCTION   "ST_box2d_contained(box2d, box2d)"      PRIVATE DELETE\rFUNCTION "box2d_overlap(box2d, box2d)"   PRIVATE KEEP\rFUNCTION   "ST_box2d_overlap(box2d, box2d)"        PRIVATE DELETE\rFUNCTION "box2d_same(box2d, box2d)"      PRIVATE KEEP\rFUNCTION   "ST_box2d_same(box2d, box2d)"   PRIVATE DELETE\rFUNCTION "box2d_intersects(box2d, box2d)"        PRIVATE KEEP\rFUNCTION   "ST_box2d_intersects(box2d, box2d)"     PRIVATE DELETE\rFUNCTION "geometry_lt(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_lt(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_le(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_le(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_gt(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_gt(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_ge(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_ge(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_eq(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_eq(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_cmp(geometry, geometry)"      PRIVATE KEEP\rFUNCTION   "ST_geometry_cmp(geometry, geometry)"   PRIVATE DELETE\rFUNCTION "postgis_gist_sel (internal, oid, internal, int4)"      PRIVATE KEEP\rFUNCTION   "ST_postgis_gist_sel (internal, oid, internal, int4)"   PRIVATE DELETE\rFUNCTION "postgis_gist_joinsel(internal, oid, internal, smallint)"       PRIVATE KEEP\rFUNCTION   "ST_postgis_gist_joinsel(internal, oid, internal, smallint)"    PRIVATE DELETE\rFUNCTION "geometry_overleft(geometry, geometry)" PRIVATE KEEP\rFUNCTION   "ST_geometry_overleft(geometry, geometry)"      PRIVATE DELETE\rFUNCTION "geometry_overright(geometry, geometry)"        PRIVATE KEEP\rFUNCTION   "ST_geometry_overright(geometry, geometry)"     PRIVATE DELETE\rFUNCTION "geometry_overabove(geometry, geometry)"        PRIVATE KEEP\rFUNCTION   "ST_geometry_overabove(geometry, geometry)"     PRIVATE DELETE\rFUNCTION "geometry_overbelow(geometry, geometry)"        PRIVATE KEEP\rFUNCTION   "ST_geometry_overbelow(geometry, geometry)"     PRIVATE DELETE\rFUNCTION "geometry_left(geometry, geometry)"     PRIVATE KEEP\rFUNCTION   "ST_geometry_left(geometry, geometry)"  PRIVATE DELETE\rFUNCTION "geometry_right(geometry, geometry)"    PRIVATE KEEP\rFUNCTION   "ST_geometry_right(geometry, geometry)" PRIVATE DELETE\rFUNCTION "geometry_above(geometry, geometry)"    PRIVATE KEEP\rFUNCTION   "ST_geometry_above(geometry, geometry)" PRIVATE DELETE\rFUNCTION "geometry_below(geometry, geometry)"    PRIVATE KEEP\rFUNCTION   "ST_geometry_below(geometry, geometry)" PRIVATE DELETE  \rFUNCTION       "geometry_contain(geometry, geometry)"  PRIVATE KEEP    \rFUNCTION       "ST_geometry_contain(geometry, geometry)"       PRIVATE DELETE  \rFUNCTION       "geometry_contained(geometry, geometry)"        PRIVATE KEEP    \rFUNCTION       "ST_geometry_contained(geometry, geometry)"     PRIVATE DELETE  \rFUNCTION       "geometry_overlap(geometry, geometry)"  PRIVATE KEEP    \rFUNCTION       "ST_geometry_overlap(geometry, geometry)"       PRIVATE DELETE  \rFUNCTION       "geometry_same(geometry, geometry)"     PRIVATE KEEP    \rFUNCTION       "ST_geometry_same(geometry, geometry)"  PRIVATE DELETE  \rFUNCTION       "LWGEOM_gist_consistent(internal,geometry,int4)"        PRIVATE RENAME  postgis_gist_consistent\rFUNCTION        LWGEOM_gist_compress(internal)  PRIVATE RENAME  postgis_gist_compress\rFUNCTION  "LWGEOM_gist_penalty(internal,internal,internal)"       PRIVATE RENAME  postgis_gist_penalty\rFUNCTION   "LWGEOM_gist_picksplit(internal, internal)"     PRIVATE RENAME  postgis_gist_picksplit\rFUNCTION "LWGEOM_gist_union(bytea, internal)"    PRIVATE RENAME  postgis_gist_union\rFUNCTION     "LWGEOM_gist_same(box2d, box2d, internal)"      PRIVATE RENAME  postgis_gist_same\rFUNCTION      LWGEOM_gist_decompress(internal)        PRIVATE RENAME  postgis_gist_decompress\rFUNCTION        addBBOX(geometry)       PUBLIC  DEPRECATE               \rFUNCTION       ST_addBBOX(geometry)    PUBLIC  KEEP            \rFUNCTION       dropBBOX(geometry)      PUBLIC  DEPRECATE               \rFUNCTION       ST_dropBBOX(geometry)   PUBLIC  KEEP            \rFUNCTION       getSRID(geometry)       PUBLIC  DEPRECATE               \rFUNCTION       getSRID(geometry)       PUBLIC  DELETE          duplicate\rFUNCTION      getBBOX(geometry)       PUBLIC  DEPRECATE               \rFUNCTION       getBBOX(geometry)       PUBLIC  DELETE          duplicate\rFUNCTION      srid(chip)      PUBLIC  DEPRECATE               \rFUNCTION       ST_srid(chip)   PUBLIC  KEEP            \rFUNCTION       height(chip)    PUBLIC  DEPRECATE               \rFUNCTION       ST_height(chip) PUBLIC  KEEP            \rFUNCTION       factor(chip)    PUBLIC  DEPRECATE               \rFUNCTION       ST_factor(chip) PUBLIC  KEEP            \rFUNCTION       width(chip)     PUBLIC  DEPRECATE               \rFUNCTION       ST_width(chip)  PUBLIC  KEEP            \rFUNCTION       dataTYPE(chip)  PUBLIC  DEPRECATE\rFUNCTION      ST_dataTYPE(chip)       PUBLIC  KEEP\rFUNCTION   compression(chip)       PUBLIC  DEPRECATE\rFUNCTION      ST_compression(chip)    PUBLIC  KEEP\rFUNCTION   "setSRID(chip,int4)"    PUBLIC  DEPRECATE\rFUNCTION      "setFactor(chip,float4)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_setFactor(chip,float4)"     PUBLIC  KEEP\rFUNCTION   mem_size(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_mem_size(geometry)   PUBLIC  KEEP\rFUNCTION   summary(geometry)       PUBLIC  DEPRECATE\rFUNCTION      ST_summary(geometry)    PUBLIC  KEEP\rFUNCTION   npoints(geometry)       PUBLIC  DEPRECATE\rFUNCTION      ST_npoints(geometry)    PUBLIC  KEEP\rFUNCTION   nrings(geometry)        PUBLIC  DEPRECATE\rFUNCTION      ST_nrings(geometry)     PUBLIC  KEEP\rFUNCTION   length3d(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_length3d(geometry)   PUBLIC  DEPRECATE               \rFUNCTION       length2d(geometry)      PUBLIC  DEPRECATE               \rFUNCTION       ST_length2d(geometry)   PUBLIC  DEPRECATE               \rFUNCTION       "ST_Length(geometry, dims)"     PUBLIC  NEW             calculate length using n dims\rFUNCTION  length(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_Length(geometry)     PUBLIC  KEEP            "calculate length using 2 or 3 dims, whatever is available"\rFUNCTION    ST_Length_WGS84(geometry)       PUBLIC  NEW             spheroid length with WGS84 set automatically\rFUNCTION   "length3d_spheroid(geometry, spheroid)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_length3d_spheroid(geometry, spheroid)"      PUBLIC  DEPRECATE               \rFUNCTION       "length_spheroid(geometry, spheroid)"   PUBLIC  DEPRECATE               \rFUNCTION       "ST_length_spheroid(geometry, spheroid)"        PUBLIC  KEEP            \rFUNCTION       "length2d_spheroid(geometry, spheroid)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_length2d_spheroid(geometry, spheroid)"      PUBLIC  DEPRECATE               \rFUNCTION       perimeter3d(geometry)   PUBLIC  DEPRECATE               \rFUNCTION       ST_perimeter3d(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       perimeter2d(geometry)   PUBLIC  DEPRECATE               \rFUNCTION       ST_perimeter2d(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       perimeter(geometry)     PUBLIC  DEPRECATE               \rFUNCTION       ST_Perimeter(geometry)  PUBLIC  KEEP            \rFUNCTION       area2d(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_area2d(geometry)     PUBLIC  DEPRECATE               \rFUNCTION       area(geometry)  PUBLIC  DEPRECATE               \rFUNCTION       ST_Area(geometry)       PUBLIC  KEEP            \rFUNCTION       "distance_spheroid(geometry,geometry,spheroid)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_Distance_WGS84(geometry,geometry)"  PUBLIC  NEW             calculate distance with WGS84 autoset for spheroid\rFUNCTION     "ST_distance_spheroid(geometry,geometry,spheroid)"      PUBLIC  KEEP            \rFUNCTION       "distance_sphere(geometry,geometry)"    PUBLIC  DEPRECATE               \rFUNCTION       "ST_distance_sphere(geometry,geometry)" PUBLIC  KEEP            \rFUNCTION       "distance(geometry,geometry)"   PUBLIC  DEPRECATE               \rFUNCTION       "ST_Distance(geometry,geometry)"        PUBLIC  KEEP            \rFUNCTION       "max_distance(geometry,geometry)"       PUBLIC  DEPRECATE               \rFUNCTION       "ST_max_distance(geometry,geometry)"    PUBLIC  KEEP            \rFUNCTION       "point_inside_circle(geometry,float8,float8,float8)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_point_inside_circle(geometry,float8,float8,float8)" PUBLIC  KEEP\rFUNCTION   "azimuth(geometry,geometry)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_azimuth(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   force_2d(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_force_2d(geometry)   PUBLIC  KEEP\rFUNCTION   force_3dz(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_force_3dz(geometry)  PUBLIC  KEEP\rFUNCTION   force_3d(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_force_3d(geometry)   PUBLIC  KEEP\rFUNCTION   force_3dm(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_force_3dm(geometry)  PUBLIC  KEEP\rFUNCTION   force_4d(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_force_4d(geometry)   PUBLIC  KEEP\rFUNCTION   force_collection(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_force_collection(geometry)   PUBLIC  KEEP\rFUNCTION   multi(geometry) PUBLIC  DEPRECATE       \rFUNCTION       ST_multi(geometry)      PUBLIC  KEEP    \rFUNCTION       "expand(box3d,float8)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_Expand(box3d,float8)"       PUBLIC  KEEP    \rFUNCTION       "expand(box2d,float8)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_expand(box2d,float8)"       PUBLIC  KEEP    \rFUNCTION       "expand(geometry,float8)"       PUBLIC  DEPRECATE       \rFUNCTION       "ST_expand(geometry,float8)"    PUBLIC  KEEP    \rFUNCTION       envelope(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_Envelope(geometry)   PUBLIC  KEEP    \rFUNCTION       reverse(geometry)       PUBLIC  DEPRECATE       \rFUNCTION       ST_Reverse(geometry)    PUBLIC  KEEP    \rFUNCTION       ForceRHR(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_ForceRHR(geometry)   PUBLIC  KEEP    \rFUNCTION       noop(geometry)  PRIVATE RENAME  postgis_noop(geometry)\rFUNCTION ST_noop(geometry)       PRIVATE DELETE  \rFUNCTION       zmflag(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_zmflag(geometry)     PUBLIC  DEPRECATE               "replace with st_hasz, st_hasm from iso"\rFUNCTION       hasBBOX(geometry)       PRIVATE RENAME  postgis_bbox_cached(geometry)   \rFUNCTION       ST_HasBBOX(geometry)    PRIVATE DELETE          \rFUNCTION       ndims(geometry) PUBLIC  DEPRECATE               \rFUNCTION       ST_NDims(geometry)      PUBLIC  KEEP            \rFUNCTION       AsEWKT(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_AsEWKT(geometry)     PUBLIC  KEEP            \rFUNCTION       AsEWKB(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_AsEWKB(geometry)     PUBLIC  KEEP            \rFUNCTION       AsHEXEWKB(geometry)     PUBLIC  DEPRECATE               \rFUNCTION       ST_AsHEXEWKB(geometry)  PUBLIC  KEEP            \rFUNCTION       "AsHEXEWKB(geometry, text)"     PUBLIC  DEPRECATE               \rFUNCTION       "ST_AsHEXEWKB(geometry, text)"  PUBLIC  KEEP            \rFUNCTION       "AsEWKB(geometry,text)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_AsEWKB(geometry,text)"      PUBLIC  KEEP            \rFUNCTION       GeomFromEWKB(bytea)     PUBLIC  DEPRECATE               \rFUNCTION       ST_GeomFromEWKB(bytea)  PUBLIC  KEEP            \rFUNCTION       GeomFromEWKT(text)      PUBLIC  DEPRECATE               \rFUNCTION       ST_GeomFromEWKT(text)   PUBLIC  KEEP            \rFUNCTION       cache_bbox()    PUBLIC  RENAME  postgis_cache_bbox()    this is a utility trigger\rFUNCTION      ST_Cache_BBox() PUBLIC  DEPRECATE               \rFUNCTION       "MakePoint(float8, float8)"     PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakePoint(float8, float8)"  PUBLIC  KEEP            \rFUNCTION       "MakePoint(float8, float8, float8)"     PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakePoint(float8, float8, float8)"  PUBLIC  KEEP            \rFUNCTION       "MakePoint(float8, float8, float8, float8)"     PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakePoint(float8, float8, float8, float8)"  PUBLIC  KEEP            \rFUNCTION       "MakePointM(float8, float8, float8)"    PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakePointM(float8, float8, float8)" PUBLIC  KEEP            \rFUNCTION       "MakeBox2d(geometry, geometry)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakeBox2d(geometry, geometry)"      PUBLIC  KEEP            \rFUNCTION       "MakeBox3d(geometry, geometry)" PUBLIC  DEPRECATE\rFUNCTION      "ST_MakeBox3d(geometry, geometry)"      PUBLIC  KEEP\rFUNCTION   makeline_garray (geometry[])    PUBLIC  DEPRECATE\rFUNCTION      ST_MakeLine_GArray (geometry[]) PUBLIC  DEPRECATE\rFUNCTION      ST_MakeLine (geometry[])        PUBLIC  KEEP\rFUNCTION   LineFromMultiPoint(geometry)    PUBLIC  DEPRECATE\rFUNCTION      ST_LineFromMultiPoint(geometry) PUBLIC  KEEP\rFUNCTION   "MakeLine(geometry, geometry)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_MakeLine(geometry, geometry)"       PUBLIC  KEEP\rFUNCTION   "AddPoint(geometry, geometry)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_AddPoint(geometry, geometry)"       PUBLIC  KEEP\rFUNCTION   "AddPoint(geometry, geometry, integer)" PUBLIC  DEPRECATE\rFUNCTION      "ST_AddPoint(geometry, geometry, integer)"      PUBLIC  KEEP\rFUNCTION   "RemovePoint(geometry, integer)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_RemovePoint(geometry, integer)"     PUBLIC  KEEP\rFUNCTION   "SetPoint(geometry, integer, geometry)" PUBLIC  DEPRECATE\rFUNCTION      "ST_SetPoint(geometry, integer, geometry)"      PUBLIC  KEEP\rFUNCTION   "MakePolygon(geometry, geometry[])"     PUBLIC  DEPRECATE\rFUNCTION      "ST_MakePolygon(geometry, geometry[])"  PUBLIC  KEEP\rFUNCTION   MakePolygon(geometry)   PUBLIC  DEPRECATE\rFUNCTION      ST_MakePolygon(geometry)        PUBLIC  KEEP\rFUNCTION   BuildArea(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_BuildArea(geometry)  PUBLIC  KEEP\rFUNCTION   Polygonize_GArray (geometry[])  PUBLIC  DEPRECATE\rFUNCTION      ST_Polygonize_GArray (geometry[])       PUBLIC  DEPRECATE\rFUNCTION      ST_Polygonize (geometry[])      PUBLIC  KEEP\rFUNCTION   LineMerge(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_LineMerge(geometry)  PUBLIC  KEEP\rFUNCTION   Dump(geometry)  PUBLIC  DEPRECATE\rFUNCTION      ST_Dump(geometry)       PUBLIC  KEEP\rFUNCTION   DumpRings(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_DumpRings(geometry)  PUBLIC  KEEP\rFUNCTION   "combine_bbox(box2d,geometry)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_Combine_BBox(box2d,geometry)"       PUBLIC  RENAME  "postgis_combine_bbox(box2d, geometry)"\rAGGREGATE       Extent( PUBLIC  DEPRECATE       \rAGGREGATE      ST_Extent(      PUBLIC  KEEP    \rFUNCTION       "combine_bbox(box3d,geometry)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_Combine_BBox(box3d,geometry)"       PUBLIC  KEEP    \rAGGREGATE      Extent3d(       PUBLIC  DEPRECATE       \rAGGREGATE      ST_Extent3d(    PUBLIC  KEEP    \rFUNCTION       "estimated_extent(text,text,text) RETURNS box2d AS"     PUBLIC  DEPRECATE       \rFUNCTION       "ST_estimated_extent(text,text,text) RETURNS box2d AS"  PUBLIC  KEEP    \rFUNCTION       "estimated_extent(text,text) RETURNS box2d AS"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_estimated_extent(text,text) RETURNS box2d AS"       PUBLIC  KEEP    \rFUNCTION       "find_extent(text,text,text) RETURNS box2d AS"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_find_extent(text,text,text) RETURNS box2d AS"       PUBLIC  KEEP    \rFUNCTION       "find_extent(text,text) RETURNS box2d AS"       PUBLIC  DEPRECATE       \rFUNCTION       "ST_find_extent(text,text) RETURNS box2d AS"    PUBLIC  KEEP    \rFUNCTION       rename_geometry_table_constraints() RETURNS text        PUBLIC  KEEP\rFUNCTION   fix_geometry_columns() RETURNS text     PUBLIC  KEEP\rFUNCTION   populate_geometry_columns()     PUBLIC  KEEP\rFUNCTION   populate_geometry_columns(tbl_oid oid)  PUBLIC  KEEP\rFUNCTION   probe_geometry_columns() RETURNS text AS        PUBLIC  KEEP\rFUNCTION   "AddGeometryColumn(varchar,varchar,varchar,varchar,integer,varchar,integer)"    PUBLIC  KEEP\rFUNCTION   "AddGeometryColumn(varchar,varchar,varchar,integer,varchar,integer) RETURNS text AS $$" PUBLIC  KEEP\rFUNCTION   "AddGeometryColumn(varchar,varchar,integer,varchar,integer) RETURNS text AS $$" PUBLIC  KEEP\rFUNCTION   "DropGeometryColumn(varchar, varchar,varchar,varchar)"  PUBLIC  KEEP\rFUNCTION   "DropGeometryColumn(varchar,varchar,varchar)"   PUBLIC  KEEP\rFUNCTION   "DropGeometryColumn(varchar,varchar)"   PUBLIC  KEEP\rFUNCTION   "DropGeometryTable(varchar, varchar,varchar)"   PUBLIC  KEEP\rFUNCTION   "DropGeometryTable(varchar,varchar) RETURNS text AS"    PUBLIC  KEEP\rFUNCTION   DropGeometryTable(varchar) RETURNS text AS      PUBLIC  KEEP\rFUNCTION   "UpdateGeometrySRID(varchar,varchar,varchar,varchar,integer)"   PUBLIC  KEEP\rFUNCTION   "UpdateGeometrySRID(varchar,varchar,varchar,integer)"   PUBLIC  KEEP\rFUNCTION   "UpdateGeometrySRID(varchar,varchar,integer)"   PUBLIC  KEEP    \rFUNCTION       "find_srid(varchar,varchar,varchar) RETURNS int4 AS"    PUBLIC  KEEP    \rFUNCTION       get_proj4_from_srid(integer) RETURNS text AS    PUBLIC  KEEP    \rFUNCTION       "transform_geometry(geometry,text,text,int)"    PRIVATE RENAME  "postgis_transform_geometry(geometry, text, text, int)"\rFUNCTION        "transform(geometry,integer)"   PUBLIC  DEPRECATE       \rFUNCTION       "ST_Transform(geometry,integer)"        PUBLIC  KEEP    \rFUNCTION       postgis_version() RETURNS text  PUBLIC  KEEP    \rFUNCTION       postgis_proj_version() RETURNS text     PUBLIC  KEEP    \rFUNCTION       postgis_scripts_installed() RETURNS text        PUBLIC  KEEP    \rFUNCTION       postgis_lib_version() RETURNS text      PUBLIC  KEEP    \rFUNCTION       postgis_scripts_released() RETURNS text PUBLIC  KEEP    \rFUNCTION       postgis_uses_stats() RETURNS bool       PUBLIC  KEEP    \rFUNCTION       postgis_geos_version() RETURNS text     PUBLIC  KEEP    \rFUNCTION       postgis_scripts_build_date() RETURNS text       PUBLIC  KEEP    \rFUNCTION       postgis_lib_build_date() RETURNS text   PUBLIC  KEEP    \rFUNCTION       postgis_full_version() RETURNS text     PUBLIC  KEEP    \rFUNCTION       box2d(geometry) PRIVATE KEEP    \rFUNCTION       ST_box2d(geometry)      PRIVATE DEPRECATE       "these are pgsql casts, they should use pgsql convention"\rFUNCTION      box3d(geometry) PRIVATE KEEP    \rFUNCTION       ST_box3d(geometry)      PRIVATE DEPRECATE       \rFUNCTION       box(geometry)   PRIVATE KEEP    \rFUNCTION       ST_box(geometry)        PRIVATE DEPRECATE       \rFUNCTION       box2d(box3d)    PRIVATE KEEP    \rFUNCTION       ST_box2d(box3d) PRIVATE DEPRECATE       \rFUNCTION       box3d(box2d)    PRIVATE KEEP    \rFUNCTION       ST_box3d(box2d) PRIVATE DEPRECATE       \rFUNCTION       box(box3d)      PRIVATE KEEP    \rFUNCTION       ST_box(box3d)   PRIVATE DEPRECATE       \rFUNCTION       text(geometry)  PRIVATE KEEP    \rFUNCTION       ST_text(geometry)       PRIVATE DEPRECATE       \rFUNCTION       box3dtobox(box3d)       PRIVATE KEEP    \rFUNCTION       geometry(box2d) PRIVATE KEEP    \rFUNCTION       ST_geometry(box2d)      PRIVATE DEPRECATE\rFUNCTION      geometry(box3d) PRIVATE KEEP\rFUNCTION   ST_geometry(box3d)      PRIVATE DEPRECATE\rFUNCTION      geometry(text)  PRIVATE KEEP\rFUNCTION   ST_geometry(text)       PRIVATE DEPRECATE\rFUNCTION      geometry(chip)  PRIVATE KEEP\rFUNCTION   ST_geometry(chip)       PRIVATE DEPRECATE\rFUNCTION      geometry(bytea) PRIVATE KEEP\rFUNCTION   ST_geometry(bytea)      PRIVATE DEPRECATE\rFUNCTION      bytea(geometry) PRIVATE KEEP\rFUNCTION   ST_bytea(geometry)      PRIVATE DEPRECATE\rFUNCTION      text(bool)      PRIVATE KEEP\rFUNCTION   ST_text(bool)   PRIVATE DEPRECATE\rFUNCTION      "Simplify(geometry, float8)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_Simplify(geometry, float8)" PUBLIC  KEEP\rFUNCTION   "SnapToGrid(geometry, float8, float8, float8, float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_SnapToGrid(geometry, float8, float8, float8, float8)"       PUBLIC  KEEP\rFUNCTION   "SnapToGrid(geometry, float8, float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_SnapToGrid(geometry, float8, float8)"       PUBLIC  KEEP\rFUNCTION   "SnapToGrid(geometry, float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_SnapToGrid(geometry, float8)"       PUBLIC  KEEP\rFUNCTION   "SnapToGrid(geometry, geometry, float8, float8, float8, float8)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_SnapToGrid(geometry, geometry, float8, float8, float8, float8)"     PUBLIC  KEEP\rFUNCTION   "Segmentize(geometry, float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_Segmentize(geometry, float8)"       PUBLIC  KEEP\rFUNCTION   "line_interpolate_point(geometry, float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_line_interpolate_point(geometry, float8)"   PUBLIC  KEEP\rFUNCTION   "line_substring(geometry, float8, float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_line_substring(geometry, float8, float8)"   PUBLIC  KEEP\rFUNCTION   "line_locate_point(geometry, geometry)" PUBLIC  DEPRECATE\rFUNCTION      "ST_line_locate_point(geometry, geometry)"      PUBLIC  KEEP\rFUNCTION   "locate_between_measures(geometry, float8, float8)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_locate_between_measures(geometry, float8, float8)"  PUBLIC  KEEP\rFUNCTION   "locate_along_measure(geometry, float8)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_locate_along_measure(geometry, float8)"     PUBLIC  KEEP\rFUNCTION   "intersection(geometry,geometry)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_Intersection(geometry,geometry)"    PUBLIC  KEEP\rFUNCTION   "buffer(geometry,float8)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_Buffer(geometry,float8)"    PUBLIC  KEEP\rFUNCTION   "buffer(geometry,float8,integer)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_buffer(geometry,float8,integer)"    PUBLIC  KEEP\rFUNCTION   convexhull(geometry)    PUBLIC  DEPRECATE\rFUNCTION      ST_ConvexHull(geometry) PUBLIC  KEEP\rFUNCTION   "_ST_LineCrossingDirection(geometry, geometry)" PUBLIC  KEEP\rFUNCTION   "ST_LineCrossingDirection(geometry, geometry)"  PUBLIC  KEEP\rFUNCTION   "ST_LocateBetweenElevations(geometry, float8, float8)"  PUBLIC  KEEP\rFUNCTION   "ST_SimplifyPreserveTopology(geometry, float8)" PUBLIC  KEEP\rFUNCTION   ST_IsValidReason(geometry)      PUBLIC  KEEP\rFUNCTION   "difference(geometry,geometry)" PUBLIC  DEPRECATE       \rFUNCTION       "ST_Difference(geometry,geometry)"      PUBLIC  KEEP    \rFUNCTION       boundary(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_Boundary(geometry)   PUBLIC  KEEP    \rFUNCTION       "symdifference(geometry,geometry)"      PUBLIC  DEPRECATE       \rFUNCTION       "ST_SymDifference(geometry,geometry)"   PUBLIC  KEEP    \rFUNCTION       "symmetricdifference(geometry,geometry)"        PUBLIC  DEPRECATE       \rFUNCTION       "ST_symmetricdifference(geometry,geometry)"     PUBLIC  KEEP    \rFUNCTION       "GeomUnion(geometry,geometry)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_Union(geometry,geometry)"   PUBLIC  KEEP    \rFUNCTION       "collector(geometry, geometry)" PUBLIC  DELETE  dupe of st_collect\rFUNCTION     "ST_collector(geometry, geometry)"      PUBLIC  DELETE  dupe of st_collect\rFUNCTION     "collect(geometry, geometry)"   PUBLIC  DEPRECATE       \rFUNCTION       "ST_collect(geometry, geometry)"        PUBLIC  KEEP    \rAGGREGATE      memcollect(     PUBLIC  DEPRECATE       \rAGGREGATE      ST_memcollect(  PUBLIC  KEEP    \rFUNCTION       "geom_accum (geometry[],geometry)"      PUBLIC  DELETE  superceded by new aggregator\rFUNCTION   "ST_geom_accum (geometry[],geometry)"   PUBLIC  DELETE  superceded by new aggregator\rFUNCTION   collect_garray (geometry[])     PUBLIC  DELETE  superceded by new aggregator\rFUNCTION   ST_collect_garray (geometry[])  PUBLIC  DELETE  superceded by new aggregator\rFUNCTION   ST_collect (geometry[]) PUBLIC  KEEP    \rAGGREGATE      MemGeomUnion (  PUBLIC  DEPRECATE       \rAGGREGATE      ST_MemUnion (   PUBLIC  KEEP    \rFUNCTION       pgis_abs_in(cstring)    PRIVATE KEEP    \rFUNCTION       pgis_abs_out(pgis_abs)  PRIVATE KEEP    \rTYPE   pgis_abs (      PRIVATE KEEP    \rFUNCTION       "pgis_geometry_accum_transfn(pgis_abs, geometry)"       PRIVATE KEEP    \rFUNCTION       pgis_geometry_accum_finalfn(pgis_abs)   PRIVATE KEEP    \rFUNCTION       pgis_geometry_union_finalfn(pgis_abs)   PRIVATE KEEP    \rFUNCTION       pgis_geometry_collect_finalfn(pgis_abs) PRIVATE KEEP    \rFUNCTION       pgis_geometry_polygonize_finalfn(pgis_abs)      PRIVATE KEEP    \rFUNCTION       pgis_geometry_makeline_finalfn(pgis_abs)        PRIVATE KEEP    \rAGGREGATE      accum ( PUBLIC  DEPRECATE       \rAGGREGATE      ST_Accum (      PUBLIC  KEEP    \rAGGREGATE      accum_old (     PUBLIC  DELETE  \rAGGREGATE      ST_accum_old (  PUBLIC  DELETE  \rFUNCTION       unite_garray (geometry[])       PUBLIC  DEPRECATE       \rFUNCTION       ST_unite_garray (geometry[])    PUBLIC  DEPRECATE       superceded by st_union(geometry[])\rFUNCTION     ST_Union (geometry[])   PUBLIC  KEEP    \rAGGREGATE      GeomUnion_Old ( PUBLIC  DELETE  \rAGGREGATE      ST_Union_Old (  PUBLIC  DELETE  \rAGGREGATE      ST_Union (      PUBLIC  KEEP    \rAGGREGATE      collect (       PUBLIC  DEPRECATE       \rAGGREGATE      ST_Collect (    PUBLIC  KEEP    \rAGGREGATE      Polygonize (    PUBLIC  DEPRECATE       \rAGGREGATE      ST_Polygonize ( PUBLIC  KEEP    \rAGGREGATE      makeline (      PUBLIC  DEPRECATE       \rAGGREGATE      ST_MakeLine (   PUBLIC  KEEP    \rFUNCTION       "relate(geometry,geometry)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_relate(geometry,geometry)"  PUBLIC  KEEP\rFUNCTION   "relate(geometry,geometry,text)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_Relate(geometry,geometry,text)"     PUBLIC  KEEP\rFUNCTION   "disjoint(geometry,geometry)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_Disjoint(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "touches(geometry,geometry)"    PUBLIC  DEPRECATE\rFUNCTION      "_ST_Touches(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "ST_Touches(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   "_ST_DWithin(geometry,geometry,float8)" PUBLIC  KEEP\rFUNCTION   "ST_DWithin(geometry, geometry, float8)"        PUBLIC  KEEP\rFUNCTION   "intersects(geometry,geometry)" PUBLIC  DEPRECATE\rFUNCTION      "_ST_Intersects(geometry,geometry)"     PUBLIC  KEEP\rFUNCTION   "ST_Intersects(geometry,geometry)"      PUBLIC  KEEP\rFUNCTION   "crosses(geometry,geometry)"    PUBLIC  DEPRECATE\rFUNCTION      "_ST_Crosses(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "ST_Crosses(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   "within(geometry,geometry)"     PUBLIC  DEPRECATE\rFUNCTION      "_ST_Within(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   "ST_Within(geometry,geometry)"  PUBLIC  KEEP\rFUNCTION   "Contains(geometry,geometry)"   PUBLIC  DEPRECATE\rFUNCTION      "_ST_Contains(geometry,geometry)"       PUBLIC  KEEP\rFUNCTION   "ST_Contains(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "_ST_CoveredBy(geometry,geometry)"      PUBLIC  KEEP\rFUNCTION   "ST_CoveredBy(geometry,geometry)"       PUBLIC  KEEP\rFUNCTION   "_ST_Covers(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   "ST_Covers(geometry,geometry)"  PUBLIC  KEEP\rFUNCTION   "_ST_ContainsProperly(geometry,geometry)"       PUBLIC  KEEP\rFUNCTION   "ST_ContainsProperly(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "overlaps(geometry,geometry)"   PUBLIC  DEPRECATE\rFUNCTION      "_ST_Overlaps(geometry,geometry)"       PUBLIC  KEEP\rFUNCTION   "ST_Overlaps(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   IsValid(geometry)       PUBLIC  DEPRECATE       \rFUNCTION       ST_IsValid(geometry)    PUBLIC  KEEP    \rFUNCTION       GEOSnoop(geometry)      PRIVATE RENAME  postgis_geos_noop\rFUNCTION      Centroid(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_Centroid(geometry)   PUBLIC  KEEP    \rFUNCTION       IsRing(geometry)        PUBLIC  DEPRECATE       \rFUNCTION       ST_IsRing(geometry)     PUBLIC  KEEP    \rFUNCTION       PointOnSurface(geometry)        PUBLIC  DEPRECATE       \rFUNCTION       ST_PointOnSurface(geometry)     PUBLIC  KEEP    \rFUNCTION       IsSimple(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_IsSimple(geometry)   PUBLIC  KEEP    \rFUNCTION       "Equals(geometry,geometry)"     PUBLIC  DEPRECATE       \rFUNCTION       "ST_Equals(geometry,geometry)"  PUBLIC  KEEP    \rFUNCTION       "AsSVG(geometry,int4,int4)"     PUBLIC  DEPRECATE       \rFUNCTION       "ST_AsSVG(geometry,int4,int4)"  PUBLIC  KEEP    \rFUNCTION       "AsSVG(geometry,int4)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_AsSVG(geometry,int4)"       PUBLIC  KEEP\rFUNCTION   AsSVG(geometry) PUBLIC  DEPRECATE\rFUNCTION      ST_AsSVG(geometry)      PUBLIC  KEEP\rFUNCTION   "_ST_AsGML(int4, geometry, int4)"       PUBLIC  KEEP\rFUNCTION   "AsGML(geometry, int4)" PUBLIC  DEPRECATE\rFUNCTION      "ST_AsGML(geometry, int4)"      PUBLIC  KEEP\rFUNCTION   AsGML(geometry) PUBLIC  DEPRECATE\rFUNCTION      ST_AsGML(geometry)      PUBLIC  KEEP\rFUNCTION   "ST_AsGML(int4, geometry)"      PUBLIC  KEEP\rFUNCTION   "ST_AsGML(int4, geometry, int4)"        PUBLIC  KEEP\rFUNCTION   "_ST_AsKML(int4, geometry, int4)"       PUBLIC  KEEP\rFUNCTION   "AsKML(geometry, int4)" PUBLIC  DEPRECATE\rFUNCTION      "ST_AsKML(geometry, int4)"      PUBLIC  KEEP\rFUNCTION   AsKML(geometry) PUBLIC  DEPRECATE\rFUNCTION      "AsKML(int4, geometry, int4)"   PUBLIC  DEPRECATE\rFUNCTION      ST_AsKML(geometry)      PUBLIC  KEEP\rFUNCTION   "ST_AsKML(int4, geometry)"      PUBLIC  KEEP\rFUNCTION   "ST_AsKML(int4, geometry, int4)"        PUBLIC  KEEP\rFUNCTION   "_ST_AsGeoJson(int4, geometry, int4, int4)"     PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(geometry, int4)"  PUBLIC  KEEP\rFUNCTION   ST_AsGeoJson(geometry)  PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(int4, geometry)"  PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(int4, geometry, int4)"    PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(geometry, int4, int4)"    PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(int4, geometry, int4, int4)"      PUBLIC  KEEP\rFUNCTION   NumPoints(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_NumPoints(geometry)  PUBLIC  KEEP\rFUNCTION   NumGeometries(geometry) PUBLIC  DEPRECATE\rFUNCTION      ST_NumGeometries(geometry)      PUBLIC  KEEP\rFUNCTION   "GeometryN(geometry,integer)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_GeometryN(geometry,integer)"        PUBLIC  KEEP\rFUNCTION   Dimension(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_Dimension(geometry)  PUBLIC  KEEP\rFUNCTION   ExteriorRing(geometry)  PUBLIC  DEPRECATE\rFUNCTION      ST_ExteriorRing(geometry)       PUBLIC  KEEP\rFUNCTION   NumInteriorRings(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_NumInteriorRings(geometry)   PUBLIC  KEEP\rFUNCTION   NumInteriorRing(geometry)       PUBLIC  DEPRECATE\rFUNCTION      ST_NumInteriorRing(geometry)    PUBLIC  KEEP\rFUNCTION   "InteriorRingN(geometry,integer)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_InteriorRingN(geometry,integer)"    PUBLIC  KEEP\rFUNCTION   GeometryTYPE(geometry)  PUBLIC  DEPRECATE\rFUNCTION      ST_GeometryTYPE(geometry)       PUBLIC  KEEP\rFUNCTION   "PointN(geometry,integer)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_PointN(geometry,integer)"   PUBLIC  KEEP\rFUNCTION   X(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_X(geometry)  PUBLIC  KEEP\rFUNCTION   Y(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_Y(geometry)  PUBLIC  KEEP    \rFUNCTION       Z(geometry)     PUBLIC  DEPRECATE       \rFUNCTION       SE_Z(geometry)  PUBLIC  KEEP    \rFUNCTION       ST_Z(geometry)  PUBLIC  KEEP    ESRI compatibility (feh!)\rFUNCTION      M(geometry)     PUBLIC  DEPRECATE       \rFUNCTION       ST_M(geometry)  PUBLIC  KEEP    \rFUNCTION       StartPoint(geometry)    PUBLIC  DEPRECATE       \rFUNCTION       ST_StartPoint(geometry) PUBLIC  KEEP    \rFUNCTION       EndPoint(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_EndPoint(geometry)   PUBLIC  KEEP    \rFUNCTION       IsClosed(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_IsClosed(geometry)   PUBLIC  KEEP    \rFUNCTION       IsEmpty(geometry)       PUBLIC  DEPRECATE       \rFUNCTION       ST_IsEmpty(geometry)    PUBLIC  KEEP    \rFUNCTION       SRID(geometry)  PUBLIC  DEPRECATE       \rFUNCTION       ST_SRID(geometry)       PUBLIC  KEEP    \rFUNCTION       "SetSRID(geometry,int4)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_SetSRID(geometry,int4)"     PUBLIC  KEEP\rFUNCTION   AsBinary(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_AsBinary(geometry)   PUBLIC  KEEP\rFUNCTION   "AsBinary(geometry,text)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_AsBinary(geometry,text)"    PUBLIC  KEEP\rFUNCTION   AsText(geometry)        PUBLIC  DEPRECATE\rFUNCTION      ST_AsText(geometry)     PUBLIC  KEEP\rFUNCTION   GeometryFromText(text)  PUBLIC  DEPRECATE\rFUNCTION      ST_GeometryFromText(text)       PUBLIC  KEEP\rFUNCTION   "GeometryFromText(text, int4)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_GeometryFromText(text, int4)"       PUBLIC  KEEP\rFUNCTION   GeomFromText(text)      PUBLIC  DEPRECATE\rFUNCTION      ST_GeomFromText(text)   PUBLIC  KEEP\rFUNCTION   "GeomFromText(text, int4)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_GeomFromText(text, int4)"   PUBLIC  KEEP\rFUNCTION   PointFromText(text)     PUBLIC  DEPRECATE\rFUNCTION      ST_PointFromText(text)  PUBLIC  KEEP\rFUNCTION   "PointFromText(text, int4)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_PointFromText(text, int4)"  PUBLIC  KEEP\rFUNCTION   LineFromText(text)      PUBLIC  DEPRECATE\rFUNCTION      ST_LineFromText(text)   PUBLIC  KEEP\rFUNCTION   "LineFromText(text, int4)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_LineFromText(text, int4)"   PUBLIC  KEEP\rFUNCTION   LineStringFromText(text)        PUBLIC  DEPRECATE\rFUNCTION      "LineStringFromText(text, int4)"        PUBLIC  DEPRECATE\rFUNCTION      PolyFromText(text)      PUBLIC  DEPRECATE\rFUNCTION      ST_PolyFromText(text)   PUBLIC  KEEP\rFUNCTION   "PolyFromText(text, int4)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_PolyFromText(text, int4)"   PUBLIC  KEEP\rFUNCTION   "PolygonFromText(text, int4)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_PolygonFromText(text, int4)"        PUBLIC  KEEP\rFUNCTION   PolygonFromText(text)   PUBLIC  DEPRECATE\rFUNCTION      ST_PolygonFromText(text)        PUBLIC  KEEP\rFUNCTION   "MLineFromText(text, int4)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_MLineFromText(text, int4)"  PUBLIC  KEEP\rFUNCTION   MLineFromText(text)     PUBLIC  DEPRECATE\rFUNCTION      ST_MLineFromText(text)  PUBLIC  KEEP\rFUNCTION   MultiLineStringFromText(text)   PUBLIC  DEPRECATE\rFUNCTION      ST_MultiLineStringFromText(text)        PUBLIC  KEEP\rFUNCTION   "MultiLineStringFromText(text, int4)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_MultiLineStringFromText(text, int4)"        PUBLIC  KEEP\rFUNCTION   "MPointFromText(text, int4)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_MPointFromText(text, int4)" PUBLIC  KEEP\rFUNCTION   MPointFromText(text)    PUBLIC  DEPRECATE\rFUNCTION      ST_MPointFromText(text) PUBLIC  KEEP\rFUNCTION   "MultiPointFromText(text, int4)"        PUBLIC  DEPRECATE\rFUNCTION      MultiPointFromText(text)        PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPointFromText(text)     PUBLIC  KEEP\rFUNCTION   MultiPointFromText(text)        PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPointFromText(text)     PUBLIC  KEEP\rFUNCTION   "MPolyFromText(text, int4)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_MPolyFromText(text, int4)"  PUBLIC  KEEP\rFUNCTION   MPolyFromText(text)     PUBLIC  DEPRECATE\rFUNCTION      ST_MPolyFromText(text)  PUBLIC  KEEP\rFUNCTION   "MultiPolygonFromText(text, int4)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_MultiPolygonFromText(text, int4)"   PUBLIC  KEEP\rFUNCTION   MultiPolygonFromText(text)      PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPolygonFromText(text)   PUBLIC  KEEP\rFUNCTION   "GeomCollFromText(text, int4)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_GeomCollFromText(text, int4)"       PUBLIC  KEEP\rFUNCTION   GeomCollFromText(text)  PUBLIC  DEPRECATE\rFUNCTION      ST_GeomCollFromText(text)       PUBLIC  KEEP\rFUNCTION   GeomFromWKB(bytea)      PUBLIC  DEPRECATE\rFUNCTION      ST_GeomFromWKB(bytea)   PUBLIC  KEEP\rFUNCTION   "GeomFromWKB(bytea, int)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_GeomFromWKB(bytea, int)"    PUBLIC  KEEP\rFUNCTION   "PointFromWKB(bytea, int)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_PointFromWKB(bytea, int)"   PUBLIC  KEEP\rFUNCTION   PointFromWKB(bytea)     PUBLIC  DEPRECATE\rFUNCTION      ST_PointFromWKB(bytea)  PUBLIC  KEEP\rFUNCTION   "LineFromWKB(bytea, int)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_LineFromWKB(bytea, int)"    PUBLIC  KEEP\rFUNCTION   LineFromWKB(bytea)      PUBLIC  DEPRECATE\rFUNCTION      ST_LineFromWKB(bytea)   PUBLIC  KEEP\rFUNCTION   "LinestringFromWKB(bytea, int)" PUBLIC  DEPRECATE\rFUNCTION      "ST_LinestringFromWKB(bytea, int)"      PUBLIC  KEEP\rFUNCTION   LinestringFromWKB(bytea)        PUBLIC  DEPRECATE\rFUNCTION      ST_LinestringFromWKB(bytea)     PUBLIC  KEEP\rFUNCTION   "PolyFromWKB(bytea, int)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_PolyFromWKB(bytea, int)"    PUBLIC  KEEP\rFUNCTION   PolyFromWKB(bytea)      PUBLIC  DEPRECATE\rFUNCTION      ST_PolyFromWKB(bytea)   PUBLIC  KEEP\rFUNCTION   "PolygonFromWKB(bytea, int)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_PolygonFromWKB(bytea, int)" PUBLIC  KEEP\rFUNCTION   PolygonFromWKB(bytea)   PUBLIC  DEPRECATE\rFUNCTION      ST_PolygonFromWKB(bytea)        PUBLIC  KEEP\rFUNCTION   "MPointFromWKB(bytea, int)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_MPointFromWKB(bytea, int)"  PUBLIC  KEEP\rFUNCTION   MPointFromWKB(bytea)    PUBLIC  DEPRECATE\rFUNCTION      ST_MPointFromWKB(bytea) PUBLIC  KEEP\rFUNCTION   "MultiPointFromWKB(bytea, int)" PUBLIC  DEPRECATE\rFUNCTION      "ST_MultiPointFromWKB(bytea, int)"      PUBLIC  KEEP\rFUNCTION   MultiPointFromWKB(bytea)        PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPointFromWKB(bytea)     PUBLIC  KEEP\rFUNCTION   "MultiLineFromWKB(bytea, int)"  PUBLIC  DEPRECATE\rFUNCTION      "MultiLineFromWKB(bytea, int)"  PUBLIC  DEPRECATE\rFUNCTION      MultiLineFromWKB(bytea) PUBLIC  DEPRECATE\rFUNCTION      ST_MultiLineFromWKB(bytea)      PUBLIC  KEEP\rFUNCTION   "MLineFromWKB(bytea, int)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_MLineFromWKB(bytea, int)"   PUBLIC  KEEP\rFUNCTION   MLineFromWKB(bytea)     PUBLIC  DEPRECATE\rFUNCTION      ST_MLineFromWKB(bytea)  PUBLIC  KEEP\rFUNCTION   "MPolyFromWKB(bytea, int)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_MPolyFromWKB(bytea, int)"   PUBLIC  KEEP\rFUNCTION   MPolyFromWKB(bytea)     PUBLIC  DEPRECATE\rFUNCTION      ST_MPolyFromWKB(bytea)  PUBLIC  KEEP\rFUNCTION   "MultiPolyFromWKB(bytea, int)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_MultiPolyFromWKB(bytea, int)"       PUBLIC  KEEP\rFUNCTION   MultiPolyFromWKB(bytea) PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPolyFromWKB(bytea)      PUBLIC  KEEP\rFUNCTION   "GeomCollFromWKB(bytea, int)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_GeomCollFromWKB(bytea, int)"        PUBLIC  KEEP\rFUNCTION   GeomCollFromWKB(bytea)  PUBLIC  DEPRECATE\rFUNCTION      ST_GeomCollFromWKB(bytea)       PUBLIC  KEEP\rFUNCTION   "BdPolyFromText(text, integer)" PUBLIC  DEPRECATE\rFUNCTION      "ST_BdPolyFromText(text, integer)"      PUBLIC  KEEP\rFUNCTION   "BdMPolyFromText(text, integer)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_BdMPolyFromText(text, integer)"     PUBLIC  KEEP\rFUNCTION   "ST_CurveToLine(geometry, integer)"     PUBLIC  KEEP\rFUNCTION   ST_CurveToLine(geometry)        PUBLIC  KEEP\rFUNCTION   ST_HasArc(geometry)     PUBLIC  KEEP\rFUNCTION   ST_LineToCurve(geometry)        PUBLIC  KEEP
\ No newline at end of file
+Type   Name    Visibility      Action  Rename  Notes\rFUNCTION  spheroid_in(cstring)    PRIVATE KEEP            \rFUNCTION       ST_spheroid_in(cstring) PRIVATE DELETE          \rFUNCTION       spheroid_out(spheroid)  PRIVATE KEEP            \rFUNCTION       ST_spheroid_out(spheroid)       PRIVATE DELETE          \rFUNCTION       geometry_in(cstring)    PRIVATE KEEP            \rFUNCTION       ST_geometry_in(cstring) PRIVATE DELETE          \rFUNCTION       geometry_out(geometry)  PRIVATE KEEP            \rFUNCTION       ST_geometry_out(geometry)       PRIVATE DELETE          \rFUNCTION       geometry_analyze(internal)      PRIVATE KEEP            \rFUNCTION       ST_geometry_analyze(internal)   PRIVATE DELETE          \rFUNCTION       geometry_recv(internal) PRIVATE KEEP            \rFUNCTION       ST_geometry_recv(internal)      PRIVATE DELETE          \rFUNCTION       geometry_send(geometry) PRIVATE KEEP            \rFUNCTION       ST_geometry_send(geometry)      PRIVATE DELETE          \rFUNCTION       "Affine(geometry,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8)"  PUBLIC  DEPRECATE               \rFUNCTION       "ST_Affine(geometry,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8)"       PUBLIC  KEEP\rFUNCTION   "Affine(geometry,float8,float8,float8,float8,float8,float8)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_Affine(geometry,float8,float8,float8,float8,float8,float8)" PUBLIC  KEEP\rFUNCTION   "RotateZ(geometry,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_RotateZ(geometry,float8)"   PUBLIC  KEEP\rFUNCTION   "Rotate(geometry,float8)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_Rotate(geometry,float8)"    PUBLIC  KEEP\rFUNCTION   "RotateX(geometry,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_RotateX(geometry,float8)"   PUBLIC  KEEP\rFUNCTION   "RotateY(geometry,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_RotateY(geometry,float8)"   PUBLIC  KEEP\rFUNCTION   "Translate(geometry,float8,float8,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_Translate(geometry,float8,float8,float8)"   PUBLIC  KEEP\rFUNCTION   "Translate(geometry,float8,float8)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_Translate(geometry,float8,float8)"  PUBLIC  KEEP\rFUNCTION   "Scale(geometry,float8,float8,float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_Scale(geometry,float8,float8,float8)"       PUBLIC  KEEP\rFUNCTION   "Scale(geometry,float8,float8)" PUBLIC  DEPRECATE\rFUNCTION      "ST_Scale(geometry,float8,float8)"      PUBLIC  KEEP\rFUNCTION   "transscale(geometry,float8,float8,float8,float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_transscale(geometry,float8,float8,float8,float8)"   PUBLIC  KEEP\rFUNCTION   shift_longitude(geometry)       PUBLIC  DEPRECATE\rFUNCTION      ST_shift_longitude(geometry)    PUBLIC  KEEP\rFUNCTION   box3d_in(cstring)       PRIVATE KEEP\rFUNCTION   box3d_out(box3d)        PRIVATE KEEP\rFUNCTION   ST_box3d_in(cstring)    PRIVATE DELETE\rFUNCTION ST_box3d_out(box3d)     PRIVATE DELETE\rFUNCTION xmin(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_XMin(box3d)  PUBLIC  KEEP\rFUNCTION   ymin(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_YMin(box3d)  PUBLIC  KEEP\rFUNCTION   zmin(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_ZMin(box3d)  PUBLIC  KEEP\rFUNCTION   xmax(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_XMax(box3d)  PUBLIC  KEEP\rFUNCTION   ymax(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_YMax(box3d)  PUBLIC  KEEP\rFUNCTION   zmax(box3d)     PUBLIC  DEPRECATE\rFUNCTION      ST_ZMax(box3d)  PUBLIC  KEEP\rFUNCTION   chip_in(cstring)        PRIVATE KEEP\rFUNCTION   ST_chip_in(cstring)     PRIVATE DELETE\rFUNCTION chip_out(chip)  PRIVATE KEEP\rFUNCTION   ST_chip_out(chip)       PRIVATE DELETE\rFUNCTION box2d_in(cstring)       PRIVATE KEEP\rFUNCTION   ST_box2d_in(cstring)    PRIVATE DELETE\rFUNCTION box2d_out(box2d)        PRIVATE KEEP\rFUNCTION   ST_box2d_out(box2d)     PRIVATE DELETE\rFUNCTION "box2d_overleft(box2d, box2d)"  PRIVATE KEEP\rFUNCTION   "ST_box2d_overleft(box2d, box2d)"       PRIVATE DELETE\rFUNCTION "box2d_overright(box2d, box2d)" PRIVATE KEEP\rFUNCTION   "ST_box2d_overright(box2d, box2d)"      PRIVATE DELETE\rFUNCTION "box2d_left(box2d, box2d)"      PRIVATE KEEP\rFUNCTION   "ST_box2d_left(box2d, box2d)"   PRIVATE DELETE\rFUNCTION "box2d_right(box2d, box2d)"     PRIVATE KEEP\rFUNCTION   "ST_box2d_right(box2d, box2d)"  PRIVATE DELETE\rFUNCTION "box2d_contain(box2d, box2d)"   PRIVATE KEEP\rFUNCTION   "ST_box2d_contain(box2d, box2d)"        PRIVATE DELETE\rFUNCTION "box2d_contained(box2d, box2d)" PRIVATE KEEP\rFUNCTION   "ST_box2d_contained(box2d, box2d)"      PRIVATE DELETE\rFUNCTION "box2d_overlap(box2d, box2d)"   PRIVATE KEEP\rFUNCTION   "ST_box2d_overlap(box2d, box2d)"        PRIVATE DELETE\rFUNCTION "box2d_same(box2d, box2d)"      PRIVATE KEEP\rFUNCTION   "ST_box2d_same(box2d, box2d)"   PRIVATE DELETE\rFUNCTION "box2d_intersects(box2d, box2d)"        PRIVATE KEEP\rFUNCTION   "ST_box2d_intersects(box2d, box2d)"     PRIVATE DELETE\rFUNCTION "geometry_lt(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_lt(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_le(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_le(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_gt(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_gt(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_ge(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_ge(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_eq(geometry, geometry)"       PRIVATE KEEP\rFUNCTION   "ST_geometry_eq(geometry, geometry)"    PRIVATE DELETE\rFUNCTION "geometry_cmp(geometry, geometry)"      PRIVATE KEEP\rFUNCTION   "ST_geometry_cmp(geometry, geometry)"   PRIVATE DELETE\rFUNCTION "postgis_gist_sel (internal, oid, internal, int4)"      PRIVATE KEEP\rFUNCTION   "ST_postgis_gist_sel (internal, oid, internal, int4)"   PRIVATE DELETE\rFUNCTION "postgis_gist_joinsel(internal, oid, internal, smallint)"       PRIVATE KEEP\rFUNCTION   "ST_postgis_gist_joinsel(internal, oid, internal, smallint)"    PRIVATE DELETE\rFUNCTION "geometry_overleft(geometry, geometry)" PRIVATE KEEP\rFUNCTION   "ST_geometry_overleft(geometry, geometry)"      PRIVATE DELETE\rFUNCTION "geometry_overright(geometry, geometry)"        PRIVATE KEEP\rFUNCTION   "ST_geometry_overright(geometry, geometry)"     PRIVATE DELETE\rFUNCTION "geometry_overabove(geometry, geometry)"        PRIVATE KEEP\rFUNCTION   "ST_geometry_overabove(geometry, geometry)"     PRIVATE DELETE\rFUNCTION "geometry_overbelow(geometry, geometry)"        PRIVATE KEEP\rFUNCTION   "ST_geometry_overbelow(geometry, geometry)"     PRIVATE DELETE\rFUNCTION "geometry_left(geometry, geometry)"     PRIVATE KEEP\rFUNCTION   "ST_geometry_left(geometry, geometry)"  PRIVATE DELETE\rFUNCTION "geometry_right(geometry, geometry)"    PRIVATE KEEP\rFUNCTION   "ST_geometry_right(geometry, geometry)" PRIVATE DELETE\rFUNCTION "geometry_above(geometry, geometry)"    PRIVATE KEEP\rFUNCTION   "ST_geometry_above(geometry, geometry)" PRIVATE DELETE\rFUNCTION "geometry_below(geometry, geometry)"    PRIVATE KEEP\rFUNCTION   "ST_geometry_below(geometry, geometry)" PRIVATE DELETE  \rFUNCTION       "geometry_contain(geometry, geometry)"  PRIVATE KEEP    \rFUNCTION       "ST_geometry_contain(geometry, geometry)"       PRIVATE DELETE  \rFUNCTION       "geometry_contained(geometry, geometry)"        PRIVATE KEEP    \rFUNCTION       "ST_geometry_contained(geometry, geometry)"     PRIVATE DELETE  \rFUNCTION       "geometry_overlap(geometry, geometry)"  PRIVATE KEEP    \rFUNCTION       "ST_geometry_overlap(geometry, geometry)"       PRIVATE DELETE  \rFUNCTION       "geometry_same(geometry, geometry)"     PRIVATE KEEP    \rFUNCTION       "ST_geometry_same(geometry, geometry)"  PRIVATE DELETE  \rFUNCTION       "LWGEOM_gist_consistent(internal,geometry,int4)"        PRIVATE RENAME  postgis_gist_consistent\rFUNCTION        LWGEOM_gist_compress(internal)  PRIVATE RENAME  postgis_gist_compress\rFUNCTION  "LWGEOM_gist_penalty(internal,internal,internal)"       PRIVATE RENAME  postgis_gist_penalty\rFUNCTION   "LWGEOM_gist_picksplit(internal, internal)"     PRIVATE RENAME  postgis_gist_picksplit\rFUNCTION "LWGEOM_gist_union(bytea, internal)"    PRIVATE RENAME  postgis_gist_union\rFUNCTION     "LWGEOM_gist_same(box2d, box2d, internal)"      PRIVATE RENAME  postgis_gist_same\rFUNCTION      LWGEOM_gist_decompress(internal)        PRIVATE RENAME  postgis_gist_decompress\rFUNCTION        addBBOX(geometry)       PUBLIC  DEPRECATE               \rFUNCTION       ST_addBBOX(geometry)    PUBLIC  KEEP            \rFUNCTION       dropBBOX(geometry)      PUBLIC  DEPRECATE               \rFUNCTION       ST_dropBBOX(geometry)   PUBLIC  KEEP            \rFUNCTION       getSRID(geometry)       PUBLIC  DEPRECATE               \rFUNCTION       getSRID(geometry)       PUBLIC  DELETE          duplicate\rFUNCTION      getBBOX(geometry)       PUBLIC  DEPRECATE               \rFUNCTION       getBBOX(geometry)       PUBLIC  DELETE          duplicate\rFUNCTION      srid(chip)      PUBLIC  DEPRECATE               \rFUNCTION       ST_srid(chip)   PUBLIC  KEEP            \rFUNCTION       height(chip)    PUBLIC  DEPRECATE               \rFUNCTION       ST_height(chip) PUBLIC  KEEP            \rFUNCTION       factor(chip)    PUBLIC  DEPRECATE               \rFUNCTION       ST_factor(chip) PUBLIC  KEEP            \rFUNCTION       width(chip)     PUBLIC  DEPRECATE               \rFUNCTION       ST_width(chip)  PUBLIC  KEEP            \rFUNCTION       dataTYPE(chip)  PUBLIC  DEPRECATE\rFUNCTION      ST_dataTYPE(chip)       PUBLIC  KEEP\rFUNCTION   compression(chip)       PUBLIC  DEPRECATE\rFUNCTION      ST_compression(chip)    PUBLIC  KEEP\rFUNCTION   "setSRID(chip,int4)"    PUBLIC  DEPRECATE\rFUNCTION      "setFactor(chip,float4)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_setFactor(chip,float4)"     PUBLIC  KEEP\rFUNCTION   mem_size(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_mem_size(geometry)   PUBLIC  KEEP\rFUNCTION   summary(geometry)       PUBLIC  DEPRECATE\rFUNCTION      ST_summary(geometry)    PUBLIC  KEEP\rFUNCTION   npoints(geometry)       PUBLIC  DEPRECATE\rFUNCTION      ST_npoints(geometry)    PUBLIC  KEEP\rFUNCTION   nrings(geometry)        PUBLIC  DEPRECATE\rFUNCTION      ST_nrings(geometry)     PUBLIC  KEEP\rFUNCTION   length3d(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_3dlength(geometry)   PUBLIC  DEPRECATE               \rFUNCTION       length2d(geometry)      PUBLIC  DEPRECATE               \rFUNCTION       ST_length2d(geometry)   PUBLIC  DEPRECATE               \rFUNCTION       "ST_Length(geometry, dims)"     PUBLIC  NEW             calculate length using n dims\rFUNCTION  length(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_Length(geometry)     PUBLIC  KEEP            "calculate length using 2 or 3 dims, whatever is available"\rFUNCTION    ST_Length_WGS84(geometry)       PUBLIC  NEW             spheroid length with WGS84 set automatically\rFUNCTION   "length3d_spheroid(geometry, spheroid)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_3dlength_spheroid(geometry, spheroid)"      PUBLIC  DEPRECATE               \rFUNCTION       "length_spheroid(geometry, spheroid)"   PUBLIC  DEPRECATE               \rFUNCTION       "ST_length_spheroid(geometry, spheroid)"        PUBLIC  KEEP            \rFUNCTION       "length2d_spheroid(geometry, spheroid)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_length2d_spheroid(geometry, spheroid)"      PUBLIC  DEPRECATE               \rFUNCTION       perimeter3d(geometry)   PUBLIC  DEPRECATE               \rFUNCTION       ST_3DPerimeter(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       perimeter2d(geometry)   PUBLIC  DEPRECATE               \rFUNCTION       ST_perimeter2d(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       perimeter(geometry)     PUBLIC  DEPRECATE               \rFUNCTION       ST_Perimeter(geometry)  PUBLIC  KEEP            \rFUNCTION       area2d(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_area2d(geometry)     PUBLIC  DEPRECATE               \rFUNCTION       area(geometry)  PUBLIC  DEPRECATE               \rFUNCTION       ST_Area(geometry)       PUBLIC  KEEP            \rFUNCTION       "distance_spheroid(geometry,geometry,spheroid)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_Distance_WGS84(geometry,geometry)"  PUBLIC  NEW             calculate distance with WGS84 autoset for spheroid\rFUNCTION     "ST_distance_spheroid(geometry,geometry,spheroid)"      PUBLIC  KEEP            \rFUNCTION       "distance_sphere(geometry,geometry)"    PUBLIC  DEPRECATE               \rFUNCTION       "ST_distance_sphere(geometry,geometry)" PUBLIC  KEEP            \rFUNCTION       "distance(geometry,geometry)"   PUBLIC  DEPRECATE               \rFUNCTION       "ST_Distance(geometry,geometry)"        PUBLIC  KEEP            \rFUNCTION       "max_distance(geometry,geometry)"       PUBLIC  DEPRECATE               \rFUNCTION       "ST_max_distance(geometry,geometry)"    PUBLIC  KEEP            \rFUNCTION       "point_inside_circle(geometry,float8,float8,float8)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_point_inside_circle(geometry,float8,float8,float8)" PUBLIC  KEEP\rFUNCTION   "azimuth(geometry,geometry)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_azimuth(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   force_2d(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_force_2d(geometry)   PUBLIC  KEEP\rFUNCTION   force_3dz(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_force_3dz(geometry)  PUBLIC  KEEP\rFUNCTION   force_3d(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_force_3d(geometry)   PUBLIC  KEEP\rFUNCTION   force_3dm(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_force_3dm(geometry)  PUBLIC  KEEP\rFUNCTION   force_4d(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_force_4d(geometry)   PUBLIC  KEEP\rFUNCTION   force_collection(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_force_collection(geometry)   PUBLIC  KEEP\rFUNCTION   multi(geometry) PUBLIC  DEPRECATE       \rFUNCTION       ST_multi(geometry)      PUBLIC  KEEP    \rFUNCTION       "expand(box3d,float8)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_Expand(box3d,float8)"       PUBLIC  KEEP    \rFUNCTION       "expand(box2d,float8)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_expand(box2d,float8)"       PUBLIC  KEEP    \rFUNCTION       "expand(geometry,float8)"       PUBLIC  DEPRECATE       \rFUNCTION       "ST_expand(geometry,float8)"    PUBLIC  KEEP    \rFUNCTION       envelope(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_Envelope(geometry)   PUBLIC  KEEP    \rFUNCTION       reverse(geometry)       PUBLIC  DEPRECATE       \rFUNCTION       ST_Reverse(geometry)    PUBLIC  KEEP    \rFUNCTION       ForceRHR(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_ForceRHR(geometry)   PUBLIC  KEEP    \rFUNCTION       noop(geometry)  PRIVATE RENAME  postgis_noop(geometry)\rFUNCTION ST_noop(geometry)       PRIVATE DELETE  \rFUNCTION       zmflag(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_zmflag(geometry)     PUBLIC  DEPRECATE               "replace with st_hasz, st_hasm from iso"\rFUNCTION       hasBBOX(geometry)       PRIVATE RENAME  postgis_bbox_cached(geometry)   \rFUNCTION       ST_HasBBOX(geometry)    PRIVATE DELETE          \rFUNCTION       ndims(geometry) PUBLIC  DEPRECATE               \rFUNCTION       ST_NDims(geometry)      PUBLIC  KEEP            \rFUNCTION       AsEWKT(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_AsEWKT(geometry)     PUBLIC  KEEP            \rFUNCTION       AsEWKB(geometry)        PUBLIC  DEPRECATE               \rFUNCTION       ST_AsEWKB(geometry)     PUBLIC  KEEP            \rFUNCTION       AsHEXEWKB(geometry)     PUBLIC  DEPRECATE               \rFUNCTION       ST_AsHEXEWKB(geometry)  PUBLIC  KEEP            \rFUNCTION       "AsHEXEWKB(geometry, text)"     PUBLIC  DEPRECATE               \rFUNCTION       "ST_AsHEXEWKB(geometry, text)"  PUBLIC  KEEP            \rFUNCTION       "AsEWKB(geometry,text)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_AsEWKB(geometry,text)"      PUBLIC  KEEP            \rFUNCTION       GeomFromEWKB(bytea)     PUBLIC  DEPRECATE               \rFUNCTION       ST_GeomFromEWKB(bytea)  PUBLIC  KEEP            \rFUNCTION       GeomFromEWKT(text)      PUBLIC  DEPRECATE               \rFUNCTION       ST_GeomFromEWKT(text)   PUBLIC  KEEP            \rFUNCTION       cache_bbox()    PUBLIC  RENAME  postgis_cache_bbox()    this is a utility trigger\rFUNCTION      ST_Cache_BBox() PUBLIC  DEPRECATE               \rFUNCTION       "MakePoint(float8, float8)"     PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakePoint(float8, float8)"  PUBLIC  KEEP            \rFUNCTION       "MakePoint(float8, float8, float8)"     PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakePoint(float8, float8, float8)"  PUBLIC  KEEP            \rFUNCTION       "MakePoint(float8, float8, float8, float8)"     PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakePoint(float8, float8, float8, float8)"  PUBLIC  KEEP            \rFUNCTION       "MakePointM(float8, float8, float8)"    PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakePointM(float8, float8, float8)" PUBLIC  KEEP            \rFUNCTION       "MakeBox2d(geometry, geometry)" PUBLIC  DEPRECATE               \rFUNCTION       "ST_MakeBox2d(geometry, geometry)"      PUBLIC  KEEP            \rFUNCTION       "MakeBox3d(geometry, geometry)" PUBLIC  DEPRECATE\rFUNCTION      "ST_3DMakeBox(geometry, geometry)"      PUBLIC  KEEP\rFUNCTION   makeline_garray (geometry[])    PUBLIC  DEPRECATE\rFUNCTION      ST_MakeLine_GArray (geometry[]) PUBLIC  DEPRECATE\rFUNCTION      ST_MakeLine (geometry[])        PUBLIC  KEEP\rFUNCTION   LineFromMultiPoint(geometry)    PUBLIC  DEPRECATE\rFUNCTION      ST_LineFromMultiPoint(geometry) PUBLIC  KEEP\rFUNCTION   "MakeLine(geometry, geometry)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_MakeLine(geometry, geometry)"       PUBLIC  KEEP\rFUNCTION   "AddPoint(geometry, geometry)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_AddPoint(geometry, geometry)"       PUBLIC  KEEP\rFUNCTION   "AddPoint(geometry, geometry, integer)" PUBLIC  DEPRECATE\rFUNCTION      "ST_AddPoint(geometry, geometry, integer)"      PUBLIC  KEEP\rFUNCTION   "RemovePoint(geometry, integer)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_RemovePoint(geometry, integer)"     PUBLIC  KEEP\rFUNCTION   "SetPoint(geometry, integer, geometry)" PUBLIC  DEPRECATE\rFUNCTION      "ST_SetPoint(geometry, integer, geometry)"      PUBLIC  KEEP\rFUNCTION   "MakePolygon(geometry, geometry[])"     PUBLIC  DEPRECATE\rFUNCTION      "ST_MakePolygon(geometry, geometry[])"  PUBLIC  KEEP\rFUNCTION   MakePolygon(geometry)   PUBLIC  DEPRECATE\rFUNCTION      ST_MakePolygon(geometry)        PUBLIC  KEEP\rFUNCTION   BuildArea(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_BuildArea(geometry)  PUBLIC  KEEP\rFUNCTION   Polygonize_GArray (geometry[])  PUBLIC  DEPRECATE\rFUNCTION      ST_Polygonize_GArray (geometry[])       PUBLIC  DEPRECATE\rFUNCTION      ST_Polygonize (geometry[])      PUBLIC  KEEP\rFUNCTION   LineMerge(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_LineMerge(geometry)  PUBLIC  KEEP\rFUNCTION   Dump(geometry)  PUBLIC  DEPRECATE\rFUNCTION      ST_Dump(geometry)       PUBLIC  KEEP\rFUNCTION   DumpRings(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_DumpRings(geometry)  PUBLIC  KEEP\rFUNCTION   "combine_bbox(box2d,geometry)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_Combine_BBox(box2d,geometry)"       PUBLIC  RENAME  "postgis_combine_bbox(box2d, geometry)"\rAGGREGATE       Extent( PUBLIC  DEPRECATE       \rAGGREGATE      ST_Extent(      PUBLIC  KEEP    \rFUNCTION       "combine_bbox(box3d,geometry)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_Combine_BBox(box3d,geometry)"       PUBLIC  KEEP    \rAGGREGATE      Extent3d(       PUBLIC  DEPRECATE       \rAGGREGATE      ST_3DExtent(    PUBLIC  KEEP    \rFUNCTION       "estimated_extent(text,text,text) RETURNS box2d AS"     PUBLIC  DEPRECATE       \rFUNCTION       "ST_estimated_extent(text,text,text) RETURNS box2d AS"  PUBLIC  KEEP    \rFUNCTION       "estimated_extent(text,text) RETURNS box2d AS"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_estimated_extent(text,text) RETURNS box2d AS"       PUBLIC  KEEP    \rFUNCTION       "find_extent(text,text,text) RETURNS box2d AS"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_find_extent(text,text,text) RETURNS box2d AS"       PUBLIC  KEEP    \rFUNCTION       "find_extent(text,text) RETURNS box2d AS"       PUBLIC  DEPRECATE       \rFUNCTION       "ST_find_extent(text,text) RETURNS box2d AS"    PUBLIC  KEEP    \rFUNCTION       rename_geometry_table_constraints() RETURNS text        PUBLIC  KEEP\rFUNCTION   fix_geometry_columns() RETURNS text     PUBLIC  KEEP\rFUNCTION   populate_geometry_columns()     PUBLIC  KEEP\rFUNCTION   populate_geometry_columns(tbl_oid oid)  PUBLIC  KEEP\rFUNCTION   probe_geometry_columns() RETURNS text AS        PUBLIC  KEEP\rFUNCTION   "AddGeometryColumn(varchar,varchar,varchar,varchar,integer,varchar,integer)"    PUBLIC  KEEP\rFUNCTION   "AddGeometryColumn(varchar,varchar,varchar,integer,varchar,integer) RETURNS text AS $$" PUBLIC  KEEP\rFUNCTION   "AddGeometryColumn(varchar,varchar,integer,varchar,integer) RETURNS text AS $$" PUBLIC  KEEP\rFUNCTION   "DropGeometryColumn(varchar, varchar,varchar,varchar)"  PUBLIC  KEEP\rFUNCTION   "DropGeometryColumn(varchar,varchar,varchar)"   PUBLIC  KEEP\rFUNCTION   "DropGeometryColumn(varchar,varchar)"   PUBLIC  KEEP\rFUNCTION   "DropGeometryTable(varchar, varchar,varchar)"   PUBLIC  KEEP\rFUNCTION   "DropGeometryTable(varchar,varchar) RETURNS text AS"    PUBLIC  KEEP\rFUNCTION   DropGeometryTable(varchar) RETURNS text AS      PUBLIC  KEEP\rFUNCTION   "UpdateGeometrySRID(varchar,varchar,varchar,varchar,integer)"   PUBLIC  KEEP\rFUNCTION   "UpdateGeometrySRID(varchar,varchar,varchar,integer)"   PUBLIC  KEEP\rFUNCTION   "UpdateGeometrySRID(varchar,varchar,integer)"   PUBLIC  KEEP    \rFUNCTION       "find_srid(varchar,varchar,varchar) RETURNS int4 AS"    PUBLIC  KEEP    \rFUNCTION       get_proj4_from_srid(integer) RETURNS text AS    PUBLIC  KEEP    \rFUNCTION       "transform_geometry(geometry,text,text,int)"    PRIVATE RENAME  "postgis_transform_geometry(geometry, text, text, int)"\rFUNCTION        "transform(geometry,integer)"   PUBLIC  DEPRECATE       \rFUNCTION       "ST_Transform(geometry,integer)"        PUBLIC  KEEP    \rFUNCTION       postgis_version() RETURNS text  PUBLIC  KEEP    \rFUNCTION       postgis_proj_version() RETURNS text     PUBLIC  KEEP    \rFUNCTION       postgis_scripts_installed() RETURNS text        PUBLIC  KEEP    \rFUNCTION       postgis_lib_version() RETURNS text      PUBLIC  KEEP    \rFUNCTION       postgis_scripts_released() RETURNS text PUBLIC  KEEP    \rFUNCTION       postgis_uses_stats() RETURNS bool       PUBLIC  KEEP    \rFUNCTION       postgis_geos_version() RETURNS text     PUBLIC  KEEP    \rFUNCTION       postgis_scripts_build_date() RETURNS text       PUBLIC  KEEP    \rFUNCTION       postgis_lib_build_date() RETURNS text   PUBLIC  KEEP    \rFUNCTION       postgis_full_version() RETURNS text     PUBLIC  KEEP    \rFUNCTION       box2d(geometry) PRIVATE KEEP    \rFUNCTION       ST_box2d(geometry)      PRIVATE DEPRECATE       "these are pgsql casts, they should use pgsql convention"\rFUNCTION      box3d(geometry) PRIVATE KEEP    \rFUNCTION       ST_box3d(geometry)      PRIVATE DEPRECATE       \rFUNCTION       box(geometry)   PRIVATE KEEP    \rFUNCTION       ST_box(geometry)        PRIVATE DEPRECATE       \rFUNCTION       box2d(box3d)    PRIVATE KEEP    \rFUNCTION       ST_box2d(box3d) PRIVATE DEPRECATE       \rFUNCTION       box3d(box2d)    PRIVATE KEEP    \rFUNCTION       ST_box3d(box2d) PRIVATE DEPRECATE       \rFUNCTION       box(box3d)      PRIVATE KEEP    \rFUNCTION       ST_box(box3d)   PRIVATE DEPRECATE       \rFUNCTION       text(geometry)  PRIVATE KEEP    \rFUNCTION       ST_text(geometry)       PRIVATE DEPRECATE       \rFUNCTION       box3dtobox(box3d)       PRIVATE KEEP    \rFUNCTION       geometry(box2d) PRIVATE KEEP    \rFUNCTION       ST_geometry(box2d)      PRIVATE DEPRECATE\rFUNCTION      geometry(box3d) PRIVATE KEEP\rFUNCTION   ST_geometry(box3d)      PRIVATE DEPRECATE\rFUNCTION      geometry(text)  PRIVATE KEEP\rFUNCTION   ST_geometry(text)       PRIVATE DEPRECATE\rFUNCTION      geometry(chip)  PRIVATE KEEP\rFUNCTION   ST_geometry(chip)       PRIVATE DEPRECATE\rFUNCTION      geometry(bytea) PRIVATE KEEP\rFUNCTION   ST_geometry(bytea)      PRIVATE DEPRECATE\rFUNCTION      bytea(geometry) PRIVATE KEEP\rFUNCTION   ST_bytea(geometry)      PRIVATE DEPRECATE\rFUNCTION      text(bool)      PRIVATE KEEP\rFUNCTION   ST_text(bool)   PRIVATE DEPRECATE\rFUNCTION      "Simplify(geometry, float8)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_Simplify(geometry, float8)" PUBLIC  KEEP\rFUNCTION   "SnapToGrid(geometry, float8, float8, float8, float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_SnapToGrid(geometry, float8, float8, float8, float8)"       PUBLIC  KEEP\rFUNCTION   "SnapToGrid(geometry, float8, float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_SnapToGrid(geometry, float8, float8)"       PUBLIC  KEEP\rFUNCTION   "SnapToGrid(geometry, float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_SnapToGrid(geometry, float8)"       PUBLIC  KEEP\rFUNCTION   "SnapToGrid(geometry, geometry, float8, float8, float8, float8)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_SnapToGrid(geometry, geometry, float8, float8, float8, float8)"     PUBLIC  KEEP\rFUNCTION   "Segmentize(geometry, float8)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_Segmentize(geometry, float8)"       PUBLIC  KEEP\rFUNCTION   "line_interpolate_point(geometry, float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_line_interpolate_point(geometry, float8)"   PUBLIC  KEEP\rFUNCTION   "line_substring(geometry, float8, float8)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_line_substring(geometry, float8, float8)"   PUBLIC  KEEP\rFUNCTION   "line_locate_point(geometry, geometry)" PUBLIC  DEPRECATE\rFUNCTION      "ST_line_locate_point(geometry, geometry)"      PUBLIC  KEEP\rFUNCTION   "locate_between_measures(geometry, float8, float8)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_locate_between_measures(geometry, float8, float8)"  PUBLIC  KEEP\rFUNCTION   "locate_along_measure(geometry, float8)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_locate_along_measure(geometry, float8)"     PUBLIC  KEEP\rFUNCTION   "intersection(geometry,geometry)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_Intersection(geometry,geometry)"    PUBLIC  KEEP\rFUNCTION   "buffer(geometry,float8)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_Buffer(geometry,float8)"    PUBLIC  KEEP\rFUNCTION   "buffer(geometry,float8,integer)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_buffer(geometry,float8,integer)"    PUBLIC  KEEP\rFUNCTION   convexhull(geometry)    PUBLIC  DEPRECATE\rFUNCTION      ST_ConvexHull(geometry) PUBLIC  KEEP\rFUNCTION   "_ST_LineCrossingDirection(geometry, geometry)" PUBLIC  KEEP\rFUNCTION   "ST_LineCrossingDirection(geometry, geometry)"  PUBLIC  KEEP\rFUNCTION   "ST_LocateBetweenElevations(geometry, float8, float8)"  PUBLIC  KEEP\rFUNCTION   "ST_SimplifyPreserveTopology(geometry, float8)" PUBLIC  KEEP\rFUNCTION   ST_IsValidReason(geometry)      PUBLIC  KEEP\rFUNCTION   "difference(geometry,geometry)" PUBLIC  DEPRECATE       \rFUNCTION       "ST_Difference(geometry,geometry)"      PUBLIC  KEEP    \rFUNCTION       boundary(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_Boundary(geometry)   PUBLIC  KEEP    \rFUNCTION       "symdifference(geometry,geometry)"      PUBLIC  DEPRECATE       \rFUNCTION       "ST_SymDifference(geometry,geometry)"   PUBLIC  KEEP    \rFUNCTION       "symmetricdifference(geometry,geometry)"        PUBLIC  DEPRECATE       \rFUNCTION       "ST_symmetricdifference(geometry,geometry)"     PUBLIC  KEEP    \rFUNCTION       "GeomUnion(geometry,geometry)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_Union(geometry,geometry)"   PUBLIC  KEEP    \rFUNCTION       "collector(geometry, geometry)" PUBLIC  DELETE  dupe of st_collect\rFUNCTION     "ST_collector(geometry, geometry)"      PUBLIC  DELETE  dupe of st_collect\rFUNCTION     "collect(geometry, geometry)"   PUBLIC  DEPRECATE       \rFUNCTION       "ST_collect(geometry, geometry)"        PUBLIC  KEEP    \rAGGREGATE      memcollect(     PUBLIC  DEPRECATE       \rAGGREGATE      ST_memcollect(  PUBLIC  KEEP    \rFUNCTION       "geom_accum (geometry[],geometry)"      PUBLIC  DELETE  superceded by new aggregator\rFUNCTION   "ST_geom_accum (geometry[],geometry)"   PUBLIC  DELETE  superceded by new aggregator\rFUNCTION   collect_garray (geometry[])     PUBLIC  DELETE  superceded by new aggregator\rFUNCTION   ST_collect_garray (geometry[])  PUBLIC  DELETE  superceded by new aggregator\rFUNCTION   ST_collect (geometry[]) PUBLIC  KEEP    \rAGGREGATE      MemGeomUnion (  PUBLIC  DEPRECATE       \rAGGREGATE      ST_MemUnion (   PUBLIC  KEEP    \rFUNCTION       pgis_abs_in(cstring)    PRIVATE KEEP    \rFUNCTION       pgis_abs_out(pgis_abs)  PRIVATE KEEP    \rTYPE   pgis_abs (      PRIVATE KEEP    \rFUNCTION       "pgis_geometry_accum_transfn(pgis_abs, geometry)"       PRIVATE KEEP    \rFUNCTION       pgis_geometry_accum_finalfn(pgis_abs)   PRIVATE KEEP    \rFUNCTION       pgis_geometry_union_finalfn(pgis_abs)   PRIVATE KEEP    \rFUNCTION       pgis_geometry_collect_finalfn(pgis_abs) PRIVATE KEEP    \rFUNCTION       pgis_geometry_polygonize_finalfn(pgis_abs)      PRIVATE KEEP    \rFUNCTION       pgis_geometry_makeline_finalfn(pgis_abs)        PRIVATE KEEP    \rAGGREGATE      accum ( PUBLIC  DEPRECATE       \rAGGREGATE      ST_Accum (      PUBLIC  KEEP    \rAGGREGATE      accum_old (     PUBLIC  DELETE  \rAGGREGATE      ST_accum_old (  PUBLIC  DELETE  \rFUNCTION       unite_garray (geometry[])       PUBLIC  DEPRECATE       \rFUNCTION       ST_unite_garray (geometry[])    PUBLIC  DEPRECATE       superceded by st_union(geometry[])\rFUNCTION     ST_Union (geometry[])   PUBLIC  KEEP    \rAGGREGATE      GeomUnion_Old ( PUBLIC  DELETE  \rAGGREGATE      ST_Union_Old (  PUBLIC  DELETE  \rAGGREGATE      ST_Union (      PUBLIC  KEEP    \rAGGREGATE      collect (       PUBLIC  DEPRECATE       \rAGGREGATE      ST_Collect (    PUBLIC  KEEP    \rAGGREGATE      Polygonize (    PUBLIC  DEPRECATE       \rAGGREGATE      ST_Polygonize ( PUBLIC  KEEP    \rAGGREGATE      makeline (      PUBLIC  DEPRECATE       \rAGGREGATE      ST_MakeLine (   PUBLIC  KEEP    \rFUNCTION       "relate(geometry,geometry)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_relate(geometry,geometry)"  PUBLIC  KEEP\rFUNCTION   "relate(geometry,geometry,text)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_Relate(geometry,geometry,text)"     PUBLIC  KEEP\rFUNCTION   "disjoint(geometry,geometry)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_Disjoint(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "touches(geometry,geometry)"    PUBLIC  DEPRECATE\rFUNCTION      "_ST_Touches(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "ST_Touches(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   "_ST_DWithin(geometry,geometry,float8)" PUBLIC  KEEP\rFUNCTION   "ST_DWithin(geometry, geometry, float8)"        PUBLIC  KEEP\rFUNCTION   "intersects(geometry,geometry)" PUBLIC  DEPRECATE\rFUNCTION      "_ST_Intersects(geometry,geometry)"     PUBLIC  KEEP\rFUNCTION   "ST_Intersects(geometry,geometry)"      PUBLIC  KEEP\rFUNCTION   "crosses(geometry,geometry)"    PUBLIC  DEPRECATE\rFUNCTION      "_ST_Crosses(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "ST_Crosses(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   "within(geometry,geometry)"     PUBLIC  DEPRECATE\rFUNCTION      "_ST_Within(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   "ST_Within(geometry,geometry)"  PUBLIC  KEEP\rFUNCTION   "Contains(geometry,geometry)"   PUBLIC  DEPRECATE\rFUNCTION      "_ST_Contains(geometry,geometry)"       PUBLIC  KEEP\rFUNCTION   "ST_Contains(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "_ST_CoveredBy(geometry,geometry)"      PUBLIC  KEEP\rFUNCTION   "ST_CoveredBy(geometry,geometry)"       PUBLIC  KEEP\rFUNCTION   "_ST_Covers(geometry,geometry)" PUBLIC  KEEP\rFUNCTION   "ST_Covers(geometry,geometry)"  PUBLIC  KEEP\rFUNCTION   "_ST_ContainsProperly(geometry,geometry)"       PUBLIC  KEEP\rFUNCTION   "ST_ContainsProperly(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   "overlaps(geometry,geometry)"   PUBLIC  DEPRECATE\rFUNCTION      "_ST_Overlaps(geometry,geometry)"       PUBLIC  KEEP\rFUNCTION   "ST_Overlaps(geometry,geometry)"        PUBLIC  KEEP\rFUNCTION   IsValid(geometry)       PUBLIC  DEPRECATE       \rFUNCTION       ST_IsValid(geometry)    PUBLIC  KEEP    \rFUNCTION       GEOSnoop(geometry)      PRIVATE RENAME  postgis_geos_noop\rFUNCTION      Centroid(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_Centroid(geometry)   PUBLIC  KEEP    \rFUNCTION       IsRing(geometry)        PUBLIC  DEPRECATE       \rFUNCTION       ST_IsRing(geometry)     PUBLIC  KEEP    \rFUNCTION       PointOnSurface(geometry)        PUBLIC  DEPRECATE       \rFUNCTION       ST_PointOnSurface(geometry)     PUBLIC  KEEP    \rFUNCTION       IsSimple(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_IsSimple(geometry)   PUBLIC  KEEP    \rFUNCTION       "Equals(geometry,geometry)"     PUBLIC  DEPRECATE       \rFUNCTION       "ST_Equals(geometry,geometry)"  PUBLIC  KEEP    \rFUNCTION       "AsSVG(geometry,int4,int4)"     PUBLIC  DEPRECATE       \rFUNCTION       "ST_AsSVG(geometry,int4,int4)"  PUBLIC  KEEP    \rFUNCTION       "AsSVG(geometry,int4)"  PUBLIC  DEPRECATE       \rFUNCTION       "ST_AsSVG(geometry,int4)"       PUBLIC  KEEP\rFUNCTION   AsSVG(geometry) PUBLIC  DEPRECATE\rFUNCTION      ST_AsSVG(geometry)      PUBLIC  KEEP\rFUNCTION   "_ST_AsGML(int4, geometry, int4)"       PUBLIC  KEEP\rFUNCTION   "AsGML(geometry, int4)" PUBLIC  DEPRECATE\rFUNCTION      "ST_AsGML(geometry, int4)"      PUBLIC  KEEP\rFUNCTION   AsGML(geometry) PUBLIC  DEPRECATE\rFUNCTION      ST_AsGML(geometry)      PUBLIC  KEEP\rFUNCTION   "ST_AsGML(int4, geometry)"      PUBLIC  KEEP\rFUNCTION   "ST_AsGML(int4, geometry, int4)"        PUBLIC  KEEP\rFUNCTION   "_ST_AsKML(int4, geometry, int4)"       PUBLIC  KEEP\rFUNCTION   "AsKML(geometry, int4)" PUBLIC  DEPRECATE\rFUNCTION      "ST_AsKML(geometry, int4)"      PUBLIC  KEEP\rFUNCTION   AsKML(geometry) PUBLIC  DEPRECATE\rFUNCTION      "AsKML(int4, geometry, int4)"   PUBLIC  DEPRECATE\rFUNCTION      ST_AsKML(geometry)      PUBLIC  KEEP\rFUNCTION   "ST_AsKML(int4, geometry)"      PUBLIC  KEEP\rFUNCTION   "ST_AsKML(int4, geometry, int4)"        PUBLIC  KEEP\rFUNCTION   "_ST_AsGeoJson(int4, geometry, int4, int4)"     PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(geometry, int4)"  PUBLIC  KEEP\rFUNCTION   ST_AsGeoJson(geometry)  PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(int4, geometry)"  PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(int4, geometry, int4)"    PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(geometry, int4, int4)"    PUBLIC  KEEP\rFUNCTION   "ST_AsGeoJson(int4, geometry, int4, int4)"      PUBLIC  KEEP\rFUNCTION   NumPoints(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_NumPoints(geometry)  PUBLIC  KEEP\rFUNCTION   NumGeometries(geometry) PUBLIC  DEPRECATE\rFUNCTION      ST_NumGeometries(geometry)      PUBLIC  KEEP\rFUNCTION   "GeometryN(geometry,integer)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_GeometryN(geometry,integer)"        PUBLIC  KEEP\rFUNCTION   Dimension(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_Dimension(geometry)  PUBLIC  KEEP\rFUNCTION   ExteriorRing(geometry)  PUBLIC  DEPRECATE\rFUNCTION      ST_ExteriorRing(geometry)       PUBLIC  KEEP\rFUNCTION   NumInteriorRings(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_NumInteriorRings(geometry)   PUBLIC  KEEP\rFUNCTION   NumInteriorRing(geometry)       PUBLIC  DEPRECATE\rFUNCTION      ST_NumInteriorRing(geometry)    PUBLIC  KEEP\rFUNCTION   "InteriorRingN(geometry,integer)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_InteriorRingN(geometry,integer)"    PUBLIC  KEEP\rFUNCTION   GeometryTYPE(geometry)  PUBLIC  DEPRECATE\rFUNCTION      ST_GeometryTYPE(geometry)       PUBLIC  KEEP\rFUNCTION   "PointN(geometry,integer)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_PointN(geometry,integer)"   PUBLIC  KEEP\rFUNCTION   X(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_X(geometry)  PUBLIC  KEEP\rFUNCTION   Y(geometry)     PUBLIC  DEPRECATE\rFUNCTION      ST_Y(geometry)  PUBLIC  KEEP    \rFUNCTION       Z(geometry)     PUBLIC  DEPRECATE       \rFUNCTION       SE_Z(geometry)  PUBLIC  KEEP    \rFUNCTION       ST_Z(geometry)  PUBLIC  KEEP    ESRI compatibility (feh!)\rFUNCTION      M(geometry)     PUBLIC  DEPRECATE       \rFUNCTION       ST_M(geometry)  PUBLIC  KEEP    \rFUNCTION       StartPoint(geometry)    PUBLIC  DEPRECATE       \rFUNCTION       ST_StartPoint(geometry) PUBLIC  KEEP    \rFUNCTION       EndPoint(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_EndPoint(geometry)   PUBLIC  KEEP    \rFUNCTION       IsClosed(geometry)      PUBLIC  DEPRECATE       \rFUNCTION       ST_IsClosed(geometry)   PUBLIC  KEEP    \rFUNCTION       IsEmpty(geometry)       PUBLIC  DEPRECATE       \rFUNCTION       ST_IsEmpty(geometry)    PUBLIC  KEEP    \rFUNCTION       SRID(geometry)  PUBLIC  DEPRECATE       \rFUNCTION       ST_SRID(geometry)       PUBLIC  KEEP    \rFUNCTION       "SetSRID(geometry,int4)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_SetSRID(geometry,int4)"     PUBLIC  KEEP\rFUNCTION   AsBinary(geometry)      PUBLIC  DEPRECATE\rFUNCTION      ST_AsBinary(geometry)   PUBLIC  KEEP\rFUNCTION   "AsBinary(geometry,text)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_AsBinary(geometry,text)"    PUBLIC  KEEP\rFUNCTION   AsText(geometry)        PUBLIC  DEPRECATE\rFUNCTION      ST_AsText(geometry)     PUBLIC  KEEP\rFUNCTION   GeometryFromText(text)  PUBLIC  DEPRECATE\rFUNCTION      ST_GeometryFromText(text)       PUBLIC  KEEP\rFUNCTION   "GeometryFromText(text, int4)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_GeometryFromText(text, int4)"       PUBLIC  KEEP\rFUNCTION   GeomFromText(text)      PUBLIC  DEPRECATE\rFUNCTION      ST_GeomFromText(text)   PUBLIC  KEEP\rFUNCTION   "GeomFromText(text, int4)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_GeomFromText(text, int4)"   PUBLIC  KEEP\rFUNCTION   PointFromText(text)     PUBLIC  DEPRECATE\rFUNCTION      ST_PointFromText(text)  PUBLIC  KEEP\rFUNCTION   "PointFromText(text, int4)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_PointFromText(text, int4)"  PUBLIC  KEEP\rFUNCTION   LineFromText(text)      PUBLIC  DEPRECATE\rFUNCTION      ST_LineFromText(text)   PUBLIC  KEEP\rFUNCTION   "LineFromText(text, int4)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_LineFromText(text, int4)"   PUBLIC  KEEP\rFUNCTION   LineStringFromText(text)        PUBLIC  DEPRECATE\rFUNCTION      "LineStringFromText(text, int4)"        PUBLIC  DEPRECATE\rFUNCTION      PolyFromText(text)      PUBLIC  DEPRECATE\rFUNCTION      ST_PolyFromText(text)   PUBLIC  KEEP\rFUNCTION   "PolyFromText(text, int4)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_PolyFromText(text, int4)"   PUBLIC  KEEP\rFUNCTION   "PolygonFromText(text, int4)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_PolygonFromText(text, int4)"        PUBLIC  KEEP\rFUNCTION   PolygonFromText(text)   PUBLIC  DEPRECATE\rFUNCTION      ST_PolygonFromText(text)        PUBLIC  KEEP\rFUNCTION   "MLineFromText(text, int4)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_MLineFromText(text, int4)"  PUBLIC  KEEP\rFUNCTION   MLineFromText(text)     PUBLIC  DEPRECATE\rFUNCTION      ST_MLineFromText(text)  PUBLIC  KEEP\rFUNCTION   MultiLineStringFromText(text)   PUBLIC  DEPRECATE\rFUNCTION      ST_MultiLineStringFromText(text)        PUBLIC  KEEP\rFUNCTION   "MultiLineStringFromText(text, int4)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_MultiLineStringFromText(text, int4)"        PUBLIC  KEEP\rFUNCTION   "MPointFromText(text, int4)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_MPointFromText(text, int4)" PUBLIC  KEEP\rFUNCTION   MPointFromText(text)    PUBLIC  DEPRECATE\rFUNCTION      ST_MPointFromText(text) PUBLIC  KEEP\rFUNCTION   "MultiPointFromText(text, int4)"        PUBLIC  DEPRECATE\rFUNCTION      MultiPointFromText(text)        PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPointFromText(text)     PUBLIC  KEEP\rFUNCTION   MultiPointFromText(text)        PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPointFromText(text)     PUBLIC  KEEP\rFUNCTION   "MPolyFromText(text, int4)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_MPolyFromText(text, int4)"  PUBLIC  KEEP\rFUNCTION   MPolyFromText(text)     PUBLIC  DEPRECATE\rFUNCTION      ST_MPolyFromText(text)  PUBLIC  KEEP\rFUNCTION   "MultiPolygonFromText(text, int4)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_MultiPolygonFromText(text, int4)"   PUBLIC  KEEP\rFUNCTION   MultiPolygonFromText(text)      PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPolygonFromText(text)   PUBLIC  KEEP\rFUNCTION   "GeomCollFromText(text, int4)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_GeomCollFromText(text, int4)"       PUBLIC  KEEP\rFUNCTION   GeomCollFromText(text)  PUBLIC  DEPRECATE\rFUNCTION      ST_GeomCollFromText(text)       PUBLIC  KEEP\rFUNCTION   GeomFromWKB(bytea)      PUBLIC  DEPRECATE\rFUNCTION      ST_GeomFromWKB(bytea)   PUBLIC  KEEP\rFUNCTION   "GeomFromWKB(bytea, int)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_GeomFromWKB(bytea, int)"    PUBLIC  KEEP\rFUNCTION   "PointFromWKB(bytea, int)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_PointFromWKB(bytea, int)"   PUBLIC  KEEP\rFUNCTION   PointFromWKB(bytea)     PUBLIC  DEPRECATE\rFUNCTION      ST_PointFromWKB(bytea)  PUBLIC  KEEP\rFUNCTION   "LineFromWKB(bytea, int)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_LineFromWKB(bytea, int)"    PUBLIC  KEEP\rFUNCTION   LineFromWKB(bytea)      PUBLIC  DEPRECATE\rFUNCTION      ST_LineFromWKB(bytea)   PUBLIC  KEEP\rFUNCTION   "LinestringFromWKB(bytea, int)" PUBLIC  DEPRECATE\rFUNCTION      "ST_LinestringFromWKB(bytea, int)"      PUBLIC  KEEP\rFUNCTION   LinestringFromWKB(bytea)        PUBLIC  DEPRECATE\rFUNCTION      ST_LinestringFromWKB(bytea)     PUBLIC  KEEP\rFUNCTION   "PolyFromWKB(bytea, int)"       PUBLIC  DEPRECATE\rFUNCTION      "ST_PolyFromWKB(bytea, int)"    PUBLIC  KEEP\rFUNCTION   PolyFromWKB(bytea)      PUBLIC  DEPRECATE\rFUNCTION      ST_PolyFromWKB(bytea)   PUBLIC  KEEP\rFUNCTION   "PolygonFromWKB(bytea, int)"    PUBLIC  DEPRECATE\rFUNCTION      "ST_PolygonFromWKB(bytea, int)" PUBLIC  KEEP\rFUNCTION   PolygonFromWKB(bytea)   PUBLIC  DEPRECATE\rFUNCTION      ST_PolygonFromWKB(bytea)        PUBLIC  KEEP\rFUNCTION   "MPointFromWKB(bytea, int)"     PUBLIC  DEPRECATE\rFUNCTION      "ST_MPointFromWKB(bytea, int)"  PUBLIC  KEEP\rFUNCTION   MPointFromWKB(bytea)    PUBLIC  DEPRECATE\rFUNCTION      ST_MPointFromWKB(bytea) PUBLIC  KEEP\rFUNCTION   "MultiPointFromWKB(bytea, int)" PUBLIC  DEPRECATE\rFUNCTION      "ST_MultiPointFromWKB(bytea, int)"      PUBLIC  KEEP\rFUNCTION   MultiPointFromWKB(bytea)        PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPointFromWKB(bytea)     PUBLIC  KEEP\rFUNCTION   "MultiLineFromWKB(bytea, int)"  PUBLIC  DEPRECATE\rFUNCTION      "MultiLineFromWKB(bytea, int)"  PUBLIC  DEPRECATE\rFUNCTION      MultiLineFromWKB(bytea) PUBLIC  DEPRECATE\rFUNCTION      ST_MultiLineFromWKB(bytea)      PUBLIC  KEEP\rFUNCTION   "MLineFromWKB(bytea, int)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_MLineFromWKB(bytea, int)"   PUBLIC  KEEP\rFUNCTION   MLineFromWKB(bytea)     PUBLIC  DEPRECATE\rFUNCTION      ST_MLineFromWKB(bytea)  PUBLIC  KEEP\rFUNCTION   "MPolyFromWKB(bytea, int)"      PUBLIC  DEPRECATE\rFUNCTION      "ST_MPolyFromWKB(bytea, int)"   PUBLIC  KEEP\rFUNCTION   MPolyFromWKB(bytea)     PUBLIC  DEPRECATE\rFUNCTION      ST_MPolyFromWKB(bytea)  PUBLIC  KEEP\rFUNCTION   "MultiPolyFromWKB(bytea, int)"  PUBLIC  DEPRECATE\rFUNCTION      "ST_MultiPolyFromWKB(bytea, int)"       PUBLIC  KEEP\rFUNCTION   MultiPolyFromWKB(bytea) PUBLIC  DEPRECATE\rFUNCTION      ST_MultiPolyFromWKB(bytea)      PUBLIC  KEEP\rFUNCTION   "GeomCollFromWKB(bytea, int)"   PUBLIC  DEPRECATE\rFUNCTION      "ST_GeomCollFromWKB(bytea, int)"        PUBLIC  KEEP\rFUNCTION   GeomCollFromWKB(bytea)  PUBLIC  DEPRECATE\rFUNCTION      ST_GeomCollFromWKB(bytea)       PUBLIC  KEEP\rFUNCTION   "BdPolyFromText(text, integer)" PUBLIC  DEPRECATE\rFUNCTION      "ST_BdPolyFromText(text, integer)"      PUBLIC  KEEP\rFUNCTION   "BdMPolyFromText(text, integer)"        PUBLIC  DEPRECATE\rFUNCTION      "ST_BdMPolyFromText(text, integer)"     PUBLIC  KEEP\rFUNCTION   "ST_CurveToLine(geometry, integer)"     PUBLIC  KEEP\rFUNCTION   ST_CurveToLine(geometry)        PUBLIC  KEEP\rFUNCTION   ST_HasArc(geometry)     PUBLIC  KEEP\rFUNCTION   ST_LineToCurve(geometry)        PUBLIC  KEEP
\ No newline at end of file

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 35e214a62406d06dc0b4c8bebab48f4cd3c8692f..171113293f10d8662f727e450ba89d0fff93b103 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -1047,7 +1047,7 @@ CREATE OR REPLACE FUNCTION ST_nrings(geometry)
 -- Misures\r
 ------------------------------------------------------------------------\r
 -- Availability: 1.2.2\r
-CREATE OR REPLACE FUNCTION ST_Length3d(geometry)\r
+CREATE OR REPLACE FUNCTION ST_3DLength(geometry)\r
        RETURNS FLOAT8\r
        AS 'MODULE_PATHNAME', 'LWGEOM_length_linestring'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
@@ -1067,7 +1067,7 @@ CREATE OR REPLACE FUNCTION ST_Length(geometry)
 -- this is a fake (for back-compatibility)\r
 -- uses 3d if 3d is available, 2d otherwise\r
 -- Availability: 1.2.2\r
-CREATE OR REPLACE FUNCTION ST_length3d_spheroid(geometry, spheroid)\r
+CREATE OR REPLACE FUNCTION ST_3DLength_spheroid(geometry, spheroid)\r
        RETURNS FLOAT8\r
        AS 'MODULE_PATHNAME','LWGEOM_length_ellipsoid_linestring'\r
        LANGUAGE 'C' IMMUTABLE STRICT\r
@@ -1088,7 +1088,7 @@ CREATE OR REPLACE FUNCTION ST_length2d_spheroid(geometry, spheroid)
        COST 100;\r
 \r
 -- Availability: 1.2.2\r
-CREATE OR REPLACE FUNCTION ST_perimeter3d(geometry)\r
+CREATE OR REPLACE FUNCTION ST_3DPerimeter(geometry)\r
        RETURNS FLOAT8\r
        AS 'MODULE_PATHNAME', 'LWGEOM_perimeter_poly'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
@@ -1357,7 +1357,7 @@ CREATE OR REPLACE FUNCTION ST_MakePointM(float8, float8, float8)
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
 -- Availability: 1.2.2\r
-CREATE OR REPLACE FUNCTION ST_MakeBox3d(geometry, geometry)\r
+CREATE OR REPLACE FUNCTION ST_3DMakeBox(geometry, geometry)\r
        RETURNS box3d\r
        AS 'MODULE_PATHNAME', 'BOX3D_construct'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
@@ -1612,7 +1612,7 @@ CREATE OR REPLACE FUNCTION ST_Combine_BBox(box3d,geometry)
        LANGUAGE 'C' IMMUTABLE;\r
 \r
 -- Availability: 1.2.2\r
-CREATE AGGREGATE ST_Extent3d(\r
+CREATE AGGREGATE ST_3DExtent(\r
        sfunc = ST_combine_bbox,\r
        basetype = geometry,\r
        stype = box3d\r

diff --git a/postgis/uninstall_postgis.sql.in.c b/postgis/uninstall_postgis.sql.in.c
index e458f2a3d79aba3675a5bda3f54ffc5a39c97fbe..8f1f00a8ca3c6d76468f81ec4de7715b974ea671 100644 (file)
--- a/postgis/uninstall_postgis.sql.in.c
+++ b/postgis/uninstall_postgis.sql.in.c
@@ -540,7 +540,7 @@ DROP FUNCTION ST_estimated_extent(text,text);
 DROP FUNCTION estimated_extent(text,text);
 DROP FUNCTION ST_estimated_extent(text,text,text);
 DROP FUNCTION estimated_extent(text,text,text);
-DROP AGGREGATE ST_Extent3d(geometry);
+DROP AGGREGATE ST_3DExtent(geometry);
 DROP AGGREGATE Extent3d(geometry);
 DROP FUNCTION ST_Combine_BBox(box3d,geometry);
 DROP FUNCTION combine_bbox(box3d,geometry);
@@ -586,7 +586,7 @@ DROP FUNCTION LineFromMultiPoint(geometry);
 DROP FUNCTION ST_MakeLine (geometry[]);
 DROP FUNCTION ST_MakeLine_GArray (geometry[]);
 DROP FUNCTION makeline_garray (geometry[]);
-DROP FUNCTION ST_MakeBox3d(geometry, geometry);
+DROP FUNCTION ST_3DMakeBox(geometry, geometry);
 DROP FUNCTION MakeBox3d(geometry, geometry);
 DROP FUNCTION ST_MakeBox2d(geometry, geometry);
 DROP FUNCTION MakeBox2d(geometry, geometry);
@@ -677,19 +677,19 @@ DROP FUNCTION ST_Perimeter(geometry);
 DROP FUNCTION perimeter(geometry);
 DROP FUNCTION ST_perimeter2d(geometry);
 DROP FUNCTION perimeter2d(geometry);
-DROP FUNCTION ST_perimeter3d(geometry);
+DROP FUNCTION ST_3dperimeter(geometry);
 DROP FUNCTION perimeter3d(geometry);
 DROP FUNCTION ST_length2d_spheroid(geometry, spheroid);
 DROP FUNCTION length2d_spheroid(geometry, spheroid);
 DROP FUNCTION ST_length_spheroid(geometry, spheroid);
 DROP FUNCTION length_spheroid(geometry, spheroid);
-DROP FUNCTION ST_length3d_spheroid(geometry, spheroid);
+DROP FUNCTION ST_3DLength_spheroid(geometry, spheroid);
 DROP FUNCTION length3d_spheroid(geometry, spheroid);
 DROP FUNCTION ST_Length(geometry);
 DROP FUNCTION length(geometry);
 DROP FUNCTION ST_length2d(geometry);
 DROP FUNCTION length2d(geometry);
-DROP FUNCTION ST_length3d(geometry);
+DROP FUNCTION ST_3DLength(geometry);
 DROP FUNCTION length3d(geometry);
 
 

diff --git a/regress/ctors.sql b/regress/ctors.sql
index 17224533c05f57b4fe5b41013d27061b3b29a4ec..da6f289d2db540cf16f31aa50e0c93af801acb1f 100644 (file)
--- a/regress/ctors.sql
+++ b/regress/ctors.sql
@@ -11,5 +11,5 @@ select ST_makeline('POINT(0 0)', 'SRID=3;POINT(1 1)');
 select ST_makebox2d('SRID=3;POINT(0 0)', 'SRID=3;POINT(1 1)');
 select ST_makebox2d('POINT(0 0)', 'SRID=3;POINT(1 1)');
 
-select ST_makebox3d('SRID=3;POINT(0 0)', 'SRID=3;POINT(1 1)');
-select ST_makebox3d('POINT(0 0)', 'SRID=3;POINT(1 1)');
+select ST_3DMakeBox('SRID=3;POINT(0 0)', 'SRID=3;POINT(1 1)');
+select ST_3DMakeBox('POINT(0 0)', 'SRID=3;POINT(1 1)');

diff --git a/regress/lwgeom_regress.sql b/regress/lwgeom_regress.sql
index 676ee10672babb60ecd02458e80b00e9c11a4cd9..14533ae487039a9d16bbfecb654f44a047bd879d 100644 (file)
--- a/regress/lwgeom_regress.sql
+++ b/regress/lwgeom_regress.sql
@@ -92,7 +92,7 @@ SELECT id,wkt FROM test_data WHERE
 
 
 SELECT ST_extent(geometry(wkb_ndr)) from test_data;
-SELECT ST_extent3d(geometry(wkb_ndr)) from test_data;
+SELECT ST_3DExtent(geometry(wkb_ndr)) from test_data;
 SELECT ST_mem_size(ST_collect(ST_force_2d(geometry(wkb_ndr)))) from test_data;
 SELECT ST_mem_size(ST_collect(ST_force_3dz(geometry(wkb_ndr)))) from test_data;
 SELECT ST_mem_size(ST_collect(ST_force_4d(ST_force_2d(geometry(wkb_ndr))))) from test_data;

diff --git a/regress/measures.sql b/regress/measures.sql
index 29fa22eb279bc18181f44ca52b8c0699d666c223..18e658ae0e7e4052db37c42a2ee71d5787b14e67 100644 (file)
--- a/regress/measures.sql
+++ b/regress/measures.sql
@@ -2,12 +2,12 @@ select '113', ST_Area2d('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)),( (0 0, 1
 
 select '114', ST_Perimeter2d('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)),( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5) ) ,( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7, 5 7, 5 5),(1 1,2 1, 2 2, 1 2, 1 1) ) )'::GEOMETRY) as value;
 
-select '115', ST_Perimeter3d('MULTIPOLYGON( ((0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0)),( (0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0),(5 5 0, 7 5 0, 7 7  0, 5 7 0, 5 5 0) ) ,( (0 0 1, 10 0 1, 10 10 1, 0 10 1, 0 0 1),(5 5 1, 7 5 1, 7 7 1, 5 7 1, 5 5 1),(1 1 1,2 1 1, 2 2 1, 1 2 1, 1 1 1) ) )'::GEOMETRY) as value;
+select '115', ST_3DPerimeter('MULTIPOLYGON( ((0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0)),( (0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0),(5 5 0, 7 5 0, 7 7  0, 5 7 0, 5 5 0) ) ,( (0 0 1, 10 0 1, 10 10 1, 0 10 1, 0 0 1),(5 5 1, 7 5 1, 7 7 1, 5 7 1, 5 5 1),(1 1 1,2 1 1, 2 2 1, 1 2 1, 1 1 1) ) )'::GEOMETRY) as value;
 
 
 select '116', ST_Length2d('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2) )'::GEOMETRY) as value;
-select '117', ST_Length3d('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2) )'::GEOMETRY) as value;
-select '118', ST_Length3d('MULTILINESTRING((0 0 0, 1 1 1),(0 0 0, 1 1 1, 2 2 2) )'::GEOMETRY) as value;
+select '117', ST_3DLength('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2) )'::GEOMETRY) as value;
+select '118', ST_3DLength('MULTILINESTRING((0 0 0, 1 1 1),(0 0 0, 1 1 1, 2 2 2) )'::GEOMETRY) as value;
 
 select '134', ST_Distance('POINT(1 2)', 'POINT(1 2)');
 select '135', ST_Distance('POINT(5 0)', 'POINT(10 12)');
@@ -26,12 +26,12 @@ select '113', ST_area2d('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)),( (0 0, 1
 
 select '114', ST_perimeter2d('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)),( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5) ) ,( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7, 5 7, 5 5),(1 1,2 1, 2 2, 1 2, 1 1) ) )'::GEOMETRY) as value;
 
-select '115', ST_perimeter3d('MULTIPOLYGON( ((0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0)),( (0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0),(5 5 0, 7 5 0, 7 7  0, 5 7 0, 5 5 0) ) ,( (0 0 1, 10 0 1, 10 10 1, 0 10 1, 0 0 1),(5 5 1, 7 5 1, 7 7 1, 5 7 1, 5 5 1),(1 1 1,2 1 1, 2 2 1, 1 2 1, 1 1 1) ) )'::GEOMETRY) as value;
+select '115', ST_3DPerimeter('MULTIPOLYGON( ((0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0)),( (0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0),(5 5 0, 7 5 0, 7 7  0, 5 7 0, 5 5 0) ) ,( (0 0 1, 10 0 1, 10 10 1, 0 10 1, 0 0 1),(5 5 1, 7 5 1, 7 7 1, 5 7 1, 5 5 1),(1 1 1,2 1 1, 2 2 1, 1 2 1, 1 1 1) ) )'::GEOMETRY) as value;
 
 
 select '116', ST_length2d('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2) )'::GEOMETRY) as value;
-select '117', ST_length3d('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2) )'::GEOMETRY) as value;
-select '118', ST_length3d('MULTILINESTRING((0 0 0, 1 1 1),(0 0 0, 1 1 1, 2 2 2) )'::GEOMETRY) as value;
+select '117', ST_3dlength('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2) )'::GEOMETRY) as value;
+select '118', ST_3dlength('MULTILINESTRING((0 0 0, 1 1 1),(0 0 0, 1 1 1, 2 2 2) )'::GEOMETRY) as value;
 
 select '134', ST_Distance('POINT(1 2)', 'POINT(1 2)');
 select '135', ST_Distance('POINT(5 0)', 'POINT(10 12)');

diff --git a/utils/new_postgis_restore.pl b/utils/new_postgis_restore.pl
index acacf911d455aa97aaf1145e350c922524df7771..12ba6ea8bb1ecd62e6cd77d815827468ec6accb9 100755 (executable)
--- a/utils/new_postgis_restore.pl
+++ b/utils/new_postgis_restore.pl
@@ -130,7 +130,7 @@ AGGREGATE   st_accum(geometry)
 AGGREGATE      st_accum_old(geometry)  
 AGGREGATE      st_collect(geometry)    
 AGGREGATE      st_extent(geometry)     
-AGGREGATE      st_extent3d(geometry)   
+AGGREGATE      ST_3DExtent(geometry)   
 AGGREGATE      st_makeline(geometry)   
 AGGREGATE      st_memcollect(geometry) 
 AGGREGATE      st_memunion(geometry)   
@@ -680,8 +680,8 @@ FUNCTION    st_isvalidreason(geometry)
 FUNCTION       st_length(geometry)     
 FUNCTION       st_length2d(geometry)   
 FUNCTION       st_length2d_spheroid(geometry, spheroid)        
-FUNCTION       st_length3d(geometry)   
-FUNCTION       st_length3d_spheroid(geometry, spheroid)        
+FUNCTION       st_3dlength(geometry)   
+FUNCTION       st_3dlength_spheroid(geometry, spheroid)        
 FUNCTION       st_length_spheroid(geometry, spheroid)  
 FUNCTION       st_line_interpolate_point(geometry, double precision)   
 FUNCTION       st_line_locate_point(geometry, geometry)        
@@ -701,7 +701,7 @@ FUNCTION    st_locate_between_measures(geometry, double precision, double precision
 FUNCTION       st_locatebetweenelevations(geometry, double precision, double precision)        
 FUNCTION       st_m(geometry)  
 FUNCTION       st_makebox2d(geometry, geometry)        
-FUNCTION       st_makebox3d(geometry, geometry)        
+FUNCTION       ST_3DMakeBox(geometry, geometry)        
 FUNCTION       st_makeline(geometry, geometry) 
 FUNCTION       st_makeline(geometry[]) 
 FUNCTION       st_makeline_garray(geometry[])  
@@ -750,7 +750,7 @@ FUNCTION    st_orderingequals(geometry, geometry)
 FUNCTION       st_overlaps(geometry, geometry) 
 FUNCTION       st_perimeter(geometry)  
 FUNCTION       st_perimeter2d(geometry)        
-FUNCTION       st_perimeter3d(geometry)        
+FUNCTION       ST_3DPerimeter(geometry)        
 FUNCTION       st_point(double precision, double precision)    
 FUNCTION       st_point_inside_circle(geometry, double precision, double precision, double precision)  
 FUNCTION       st_pointfromtext(text)