Putting renamed 3D-functions in legacy.sql.c and some clarifying notes about the...

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

diff --git a/doc/reference_constructor.xml b/doc/reference_constructor.xml
index 2958c763a7dd8072b378417b0c687bb3e0a1b7bf..a794792004677a3a7ceaf813b4bdcb0945090f94 100644 (file)
--- a/doc/reference_constructor.xml
+++ b/doc/reference_constructor.xml
@@ -1113,7 +1113,6 @@ WHERE the_geom && ST_SetSRID(ST_MakeBox2D(ST_Point(-989502.1875, 528439.
                <refpurpose>Creates a BOX3D defined by the given 3d point
                        geometries.</refpurpose>
          </refnamediv>
-
          <refsynopsisdiv>
                <funcsynopsis>
                  <funcprototype>
@@ -1136,6 +1135,7 @@ WHERE the_geom &amp;&amp; ST_SetSRID(ST_MakeBox2D(ST_Point(-989502.1875, 528439.
                          <imagedata fileref="images/check.png" />
                        </imageobject>
                  </inlinemediaobject> This function supports 3d and will not drop the z-index.</para>
+                <para>Changed: 2.0.0 In prior versions this used to be called ST_MakeBox3D</para>
          </refsection>
 
 

diff --git a/doc/reference_measure.xml b/doc/reference_measure.xml
index 911cbe31cf31ede15c12e2e34f6a43751ff2130a..4fd23dc09d84fd01fbb5060bc6981e724846f7d9 100644 (file)
--- a/doc/reference_measure.xml
+++ b/doc/reference_measure.xml
@@ -2769,8 +2769,8 @@ FROM (SELECT ST_GeographyFromText(
 
                <para>Returns the 3-dimensional or 2-dimensional length of the geometry if it is a
                        linestring or multi-linestring. For 2-d lines it will just return the 2-d length (same as ST_Length and ST_Length2D)</para>
-
                <para>&Z_support;</para>
+               <para>Changed: 2.0.0 In prior versions this used to be called ST_Length3D</para>
          </refsection>
 
 
@@ -2981,8 +2981,8 @@ CAST('SPHEROID["GRS_1980",6378137,298.257222101]' As spheroid) As sph_m)  as foo
 
                <note><para>Will return 0 for anything that is not a MULTILINESTRING or LINESTRING</para></note>
                <note><para>This function is just an alias for ST_Length_Spheroid. </para></note>
-
                <para>&Z_support;</para>
+               <para>Changed: 2.0.0 In prior versions this used to be called ST_Length_Spheroid3D</para>
          </refsection>
 
 
@@ -3406,8 +3406,8 @@ st_perimeter
 
                <para>Returns the 3-dimensional perimeter of the geometry, if it
                        is a polygon or multi-polygon. If the geometry is 2-dimensional, then the 2-dimensional perimeter is returned.  </para>
-
                <para>&Z_support;</para>
+               <para>Changed: 2.0.0 In prior versions this used to be called ST_Perimeter3D</para>
          </refsection>
 
 

diff --git a/doc/reference_misc.xml b/doc/reference_misc.xml
index 089eca586d6d2d5158ad0a92fbc4e9db213ddd4f..245891601a4ab542d344d7fcf67647f9b59fc898 100644 (file)
--- a/doc/reference_misc.xml
+++ b/doc/reference_misc.xml
@@ -431,6 +431,7 @@ SELECT ST_SetSRID(ST_Extent(the_geom),2249) as bextent FROM sometable;
                </note>
 
                <para>Enhanced: 2.0.0 support for Polyhedral surfaces, Triangles and TIN was introduced.</para>
+               <para>Changed: 2.0.0 In prior versions this used to be called ST_Extent3D</para>
                <para>&Z_support;</para>
                <para>&curve_support;</para>
                <para>&P_support;</para>

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index d2baa88cd7e77f2acafec5c9311129119c5345a3..d701d386a98bbd9250d40a16ce25956f6e2255ff 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -1867,3 +1867,39 @@ CREATE OR REPLACE FUNCTION geometry(chip)
 CREATE CAST (chip AS geometry) WITH FUNCTION geometry(chip) AS IMPLICIT;
 -- END CHIP --
 
+------------------------------------------------
+--Begin 3D functions --
+------------------------------------------------
+
+-- Renamed in 2.0.0 to ST_3DLength
+CREATE OR REPLACE FUNCTION ST_Length3D(geometry)
+       RETURNS FLOAT8
+       AS 'MODULE_PATHNAME', 'LWGEOM_length_linestring'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+
+-- Renamed in 2.0.0 to ST_3DLength_spheroid
+CREATE OR REPLACE FUNCTION ST_Length_spheroid3D(geometry, spheroid)
+       RETURNS FLOAT8
+       AS 'MODULE_PATHNAME','LWGEOM_length_ellipsoid_linestring'
+       LANGUAGE 'C' IMMUTABLE STRICT
+       COST 100;
+       
+-- Renamed in 2.0.0 to ST_3DPerimeter
+CREATE OR REPLACE FUNCTION ST_Perimeter3D(geometry)
+       RETURNS FLOAT8
+       AS 'MODULE_PATHNAME', 'LWGEOM_perimeter_poly'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+
+-- Renamed in 2.0.0 to ST_3DMakeBox
+CREATE OR REPLACE FUNCTION ST_MakeBox3D(geometry, geometry)
+       RETURNS box3d
+       AS 'MODULE_PATHNAME', 'BOX3D_construct'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+
+-- Renamed in 2.0.0 to ST_3DExtent
+CREATE AGGREGATE ST_Extent3D(
+       sfunc = ST_combine_bbox,
+       basetype = geometry,
+       stype = box3d
+       );
+--END 3D functions--

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 171113293f10d8662f727e450ba89d0fff93b103..e5436897175fc72dba3761aa620e1c8325a56767 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -1046,7 +1046,7 @@ CREATE OR REPLACE FUNCTION ST_nrings(geometry)
 ------------------------------------------------------------------------\r
 -- Misures\r
 ------------------------------------------------------------------------\r
--- Availability: 1.2.2\r
+-- Availability: 2.0.0\r
 CREATE OR REPLACE FUNCTION ST_3DLength(geometry)\r
        RETURNS FLOAT8\r
        AS 'MODULE_PATHNAME', 'LWGEOM_length_linestring'\r
@@ -1066,7 +1066,7 @@ CREATE OR REPLACE FUNCTION ST_Length(geometry)
 \r
 -- this is a fake (for back-compatibility)\r
 -- uses 3d if 3d is available, 2d otherwise\r
--- Availability: 1.2.2\r
+-- Availability: 2.0.0\r
 CREATE OR REPLACE FUNCTION ST_3DLength_spheroid(geometry, spheroid)\r
        RETURNS FLOAT8\r
        AS 'MODULE_PATHNAME','LWGEOM_length_ellipsoid_linestring'\r
@@ -1087,7 +1087,7 @@ CREATE OR REPLACE FUNCTION ST_length2d_spheroid(geometry, spheroid)
        LANGUAGE 'C' IMMUTABLE STRICT\r
        COST 100;\r
 \r
--- Availability: 1.2.2\r
+-- Availability: 2.0.0\r
 CREATE OR REPLACE FUNCTION ST_3DPerimeter(geometry)\r
        RETURNS FLOAT8\r
        AS 'MODULE_PATHNAME', 'LWGEOM_perimeter_poly'\r
@@ -1356,7 +1356,7 @@ CREATE OR REPLACE FUNCTION ST_MakePointM(float8, float8, float8)
        AS 'MODULE_PATHNAME', 'LWGEOM_makepoint3dm'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Availability: 1.2.2\r
+-- Availability: 2.0.0\r
 CREATE OR REPLACE FUNCTION ST_3DMakeBox(geometry, geometry)\r
        RETURNS box3d\r
        AS 'MODULE_PATHNAME', 'BOX3D_construct'\r
@@ -1611,7 +1611,7 @@ CREATE OR REPLACE FUNCTION ST_Combine_BBox(box3d,geometry)
        AS 'MODULE_PATHNAME', 'BOX3D_combine'\r
        LANGUAGE 'C' IMMUTABLE;\r
 \r
--- Availability: 1.2.2\r
+-- Availability: 2.0.0\r
 CREATE AGGREGATE ST_3DExtent(\r
        sfunc = ST_combine_bbox,\r
        basetype = geometry,\r