CamelCase-ize ST_ShiftLongitude, ST_CombineBbox, ST_FindExtent (#2748)

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

diff --git a/NEWS b/NEWS
index 162da5d6d6989a77e64d6d1489363bf00c802d87..c1e49979242f2fbe5a97df74695951dccc343981 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ PostGIS 2.2.0
 
  * Deprecated signatures *
 
+  - #2748, ST_Shift_Longitude renamed to ST_ShiftLongitude,
+           ST_Find_Extent renamed to ST_FindExtent,
+           ST_Combine_BBox renamed to ST_CombineBbox
   - #2769, ST_Mem_Size renamed to ST_MemSize
   - #2565, ST_SummaryStats(tablename, rastercolumn, ...)
   - #2567, ST_Count(tablename, rastercolumn, ...)

diff --git a/doc/reference_processing.xml b/doc/reference_processing.xml
index ca15d6e5230432ae08268da3e6e6f07b6702e2f4..1648929285878232f2afb1e84a49374a9f16b285 100644 (file)
--- a/doc/reference_processing.xml
+++ b/doc/reference_processing.xml
@@ -2499,7 +2499,7 @@ MULTILINESTRING((76 175,90 161),(90 161,101 150),(126 125,126 156.25)))
 
        <refentry id="ST_Shift_Longitude">
          <refnamediv>
-               <refname>ST_Shift_Longitude</refname>
+               <refname>ST_ShiftLongitude</refname>
 
                <refpurpose>Reads every point/vertex in every component of every feature
                        in a geometry, and if the longitude coordinate is &lt;0, adds 360
@@ -2510,7 +2510,7 @@ MULTILINESTRING((76 175,90 161),(90 161,101 150),(126 125,126 156.25)))
          <refsynopsisdiv>
                <funcsynopsis>
                  <funcprototype>
-                       <funcdef>geometry <function>ST_Shift_Longitude</function></funcdef>
+                       <funcdef>geometry <function>ST_ShiftLongitude</function></funcdef>
                        <paramdef><type>geometry </type> <parameter>geomA</parameter></paramdef>
                  </funcprototype>
                </funcsynopsis>
@@ -2531,6 +2531,7 @@ MULTILINESTRING((76 175,90 161),(90 161,101 150),(126 125,126 156.25)))
 
                <para>&Z_support;</para>
                <para>Enhanced: 2.0.0 support for Polyhedral surfaces and TIN was introduced.</para>
+    <para>NOTE: this function was renamed from "ST_Shift_Longitude" in 2.2.0</para>
                <para>&P_support;</para>
                <para>&T_support;</para>
          </refsection>
@@ -2540,14 +2541,14 @@ MULTILINESTRING((76 175,90 161),(90 161,101 150),(126 125,126 156.25)))
                <title>Examples</title>
 
                <programlisting>--3d points
-SELECT ST_AsEWKT(ST_Shift_Longitude(ST_GeomFromEWKT('SRID=4326;POINT(-118.58 38.38 10)'))) As geomA,
-       ST_AsEWKT(ST_Shift_Longitude(ST_GeomFromEWKT('SRID=4326;POINT(241.42 38.38 10)'))) As geomb
+SELECT ST_AsEWKT(ST_ShiftLongitude(ST_GeomFromEWKT('SRID=4326;POINT(-118.58 38.38 10)'))) As geomA,
+       ST_AsEWKT(ST_ShiftLongitude(ST_GeomFromEWKT('SRID=4326;POINT(241.42 38.38 10)'))) As geomb
 geomA                                                    geomB
 ----------                                               -----------
 SRID=4326;POINT(241.42 38.38 10) SRID=4326;POINT(-118.58 38.38 10)
 
 --regular line string
-SELECT ST_AsText(ST_Shift_Longitude(ST_GeomFromText('LINESTRING(-118.58 38.38, -118.20 38.45)')))
+SELECT ST_AsText(ST_ShiftLongitude(ST_GeomFromText('LINESTRING(-118.58 38.38, -118.20 38.45)')))
 
 st_astext
 ----------

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 5ce971221be06d50e47e86a7aa52e096d90c62ee..23c6f20611dd06b2398434ae455c2daa4dabd587 100644 (file)
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -886,12 +886,21 @@ CREATE OR REPLACE FUNCTION ST_Transscale(geometry,float8,float8,float8,float8)
                0, 0, 1,  $2 * $4, $3 * $5, 0)'
        LANGUAGE 'sql' IMMUTABLE STRICT;
 
--- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_Shift_Longitude(geometry)
+-- Availability: 2.2.0
+CREATE OR REPLACE FUNCTION ST_ShiftLongitude(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_longitude_shift'
        LANGUAGE 'c' IMMUTABLE STRICT;
 
+-- Availability: 1.2.2
+-- Deprecation in 2.2.0
+CREATE OR REPLACE FUNCTION ST_Shift_Longitude(geometry)
+       RETURNS geometry AS
+  $$ SELECT _postgis_deprecate('ST_Shift_Longitude', 'ST_ShiftLongitude', '2.2.0');
+    SELECT ST_ShiftLongitude($1);
+  $$
+       LANGUAGE 'sql' IMMUTABLE STRICT;
+
 -----------------------------------------------------------------------------
 --  BOX3D FUNCTIONS
 -----------------------------------------------------------------------------
@@ -954,13 +963,6 @@ CREATE OR REPLACE FUNCTION ST_MakeBox2d(geom1 geometry, geom2 geometry)
        AS 'MODULE_PATHNAME', 'BOX2D_construct'
        LANGUAGE 'c' IMMUTABLE STRICT;
 
-
--- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_Combine_BBox(box2d,geometry)
-       RETURNS box2d
-       AS 'MODULE_PATHNAME', 'BOX2D_combine'
-       LANGUAGE 'c' IMMUTABLE;
-
 -----------------------------------------------------------------------
 -- ST_ESTIMATED_EXTENT( <schema name>, <table name>, <column name> )
 -----------------------------------------------------------------------
@@ -1003,15 +1005,15 @@ CREATE OR REPLACE FUNCTION ST_estimated_extent(text,text) RETURNS box2d AS
 -----------------------------------------------------------------------
 -- FIND_EXTENT( <schema name>, <table name>, <column name> )
 -----------------------------------------------------------------------
--- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_find_extent(text,text,text) RETURNS box2d AS
+
+-- Availability: 2.2.0
+CREATE OR REPLACE FUNCTION ST_FindExtent(text,text,text) RETURNS box2d AS
 $$
 DECLARE
        schemaname alias for $1;
        tablename alias for $2;
        columnname alias for $3;
        myrec RECORD;
-
 BEGIN
        FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") As extent FROM "' || schemaname || '"."' || tablename || '"' LOOP
                return myrec.extent;
@@ -1020,12 +1022,20 @@ END;
 $$
 LANGUAGE 'plpgsql' IMMUTABLE STRICT;
 
+-- Availability: 1.2.2
+-- Deprecation in 2.2.0
+CREATE OR REPLACE FUNCTION ST_find_extent(text,text,text) RETURNS box2d AS
+  $$ SELECT _postgis_deprecate('ST_Find_Extent', 'ST_FindExtent', '2.2.0');
+    SELECT ST_FindExtent($1,$2,$3);
+  $$
+       LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -----------------------------------------------------------------------
 -- FIND_EXTENT( <table name>, <column name> )
 -----------------------------------------------------------------------
--- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_find_extent(text,text) RETURNS box2d AS
+
+-- Availability: 2.2.0
+CREATE OR REPLACE FUNCTION ST_FindExtent(text,text) RETURNS box2d AS
 $$
 DECLARE
        tablename alias for $1;
@@ -1040,6 +1050,13 @@ END;
 $$
 LANGUAGE 'plpgsql' IMMUTABLE STRICT;
 
+-- Availability: 1.2.2
+-- Deprecation in 2.2.0
+CREATE OR REPLACE FUNCTION ST_find_extent(text,text) RETURNS box2d AS
+  $$ SELECT _postgis_deprecate('ST_Find_Extent', 'ST_FindExtent', '2.2.0');
+    SELECT ST_FindExtent($1,$2);
+  $$
+       LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -------------------------------------------
 -- other lwgeom functions
@@ -3278,15 +3295,41 @@ CREATE OR REPLACE FUNCTION ST_DelaunayTriangles(g1 geometry, tolerance float8 DE
 --------------------------------------------------------------------------------
 
 ------------------------------------------------------------------------
--- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_Combine_BBox(box3d,geometry)
+
+-- Availability: 2.2.0
+CREATE OR REPLACE FUNCTION ST_CombineBBox(box3d,geometry)
        RETURNS box3d
        AS 'MODULE_PATHNAME', 'BOX3D_combine'
        LANGUAGE 'c' IMMUTABLE;
 
+-- Availability: 1.2.2
+-- Deprecation in 2.2.0
+CREATE OR REPLACE FUNCTION ST_Combine_BBox(box3d,geometry)
+       RETURNS box3d AS
+  $$ SELECT _postgis_deprecate('ST_Combine_BBox', 'ST_CombineBbox', '2.2.0');
+    SELECT ST_CombineBbox($1,$2);
+  $$
+       LANGUAGE 'sql' IMMUTABLE;
+
+-- Availability: 2.2.0
+CREATE OR REPLACE FUNCTION ST_CombineBbox(box2d,geometry)
+       RETURNS box2d
+       AS 'MODULE_PATHNAME', 'BOX2D_combine'
+       LANGUAGE 'c' IMMUTABLE;
+
+-- Availability: 1.2.2
+-- Deprecation in 2.2.0
+CREATE OR REPLACE FUNCTION ST_Combine_BBox(box2d,geometry)
+       RETURNS box2d AS
+  $$ SELECT _postgis_deprecate('ST_Combine_BBox', 'ST_CombineBbox', '2.2.0');
+    SELECT ST_CombineBbox($1,$2);
+  $$
+       LANGUAGE 'sql' IMMUTABLE;
+
+
 -- Availability: 1.2.2
 CREATE AGGREGATE ST_Extent(
-       sfunc = ST_combine_bbox,
+       sfunc = ST_combine_bbox, -- TODO: use ST_CombineBbox (since 2.2.0)
        finalfunc = box2d,
        basetype = geometry,
        stype = box3d
@@ -3294,7 +3337,7 @@ CREATE AGGREGATE ST_Extent(
 
 -- Availability: 2.0.0
 CREATE AGGREGATE ST_3DExtent(
-       sfunc = ST_combine_bbox,
+       sfunc = ST_combine_bbox, -- TODO: use ST_CombineBbox (since 2.2.0)
        basetype = geometry,
        stype = box3d
        );

diff --git a/regress/tickets.sql b/regress/tickets.sql
index 0dab8e3d53c6ffcaeb30edfbaca2615e04774fe4..a33003406d811a55e9d51093d177113c62996367 100644 (file)
--- a/regress/tickets.sql
+++ b/regress/tickets.sql
@@ -62,7 +62,7 @@ SELECT '#66', ST_AsText((ST_Dump(ST_GeomFromEWKT('CIRCULARSTRING(0 0,1 1,2 2)'))
 
 -- #68 --
 SELECT '#68a', ST_AsText(ST_Shift_Longitude(ST_GeomFromText('MULTIPOINT(1 3, 4 5)')));
-SELECT '#68b', ST_AsText(ST_Shift_Longitude(ST_GeomFromText('CIRCULARSTRING(1 3, 4 5, 6 7)')));
+SELECT '#68b', ST_AsText(ST_ShiftLongitude(ST_GeomFromText('CIRCULARSTRING(1 3, 4 5, 6 7)')));
 
 -- #69 --
 SELECT '#69', ST_AsText(ST_Translate(ST_GeomFromText('CIRCULARSTRING(220268 150415,220227 150505,220227 150406)'),1,2));