Changeset 4124

Timestamp:

06/02/09 15:28:23 (3 years ago)

Author:

pracine

Message:

[wktraster] Fixed ticket 151. Changed rt_ prefixes to st_ prefix to ensure seemless integration with geometry functions.

Files:

• spike/wktraster/rt_pg/rtpostgis.sql.in.c (modified) (21 diffs)

spike/wktraster/rt_pg/rtpostgis.sql.in.c

@@ -37 +37 @@
 ------------------------------------------------------------------------------
 
-CREATEFUNCTION rt_raster_in(cstring)
+CREATEFUNCTION st_raster_in(cstring)
     RETURNS raster
     AS 'MODULE_PATHNAME','RASTER_in'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_raster_out(raster)
+CREATEFUNCTION st_raster_out(raster)
     RETURNS cstring
     AS 'MODULE_PATHNAME','RASTER_out'
@@ -50 +50 @@
     alignment = double,
     internallength = variable,
-    input = rt_raster_in,
-    output = rt_raster_out,
+    input = st_raster_in,
+    output = st_raster_out,
     storage = extended
 );
@@ -59 +59 @@
 ------------------------------------------------------------------------------
 
-CREATEFUNCTION rt_lib_version()
+CREATEFUNCTION st_lib_version()
     RETURNS text
     AS 'MODULE_PATHNAME', 'RASTER_lib_version'
     LANGUAGE 'C' IMMUTABLE; -- a new lib will require a new session
 
-CREATEFUNCTION rt_lib_build_date()
+CREATEFUNCTION st_lib_build_date()
     RETURNS text
     AS 'MODULE_PATHNAME', 'RASTER_lib_build_date'
     LANGUAGE 'C' IMMUTABLE; -- a new lib will require a new session
 
-CREATEFUNCTION rt_bytea(raster)
+CREATEFUNCTION st_bytea(raster)
     RETURNS bytea
     AS 'MODULE_PATHNAME', 'RASTER_to_bytea'
     LANGUAGE 'C' IMMUTABLE;
 
-CREATEFUNCTION rt_raster_to_box2d(raster)
+CREATEFUNCTION st_raster_to_box2d(raster)
     RETURNS BOX2D
     AS 'MODULE_PATHNAME','RASTER_to_BOX2DFLOAT4'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_raster_envelope(raster)
+CREATEFUNCTION st_raster_envelope(raster)
     RETURNS GEOMETRY
     AS 'MODULE_PATHNAME','RASTER_envelope'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_srid(raster)
+CREATEFUNCTION st_srid(raster)
     RETURNS integer
     AS 'MODULE_PATHNAME','RASTER_getSRID'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_width(raster)
+CREATEFUNCTION st_width(raster)
     RETURNS integer
     AS 'MODULE_PATHNAME','RASTER_getWidth'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_height(raster)
+CREATEFUNCTION st_height(raster)
     RETURNS integer
     AS 'MODULE_PATHNAME','RASTER_getHeight'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_pixelsizex(raster)
+CREATEFUNCTION st_pixelsizex(raster)
     RETURNS float8
     AS 'MODULE_PATHNAME','RASTER_getXPixelSize'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_pixelsizey(raster)
+CREATEFUNCTION st_pixelsizey(raster)
     RETURNS float8
     AS 'MODULE_PATHNAME','RASTER_getYPixelSize'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_rotationx(raster)
+CREATEFUNCTION st_rotationx(raster)
     RETURNS float8
     AS 'MODULE_PATHNAME','RASTER_getXRotation'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_rotationy(raster)
+CREATEFUNCTION st_rotationy(raster)
     RETURNS float8
     AS 'MODULE_PATHNAME','RASTER_getYRotation'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_upperleftx(raster)
+CREATEFUNCTION st_upperleftx(raster)
     RETURNS float8
     AS 'MODULE_PATHNAME','RASTER_getXUpperLeft'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_upperlefty(raster)
+CREATEFUNCTION st_upperlefty(raster)
     RETURNS float8
     AS 'MODULE_PATHNAME','RASTER_getYUpperLeft'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_gdalgeotransform(raster)
+CREATEFUNCTION st_gdalgeotransform(raster)
     RETURNS TEXT
     AS 'MODULE_PATHNAME','RASTER_getGDALGeoTransform'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_esriworldfile(raster) RETURNS text AS
+CREATEFUNCTION st_esriworldfile(raster) RETURNS text AS
 $$
 DECLARE
@@ -141 +141 @@
         result text;
 BEGIN
-        SELECT rt_pixelsizex(rast)::numeric INTO x;
+        SELECT st_pixelsizex(rast)::numeric INTO x;
         result = trunc(x, 10) || E'\n';
 
-        SELECT rt_rotationy(rast)::numeric INTO x;
+        SELECT st_rotationy(rast)::numeric INTO x;
         result = result || trunc(x, 10) || E'\n';
 
-        SELECT rt_rotationx(rast)::numeric INTO x;
+        SELECT st_rotationx(rast)::numeric INTO x;
         result = result || trunc(x, 10) || E'\n';
 
-        SELECT rt_pixelsizey(rast)::numeric INTO x;
+        SELECT st_pixelsizey(rast)::numeric INTO x;
         result = result || trunc(x, 10) || E'\n';
 
-        SELECT (rt_upperleftx(rast) + rt_pixelsizex(rast)*0.5 + rt_rotationx(rast)*0.5)::numeric INTO x;
+        SELECT (st_upperleftx(rast) + st_pixelsizex(rast)*0.5 + st_rotationx(rast)*0.5)::numeric INTO x;
         result = result || trunc(x, 10) || E'\n';
 
-        SELECT (rt_upperlefty(rast) + rt_pixelsizey(rast)*0.5 + rt_rotationy(rast)*0.5)::numeric INTO x;
+        SELECT (st_upperlefty(rast) + st_pixelsizey(rast)*0.5 + st_rotationy(rast)*0.5)::numeric INTO x;
         result = result || trunc(x, 10) || E'\n';
 
@@ -165 +165 @@
 
 
-CREATEFUNCTION rt_numbands(raster)
+CREATEFUNCTION st_numbands(raster)
     RETURNS integer
     AS 'MODULE_PATHNAME','RASTER_getNumBands'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_bandpixeltype(raster, integer)
+CREATEFUNCTION st_bandpixeltype(raster, integer)
     RETURNS text
     AS 'MODULE_PATHNAME','RASTER_getBandPixelTypeName'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_bandnodatavalue(raster, integer)
+CREATEFUNCTION st_bandnodatavalue(raster, integer)
     RETURNS float4
     AS 'MODULE_PATHNAME','RASTER_getBandNoDataValue'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_bandpath(raster, integer)
+CREATEFUNCTION st_bandpath(raster, integer)
     RETURNS text
     AS 'MODULE_PATHNAME','RASTER_getBandPath'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_value(raster, integer, integer, integer)
+CREATEFUNCTION st_value(raster, integer, integer, integer)
     RETURNS float8
     AS 'MODULE_PATHNAME','RASTER_getPixelValue'
@@ -191 +191 @@
 
 -- TODO: To be implemented
-CREATEFUNCTION rt_setvalue(raster, integer, integer, integer, float8)
+CREATEFUNCTION st_setvalue(raster, integer, integer, integer, float8)
     RETURNS float8
     AS 'MODULE_PATHNAME','RASTER_setPixelValue'
     LANGUAGE 'C' _IMMUTABLE_STRICT;
 --
--- rt_MakeEmptyRaster( <width>, <height>, <ipx>, <ipy>,
+-- st_MakeEmptyRaster( <width>, <height>, <ipx>, <ipy>,
 --                                        <scalex>, <scaley>,
 --                                        <skewx>, <skewy>,
 --                                        <srid>)
 --
-CREATEFUNCTION rt_MakeEmptyRaster(int, int, float8, float8, float8, float8, float8, float8, int4)
+CREATEFUNCTION st_MakeEmptyRaster(int, int, float8, float8, float8, float8, float8, float8, int4)
     RETURNS RASTER
     AS 'MODULE_PATHNAME', 'RASTER_makeEmpty'
@@ -211 +211 @@
 
 CREATE CAST (raster AS box2d)
-    WITH FUNCTION rt_raster_to_box2d(raster) AS IMPLICIT;
+    WITH FUNCTION st_raster_to_box2d(raster) AS IMPLICIT;
 
 CREATE CAST (raster AS geometry)
-    WITH FUNCTION rt_raster_envelope(raster) AS IMPLICIT;
+    WITH FUNCTION st_raster_envelope(raster) AS IMPLICIT;
 
 CREATE CAST (raster AS bytea)
-    WITH FUNCTION rt_bytea(raster) AS IMPLICIT;
+    WITH FUNCTION st_bytea(raster) AS IMPLICIT;
 
 ------------------------------------------------------------------------------
@@ -223 +223 @@
 ------------------------------------------------------------------------------
 
-CREATEFUNCTION rt_overleft(raster, raster)
+CREATEFUNCTION st_overleft(raster, raster)
     RETURNS bool
     AS 'select geometry_overleft($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_overright(raster, raster)
+CREATEFUNCTION st_overright(raster, raster)
     RETURNS bool
     AS 'select geometry_overright($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_left(raster, raster)
+CREATEFUNCTION st_left(raster, raster)
     RETURNS bool
     AS 'select geometry_left($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_right(raster, raster)
+CREATEFUNCTION st_right(raster, raster)
     RETURNS bool
     AS 'select geometry_right($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_overabove(raster, raster)
+CREATEFUNCTION st_overabove(raster, raster)
     RETURNS bool
     AS 'select geometry_overabove($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_overbelow(raster, raster)
+CREATEFUNCTION st_overbelow(raster, raster)
     RETURNS bool
     AS 'select geometry_overbelow($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_above(raster, raster)
+CREATEFUNCTION st_above(raster, raster)
     RETURNS bool
     AS 'select geometry_above($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_below(raster, raster)
+CREATEFUNCTION st_below(raster, raster)
     RETURNS bool
     AS 'select geometry_below($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_same(raster, raster)
+CREATEFUNCTION st_same(raster, raster)
     RETURNS bool
     AS 'select geometry_same($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_contained(raster, raster)
+CREATEFUNCTION st_contained(raster, raster)
     RETURNS bool
     AS 'select geometry_contained($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_contain(raster, raster)
+CREATEFUNCTION st_contain(raster, raster)
     RETURNS bool
     AS 'select geometry_contain($1::geometry, $2::geometry)'
     LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
-CREATEFUNCTION rt_overlap(raster, raster)
+CREATEFUNCTION st_overlap(raster, raster)
     RETURNS bool
     AS 'select geometry_overlap($1::geometry, $2::geometry)'
@@ -288 +288 @@
 
 CREATE OPERATOR << (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_left,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_left,
    COMMUTATOR = '>>',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -294 +294 @@
 
 CREATE OPERATOR &< (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_overleft,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overleft,
    COMMUTATOR = '&>',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -300 +300 @@
 
 CREATE OPERATOR <<| (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_below,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_below,
    COMMUTATOR = '|>>',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -306 +306 @@
 
 CREATE OPERATOR &<| (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_overbelow,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overbelow,
    COMMUTATOR = '|&>',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -312 +312 @@
 
 CREATE OPERATOR && (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_overlap,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overlap,
    COMMUTATOR = '&&',
    RESTRICT = postgis_gist_sel, JOIN = postgis_gist_joinsel
@@ -318 +318 @@
 
 CREATE OPERATOR &> (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_overright,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overright,
    COMMUTATOR = '&<',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -324 +324 @@
 
 CREATE OPERATOR >> (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_right,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_right,
    COMMUTATOR = '<<',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -330 +330 @@
 
 CREATE OPERATOR |&> (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_overabove,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overabove,
    COMMUTATOR = '&<|',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -336 +336 @@
 
 CREATE OPERATOR |>> (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_above,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_above,
    COMMUTATOR = '<<|',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -342 +342 @@
 
 CREATE OPERATOR ~= (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_same,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_same,
    COMMUTATOR = '~=',
    RESTRICT = eqsel, JOIN = eqjoinsel
@@ -348 +348 @@
 
 CREATE OPERATOR @ (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_contained,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_contained,
    COMMUTATOR = '~',
    RESTRICT = contsel, JOIN = contjoinsel
@@ -354 +354 @@
 
 CREATE OPERATOR ~ (
-   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = rt_contain,
+   LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_contain,
    COMMUTATOR = '@',
    RESTRICT = contsel, JOIN = contjoinsel
@@ -678 +678 @@
         || ' ADD CONSTRAINT '
         || quote_ident('enforce_srid_' || p_column_name)
-        || ' CHECK (RT_SRID(' || quote_ident(p_column_name)
+        || ' CHECK (ST_SRID(' || quote_ident(p_column_name)
         || ') = ' || p_srid::text || ')';
     RAISE DEBUG '%', sql;