Changeset 2616

Timestamp:

06/04/07 16:06:28 (5 years ago)

Author:

mleslie

Message:

Added versions of functions with standard ST (Spatial Type) prefixes to any functions that were lacking them. Updated the regression tests to include the new functions.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• lwgeom/lwpostgis.sql.in (modified) (314 diffs)
• lwgeom/sqlmm.sql.in (modified) (2 diffs)
• regress/affine_expected (modified) (1 diff)
• regress/affine.sql (modified) (1 diff)
• regress/ctors_expected (modified) (1 diff)
• regress/ctors.sql (modified) (1 diff)
• regress/kml_expected (modified) (1 diff)
• regress/kml.sql (modified) (1 diff)
• regress/lwgeom_regress_expected (modified) (1 diff)
• regress/lwgeom_regress.sql (modified) (1 diff)
• regress/measures_expected (modified) (1 diff)
• regress/measures.sql (modified) (3 diffs)
• regress/regress_bdpoly_expected (modified) (1 diff)
• regress/regress_bdpoly.sql (modified) (1 diff)
• regress/regress_expected (modified) (2 diffs)
• regress/regress_index.sql (modified) (1 diff)
• regress/regress_lrs_expected (modified) (1 diff)
• regress/regress_lrs.sql (modified) (1 diff)
• regress/regress_ogc_expected (modified) (1 diff)
• regress/regress_ogc.sql (modified) (1 diff)
• regress/regress_proj_expected (modified) (1 diff)
• regress/regress_proj.sql (modified) (1 diff)
• regress/regress.sql (modified) (5 diffs)
• regress/removepoint_expected (modified) (1 diff)
• regress/removepoint.sql (modified) (1 diff)
• regress/setpoint_expected (modified) (1 diff)
• regress/setpoint.sql (modified) (1 diff)
• regress/simplify_expected (modified) (1 diff)
• regress/simplify.sql (modified) (1 diff)
• regress/snaptogrid_expected (modified) (1 diff)
• regress/snaptogrid.sql (modified) (1 diff)
• regress/sql-mm-circularstring_expected (modified) (2 diffs)
• regress/sql-mm-circularstring.sql (modified) (2 diffs)
• regress/sql-mm-compoundcurve_expected (modified) (2 diffs)
• regress/sql-mm-compoundcurve.sql (modified) (2 diffs)
• regress/sql-mm-curvepoly_expected (modified) (2 diffs)
• regress/sql-mm-curvepoly.sql (modified) (2 diffs)
• regress/sql-mm-multicurve_expected (modified) (2 diffs)
• regress/sql-mm-multicurve.sql (modified) (2 diffs)
• regress/sql-mm-multisurface_expected (modified) (2 diffs)
• regress/sql-mm-multisurface.sql (modified) (6 diffs)
• regress/sql-mm-serialize.sql (modified) (1 diff)
• regress/wkt.sql (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-06-04 Mark Leslie <mleslie@refractions.net>
+
+        * lwgeom/lwpostgis.sql.in, lwgeom/sqlmm.sql.in:
+          Added ST_ prefixed function versions where they were lacking.
+        * regress:
+          Added tests for the new function names.
+
 2007-05-25 Mark Leslie <mleslie@refractions.net>
 

trunk/lwgeom/lwpostgis.sql.in

@@ -36 +36 @@
 #endif
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION histogram2d_in(HISTOGRAM_OUT_REP)
         RETURNS HISTOGRAM_IN_REP
@@ -41 +42 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_histogram2d_in(HISTOGRAM_OUT_REP)
+        RETURNS HISTOGRAM_IN_REP
+        AS '@MODULE_FILENAME@', 'lwhistogram2d_in'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION histogram2d_out(HISTOGRAM_IN_REP)
         RETURNS HISTOGRAM_OUT_REP
@@ -46 +54 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_histogram2d_out(HISTOGRAM_IN_REP)
+        RETURNS HISTOGRAM_OUT_REP
+        AS '@MODULE_FILENAME@', 'lwhistogram2d_out'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 CREATE TYPE histogram2d (
         alignment = double,
         internallength = variable,
-        input = histogram2d_in,
-        output = histogram2d_out,
+        input = ST_histogram2d_in,
+        output = ST_histogram2d_out,
         storage = main
 );
@@ -66 +80 @@
 #endif
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION spheroid_in(SPHEROID_OUT_REP)
         RETURNS SPHEROID_IN_REP
@@ -71 +86 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_spheroid_in(SPHEROID_OUT_REP)
+        RETURNS SPHEROID_IN_REP
+        AS '@MODULE_FILENAME@','ellipsoid_in'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION spheroid_out(SPHEROID_IN_REP)
         RETURNS SPHEROID_OUT_REP
@@ -76 +98 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_spheroid_out(SPHEROID_IN_REP)
+        RETURNS SPHEROID_OUT_REP
+        AS '@MODULE_FILENAME@','ellipsoid_out'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 CREATE TYPE spheroid (
         alignment = double,
         internallength = 65,
-        input = spheroid_in,
-        output = spheroid_out
+        input = ST_spheroid_in,
+        output = ST_spheroid_out
 );
 
@@ -95 +123 @@
 #endif
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_in(GEOMETRY_OUT_REP)
         RETURNS geometry
@@ -100 +129 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_in(GEOMETRY_OUT_REP)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_in'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_out(GEOMETRY_IN_REP)
         RETURNS cstring
@@ -105 +141 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_out(GEOMETRY_IN_REP)
+        RETURNS cstring
+        AS '@MODULE_FILENAME@','LWGEOM_out'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 #if USE_VERSION >= 80
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_analyze(internal)
         RETURNS bool
         AS '@MODULE_FILENAME@', 'LWGEOM_analyze'
         LANGUAGE 'C' _VOLATILE_STRICT; -- WITH (isstrict);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_analyze(internal)
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_analyze'
+        LANGUAGE 'C' _VOLATILE_STRICT; -- WITH (isstrict);
 #endif
 
 #if USE_VERSION > 73
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_recv(internal)
         RETURNS geometry
@@ -118 +168 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_recv(internal)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_recv'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_send(geometry)
         RETURNS bytea
         AS '@MODULE_FILENAME@','LWGEOM_send'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_send(geometry)
+        RETURNS bytea
+        AS '@MODULE_FILENAME@','LWGEOM_send'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 #endif
-
 
 CREATE TYPE geometry (
         internallength = variable,
-        input = geometry_in,
-        output = geometry_out,
+        input = ST_geometry_in,
+        output = ST_geometry_out,
 #if USE_VERSION > 73
-        send = geometry_send,
-        receive = geometry_recv,
+        send = ST_geometry_send,
+        receive = ST_geometry_recv,
 #endif
         delimiter = ':',
 #if USE_VERSION >= 80
-        analyze = geometry_analyze,
+        analyze = ST_geometry_analyze,
 #endif 
         storage = main
@@ -145 +207 @@
 
 -- Availability: 1.1.2
+-- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Affine(geometry,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8)
         RETURNS geometry
@@ -150 +213 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATE OR REPLACE FUNCTION ST_Affine(geometry,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_affine'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; 
+
 -- Availability: 1.1.2
+-- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Affine(geometry,float8,float8,float8,float8,float8,float8)
         RETURNS geometry
@@ -156 +226 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATE OR REPLACE FUNCTION ST_Affine(geometry,float8,float8,float8,float8,float8,float8)
+        RETURNS geometry
+        AS 'SELECT affine($1,  $2, $3, 0,  $4, $5, 0,  0, 0, 1,  $6, $7, 0)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
+
 -- Availability: 1.1.2
+-- Deprecation in 1.2.3
 CREATEFUNCTION RotateZ(geometry,float8)
         RETURNS geometry
@@ -162 +239 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_RotateZ(geometry,float8)
+        RETURNS geometry
+        AS 'SELECT affine($1,  cos($2), -sin($2), 0,  sin($2), cos($2), 0,  0, 0, 1,  0, 0, 0)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
+
 -- Availability: 1.1.2
+-- Deprecation in 1.2.3
 CREATEFUNCTION Rotate(geometry,float8)
         RETURNS geometry
@@ -168 +252 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Rotate(geometry,float8)
+        RETURNS geometry
+        AS 'SELECT rotateZ($1, $2)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
+
 -- Availability: 1.1.2
+-- Deprecation in 1.2.3
 CREATEFUNCTION RotateX(geometry,float8)
         RETURNS geometry
@@ -174 +265 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_RotateX(geometry,float8)
+        RETURNS geometry
+        AS 'SELECT affine($1, 1, 0, 0, 0, cos($2), -sin($2), 0, sin($2), cos($2), 0, 0, 0)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
+
 -- Availability: 1.1.2
+-- Deprecation in 1.2.3
 CREATEFUNCTION RotateY(geometry,float8)
         RETURNS geometry
@@ -180 +278 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_RotateY(geometry,float8)
+        RETURNS geometry
+        AS 'SELECT affine($1,  cos($2), 0, sin($2),  0, 1, 0,  -sin($2), 0, cos($2), 0,  0, 0)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION Translate(geometry,float8,float8,float8)
         RETURNS geometry
@@ -185 +290 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Translate(geometry,float8,float8,float8)
+        RETURNS geometry
+        AS 'SELECT affine($1, 1, 0, 0, 0, 1, 0, 0, 0, 1, $2, $3, $4)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION Translate(geometry,float8,float8)
         RETURNS geometry
@@ -190 +302 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Translate(geometry,float8,float8)
+        RETURNS geometry
+        AS 'SELECT translate($1, $2, $3, 0)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT;
+
 -- Availability: 1.1.0
+-- Deprecation in 1.2.3
 CREATEFUNCTION Scale(geometry,float8,float8,float8)
         RETURNS geometry
@@ -196 +315 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Scale(geometry,float8,float8,float8)
+        RETURNS geometry
+        AS 'SELECT affine($1,  $2, 0, 0,  0, $3, 0,  0, 0, $4,  0, 0, 0)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
+
 -- Availability: 1.1.0
+-- Deprecation in 1.2.3
 CREATEFUNCTION Scale(geometry,float8,float8)
         RETURNS geometry
@@ -202 +328 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Scale(geometry,float8,float8)
+        RETURNS geometry
+        AS 'SELECT scale($1, $2, $3, 1)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; 
+
 -- Availability: 1.1.0 
+-- Deprecation in 1.2.3
 CREATEFUNCTION transscale(geometry,float8,float8,float8,float8)
         RETURNS geometry
@@ -209 +342 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT;
 
+-- Availability: 1.2.2 
+CREATEFUNCTION ST_transscale(geometry,float8,float8,float8,float8)
+        RETURNS geometry
+        AS 'SELECT affine($1,  $4, 0, 0,  0, $5, 0, 
+                0, 0, 1,  $2 * $4, $3 * $5, 0)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT;
+
 -- Availability: 1.1.0
+-- Deprecation in 1.2.3
 CREATEFUNCTION shift_longitude(geometry)
         RETURNS geometry
@@ -215 +356 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; 
 
-
-        
+-- Availability: 1.2.2
+CREATEFUNCTION ST_shift_longitude(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_longitude_shift'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; 
+
 -------------------------------------------------------------------
 --  BOX3D TYPE
@@ -229 +374 @@
 #endif
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION box3d_in(BOX3D_OUT_REP)
         RETURNS BOX3D_IN_REP
@@ -234 +380 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION box3d_out(BOX3D_IN_REP)
         RETURNS BOX3D_OUT_REP
@@ -239 +386 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box3d_in(BOX3D_OUT_REP)
+        RETURNS BOX3D_IN_REP
+        AS '@MODULE_FILENAME@', 'BOX3D_in'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box3d_out(BOX3D_IN_REP)
+        RETURNS BOX3D_OUT_REP
+        AS '@MODULE_FILENAME@', 'BOX3D_out'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 CREATE TYPE box3d (
         alignment = double,
         internallength = 48,
-        input = box3d_in,
-        output = box3d_out
+        input = ST_box3d_in,
+        output = ST_box3d_out
 );
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION xmin(box3d)
         RETURNS FLOAT8
@@ -251 +411 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_xmin(box3d)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','BOX3D_xmin'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION ymin(box3d)
         RETURNS FLOAT8
@@ -256 +423 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_ymin(box3d)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','BOX3D_ymin'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION zmin(box3d)
         RETURNS FLOAT8
@@ -261 +435 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_zmin(box3d)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','BOX3D_zmin'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION xmax(box3d)
         RETURNS FLOAT8
@@ -266 +447 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_xmax(box3d)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','BOX3D_xmax'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION ymax(box3d)
         RETURNS FLOAT8
@@ -271 +459 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_ymax(box3d)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','BOX3D_ymax'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION zmax(box3d)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','BOX3D_zmax'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_zmax(box3d)
         RETURNS FLOAT8
         AS '@MODULE_FILENAME@','BOX3D_zmax'
@@ -288 +489 @@
 #endif
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION chip_in(CHIP_OUT_REP)
         RETURNS CHIP_IN_REP
         AS '@MODULE_FILENAME@','CHIP_in'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
-
+        
+-- Availability: 1.2.2
+CREATEFUNCTION ST_chip_in(CHIP_OUT_REP)
+        RETURNS CHIP_IN_REP
+        AS '@MODULE_FILENAME@','CHIP_in'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION chip_out(CHIP_IN_REP)
         RETURNS CHIP_OUT_REP
@@ -298 +507 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_chip_out(CHIP_IN_REP)
+        RETURNS CHIP_OUT_REP
+        AS '@MODULE_FILENAME@','CHIP_out'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 CREATE TYPE chip (
         alignment = double,
         internallength = variable,
-        input = chip_in,
-        output = chip_out,
+        input = ST_chip_in,
+        output = ST_chip_out,
         storage = extended
 );
@@ -319 +534 @@
 #endif
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_in(BOX2D_OUT_REP)
         RETURNS box2d
@@ -324 +540 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_in(BOX2D_OUT_REP)
+        RETURNS box2d
+        AS '@MODULE_FILENAME@','BOX2DFLOAT4_in'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_out(BOX2D_IN_REP)
         RETURNS cstring
@@ -329 +552 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_out(BOX2D_IN_REP)
+        RETURNS cstring
+        AS '@MODULE_FILENAME@','BOX2DFLOAT4_out'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 CREATE TYPE box2d (
         internallength = 16,
-        input = box2d_in,
-        output = box2d_out,
+        input = ST_box2d_in,
+        output = ST_box2d_out,
         storage = plain
 );
@@ -338 +567 @@
 ---- BOX2D  support functions
 
-
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_overleft(box2d, box2d) 
         RETURNS bool
@@ -344 +573 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_overleft(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_overleft'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_overright(box2d, box2d) 
         RETURNS bool
@@ -349 +585 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_overright(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_overright' 
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_left(box2d, box2d) 
         RETURNS bool
@@ -354 +597 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_left(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_left' 
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_right(box2d, box2d) 
         RETURNS bool
@@ -359 +609 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_right(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_right' 
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_contain(box2d, box2d) 
         RETURNS bool
@@ -364 +621 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_contain(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_contain'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_contained(box2d, box2d) 
         RETURNS bool
@@ -369 +633 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_contained(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_contained'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_overlap(box2d, box2d) 
         RETURNS bool
@@ -374 +645 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_overlap(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_overlap'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_same(box2d, box2d) 
         RETURNS bool
@@ -379 +657 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_same(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_same'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d_intersects(box2d, box2d) 
         RETURNS bool
@@ -384 +669 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d_intersects(box2d, box2d) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'BOX2D_intersects'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+
 -- lwgeom  operator support functions
 
@@ -390 +682 @@
 -------------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_lt(geometry, geometry) 
         RETURNS bool
@@ -395 +688 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_lt(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'lwgeom_lt'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_le(geometry, geometry) 
         RETURNS bool
@@ -400 +700 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_le(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'lwgeom_le'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_gt(geometry, geometry) 
         RETURNS bool
@@ -405 +712 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_gt(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'lwgeom_gt'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_ge(geometry, geometry) 
         RETURNS bool
@@ -410 +724 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_ge(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'lwgeom_ge'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_eq(geometry, geometry) 
         RETURNS bool
@@ -415 +736 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_eq(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'lwgeom_eq'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_cmp(geometry, geometry) 
         RETURNS integer
@@ -420 +748 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_cmp(geometry, geometry) 
+        RETURNS integer
+        AS '@MODULE_FILENAME@', 'lwgeom_cmp'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 --
 -- Sorting operators for Btree
@@ -425 +759 @@
 
 CREATE OPERATOR < (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_lt,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_lt,
    COMMUTATOR = '>', NEGATOR = '>=',
    RESTRICT = contsel, JOIN = contjoinsel
@@ -431 +765 @@
 
 CREATE OPERATOR <= (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_le,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_le,
    COMMUTATOR = '>=', NEGATOR = '>',
    RESTRICT = contsel, JOIN = contjoinsel
@@ -437 +771 @@
 
 CREATE OPERATOR = (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_eq,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_eq,
    COMMUTATOR = '=', -- we might implement a faster negator here
    RESTRICT = contsel, JOIN = contjoinsel
@@ -443 +777 @@
 
 CREATE OPERATOR >= (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_ge,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_ge,
    COMMUTATOR = '<=', NEGATOR = '<',
    RESTRICT = contsel, JOIN = contjoinsel
 );
 CREATE OPERATOR > (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_gt,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_gt,
    COMMUTATOR = '<', NEGATOR = '<=',
    RESTRICT = contsel, JOIN = contjoinsel
@@ -470 +804 @@
 -- GiST indexes
 -------------------------------------------------------------------
+-- Deprecation in 1.2.3
 #if USE_VERSION < 73
 CREATEFUNCTION postgis_gist_sel(opaque, oid,  opaque, int4)
@@ -479 +814 @@
         LANGUAGE 'C';
 
+-- Availability: 1.2.2
+#if USE_VERSION < 73
+CREATEFUNCTION ST_postgis_gist_sel(opaque, oid,  opaque, int4)
+#else
+CREATEFUNCTION ST_postgis_gist_sel (internal, oid, internal, int4)
+#endif
+        RETURNS float8
+        AS '@MODULE_FILENAME@', 'LWGEOM_gist_sel'
+        LANGUAGE 'C';
+
+-- Deprecation in 1.2.3
 #if USE_VERSION == 72
 CREATEFUNCTION postgis_gist_joinsel(opaque, oid,  opaque)
@@ -490 +836 @@
         LANGUAGE 'C';
 
+-- Availability: 1.2.2
+#if USE_VERSION == 72
+CREATEFUNCTION ST_postgis_gist_joinsel(opaque, oid,  opaque)
+#elif USE_VERSION == 73
+CREATEFUNCTION ST_postgis_gist_joinsel(internal, oid,  internal)
+#else
+CREATEFUNCTION ST_postgis_gist_joinsel(internal, oid, internal, smallint)
+#endif
+        RETURNS float8
+        AS '@MODULE_FILENAME@', 'LWGEOM_gist_joinsel'
+        LANGUAGE 'C';
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_overleft(geometry, geometry) 
         RETURNS bool
@@ -495 +854 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_overleft(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_overleft'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_overright(geometry, geometry) 
         RETURNS bool
@@ -500 +866 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_overright(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_overright'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_overabove(geometry, geometry) 
         RETURNS bool
@@ -505 +878 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_overabove(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_overabove'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_overbelow(geometry, geometry) 
         RETURNS bool
@@ -510 +890 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_overbelow(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_overbelow'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_left(geometry, geometry) 
         RETURNS bool
@@ -515 +902 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_left(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_left'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_right(geometry, geometry) 
         RETURNS bool
@@ -520 +914 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_right(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_right'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_above(geometry, geometry) 
         RETURNS bool
@@ -525 +926 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_above(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_above'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_below(geometry, geometry) 
         RETURNS bool
@@ -530 +938 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_below(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_below'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_contain(geometry, geometry) 
         RETURNS bool
@@ -535 +950 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_contain(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_contain'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_contained(geometry, geometry) 
         RETURNS bool
@@ -540 +962 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_contained(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_contained'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_overlap(geometry, geometry) 
         RETURNS bool
@@ -545 +974 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry_overlap(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_overlap'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry_same(geometry, geometry) 
         RETURNS bool
@@ -550 +986 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+--Availability: 1.2.2
+CREATEFUNCTION ST_geometry_same(geometry, geometry) 
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_same'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- GEOMETRY operators
 
 CREATE OPERATOR << (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_left,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_left,
    COMMUTATOR = '>>',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -559 +1001 @@
 
 CREATE OPERATOR &< (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overleft,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overleft,
    COMMUTATOR = '&>',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -565 +1007 @@
 
 CREATE OPERATOR <<| (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_below,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_below,
    COMMUTATOR = '|>>',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -571 +1013 @@
 
 CREATE OPERATOR &<| (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overbelow,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overbelow,
    COMMUTATOR = '|&>',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -577 +1019 @@
 
 CREATE OPERATOR && (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overlap,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overlap,
    COMMUTATOR = '&&',
-   RESTRICT = postgis_gist_sel, JOIN = postgis_gist_joinsel
+   RESTRICT = ST_postgis_gist_sel, JOIN = ST_postgis_gist_joinsel
 );
 
 CREATE OPERATOR &> (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overright,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overright,
    COMMUTATOR = '&<',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -589 +1031 @@
 
 CREATE OPERATOR >> (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_right,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_right,
    COMMUTATOR = '<<',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -595 +1037 @@
 
 CREATE OPERATOR |&> (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overabove,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overabove,
    COMMUTATOR = '&<|',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -601 +1043 @@
 
 CREATE OPERATOR |>> (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_above,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_above,
    COMMUTATOR = '<<|',
    RESTRICT = positionsel, JOIN = positionjoinsel
@@ -607 +1049 @@
 
 CREATE OPERATOR ~= (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_same,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_same,
    COMMUTATOR = '~=', 
    RESTRICT = eqsel, JOIN = eqjoinsel
@@ -613 +1055 @@
 
 CREATE OPERATOR @ (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_contained,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_contained,
    COMMUTATOR = '~',
    RESTRICT = contsel, JOIN = contjoinsel
@@ -619 +1061 @@
 
 CREATE OPERATOR ~ (
-   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_contain,
+   LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_contain,
    COMMUTATOR = '@',
    RESTRICT = contsel, JOIN = contjoinsel
@@ -907 +1349 @@
 -------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION addBBOX(geometry) 
         RETURNS geometry
@@ -912 +1355 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_addBBOX(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_addBBOX'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION dropBBOX(geometry) 
         RETURNS geometry
@@ -917 +1367 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_dropBBOX(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_dropBBOX'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
         
+-- Deprecation in 1.2.3
 CREATEFUNCTION getSRID(geometry) 
         RETURNS int4
@@ -923 +1379 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION getSRID(geometry) 
+        RETURNS int4
+        AS '@MODULE_FILENAME@','LWGEOM_getSRID'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION getBBOX(geometry)
         RETURNS box2d
@@ -928 +1391 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION getBBOX(geometry)
+        RETURNS box2d
+        AS '@MODULE_FILENAME@','LWGEOM_to_BOX2DFLOAT4'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -------------------------------------------
 --- CHIP functions
 -------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION srid(chip)
         RETURNS int4
@@ -937 +1407 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_srid(chip)
+        RETURNS int4
+        AS '@MODULE_FILENAME@','CHIP_getSRID'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION height(chip)
         RETURNS int4
@@ -942 +1419 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_height(chip)
+        RETURNS int4
+        AS '@MODULE_FILENAME@','CHIP_getHeight'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION factor(chip)
         RETURNS FLOAT4
@@ -947 +1431 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_factor(chip)
+        RETURNS FLOAT4
+        AS '@MODULE_FILENAME@','CHIP_getFactor'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION width(chip)
         RETURNS int4
@@ -952 +1443 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_width(chip)
+        RETURNS int4
+        AS '@MODULE_FILENAME@','CHIP_getWidth'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION datatype(chip)
         RETURNS int4
@@ -957 +1455 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_datatype(chip)
+        RETURNS int4
+        AS '@MODULE_FILENAME@','CHIP_getDatatype'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION compression(chip)
         RETURNS int4
@@ -962 +1467 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_compression(chip)
+        RETURNS int4
+        AS '@MODULE_FILENAME@','CHIP_getCompression'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION setSRID(chip,int4)
         RETURNS chip
@@ -967 +1479 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION setFactor(chip,float4)
         RETURNS chip
@@ -972 +1485 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_setFactor(chip,float4)
+        RETURNS chip
+        AS '@MODULE_FILENAME@','CHIP_setFactor'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 ------------------------------------------------------------------------
 -- DEBUG
 ------------------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION mem_size(geometry)
         RETURNS int4
@@ -981 +1501 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_mem_size(geometry)
+        RETURNS int4
+        AS '@MODULE_FILENAME@', 'LWGEOM_mem_size'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION summary(geometry)
         RETURNS text
@@ -986 +1513 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_summary(geometry)
+        RETURNS text
+        AS '@MODULE_FILENAME@', 'LWGEOM_summary'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION npoints(geometry)
         RETURNS int4
@@ -991 +1525 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_npoints(geometry)
+        RETURNS int4
+        AS '@MODULE_FILENAME@', 'LWGEOM_npoints'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION nrings(geometry)
         RETURNS int4
@@ -996 +1537 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_nrings(geometry)
+        RETURNS int4
+        AS '@MODULE_FILENAME@', 'LWGEOM_nrings'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 ------------------------------------------------------------------------
 -- Misures
@@ -1002 +1549 @@
 -- this is a fake (for back-compatibility)
 -- uses 3d if 3d is available, 2d otherwise
+-- Deprecation in 1.2.3
 CREATEFUNCTION length3d(geometry)
         RETURNS FLOAT8
@@ -1007 +1555 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_length3d(geometry)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@', 'LWGEOM_length_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION length2d(geometry)
         RETURNS FLOAT8
@@ -1012 +1567 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_length2d(geometry)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@', 'LWGEOM_length2d_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 CREATEFUNCTION length(geometry)
         RETURNS FLOAT8
@@ -1019 +1580 @@
 -- this is a fake (for back-compatibility)
 -- uses 3d if 3d is available, 2d otherwise
+-- Deprecation in 1.2.3
 CREATEFUNCTION length3d_spheroid(geometry, spheroid)
         RETURNS FLOAT8
@@ -1024 +1586 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_length3d_spheroid(geometry, spheroid)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','LWGEOM_length_ellipsoid_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION length_spheroid(geometry, spheroid)
         RETURNS FLOAT8
@@ -1029 +1598 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_length_spheroid(geometry, spheroid)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','LWGEOM_length_ellipsoid_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION length2d_spheroid(geometry, spheroid)
         RETURNS FLOAT8
@@ -1034 +1610 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_length2d_spheroid(geometry, spheroid)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','LWGEOM_length2d_ellipsoid_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 -- this is a fake (for back-compatibility)
 -- uses 3d if 3d is available, 2d otherwise
+-- Deprecation in 1.2.3
 CREATEFUNCTION perimeter3d(geometry)
         RETURNS FLOAT8
@@ -1041 +1624 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_perimeter3d(geometry)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@', 'LWGEOM_perimeter_poly'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION perimeter2d(geometry)
         RETURNS FLOAT8
@@ -1046 +1636 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_perimeter2d(geometry)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@', 'LWGEOM_perimeter2d_poly'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION perimeter(geometry)
         RETURNS FLOAT8
@@ -1053 +1650 @@
 -- this is an alias for 'area(geometry)'
 -- there is nothing such an 'area3d'...
+-- Deprecation in 1.2.3
 CREATEFUNCTION area2d(geometry)
         RETURNS FLOAT8
@@ -1058 +1656 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_area2d(geometry)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@', 'LWGEOM_area_polygon'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION area(geometry)
         RETURNS FLOAT8
@@ -1063 +1668 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION distance_spheroid(geometry,geometry,spheroid)
         RETURNS FLOAT8
@@ -1068 +1674 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_distance_spheroid(geometry,geometry,spheroid)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','LWGEOM_distance_ellipsoid_point'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION distance_sphere(geometry,geometry)
         RETURNS FLOAT8
@@ -1073 +1686 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_distance_sphere(geometry,geometry)
+        RETURNS FLOAT8
+        AS '@MODULE_FILENAME@','LWGEOM_distance_sphere'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 -- Minimum distance. 2d only.
+-- Deprecation in 1.2.3
 CREATEFUNCTION distance(geometry,geometry)
         RETURNS float8
@@ -1080 +1700 @@
 
 -- Maximum distance between linestrings. 2d only. Very bogus.
+-- Deprecation in 1.2.3
 CREATEFUNCTION max_distance(geometry,geometry)
         RETURNS float8
@@ -1085 +1706 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_max_distance(geometry,geometry)
+        RETURNS float8
+        AS '@MODULE_FILENAME@', 'LWGEOM_maxdistance2d_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION point_inside_circle(geometry,float8,float8,float8)
         RETURNS bool
@@ -1090 +1718 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_point_inside_circle(geometry,float8,float8,float8)
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_inside_circle_point'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION azimuth(geometry,geometry)
         RETURNS float8
@@ -1095 +1730 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_azimuth(geometry,geometry)
+        RETURNS float8
+        AS '@MODULE_FILENAME@', 'LWGEOM_azimuth'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
 ------------------------------------------------------------------------
@@ -1100 +1740 @@
 ------------------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION force_2d(geometry) 
         RETURNS geometry
@@ -1105 +1746 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_force_2d(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_force_2d'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION force_3dz(geometry) 
         RETURNS geometry
@@ -1110 +1758 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_force_3dz(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_force_3dz'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 -- an alias for force_3dz
+-- Deprecation in 1.2.3
 CREATEFUNCTION force_3d(geometry) 
         RETURNS geometry
@@ -1116 +1771 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_force_3d(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_force_3dz'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION force_3dm(geometry) 
         RETURNS geometry
@@ -1121 +1783 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_force_3dm(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_force_3dm'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION force_4d(geometry) 
         RETURNS geometry
@@ -1126 +1795 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_force_4d(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_force_4d'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION force_collection(geometry) 
         RETURNS geometry
@@ -1131 +1807 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_force_collection(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_force_collection'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION multi(geometry) 
         RETURNS geometry
@@ -1136 +1819 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_multi(geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_force_multi'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION collector(geometry, geometry) 
         RETURNS geometry
@@ -1141 +1831 @@
         LANGUAGE 'C' _IMMUTABLE;
 
-CREATEFUNCTION collect(geometry, geometry) 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_collector(geometry, geometry) 
         RETURNS geometry
         AS '@MODULE_FILENAME@', 'LWGEOM_collect'
         LANGUAGE 'C' _IMMUTABLE;
 
+-- Deprecation in 1.2.3
+CREATEFUNCTION collect(geometry, geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_collect'
+        LANGUAGE 'C' _IMMUTABLE;
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_collect(geometry, geometry) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_collect'
+        LANGUAGE 'C' _IMMUTABLE;
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE memcollect(
-        sfunc = collect,
+        sfunc = ST_collect,
         basetype = geometry,
         stype = geometry
         );
 
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_memcollect(
+        sfunc = ST_collect,
+        basetype = geometry,
+        stype = geometry
+        );
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geom_accum (geometry[],geometry)
         RETURNS geometry[]
@@ -1157 +1869 @@
         LANGUAGE 'C' _IMMUTABLE;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geom_accum (geometry[],geometry)
+        RETURNS geometry[]
+        AS '@MODULE_FILENAME@', 'LWGEOM_accum'
+        LANGUAGE 'C' _IMMUTABLE;
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE accum (
-        sfunc = geom_accum,
+        sfunc = ST_geom_accum,
         basetype = geometry,
         stype = geometry[]
         );
 
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_accum (
+        sfunc = ST_geom_accum,
+        basetype = geometry,
+        stype = geometry[]
+        );
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION collect_garray (geometry[])
         RETURNS geometry
@@ -1168 +1895 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_collect_garray (geometry[])
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_collect_garray'
+        LANGUAGE 'C' _IMMUTABLE_STRICT;
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE collect (
-        sfunc = geom_accum,
+        sfunc = ST_geom_accum,
         basetype = geometry,
         stype = geometry[],
-        finalfunc = collect_garray
+        finalfunc = ST_collect_garray
         );
 
+
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_collect (
+        sfunc = ST_geom_accum,
+        basetype = geometry,
+        stype = geometry[],
+        finalfunc = ST_collect_garray
+        );
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION expand(box3d,float8)
         RETURNS box3d
@@ -1180 +1924 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_expand(box3d,float8)
+        RETURNS box3d
+        AS '@MODULE_FILENAME@', 'BOX3D_expand'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION expand(box2d,float8)
         RETURNS box2d
@@ -1185 +1936 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_expand(box2d,float8)
+        RETURNS box2d
+        AS '@MODULE_FILENAME@', 'BOX2DFLOAT4_expand'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION expand(geometry,float8)
         RETURNS geometry
@@ -1190 +1948 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_expand(geometry,float8)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_expand'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION envelope(geometry)
         RETURNS geometry
@@ -1195 +1960 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION reverse(geometry)
         RETURNS geometry
@@ -1200 +1966 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION reverse(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_reverse'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION ForceRHR(geometry)
         RETURNS geometry
@@ -1205 +1978 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ForceRHR(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_forceRHR_poly'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION noop(geometry)
         RETURNS geometry
@@ -1210 +1990 @@
         LANGUAGE 'C' _VOLATILE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_noop(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_noop'
+        LANGUAGE 'C' _VOLATILE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION zmflag(geometry)
         RETURNS smallint
@@ -1215 +2002 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_zmflag(geometry)
+        RETURNS smallint
+        AS '@MODULE_FILENAME@', 'LWGEOM_zmflag'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION hasBBOX(geometry)
         RETURNS bool
@@ -1220 +2014 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availabitily: 1.2.2
+CREATEFUNCTION hasBBOX(geometry)
+        RETURNS bool
+        AS '@MODULE_FILENAME@', 'LWGEOM_hasBBOX'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION ndims(geometry)
         RETURNS smallint
@@ -1225 +2026 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_ndims(geometry)
+        RETURNS smallint
+        AS '@MODULE_FILENAME@', 'LWGEOM_ndims'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsEWKT(geometry)
         RETURNS TEXT
@@ -1230 +2038 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsEWKT(geometry)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asEWKT'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsEWKB(geometry)
         RETURNS BYTEA
@@ -1235 +2050 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsEWKB(geometry)
+        RETURNS BYTEA
+        AS '@MODULE_FILENAME@','WKBFromLWGEOM'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsHEXEWKB(geometry)
         RETURNS TEXT
@@ -1240 +2062 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsHEXEWKB(geometry)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asHEXEWKB'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsHEXEWKB(geometry, text)
         RETURNS TEXT
@@ -1245 +2074 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsHEXEWKB(geometry, text)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asHEXEWKB'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsEWKB(geometry,text)
         RETURNS bytea
@@ -1250 +2086 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsEWKB(geometry,text)
+        RETURNS bytea
+        AS '@MODULE_FILENAME@','WKBFromLWGEOM'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomFromEWKB(bytea)
         RETURNS geometry
@@ -1255 +2098 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomFromEWKB(bytea)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOMFromWKB'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomFromEWKT(text)
         RETURNS geometry
@@ -1260 +2110 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomFromEWKT(text)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','parse_WKT_lwgeom'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION cache_bbox()
+        RETURNS trigger
+        AS '@MODULE_FILENAME@'
+        LANGUAGE 'C';
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_cache_bbox()
         RETURNS trigger
-        AS '@MODULE_FILENAME@'
+        AS '@MODULE_FILENAME@','cache_bbox'
         LANGUAGE 'C';
 
@@ -1269 +2132 @@
 ------------------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION makePoint(float8, float8)
         RETURNS geometry
@@ -1274 +2138 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
-CREATEFUNCTION makePoint(float8, float8, float8)
+-- Availability: 1.2.2
+CREATEFUNCTION ST_makePoint(float8, float8)
         RETURNS geometry
         AS '@MODULE_FILENAME@', 'LWGEOM_makepoint'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
-CREATEFUNCTION makePoint(float8, float8, float8, float8)
+-- Deprecation in 1.2.3
+CREATEFUNCTION makePoint(float8, float8, float8)
         RETURNS geometry
         AS '@MODULE_FILENAME@', 'LWGEOM_makepoint'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_makePoint(float8, float8, float8)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_makepoint'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
+CREATEFUNCTION makePoint(float8, float8, float8, float8)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_makepoint'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_makePoint(float8, float8, float8, float8)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_makepoint'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION makePointM(float8, float8, float8)
         RETURNS geometry
@@ -1289 +2174 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION makePointM(float8, float8, float8)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_makepoint3dm'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION makeBox2d(geometry, geometry)
         RETURNS box2d
@@ -1294 +2186 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_makeBox2d(geometry, geometry)
+        RETURNS box2d
+        AS '@MODULE_FILENAME@', 'BOX2DFLOAT4_construct'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION makeBox3d(geometry, geometry)
         RETURNS box3d
@@ -1299 +2198 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_makeBox3d(geometry, geometry)
+        RETURNS box3d
+        AS '@MODULE_FILENAME@', 'BOX3D_construct'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION makeline_garray (geometry[])
         RETURNS geometry
@@ -1304 +2210 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_makeline_garray (geometry[])
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_makeline_garray'
+        LANGUAGE 'C' _IMMUTABLE_STRICT;
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION LineFromMultiPoint(geometry)
         RETURNS geometry
@@ -1309 +2222 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_LineFromMultiPoint(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_line_from_mpoint'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MakeLine(geometry, geometry)
         RETURNS geometry
@@ -1314 +2234 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MakeLine(geometry, geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_makeline'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AddPoint(geometry, geometry)
         RETURNS geometry
@@ -1319 +2246 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
-CREATEFUNCTION AddPoint(geometry, geometry, integer)
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AddPoint(geometry, geometry)
         RETURNS geometry
         AS '@MODULE_FILENAME@', 'LWGEOM_addpoint'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Deprecation in 1.2.3
+CREATEFUNCTION AddPoint(geometry, geometry, integer)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_addpoint'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AddPoint(geometry, geometry, integer)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_addpoint'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION RemovePoint(geometry, integer)
         RETURNS geometry
@@ -1329 +2270 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_RemovePoint(geometry, integer)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_removepoint'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION SetPoint(geometry, integer, geometry)
         RETURNS geometry
@@ -1334 +2282 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_SetPoint(geometry, integer, geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_setpoint_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE makeline (
         sfunc = geom_accum,
@@ -1341 +2296 @@
         );
 
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_makeline (
+        sfunc = geom_accum,
+        basetype = geometry,
+        stype = geometry[],
+        finalfunc = ST_makeline_garray
+        );
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MakePolygon(geometry, geometry[])
         RETURNS geometry
@@ -1346 +2310 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
-CREATEFUNCTION MakePolygon(geometry)
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MakePolygon(geometry, geometry[])
         RETURNS geometry
         AS '@MODULE_FILENAME@', 'LWGEOM_makepoly'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Deprecation in 1.2.3
+CREATEFUNCTION MakePolygon(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_makepoly'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MakePolygon(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_makepoly'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION BuildArea(geometry)
         RETURNS geometry
@@ -1356 +2334 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_BuildArea(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_buildarea'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION polygonize_garray (geometry[])
         RETURNS geometry
@@ -1361 +2346 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_polygonize_garray (geometry[])
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'polygonize_garray'
+        LANGUAGE 'C' _IMMUTABLE_STRICT;
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION LineMerge(geometry)
         RETURNS geometry
@@ -1366 +2358 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_LineMerge(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'linemerge'
+        LANGUAGE 'C' _IMMUTABLE_STRICT;
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE polygonize (
         sfunc = geom_accum,
@@ -1373 +2372 @@
         );
 
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_polygonize (
+        sfunc = ST_geom_accum,
+        basetype = geometry,
+        stype = geometry[],
+        finalfunc = ST_polygonize_garray
+        );
 
 #if USE_VERSION > 72
@@ -1378 +2384 @@
 CREATE TYPE geometry_dump AS (path integer[], geom geometry);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION Dump(geometry)
         RETURNS SETOF geometry_dump
@@ -1383 +2390 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Dump(geometry)
+        RETURNS SETOF geometry_dump
+        AS '@MODULE_FILENAME@', 'LWGEOM_dump'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION DumpRings(geometry)
         RETURNS SETOF geometry_dump
@@ -1388 +2402 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION DumpRings(geometry)
+        RETURNS SETOF geometry_dump
+        AS '@MODULE_FILENAME@', 'LWGEOM_dump_rings'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 #endif
 
@@ -1396 +2416 @@
 --
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION combine_bbox(box2d,geometry)
         RETURNS box2d
@@ -1401 +2422 @@
         LANGUAGE 'C' _IMMUTABLE;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_combine_bbox(box2d,geometry)
+        RETURNS box2d
+        AS '@MODULE_FILENAME@', 'BOX2DFLOAT4_combine'
+        LANGUAGE 'C' _IMMUTABLE;
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE extent(
-        sfunc = combine_bbox,
+        sfunc = ST_combine_bbox,
         basetype = geometry,
         stype = box2d
         );
 
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_extent(
+        sfunc = ST_combine_bbox,
+        basetype = geometry,
+        stype = box2d
+        );
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION combine_bbox(box3d,geometry)
         RETURNS box3d
@@ -1412 +2448 @@
         LANGUAGE 'C' _IMMUTABLE;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_combine_bbox(box3d,geometry)
+        RETURNS box3d
+        AS '@MODULE_FILENAME@', 'BOX3D_combine'
+        LANGUAGE 'C' _IMMUTABLE;
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE extent3d(
         sfunc = combine_bbox,
@@ -1418 +2461 @@
         );
 
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_extent3d(
+        sfunc = ST_combine_bbox,
+        basetype = geometry,
+        stype = box3d
+        );
+
 -----------------------------------------------------------------------
 -- CREATE_HISTOGRAM2D( <box2d>, <size> )
@@ -1425 +2475 @@
 --
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION create_histogram2d(box2d,int)
         RETURNS histogram2d
@@ -1430 +2481 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_create_histogram2d(box2d,int)
+        RETURNS histogram2d
+        AS '@MODULE_FILENAME@','create_lwhistogram2d'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 -----------------------------------------------------------------------
 -- BUILD_HISTOGRAM2D( <histogram2d>, <tablename>, <columnname> )
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION build_histogram2d (histogram2d,text,text)
         RETURNS histogram2d
@@ -1438 +2496 @@
         LANGUAGE 'C' _STABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_build_histogram2d (histogram2d,text,text)
+        RETURNS histogram2d
+        AS '@MODULE_FILENAME@','build_lwhistogram2d'
+        LANGUAGE 'C' _STABLE_STRICT; -- WITH (isstrict);
+
 #if USE_VERSION >= 73
 -----------------------------------------------------------------------
@@ -1445 +2509 @@
 -- thanks to Carl Anderson for the idea.
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION build_histogram2d (histogram2d,text,text,text)
 RETURNS histogram2d
@@ -1454 +2519 @@
 '
 LANGUAGE 'plpgsql' _STABLE_STRICT; -- WITH (isstrict);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_build_histogram2d (histogram2d,text,text,text)
+RETURNS histogram2d
+AS '
+BEGIN
+        EXECUTE ''SET local search_path = ''||$2||'',public'';
+        RETURN public.build_histogram2d($1,$3,$4);
+END
+'
+LANGUAGE 'plpgsql' _STABLE_STRICT; -- WITH (isstrict);
+
 #endif
 
@@ -1459 +2536 @@
 -- EXPLODE_HISTOGRAM2D( <histogram2d>, <tablename> )
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION explode_histogram2d (histogram2d,text)
         RETURNS histogram2d
@@ -1464 +2542 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_explode_histogram2d (histogram2d,text)
+        RETURNS histogram2d
+        AS '@MODULE_FILENAME@','explode_lwhistogram2d'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 -----------------------------------------------------------------------
 -- ESTIMATE_HISTOGRAM2D( <histogram2d>, <box> )
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION estimate_histogram2d(histogram2d,box2d)
         RETURNS float8
@@ -1472 +2557 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_estimate_histogram2d(histogram2d,box2d)
+        RETURNS float8
+        AS '@MODULE_FILENAME@','estimate_lwhistogram2d'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
 -----------------------------------------------------------------------
 -- ESTIMATED_EXTENT( <schema name>, <table name>, <column name> )
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION estimated_extent(text,text,text) RETURNS box2d AS
         '@MODULE_FILENAME@', 'LWGEOM_estimated_extent'
         LANGUAGE 'C' _IMMUTABLE_STRICT _SECURITY_DEFINER;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_estimated_extent(text,text,text) RETURNS box2d AS
+        '@MODULE_FILENAME@', 'LWGEOM_estimated_extent'
+        LANGUAGE 'C' _IMMUTABLE_STRICT _SECURITY_DEFINER;
+
 -----------------------------------------------------------------------
 -- ESTIMATED_EXTENT( <table name>, <column name> )
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION estimated_extent(text,text) RETURNS box2d AS
         '@MODULE_FILENAME@', 'LWGEOM_estimated_extent'
         LANGUAGE 'C' _IMMUTABLE_STRICT _SECURITY_DEFINER; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_estimated_extent(text,text) RETURNS box2d AS
+        '@MODULE_FILENAME@', 'LWGEOM_estimated_extent'
+        LANGUAGE 'C' _IMMUTABLE_STRICT _SECURITY_DEFINER; 
+
 -----------------------------------------------------------------------
 -- FIND_EXTENT( <schema name>, <table name>, <column name> )
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION find_extent(text,text,text) RETURNS box2d AS
 '
@@ -1505 +2609 @@
 LANGUAGE 'plpgsql' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_find_extent(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 extent("''||columnname||''") FROM "''||schemaname||''"."''||tablename||''"'' LOOP
+                return myrec.extent;
+        END LOOP; 
+END;
+'
+LANGUAGE 'plpgsql' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+
 -----------------------------------------------------------------------
 -- FIND_EXTENT( <table name>, <column name> )
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION find_extent(text,text) RETURNS box2d AS
+'
+DECLARE
+        tablename alias for $1;
+        columnname alias for $2;
+        myrec RECORD;
+
+BEGIN
+        FOR myrec IN EXECUTE ''SELECT extent("''||columnname||''") FROM "''||tablename||''"'' LOOP
+                return myrec.extent;
+        END LOOP; 
+END;
+'
+LANGUAGE 'plpgsql' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_find_extent(text,text) RETURNS box2d AS
 '
 DECLARE
@@ -2701 +3840 @@
 ---------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d(geometry)
         RETURNS box2d
@@ -2706 +3846 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d(geometry)
+        RETURNS box2d
+        AS '@MODULE_FILENAME@','LWGEOM_to_BOX2DFLOAT4'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box3d(geometry)
         RETURNS box3d
@@ -2711 +3858 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box3d(geometry)
+        RETURNS box3d
+        AS '@MODULE_FILENAME@','LWGEOM_to_BOX3D'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box(geometry)
         RETURNS box
@@ -2716 +3870 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box(geometry)
+        RETURNS box
+        AS '@MODULE_FILENAME@','LWGEOM_to_BOX'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box2d(box3d)
         RETURNS box2d
@@ -2721 +3882 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box2d(box3d)
+        RETURNS box2d
+        AS '@MODULE_FILENAME@','BOX3D_to_BOX2DFLOAT4'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box3d(box2d)
         RETURNS box3d
@@ -2726 +3894 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box3d(box2d)
+        RETURNS box3d
+        AS '@MODULE_FILENAME@','BOX2DFLOAT4_to_BOX3D'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION box(box3d)
         RETURNS box
@@ -2731 +3906 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_box(box3d)
+        RETURNS box
+        AS '@MODULE_FILENAME@','BOX3D_to_BOX'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION text(geometry)
         RETURNS text
@@ -2736 +3918 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_text(geometry)
+        RETURNS text
+        AS '@MODULE_FILENAME@','LWGEOM_to_text'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- this is kept for backward-compatibility
+-- Deprecation in 1.2.3
 CREATEFUNCTION box3dtobox(box3d)
         RETURNS box
@@ -2742 +3931 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry(box2d)
         RETURNS geometry
@@ -2747 +3937 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry(box2d)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','BOX2DFLOAT4_to_LWGEOM'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry(box3d)
         RETURNS geometry
@@ -2752 +3949 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry(box3d)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','BOX3D_to_LWGEOM'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry(text)
         RETURNS geometry
@@ -2757 +3961 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry(text)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','parse_WKT_lwgeom'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry(chip)
         RETURNS geometry
@@ -2762 +3973 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry(chip)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','CHIP_to_LWGEOM'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION geometry(bytea)
         RETURNS geometry
@@ -2767 +3985 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_geometry(bytea)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_from_bytea'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION bytea(geometry)
         RETURNS bytea
@@ -2772 +3997 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_bytea(geometry)
+        RETURNS bytea
+        AS '@MODULE_FILENAME@','LWGEOM_to_bytea'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION text(bool)
         RETURNS text
@@ -2777 +4009 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_text(bool)
+        RETURNS text
+        AS '@MODULE_FILENAME@','BOOL_to_text'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- 7.3+ explicit casting definitions
 #if USE_VERSION >= 73
-CREATE CAST (geometry AS box2d) WITH FUNCTION box2d(geometry) AS IMPLICIT;
-CREATE CAST (geometry AS box3d) WITH FUNCTION box3d(geometry) AS IMPLICIT;
-CREATE CAST (geometry AS box) WITH FUNCTION box(geometry) AS IMPLICIT;
-CREATE CAST (box3d AS box2d) WITH FUNCTION box2d(box3d) AS IMPLICIT;
-CREATE CAST (box2d AS box3d) WITH FUNCTION box3d(box2d) AS IMPLICIT;
-CREATE CAST (box2d AS geometry) WITH FUNCTION geometry(box2d) AS IMPLICIT;
-CREATE CAST (box3d AS box) WITH FUNCTION box(box3d) AS IMPLICIT;
-CREATE CAST (box3d AS geometry) WITH FUNCTION geometry(box3d) AS IMPLICIT;
-CREATE CAST (text AS geometry) WITH FUNCTION geometry(text) AS IMPLICIT;
-CREATE CAST (geometry AS text) WITH FUNCTION text(geometry) AS IMPLICIT;
-CREATE CAST (chip AS geometry) WITH FUNCTION geometry(chip) AS IMPLICIT;
-CREATE CAST (bytea AS geometry) WITH FUNCTION geometry(bytea) AS IMPLICIT;
-CREATE CAST (geometry AS bytea) WITH FUNCTION bytea(geometry) AS IMPLICIT;
-CREATE CAST (bool AS text) WITH FUNCTION text(bool) AS IMPLICIT;
+CREATE CAST (geometry AS box2d) WITH FUNCTION ST_box2d(geometry) AS IMPLICIT;
+CREATE CAST (geometry AS box3d) WITH FUNCTION ST_box3d(geometry) AS IMPLICIT;
+CREATE CAST (geometry AS box) WITH FUNCTION ST_box(geometry) AS IMPLICIT;
+CREATE CAST (box3d AS box2d) WITH FUNCTION ST_box2d(box3d) AS IMPLICIT;
+CREATE CAST (box2d AS box3d) WITH FUNCTION ST_box3d(box2d) AS IMPLICIT;
+CREATE CAST (box2d AS geometry) WITH FUNCTION ST_geometry(box2d) AS IMPLICIT;
+CREATE CAST (box3d AS box) WITH FUNCTION ST_box(box3d) AS IMPLICIT;
+CREATE CAST (box3d AS geometry) WITH FUNCTION ST_geometry(box3d) AS IMPLICIT;
+CREATE CAST (text AS geometry) WITH FUNCTION ST_geometry(text) AS IMPLICIT;
+CREATE CAST (geometry AS text) WITH FUNCTION ST_text(geometry) AS IMPLICIT;
+CREATE CAST (chip AS geometry) WITH FUNCTION ST_geometry(chip) AS IMPLICIT;
+CREATE CAST (bytea AS geometry) WITH FUNCTION ST_geometry(bytea) AS IMPLICIT;
+CREATE CAST (geometry AS bytea) WITH FUNCTION ST_bytea(geometry) AS IMPLICIT;
+CREATE CAST (bool AS text) WITH FUNCTION ST_text(bool) AS IMPLICIT;
 #endif
 
@@ -2799 +4037 @@
 ---------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION simplify(geometry, float8)
    RETURNS geometry
@@ -2804 +4043 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_simplify(geometry, float8)
+   RETURNS geometry
+   AS '@MODULE_FILENAME@', 'LWGEOM_simplify2d'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- SnapToGrid(input, xoff, yoff, xsize, ysize)
+-- Deprecation in 1.2.3
 CREATEFUNCTION SnapToGrid(geometry, float8, float8, float8, float8)
    RETURNS geometry
@@ -2810 +4056 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_SnapToGrid(geometry, float8, float8, float8, float8)
+   RETURNS geometry
+   AS '@MODULE_FILENAME@', 'LWGEOM_snaptogrid'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- SnapToGrid(input, xsize, ysize) # offsets=0
+-- Deprecation in 1.2.3
 CREATEFUNCTION SnapToGrid(geometry, float8, float8)
    RETURNS geometry
@@ -2816 +4069 @@
    LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_SnapToGrid(geometry, float8, float8)
+   RETURNS geometry
+   AS 'SELECT SnapToGrid($1, 0, 0, $2, $3)'
+   LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- SnapToGrid(input, size) # xsize=ysize=size, offsets=0
+-- Deprecation in 1.2.3
 CREATEFUNCTION SnapToGrid(geometry, float8)
    RETURNS geometry
@@ -2822 +4082 @@
    LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_SnapToGrid(geometry, float8)
+   RETURNS geometry
+   AS 'SELECT SnapToGrid($1, 0, 0, $2, $2)'
+   LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- SnapToGrid(input, point_offsets, xsize, ysize, zsize, msize)
+-- Deprecation in 1.2.3
 CREATEFUNCTION SnapToGrid(geometry, geometry, float8, float8, float8, float8)
    RETURNS geometry
@@ -2828 +4095 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_SnapToGrid(geometry, geometry, float8, float8, float8, float8)
+   RETURNS geometry
+   AS '@MODULE_FILENAME@', 'LWGEOM_snaptogrid_pointoff'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION segmentize(geometry, float8)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_segmentize2d'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_segmentize(geometry, float8)
         RETURNS geometry
         AS '@MODULE_FILENAME@', 'LWGEOM_segmentize2d'
@@ -2837 +4117 @@
 ---------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION line_interpolate_point(geometry, float8)
    RETURNS geometry
@@ -2842 +4123 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_line_interpolate_point(geometry, float8)
+   RETURNS geometry
+   AS '@MODULE_FILENAME@', 'LWGEOM_line_interpolate_point'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION line_substring(geometry, float8, float8)
    RETURNS geometry
@@ -2847 +4135 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_line_substring(geometry, float8, float8)
+   RETURNS geometry
+   AS '@MODULE_FILENAME@', 'LWGEOM_line_substring'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION line_locate_point(geometry, geometry)
    RETURNS float8
@@ -2852 +4147 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_line_locate_point(geometry, geometry)
+   RETURNS float8
+   AS '@MODULE_FILENAME@', 'LWGEOM_line_locate_point'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION locate_between_measures(geometry, float8, float8)
         RETURNS geometry
@@ -2857 +4159 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT;
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_locate_between_measures(geometry, float8, float8)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_locate_between_m'
+        LANGUAGE 'C' _IMMUTABLE_STRICT;
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION locate_along_measure(geometry, float8)
+        RETURNS geometry
+        AS 'SELECT locate_between_measures($1, $2, $2)'
+        LANGUAGE 'sql' _IMMUTABLE_STRICT;
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_locate_along_measure(geometry, float8)
         RETURNS geometry
         AS 'SELECT locate_between_measures($1, $2, $2)'
@@ -2866 +4181 @@
 ---------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION intersection(geometry,geometry)
    RETURNS geometry
@@ -2871 +4187 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_intersection(geometry,geometry)
+   RETURNS geometry
+   AS '@MODULE_FILENAME@','intersection'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION buffer(geometry,float8)
    RETURNS geometry
@@ -2876 +4199 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_buffer(geometry,float8)
+   RETURNS geometry
+   AS '@MODULE_FILENAME@','buffer'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION buffer(geometry,float8,integer)
    RETURNS geometry
    AS '@MODULE_FILENAME@','buffer'
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_buffer(geometry,float8,integer)
+   RETURNS geometry
+   AS '@MODULE_FILENAME@','buffer'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
    
+-- Deprecation in 1.2.3
 CREATEFUNCTION convexhull(geometry)
         RETURNS geometry
         AS '@MODULE_FILENAME@','convexhull'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_convexhull(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','convexhull'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
   
-  
+-- Deprecation in 1.2.3
 CREATEFUNCTION difference(geometry,geometry)
         RETURNS geometry
         AS '@MODULE_FILENAME@','difference'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_difference(geometry,geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','difference'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
    
+-- Deprecation in 1.2.3
 CREATEFUNCTION boundary(geometry)
         RETURNS geometry
@@ -2897 +4247 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_boundary(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','boundary'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION symdifference(geometry,geometry)
         RETURNS geometry
         AS '@MODULE_FILENAME@','symdifference'
-   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
-
-
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_symdifference(geometry,geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','symdifference'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION symmetricdifference(geometry,geometry)
         RETURNS geometry
@@ -2908 +4271 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
-
+-- Availability: 1.2.2
+CREATEFUNCTION ST_symmetricdifference(geometry,geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','symdifference'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomUnion(geometry,geometry)
         RETURNS geometry
@@ -2914 +4283 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Union(geometry,geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','geomunion'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE MemGeomUnion (
         basetype = geometry,
@@ -2920 +4296 @@
         );
 
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_MemGeomUnion (
+        basetype = geometry,
+        sfunc = ST_union,
+        stype = geometry
+        );
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION unite_garray (geometry[])
         RETURNS geometry
-        AS '@MODULE_FILENAME@'
+        AS '@MODULE_FILENAME@'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable); 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_unite_garray (geometry[])
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','unite_garray'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable); 
+
+-- Deprecation in 1.2.3
 CREATE AGGREGATE GeomUnion (
         sfunc = geom_accum,
         basetype = geometry,
         stype = geometry[],
-        finalfunc = unite_garray
+        finalfunc = ST_unite_garray
         );
 
-
+-- Availability: 1.2.2
+CREATE AGGREGATE ST_Union (
+        sfunc = ST_geom_accum,
+        basetype = geometry,
+        stype = geometry[],
+        finalfunc = ST_unite_garray
+        );
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION relate(geometry,geometry)
    RETURNS text
@@ -2938 +4337 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_relate(geometry,geometry)
+   RETURNS text
+   AS '@MODULE_FILENAME@','relate_full'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION relate(geometry,geometry,text)
    RETURNS boolean
@@ -2943 +4349 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_relate(geometry,geometry,text)
+   RETURNS boolean
+   AS '@MODULE_FILENAME@','relate_pattern'
+   LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION disjoint(geometry,geometry)
    RETURNS boolean
    AS '@MODULE_FILENAME@'
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
-
+   
+-- Deprecation in 1.2.3
 CREATEFUNCTION touches(geometry,geometry)
    RETURNS boolean
@@ -2953 +4367 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION intersects(geometry,geometry)
    RETURNS boolean
@@ -2958 +4373 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION crosses(geometry,geometry)
    RETURNS boolean
@@ -2963 +4379 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION within(geometry,geometry)
    RETURNS boolean
@@ -2968 +4385 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION contains(geometry,geometry)
    RETURNS boolean
@@ -2973 +4391 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION overlaps(geometry,geometry)
    RETURNS boolean
@@ -2978 +4397 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION IsValid(geometry)
    RETURNS boolean
@@ -2983 +4403 @@
    LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION GEOSnoop(geometry)
    RETURNS geometry
@@ -2988 +4409 @@
    LANGUAGE 'C' _VOLATILE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION JTSnoop(geometry)
    RETURNS geometry
@@ -2999 +4421 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Centroid(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','centroid'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION IsRing(geometry)
         RETURNS boolean
@@ -3004 +4433 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_IsRing(geometry)
+        RETURNS boolean
+        AS '@MODULE_FILENAME@','isring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PointOnSurface(geometry)
         RETURNS geometry
         AS '@MODULE_FILENAME@'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PointOnSurface(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','pointonsurface'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
         
+-- Deprecation in 1.2.3
 CREATEFUNCTION IsSimple(geometry)
         RETURNS boolean
@@ -3014 +4457 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_IsSimple(geometry)
+        RETURNS boolean
+        AS '@MODULE_FILENAME@', 'issimple'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION Equals(geometry,geometry)
         RETURNS boolean
@@ -3019 +4469 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Equals(geometry,geometry)
+        RETURNS boolean
+        AS '@MODULE_FILENAME@','geomequals'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -----------------------------------------------------------------------
 -- SVG OUTPUT
 -----------------------------------------------------------------------
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsSVG(geometry,int4,int4)
         RETURNS TEXT
@@ -3027 +4484 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsSVG(geometry,int4,int4)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','assvg_geometry'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsSVG(geometry,int4)
         RETURNS TEXT
@@ -3032 +4496 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsSVG(geometry,int4)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','assvg_geometry'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsSVG(geometry)
         RETURNS TEXT
@@ -3037 +4508 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsSVG(geometry)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','assvg_geometry'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -----------------------------------------------------------------------
 -- GML OUTPUT
 -----------------------------------------------------------------------
 -- AsGML(geom, precision, version)
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsGML(geometry, int4, int4)
         RETURNS TEXT
@@ -3046 +4524 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsGML(geometry, int4, int4)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asGML'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- AsGML(geom, precision) / version=2
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsGML(geometry, int4)
         RETURNS TEXT
@@ -3052 +4537 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsGML(geometry, int4)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asGML'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- AsGML(geom) / precision=15 version=2
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsGML(geometry)
         RETURNS TEXT
@@ -3058 +4550 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availabiltiy: 1.2.2
+CREATEFUNCTION ST_AsGML(geometry)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asGML'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -----------------------------------------------------------------------
 -- KML OUTPUT
 -----------------------------------------------------------------------
 -- AsUKML(geom, precision, version)
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsUKML(geometry, int4, int4)
         RETURNS TEXT
@@ -3067 +4566 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsUKML(geometry, int4, int4)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asKML'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- AsUKML(geom, precision) / version=2
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsUKML(geometry, int4)
         RETURNS TEXT
@@ -3073 +4579 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsUKML(geometry, int4)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asKML'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- AsUKML(geom) / precision=15 version=2
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsUKML(geometry)
         RETURNS TEXT
@@ -3079 +4592 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsUKML(geometry)
+        RETURNS TEXT
+        AS '@MODULE_FILENAME@','LWGEOM_asKML'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- AsKML(geom, precision, version)
+-- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsKML(geometry, int4, int4)
         RETURNS TEXT
@@ -3085 +4605 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATE OR REPLACE FUNCTION ST_AsKML(geometry, int4, int4)
+        RETURNS TEXT
+        AS 'SELECT AsUKML(transform($1,4326),$2,$3)' 
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- AsKML(geom, precision) / version=2
+-- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsKML(geometry, int4) 
         RETURNS TEXT
@@ -3091 +4618 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATE OR REPLACE FUNCTION ST_AsKML(geometry, int4) 
+        RETURNS TEXT
+        AS 'SELECT AsUKML(transform($1,4326),$2)' 
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 -- AsKML(geom) / precision=15 version=2
+-- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsKML(geometry) 
         RETURNS TEXT
@@ -3097 +4631 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATE OR REPLACE FUNCTION ST_AsKML(geometry) 
+        RETURNS TEXT
+        AS 'SELECT AsUKML(transform($1,4326))' 
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
 ------------------------------------------------------------------------
 -- OGC defined
 ------------------------------------------------------------------------
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION NumPoints(geometry)
         RETURNS int4
@@ -3106 +4647 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_NumPoints(geometry)
+        RETURNS int4
+        AS '@MODULE_FILENAME@', 'LWGEOM_numpoints_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION NumGeometries(geometry)
         RETURNS int4
@@ -3111 +4659 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_NumGeometries(geometry)
+        RETURNS int4
+        AS '@MODULE_FILENAME@', 'LWGEOM_numgeometries_collection'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeometryN(geometry,integer)
         RETURNS geometry
@@ -3116 +4671 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeometryN(geometry,integer)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@', 'LWGEOM_geometryn_collection'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION Dimension(geometry)
         RETURNS int4
@@ -3121 +4683 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Dimension(geometry)
+        RETURNS int4
+        AS '@MODULE_FILENAME@', 'LWGEOM_dimension'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION ExterioRring(geometry)
         RETURNS geometry
@@ -3126 +4695 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_ExteriorRing(geometry)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_exteriorring_polygon'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION NumInteriorRings(geometry)
         RETURNS integer
@@ -3131 +4707 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_NumInteriorRings(geometry)
+        RETURNS integer
+        AS '@MODULE_FILENAME@','LWGEOM_numinteriorrings_polygon'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION NumInteriorRing(geometry)
         RETURNS integer
@@ -3136 +4719 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_NumInteriorRing(geometry)
+        RETURNS integer
+        AS '@MODULE_FILENAME@','LWGEOM_numinteriorrings_polygon'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION InteriorRingN(geometry,integer)
         RETURNS geometry
@@ -3141 +4731 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_InteriorRingN(geometry,integer)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_interiorringn_polygon'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeometryType(geometry)
         RETURNS text
@@ -3146 +4743 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeometryType(geometry)
+        RETURNS text
+        AS '@MODULE_FILENAME@', 'LWGEOM_getTYPE'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PointN(geometry,integer)
         RETURNS geometry
@@ -3151 +4755 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PointN(geometry,integer)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_pointn_linestring'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION X(geometry)
         RETURNS float8
@@ -3156 +4767 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION Y(geometry)
         RETURNS float8
@@ -3161 +4773 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION Z(geometry)
         RETURNS float8
@@ -3166 +4779 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_Z(geometry)
+        RETURNS float8
+        AS '@MODULE_FILENAME@','LWGEOM_z_point'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION M(geometry)
         RETURNS float8
@@ -3171 +4791 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_M(geometry)
+        RETURNS float8
+        AS '@MODULE_FILENAME@','LWGEOM_m_point'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION StartPoint(geometry)
         RETURNS geometry
@@ -3176 +4803 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION EndPoint(geometry)
         RETURNS geometry
@@ -3181 +4809 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION IsClosed(geometry)
         RETURNS boolean
@@ -3186 +4815 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION IsEmpty(geometry)
         RETURNS boolean
@@ -3191 +4821 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION SRID(geometry) 
         RETURNS int4
         AS '@MODULE_FILENAME@','LWGEOM_getSRID'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
-        
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION SetSRID(geometry,int4) 
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_setSRID'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);  
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_SetSRID(geometry,int4) 
         RETURNS geometry
         AS '@MODULE_FILENAME@','LWGEOM_setSRID'
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);  
         
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsBinary(geometry)
         RETURNS bytea
@@ -3206 +4845 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsBinary(geometry,text)
         RETURNS bytea
@@ -3211 +4851 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_AsBinary(geometry,text)
+        RETURNS bytea
+        AS '@MODULE_FILENAME@','LWGEOM_asBinary'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION AsText(geometry)
         RETURNS TEXT
@@ -3216 +4863 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeometryFromText(text)
         RETURNS geometry
@@ -3221 +4869 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeometryFromText(text)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_from_text'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeometryFromText(text, int4)
         RETURNS geometry
@@ -3226 +4881 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeometryFromText(text, int4)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_from_text'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomFromText(text)
         RETURNS geometry AS 'SELECT geometryfromtext($1)'
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomFromText(text)
+        RETURNS geometry AS 'SELECT geometryfromtext($1)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomFromText(text, int4)
         RETURNS geometry AS 'SELECT geometryfromtext($1, $2)'
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION PointFromText(text)
         RETURNS geometry
@@ -3243 +4912 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PointFromText(text)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromText($1)) = ''POINT''
+        THEN GeomFromText($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PointFromText(text, int4)
         RETURNS geometry
@@ -3252 +4932 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION LineFromText(text)
         RETURNS geometry
@@ -3261 +4942 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_LineFromText(text)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromText($1)) = ''LINESTRING''
+        THEN GeomFromText($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION LineFromText(text, int4)
         RETURNS geometry
@@ -3270 +4962 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION LineStringFromText(text)
         RETURNS geometry
@@ -3275 +4968 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION LineStringFromText(text, int4)
         RETURNS geometry
@@ -3280 +4974 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION PolyFromText(text)
         RETURNS geometry
@@ -3289 +4984 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PolyFromText(text)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromText($1)) = ''POLYGON''
+        THEN GeomFromText($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PolyFromText(text, int4)
         RETURNS geometry
@@ -3298 +5004 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION PolygonFromText(text, int4)
         RETURNS geometry
@@ -3303 +5010 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PolygonFromText(text, int4)
+        RETURNS geometry
+        AS 'SELECT PolyFromText($1, $2)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PolygonFromText(text)
         RETURNS geometry
@@ -3308 +5022 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PolygonFromText(text)
+        RETURNS geometry
+        AS 'SELECT PolyFromText($1)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MLineFromText(text, int4)
         RETURNS geometry
@@ -3318 +5039 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION MLineFromText(text)
         RETURNS geometry
@@ -3327 +5049 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MLineFromText(text)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromText($1)) = ''MULTILINESTRING''
+        THEN GeomFromText($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiLineStringFromText(text)
         RETURNS geometry
@@ -3332 +5065 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiLineStringFromText(text)
+        RETURNS geometry
+        AS 'SELECT MLineFromText($1)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiLineStringFromText(text, int4)
         RETURNS geometry
@@ -3337 +5077 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiLineStringFromText(text, int4)
+        RETURNS geometry
+        AS 'SELECT MLineFromText($1, $2)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MPointFromText(text, int4)
         RETURNS geometry
@@ -3346 +5093 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION MPointFromText(text)
         RETURNS geometry
@@ -3355 +5103 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MPointFromText(text)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromText($1)) = ''MULTIPOINT''
+        THEN GeomFromText($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiPointFromText(text, int4)
         RETURNS geometry
@@ -3360 +5119 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiPointFromText(text)
         RETURNS geometry
@@ -3365 +5125 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiPointFromText(text)
+        RETURNS geometry
+        AS 'SELECT MPointFromText($1)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
+CREATEFUNCTION MultiPointFromText(text)
+        RETURNS geometry
+        AS 'SELECT MPointFromText($1)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiPointFromText(text)
+        RETURNS geometry
+        AS 'SELECT MPointFromText($1)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MPolyFromText(text, int4)
         RETURNS geometry
@@ -3374 +5153 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION MPolyFromText(text)
         RETURNS geometry
@@ -3383 +5163 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+--Availability: 1.2.2
+CREATEFUNCTION ST_MPolyFromText(text)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromText($1)) = ''MULTIPOLYGON''
+        THEN GeomFromText($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiPolygonFromText(text, int4)
         RETURNS geometry
@@ -3388 +5179 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiPolygonFromText(text, int4)
+        RETURNS geometry
+        AS 'SELECT MPolyFromText($1, $2)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiPolygonFromText(text)
         RETURNS geometry
@@ -3393 +5191 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiPolygonFromText(text)
+        RETURNS geometry
+        AS 'SELECT MPolyFromText($1)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomCollFromText(text, int4)
         RETURNS geometry
@@ -3403 +5208 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomCollFromText(text, int4)
+        RETURNS geometry
+        AS '
+        SELECT CASE
+        WHEN geometrytype(GeomFromText($1, $2)) = ''GEOMETRYCOLLECTION''
+        THEN GeomFromText($1,$2)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomCollFromText(text)
         RETURNS geometry
@@ -3413 +5230 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomCollFromText(text)
+        RETURNS geometry
+        AS '
+        SELECT CASE
+        WHEN geometrytype(GeomFromText($1)) = ''GEOMETRYCOLLECTION''
+        THEN GeomFromText($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomFromWKB(bytea)
         RETURNS geometry
@@ -3418 +5247 @@
         LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomFromWKB(bytea)
+        RETURNS geometry
+        AS '@MODULE_FILENAME@','LWGEOM_from_WKB'
+        LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomFromWKB(bytea, int)
         RETURNS geometry
@@ -3423 +5259 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomFromWKB(bytea, int)
+        RETURNS geometry
+        AS 'SELECT setSRID(GeomFromWKB($1), $2)'
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PointFromWKB(bytea, int)
         RETURNS geometry
@@ -3432 +5275 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION PointFromWKB(bytea)
         RETURNS geometry
@@ -3441 +5285 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PointFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''POINT''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION LineFromWKB(bytea, int)
         RETURNS geometry
@@ -3450 +5305 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION LineFromWKB(bytea)
         RETURNS geometry
@@ -3459 +5315 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_LineFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''LINESTRING''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION LinestringFromWKB(bytea, int)
         RETURNS geometry
@@ -3468 +5335 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_LinestringFromWKB(bytea, int)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1, $2)) = ''LINESTRING''
+        THEN GeomFromWKB($1, $2)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION LinestringFromWKB(bytea)
         RETURNS geometry
@@ -3477 +5355 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_LinestringFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''LINESTRING''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PolyFromWKB(bytea, int)
         RETURNS geometry
@@ -3486 +5375 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION PolyFromWKB(bytea)
         RETURNS geometry
@@ -3495 +5385 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PolyFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''POLYGON''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PolygonFromWKB(bytea, int)
         RETURNS geometry
@@ -3504 +5405 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PolygonFromWKB(bytea, int)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1,$2)) = ''POLYGON''
+        THEN GeomFromWKB($1, $2)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION PolygonFromWKB(bytea)
         RETURNS geometry
@@ -3513 +5425 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_PolygonFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''POLYGON''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MPointFromWKB(bytea, int)
         RETURNS geometry
@@ -3522 +5445 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION MPointFromWKB(bytea)
         RETURNS geometry
@@ -3531 +5455 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MPointFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''MULTIPOINT''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiPointFromWKB(bytea, int)
         RETURNS geometry
@@ -3540 +5475 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiPointFromWKB(bytea, int)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1,$2)) = ''MULTIPOINT''
+        THEN GeomFromWKB($1, $2)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiPointFromWKB(bytea)
         RETURNS geometry
@@ -3549 +5495 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiPointFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''MULTIPOINT''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiLineFromWKB(bytea, int)
         RETURNS geometry
@@ -3558 +5515 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION MultiLineFromWKB(bytea, int)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1, $2)) = ''MULTILINESTRING''
+        THEN GeomFromWKB($1, $2)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiLineFromWKB(bytea)
         RETURNS geometry
@@ -3567 +5535 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiLineFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''MULTILINESTRING''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MLineFromWKB(bytea, int)
         RETURNS geometry
@@ -3576 +5555 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION MLineFromWKB(bytea)
         RETURNS geometry
@@ -3585 +5565 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MLineFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''MULTILINESTRING''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MPolyFromWKB(bytea, int)
         RETURNS geometry
@@ -3594 +5585 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Deprecation in 1.2.3
 CREATEFUNCTION MPolyFromWKB(bytea)
         RETURNS geometry
@@ -3603 +5595 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MPolyFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''MULTIPOLYGON''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiPolyFromWKB(bytea, int)
         RETURNS geometry
@@ -3612 +5615 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiPolyFromWKB(bytea, int)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1, $2)) = ''MULTIPOLYGON''
+        THEN GeomFromWKB($1, $2)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION MultiPolyFromWKB(bytea)
         RETURNS geometry
@@ -3621 +5635 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_MultiPolyFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''MULTIPOLYGON''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomCollFromWKB(bytea, int)
         RETURNS geometry
@@ -3631 +5656 @@
         LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomCollFromWKB(bytea, int)
+        RETURNS geometry
+        AS '
+        SELECT CASE
+        WHEN geometrytype(GeomFromWKB($1, $2)) = ''GEOMETRYCOLLECTION''
+        THEN GeomFromWKB($1, $2)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Deprecation in 1.2.3
 CREATEFUNCTION GeomCollFromWKB(bytea)
+        RETURNS geometry
+        AS '
+        SELECT CASE
+        WHEN geometrytype(GeomFromWKB($1)) = ''GEOMETRYCOLLECTION''
+        THEN GeomFromWKB($1)
+        ELSE NULL END
+        '
+        LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
+
+-- Availability: 1.2.2
+CREATEFUNCTION ST_GeomCollFromWKB(bytea)
         RETURNS geometry
         AS '
@@ -3655 +5703 @@
 -- Also, we profit from plpgsql to RAISE exceptions.
 --
+-- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION BdPolyFromText(text, integer)
 RETURNS geometry
@@ -3683 +5732 @@
 LANGUAGE 'plpgsql' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATE OR REPLACE FUNCTION ST_BdPolyFromText(text, integer)
+RETURNS geometry
+AS '
+DECLARE
+        geomtext alias for $1;
+        srid alias for $2;
+        mline geometry;
+        geom geometry;
+BEGIN
+        mline := MultiLineStringFromText(geomtext, srid);
+
+        IF mline IS NULL
+        THEN
+                RAISE EXCEPTION ''Input is not a MultiLinestring'';
+        END IF;
+
+        geom := BuildArea(mline);
+
+        IF GeometryType(geom) != ''POLYGON''
+        THEN
+                RAISE EXCEPTION ''Input returns more then a single polygon, try using BdMPolyFromText instead'';
+        END IF;
+
+        RETURN geom;
+END;
+'
+LANGUAGE 'plpgsql' _IMMUTABLE_STRICT; 
+
 --
 -- SFSQL 1.1
@@ -3695 +5773 @@
 -- To raise an exception in case of invalid input.
 --
+-- Deprecation in 1.2.3
 CREATEFUNCTION BdMPolyFromText(text, integer)
 RETURNS geometry
@@ -3718 +5797 @@
 LANGUAGE 'plpgsql' _IMMUTABLE_STRICT; 
 
+-- Availability: 1.2.2
+CREATEFUNCTION ST_BdMPolyFromText(text, integer)
+RETURNS geometry
+AS '
+DECLARE
+        geomtext alias for $1;
+        srid alias for $2;
+        mline geometry;
+        geom geometry;
+BEGIN
+        mline := MultiLineStringFromText(geomtext, srid);
+
+        IF mline IS NULL
+        THEN
+                RAISE EXCEPTION ''Input is not a MultiLinestring'';
+        END IF;
+
+        geom := multi(BuildArea(mline));
+
+        RETURN geom;
+END;
+'
+LANGUAGE 'plpgsql' _IMMUTABLE_STRICT; 
+
 #include "long_xact.sql.in"
 #include "sqlmm.sql.in"

trunk/lwgeom/sqlmm.sql.in

@@ -379 +379 @@
     RETURNS boolean
     AS '
-    SELECT CASE zmflag($1)
+    SELECT CASE ST_zmflag($1)
                WHEN 0 THEN false
                WHEN 1 THEN false
@@ -393 +393 @@
     RETURNS boolean
     AS '
-    SELECT CASE zmflag($1)
+    SELECT CASE ST_zmflag($1)
                WHEN 0 THEN false
                WHEN 1 THEN true

trunk/regress/affine_expected

@@ -34 +34 @@
 rotZ_bbox|BOX(-1 0,0 0)
 rotY_bbox|BOX(-1 0,0 0)
+translate|POINT(5 12)
+translate|POINT(-3 -7 3)
+scale|POINT(5 5)
+scale|POINT(3 2)
+scale|POINT(40 40 40)
+rotateZ|POINT(-1 -1)
+rotateZ|POINT(-1 1)
+rotateZ|POINT(1 -1)
+rotateZ|POINT(1 1)
+rotateY|POINT(-1 1 -1)
+rotateY|POINT(1 1 -1)
+rotateY|POINT(-1 1 1)
+rotateY|POINT(1 1 1)
+rotateX|POINT(1 -1 -1)
+rotateX|POINT(1 -1 1)
+rotateX|POINT(1 1 -1)
+rotateX|POINT(1 1 1)
+transscale|POINT(2 2)
+transscale|POINT(3 3)
+transscale|POINT(0 0)
+transscale|POINT(1 2)
+transscale|POINT(2 1)
+transscale|POINT(0 2)
+transscale|POINT(2 0)
+transscale|POINT(3 2)
+transscale|POINT(2 3)
+transscale|POINT(4 2)
+transscale|POINT(2 4)
+transscale|POINT(15 28)
+transscale|POINT(15 28 1)
+transl_bbox|BOX(1 0,2 1)
+scale_bbox|BOX(2 0,4 0)
+tscale_bbox|BOX(3 1,4 2)
+rotZ_bbox|BOX(-1 0,0 0)
+rotY_bbox|BOX(-1 0,0 0)

trunk/regress/affine.sql

@@ -50 +50 @@
 select 'rotZ_bbox', box2d(SnapToGrid(rotateZ('LINESTRING(0 0, 1 0)'::geometry, pi()), 0.1));
 select 'rotY_bbox', box2d(SnapToGrid(rotateY('LINESTRING(0 0, 1 0)'::geometry, pi()), 0.1));
+
+-- Repeat all tests with the new function names.
+-- translate
+select 'translate', ST_asewkt(ST_translate('POINT(0 0)'::geometry, 5, 12));
+select 'translate', ST_asewkt(ST_translate('POINT(0 0 0)'::geometry, -3, -7, 3));
+
+-- scale
+select 'scale', ST_asewkt(ST_scale('POINT(1 1)'::geometry, 5, 5));
+select 'scale', ST_asewkt(ST_scale('POINT(1 1)'::geometry, 3, 2));
+select 'scale', ST_asewkt(ST_scale('POINT(10 20 -5)'::geometry, 4, 2, -8));
+
+-- rotateZ
+select 'rotateZ', ST_asewkt(ST_SnapToGrid(rotateZ('POINT(1 1)'::geometry, pi()), 0.1));
+select 'rotateZ', ST_asewkt(ST_SnapToGrid(rotateZ('POINT(1 1)'::geometry, pi()/2), 0.1));
+select 'rotateZ', ST_asewkt(ST_SnapToGrid(rotateZ('POINT(1 1)'::geometry, pi()+pi()/2), 0.1));
+select 'rotateZ', ST_asewkt(ST_SnapToGrid(rotateZ('POINT(1 1)'::geometry, 2*pi()), 0.1));
+
+-- rotateY
+select 'rotateY', ST_asewkt(ST_SnapToGrid(rotateY('POINT(1 1 1)'::geometry, pi()), 0.1));
+select 'rotateY', ST_asewkt(ST_SnapToGrid(rotateY('POINT(1 1 1)'::geometry, pi()/2), 0.1));
+select 'rotateY', ST_asewkt(ST_SnapToGrid(rotateY('POINT(1 1 1)'::geometry, pi()+pi()/2), 0.1));
+select 'rotateY', ST_asewkt(ST_SnapToGrid(rotateY('POINT(1 1 1)'::geometry, 2*pi()), 0.1));
+
+-- rotateX
+select 'rotateX', ST_asewkt(ST_SnapToGrid(rotateX('POINT(1 1 1)'::geometry, pi()), 0.1));
+select 'rotateX', ST_asewkt(ST_SnapToGrid(rotateX('POINT(1 1 1)'::geometry, pi()/2), 0.1));
+select 'rotateX', ST_asewkt(ST_SnapToGrid(rotateX('POINT(1 1 1)'::geometry, pi()+pi()/2), 0.1));
+select 'rotateX', ST_asewkt(ST_SnapToGrid(rotateX('POINT(1 1 1)'::geometry, 2*pi()), 0.1));
+
+-- transscale
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,1, 1, 1, 1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(2 2)'::geometry,1, 1, 1, 1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,-1, -1, -1, -1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,0, 1, 1, 1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,1, 0, 1, 1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,1, 1, 0, 1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,1, 1, 1, 0), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,2, 1, 1, 1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,1, 2, 1, 1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,1, 1, 2, 1), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,1, 1, 1, 2), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1)'::geometry,2, 3, 5, 7), 0.1));
+select 'transscale', ST_asewkt(ST_snapToGrid(transscale('POINT(1 1 1)'::geometry,2, 3, 5, 7), 0.1));
+
+-- postgis-users/2006-May/012119.html
+select 'transl_bbox', ST_box2d(ST_translate('LINESTRING(0 0, 1 1)'::geometry, 1, 0, 0));
+select 'scale_bbox', ST_box2d(ST_scale('LINESTRING(1 0, 2 1)'::geometry, 2, 0));
+select 'tscale_bbox', ST_box2d(ST_transscale('LINESTRING(1 0, 2 1)'::geometry, 2, 1, 1, 1));
+
+select 'rotZ_bbox', ST_box2d(ST_SnapToGrid(rotateZ('LINESTRING(0 0, 1 0)'::geometry, pi()), 0.1));
+select 'rotY_bbox', ST_box2d(ST_SnapToGrid(rotateY('LINESTRING(0 0, 1 0)'::geometry, pi()), 0.1));

trunk/regress/ctors_expected

@@ -7 +7 @@
 BOX3D(0 0 0,1 1 0)
 ERROR:  Operation on mixed SRID geometries
+32749
+ERROR:  Operation on mixed SRID geometries
+SRID=3;LINESTRING(0 0,1 1)
+ERROR:  Operation on mixed SRID geometries
+BOX(0 0,1 1)
+ERROR:  Operation on mixed SRID geometries
+BOX3D(0 0 0,1 1 0)
+ERROR:  Operation on mixed SRID geometries

trunk/regress/ctors.sql

@@ -13 +13 @@
 select makebox3d('SRID=3;POINT(0 0)', 'SRID=3;POINT(1 1)');
 select makebox3d('POINT(0 0)', 'SRID=3;POINT(1 1)');
+
+-- Repeat all tests with the new function names.
+-- postgis-users/2006-July/012764.html
+SELECT ST_SRID(collect('SRID=32749;POINT(0 0)', 'SRID=32749;POINT(1 1)'));
+
+SELECT ST_collect('SRID=32749;POINT(0 0)', 'SRID=32740;POINT(1 1)');
+
+select ST_asewkt(makeline('SRID=3;POINT(0 0)', 'SRID=3;POINT(1 1)'));
+select ST_makeline('POINT(0 0)', 'SRID=3;POINT(1 1)');
+
+-- postgis-users/2006-July/012788.html
+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)');

trunk/regress/kml_expected

@@ -20 +20 @@
 <Point><coordinates>-73.1978481045547,6.76797715816346,0</coordinates></Point>
 <Point><coordinates>-74.0775046875181,4.59620005298432,0</coordinates></Point>
+ERROR:  Input geometry has unknown (-1) SRID
+ERROR:  geometry_to_kml: 'Curve' geometry type not supported by Google Earth
+ERROR:  geometry_to_kml: 'CompoundString' geometry type not supported by Google Earth
+ERROR:  geometry_to_kml: 'Invalid type' geometry type not supported by Google Earth
+ERROR:  geometry_to_kml: 'Invalid type' geometry type not supported by Google Earth
+ERROR:  geometry_to_kml: 'Invalid type' geometry type not supported by Google Earth
+ERROR:  Precision out of range 1..15
+ERROR:  Precision out of range 1..15
+ERROR:  Only KML 2 is supported
+<Point><coordinates>-75.5521729775749,10.4203366345305,0</coordinates></Point>
+<Point><coordinates>-75.55217298,10.42033663,0</coordinates></Point>
+<LineString><coordinates>-75.5884516874785,6.23081171191744,0 -75.5925764681848,6.20903425257533,0</coordinates></LineString>
+<LineString><coordinates>-75.58845169,6.230811712,0 -75.59257647,6.209034253,0</coordinates></LineString>
+<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.042399,4.701288,0 -74.042099,4.700951,0 -74.042018,4.701012,0 -74.041835,4.700831,0 -74.041486,4.70114,0 -74.041328,4.700977,0 -74.04102,4.701245,0 -74.041178,4.701426,0 -74.040872,4.701697,0 -74.040941,4.701774,0 -74.0409,4.702606,0 -74.040824,4.702678,0 -74.041066,4.70295,0 -74.040873,4.703121,0 -74.041189,4.703468,0 -74.041383,4.703309,0 -74.041739,4.703689,0 -74.041924,4.703528,0 -74.041954,4.703555,0 -74.042307,4.703239,0 -74.042075,4.702978,0 -74.042155,4.702908,0 -74.04195,4.702675,0 -74.042096,4.702534,0 -74.042035,4.702467,0 -74.042053,4.702038,0 -74.042123,4.701974,0 -74.041986,4.701817,0 -74.042222,4.701604,0 -74.042149,4.70152,0 -74.042399,4.701288,0</coordinates></LinearRing></outerBoundaryIs></Polygon>
+<Polygon><outerBoundaryIs><LinearRing><coordinates>-74.04239911,4.701288195,0 -74.04209926,4.700950994,0 -74.0420183,4.701011516,0 -74.04183483,4.700831449,0 -74.04148629,4.70114015,0 -74.04132847,4.700976981,0 -74.04101991,4.701244757,0 -74.04117774,4.701425554,0 -74.04087245,4.701697127,0 -74.04094064,4.70177368,0 -74.04089953,4.70260566,0 -74.04082413,4.702677666,0 -74.04106565,4.702949831,0 -74.04087265,4.703121095,0 -74.04118885,4.703468333,0 -74.04138265,4.703308984,0 -74.04173931,4.703688848,0 -74.0419237,4.703528239,0 -74.04195356,4.703554861,0 -74.04230658,4.703239478,0 -74.04207492,4.702978243,0 -74.0421547,4.702907817,0 -74.04195033,4.702675127,0 -74.04209558,4.702533577,0 -74.04203505,4.702466796,0 -74.04205318,4.702038078,0 -74.04212336,4.701974338,0 -74.04198589,4.701816902,0 -74.04222168,4.701604424,0 -74.04214902,4.701519996,0 -74.04239911,4.701288195,0</coordinates></LinearRing></outerBoundaryIs></Polygon>
+<MultiGeometry><Point><coordinates>-74.0460345759477,4.75468700665652,0</coordinates></Point><Point><coordinates>-74.095833,4.746435,0</coordinates></Point><Point><coordinates>-74.1103754749261,4.7098754227297,0</coordinates></Point><Point><coordinates>-74.120148,4.533696,0</coordinates></Point></MultiGeometry>
+<MultiGeometry><Point><coordinates>-74.04603458,4.754687007,0</coordinates></Point><Point><coordinates>-74.095833,4.746435,0</coordinates></Point><Point><coordinates>-74.11037547,4.709875423,0</coordinates></Point><Point><coordinates>-74.120148,4.533696,0</coordinates></Point></MultiGeometry>
+<Point><coordinates>-73.1137865115871,7.10625638610512,0</coordinates></Point>
+<Point><coordinates>-73.1978481045547,6.76797715816346,0</coordinates></Point>
+<Point><coordinates>-74.0775046875181,4.59620005298432,0</coordinates></Point>

trunk/regress/kml.sql

@@ -52 +52 @@
 SELECT AsKML(GeomFromEWKT('SRID=1021892;POINT(1000000 1000000)'));
 
+-- Repeat all tests with the new function names.
+-- NO SRID PROVIDED
+SELECT ST_AsKML(ST_GeomFromEWKT('POINT(1 1)'));
+
+-- UNSUPPORTED GEOMETRY TYPES
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;CIRCULARSTRING(-2 0,0 2,2 0,0 2,2 4)'));
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))'));
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))'));
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,2 1,2 2))'));
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))'));
+
+-- PARAMETERS
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;POINT(1 1)'), 0);
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;POINT(1 1)'), 16);
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;POINT(1 1)'), 15, 3);
+
+-- SIMPLE FEATURES
+-- San Felipe de Barajas Fortresses - Cartagena, Colombia (Placemark) http://en.wikipedia.org/wiki/Cartagena%2C_Bol%C3%ADvar
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;POINT(-75.55217297757488 10.42033663453054)'));
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;POINT(-75.55217297757488 10.42033663453054)'), 10);
+-- Olaya Herrera Airport - Medellin, Colombia (Path) http://en.wikipedia.org/wiki/Olaya_Herrera_Airport
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;LINESTRING(-75.58845168747847 6.230811711917435, -75.59257646818483 6.209034252575331)'));
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;LINESTRING(-75.58845168747847 6.230811711917435, -75.59257646818483 6.209034252575331)'), 10);
+-- Unicentro Shopping Centre - Bogota, Colombia (Polygon) http://www.unicentrobogota.com/
+SELECT ST_AsKML(ST_SnapToGrid(GeomFromEWKT('SRID=4326;POLYGON((-74.0423991077642 4.70128819450968, -74.04209925973704 4.700950993650923, -74.0420182951016 4.701011516462908, -74.04183483125468 4.700831448835688, -74.0414862905795 4.70114015046422, -74.04132847200927 4.70097698051241, -74.04101990886149 4.701244756502166, -74.0411777421693 4.701425554204853, -74.04087244656924 4.701697127180076, -74.040940643764 4.701773680406961, -74.04089952744008 4.702605660205299, -74.04082413388542 4.702677666010084, -74.04106565350325 4.702949831221687, -74.04087265096442 4.703121094787139, -74.04118884713594 4.7034683330851, -74.04138264686453 4.703308983914091, -74.04173931195382 4.703688847671272, -74.04192370456995 4.703528238994438, -74.0419535628069 4.70355486096117, -74.04230657961881 4.703239478084376, -74.04207492135191 4.702978242710751, -74.0421546959669 4.702907817351857, -74.04195032608129 4.70267512672329, -74.04209558069562 4.702533577124568, -74.04203505048247 4.702466795922, -74.04205318281811 4.702038077671765, -74.04212335562635 4.701974337580458, -74.04198589330784 4.701816901909086, -74.04222167646385 4.70160442413543, -74.04214901975594 4.701519995786457, -74.0423991077642 4.70128819450968))'), 0.000001));
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;POLYGON((-74.0423991077642 4.70128819450968, -74.04209925973704 4.700950993650923, -74.0420182951016 4.701011516462908, -74.04183483125468 4.700831448835688, -74.0414862905795 4.70114015046422, -74.04132847200927 4.70097698051241, -74.04101990886149 4.701244756502166, -74.0411777421693 4.701425554204853, -74.04087244656924 4.701697127180076, -74.040940643764 4.701773680406961, -74.04089952744008 4.702605660205299, -74.04082413388542 4.702677666010084, -74.04106565350325 4.702949831221687, -74.04087265096442 4.703121094787139, -74.04118884713594 4.7034683330851, -74.04138264686453 4.703308983914091, -74.04173931195382 4.703688847671272, -74.04192370456995 4.703528238994438, -74.0419535628069 4.70355486096117, -74.04230657961881 4.703239478084376, -74.04207492135191 4.702978242710751, -74.0421546959669 4.702907817351857, -74.04195032608129 4.70267512672329, -74.04209558069562 4.702533577124568, -74.04203505048247 4.702466795922, -74.04205318281811 4.702038077671765, -74.04212335562635 4.701974337580458, -74.04198589330784 4.701816901909086, -74.04222167646385 4.70160442413543, -74.04214901975594 4.701519995786457, -74.0423991077642 4.70128819450968))'), 10);
+
+-- MULTI FEATURES
+-- Transmilenio mass-transit system Portal Stations - Bogota, Colombia (Placemarks) http://en.wikipedia.org/wiki/List_of_TransMilenio_Stations
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;MULTIPOINT((-74.04603457594773 4.754687006656519),(-74.095833 4.746435),(-74.11037547492613 4.7098754227297),(-74.120148 4.533696))'));
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=4326;MULTIPOINT((-74.04603457594773 4.754687006656519),(-74.095833 4.746435),(-74.11037547492613 4.7098754227297),(-74.120148 4.533696))'), 10);
+
+-- REPROJECTED DATA
+-- Sun Door Interchange - Bucaramanga, Colombia (Placemark)
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=1021892;POINT(1106465.31495947 1277689.13470039)'));
+-- Chicamocha, Suarez and Fonce rivers confluence - Santander, Colombia (Placemark)
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=1021892;POINT(1097247.52170185 1240255.74263751)'));
+-- National Astronomical Observatory of Colombia - Bogota, Colombia (Placemark)
+SELECT ST_AsKML(ST_GeomFromEWKT('SRID=1021892;POINT(1000000 1000000)'));
+
 DELETE FROM spatial_ref_sys WHERE srid = 4326;
 DELETE FROM spatial_ref_sys WHERE srid >= 1000000;

trunk/regress/lwgeom_regress_expected

@@ -6 +6 @@
 15063
 10431
+BOX(0 0.0999999940395355,11 12)
+BOX3D(0 0.1 -55,11 12 12)
+10431
+15063
+19695
+15063
+10431

trunk/regress/lwgeom_regress.sql

@@ -100 +100 @@
 SELECT mem_size(collect(force_2d(force_4d(force_3dm(force_3dz(force_2d(geometry(wkb_ndr)))))))) from test_data;
 
+--
+SELECT id,wkt FROM test_data WHERE
+       ST_asEWKT(ST_geometry(wkt)) != wkt  OR
+       ST_asEWKT(ST_geometry(wkb_xdr)) != wkt OR 
+       ST_asEWKT(ST_geometry(wkb_ndr)) != wkt OR
+       ST_asBinary(ST_geometry(wkb_ndr)) != ST_asBinary(ST_geometry(wkb_xdr)) OR
+       ST_asBinary(ST_geometry(wkt)) != ST_asBinary(ST_geometry(wkb_xdr));
+
+
+SELECT ST_extent(ST_geometry(wkb_ndr)) from test_data;
+SELECT ST_extent3d(ST_geometry(wkb_ndr)) from test_data;
+SELECT ST_mem_size(ST_collect(ST_force_2d(ST_geometry(wkb_ndr)))) from test_data;
+SELECT ST_mem_size(ST_collect(ST_force_3dz(ST_geometry(wkb_ndr)))) from test_data;
+SELECT ST_mem_size(ST_collect(ST_force_4d(ST_force_2d(ST_geometry(wkb_ndr))))) from test_data;
+SELECT ST_mem_size(ST_collect(ST_force_3dm(ST_geometry(wkb_ndr)))) from test_data;
+SELECT ST_mem_size(ST_collect(ST_force_2d(ST_force_4d(ST_force_3dm(ST_force_3dz(ST_force_2d(ST_geometry(wkb_ndr)))))))) from test_data;
+
 DROP TABLE test_data;

trunk/regress/measures_expected

@@ -9 +9 @@
 136|13
 dist|1|1
+113|291
+114|140
+115|140
+116|4.24264068711929
+117|4.24264068711929
+118|5.19615242270663
+134|0
+135|13
+136|13
+dist|1|1

trunk/regress/measures.sql

@@ -1 @@
-
 select '113', area2d('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;
 
@@ -16 +15 @@
 select '136', distance('POINT(0 0)', translate('POINT(0 0)', 5, 12, 0));
 
-
 -- postgis-users/2006-May/012174.html
-select 'dist', distance(a,b), distance(b,a) from (
+select 'dist', distance(a,b), ST_distance(b,a) from (
         select 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry as a,
                 'POLYGON((11 0, 11 10, 20 10, 20 0, 11 0),
@@ -24 +22 @@
         ) as foo;
 
+-- Apply the same tests using the new function names.
+select '113', ST_area2d('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 '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 '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 '134', ST_distance('POINT(1 2)', 'POINT(1 2)');
+select '135', ST_distance('POINT(5 0)', 'POINT(10 12)');
+
+select '136', ST_distance('POINT(0 0)', ST_translate('POINT(0 0)', 5, 12, 0));
+
+
+-- postgis-users/2006-May/012174.html
+select 'dist', ST_distance(a,b), ST_distance(b,a) from (
+        select 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry as a,
+                'POLYGON((11 0, 11 10, 20 10, 20 0, 11 0),
+                        (15 5, 15 8, 17 8, 17 5, 15 5))'::geometry as b
+        ) as foo;
+

trunk/regress/regress_bdpoly_expected

@@ -10 +10 @@
 ERROR:  Input returns more then a single polygon, try using BdMPolyFromText instead
 BdMPolyFromText|SRID=3;MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(2 2,4 2,4 4,2 4,2 2),(5 5,7 5,7 7,5 7,5 5)))
+BuildArea|SRID=2;POLYGON((0 0 10,0 10 8,10 10 6,10 0 4,0 0 2))
+BuildArea|SRID=3;POLYGON((0 0 10,0 10 8,10 10 6,10 0 4,0 0 2),(2 2 5,4 2 4,4 4 3,2 4 2,2 2 1),(5 5 6,7 5 7,7 7 8,5 7 9,5 5 10))
+BuildArea|SRID=3;POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,4 2,4 4,2 4,2 2),(5 5,7 5,7 7,5 7,5 5))
+BuildArea|SRID=3;POLYGON((0 0 10,0 10 8,10 10 6,10 0 4,0 0 2),(2 2 5,4 2 4,4 4 3,2 4 2,2 2 1),(5 5 6,7 5 7,7 7 8,5 7 9,5 5 10))
+BuildArea|SRID=3;MULTIPOLYGON(((0 0 10,0 10 8,10 10 6,10 0 4,0 0 2),(2 2 5,4 2 4,4 4 3,2 4 2,2 2 1),(5 5 6,7 5 7,7 7 8,5 7 9,5 5 10)),((20 0 10,20 10 8,30 10 6,30 0 4,20 0 2),(22 2 5,24 2 4,24 4 3,22 4 2,22 2 1),(25 5 6,27 5 7,27 7 8,25 7 9,25 5 10)))
+BdMPolyFromText|SRID=3;MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(2 2,4 2,4 4,2 4,2 2),(5 5,7 5,7 7,5 7,5 5)),((20 0,20 10,30 10,30 0,20 0),(22 2,24 2,24 4,22 4,22 2),(25 5,27 5,27 7,25 7,25 5)))
+BdPolyFromText|SRID=3;POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,4 2,4 4,2 4,2 2),(5 5,7 5,7 7,5 7,5 5))
+ERROR:  Input is not a MultiLinestring
+ERROR:  Input is not a MultiLinestring
+ERROR:  Input returns more then a single polygon, try using BdMPolyFromText instead
+BdMPolyFromText|SRID=3;MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(2 2,4 2,4 4,2 4,2 2),(5 5,7 5,7 7,5 7,5 5)))

trunk/regress/regress_bdpoly.sql

@@ -30 +30 @@
 select 'BdMPolyFromText', asewkt(BdMPolyFromText('MULTILINESTRING((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2),(5 5, 5 7, 7 7, 7 5, 5 5))', 3));
 
+-- Repeat all tests with the new function names.
+-- Single 3dz polygon w/out holes
+select 'BuildArea', ST_asewkt(ST_buildarea('SRID=2;LINESTRING(0 0 2, 10 0 4, 10 10 6, 0 10 8, 0 0 10)'));
+
+-- Single 3dz polygon with holes
+select 'BuildArea', ST_asewkt(ST_buildarea('SRID=3;MULTILINESTRING((0 0 2, 10 0 4, 10 10 6, 0 10 8, 0 0 10),(2 2 1, 2 4 2, 4 4 3, 4 2 4, 2 2 5),(5 5 10, 5 7 9, 7 7 8, 7 5 7, 5 5 6))'));
+
+-- Single 3dm polygon with holes (M is currently discarded)
+select 'BuildArea', ST_asewkt(ST_buildarea('SRID=3;MULTILINESTRINGM((0 0 2, 10 0 4, 10 10 6, 0 10 8, 0 0 10),(2 2 1, 2 4 2, 4 4 3, 4 2 4, 2 2 5),(5 5 10, 5 7 9, 7 7 8, 7 5 7, 5 5 6))'));
+
+-- Single 4d polygon with holes (M is currently discarded)
+select 'BuildArea', ST_asewkt(ST_buildarea('SRID=3;MULTILINESTRING((0 0 2 9, 10 0 4 9, 10 10 6 9, 0 10 8 9, 0 0 10 9),(2 2 1 9, 2 4 2 9, 4 4 3 9, 4 2 4 9, 2 2 5 9),(5 5 10 9, 5 7 9 9, 7 7 8 9, 7 5 7 9, 5 5 6 9))'));
+
+-- Multi 4d polygon with holes (M is currently discarded)
+select 'BuildArea', ST_asewkt(ST_buildarea('SRID=3;MULTILINESTRING( (0 0 2 9, 10 0 4 9, 10 10 6 9, 0 10 8 9, 0 0 10 9), (2 2 1 9, 2 4 2 9, 4 4 3 9, 4 2 4 9, 2 2 5 9), (5 5 10 9, 5 7 9 9, 7 7 8 9, 7 5 7 9, 5 5 6 9), (20 0 2 9,30 0 4 9,30 10 6 9,20 10 8 9,20 0 10 9), (22 2 1 9,22 4 2 9,24 4 3 9,24 2 4 9,22 2 5 9), (25 5 10 9,25 7 9 9,27 7 8 9,27 5 7 9,25 5 6 9))'));
+
+-- Multi 2d polygon with holes (OGC doesn't support higher dims)
+select 'BdMPolyFromText', ST_asewkt(ST_BdMPolyFromText('MULTILINESTRING( (0 0, 10 0, 10 10, 0 10, 0 0), (2 2, 2 4, 4 4, 4 2, 2 2), (5 5, 5 7, 7 7, 7 5, 5 5), (20 0,30 0,30 10,20 10,20 0), (22 2,22 4,24 4,24 2,22 2), (25 5,25 7,27 7,27 5,25 5))', 3));
+
+-- Single 2d polygon with holes (OGC doesn't support higher dims)
+select 'BdPolyFromText', ST_asewkt(ST_BdPolyFromText('MULTILINESTRING((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2),(5 5, 5 7, 7 7, 7 5, 5 5))', 3));
+
+-- Invalid input (not a linestring) to BdPolyFromText and BdMPolyFromText
+select ST_BdPolyFromText('POINT(0 0)', 3);
+select ST_BdMPolyFromText('POINT(0 0)', 3);
+
+-- MultiPolygon forming input to BdPolyFromText 
+select ST_BdPolyFromText('MULTILINESTRING( (0 0, 10 0, 10 10, 0 10, 0 0), (2 2, 2 4, 4 4, 4 2, 2 2), (5 5, 5 7, 7 7, 7 5, 5 5), (20 0,30 0,30 10,20 10,20 0), (22 2,22 4,24 4,24 2,22 2), (25 5,25 7,27 7,27 5,25 5))', 3);
+
+-- SinglePolygon forming input to BdMPolyFromText 
+select 'BdMPolyFromText', ST_asewkt(ST_BdMPolyFromText('MULTILINESTRING((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2),(5 5, 5 7, 7 7, 7 5, 5 5))', 3));
+

trunk/regress/regress_expected

@@ -105 +105 @@
 105|f
 106|BOX3D(0 0 0,7 7 0)
+106_|BOX3D(0 0 0,7 7 0)
 107|POLYGON((0 0,0 7,7 7,7 0,0 0))
 108|2
+108_|2
 109|4
+109_|4
 110|6
+110_|6
 111|528
+111_|528
 112|3
+112_|3
 121|BOX3D(1.19894826 1.20265412 0,999.932129 999.692932 0)|BOX3D(1.40486765 1.3484304 0,999.857666 999.936401 0)
+121_|BOX3D(1.19894826 1.20265412 0,999.932129 999.692932 0)|BOX3D(1.40486765 1.3484304 0,999.857666 999.936401 0)
 122|f
 123|f
@@ -121 +128 @@
 129|34009|34009
 131|1
+131_|1
 132|2
+132_|2
 133|
+133_|
 133a|3
+133a_|3
 133b|
+133b_|
 133c|
+133c_|
 133d|4
+133d_|4
 133e|
+133e_|
 137|
+137_|
 138|BOX3D(0 0 0,0 0 0)
+138_|BOX3D(0 0 0,0 0 0)
 139|SRID=2;GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY,POINT(0 0))
+139_|SRID=2;GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY,POINT(0 0))
 140|SRID=3;MULTIPOINT(2 2)
+140_|SRID=3;MULTIPOINT(2 2)
 141|SRID=4;MULTILINESTRING((2 2,3 3))
+141_|SRID=4;MULTILINESTRING((2 2,3 3))
 142|SRID=5;MULTILINESTRING((2 2,3 3))
+142_|SRID=5;MULTILINESTRING((2 2,3 3))
 143|SRID=6;MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)))
+143_|SRID=6;MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)))
 144|POINTM(1 2 0)
+144_|POINTM(1 2 0)
 145|POINT(1 2 0)
+145_|POINT(1 2 0)
 146|POINT(1 2 0 3)
+146_|POINT(1 2 0 3)
 147|POINT(1 2 3 0)
+147_|POINT(1 2 3 0)
 148|LINESTRING(0 0,5 0,10 0)
+148_|LINESTRING(0 0,5 0,10 0)
 150|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)))
+150_|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)))
 151|
+151_|

trunk/regress/regress_index.sql

@@ -8 +8 @@
 CREATE INDEX quick_gist on test using gist (the_geom gist_geometry_ops);
 
- select num,astext(the_geom) from test where the_geom && 'BOX3D(125 125,135 135)'::box3d order by num;
+ select num,ST_astext(the_geom) from test where the_geom && 'BOX3D(125 125,135 135)'::box3d order by num;
 
 set enable_seqscan = off;
 
- select num,astext(the_geom) from test where the_geom && 'BOX3D(125 125,135 135)'::box3d  order by num;
+ select num,ST_astext(the_geom) from test where the_geom && 'BOX3D(125 125,135 135)'::box3d  order by num;
 
 DROP TABLE test;

trunk/regress/regress_lrs_expected

@@ -33 +33 @@
 line_interpolate_point|POINT(0 0)
 line_interpolate_point|POINT(0.5 0.5 7.5)
+2d|
+3dz|
+PNTM_1|GEOMETRYCOLLECTIONM EMPTY
+PNTM_2|POINTM(1 2 3)
+PNTM_3|POINTM(1 2 3)
+PNTM_4|POINTM(1 2 3)
+PNTM_5|GEOMETRYCOLLECTIONM EMPTY
+MPNT_1|GEOMETRYCOLLECTIONM(POINT(1 2 2))
+MPNT_2|GEOMETRYCOLLECTIONM(POINT(2 2 5))
+MPNT_3|GEOMETRYCOLLECTIONM EMPTY
+MPNT_4|GEOMETRYCOLLECTIONM(POINT(1 2 8),POINT(2 2 5))
+LINEZM_1|LINESTRING(0 8 80 2,0 0 0 10)
+LINEZM_2|LINESTRING(0 8 20 2,0 0 100 10)
+LINEZM_3|LINESTRING(0 8 80 2,0 0 0 10,8 0 0 2)
+LINEZM_4|GEOMETRYCOLLECTION(LINESTRING(0 9 90 2,0 1 10 18),LINESTRING(1 0 0 18,9 0 0 2))
+LINEZM_5|GEOMETRYCOLLECTION(LINESTRING(0 9 90 2,0 1 10 18),LINESTRING(5.5 4.5 4.5 18,9.5 0.5 0.5 2))
+LINEZM_6|POINT(9.5 0.5 0.5 2)
+line_locate_point|0.528602749909894
+line_locate_point|1
+line_locate_point|0
+line_substring|SRID=4326;LINESTRING(2 2 2 2,3 3 3 3,3.2 3.2 3.2 3.2)
+line_substring|LINESTRING(2 2 2 2,3 3 3 3)
+line_substring|LINESTRING(0 0,1 1)
+line_substring|LINESTRING(1 1,2 2)
+line_substring|LINESTRING(1 1,2 2)
+line_substring|LINESTRING(0 0,1 1)
+line_substring|LINESTRING(1 1,2 2)
+line_substring|LINESTRINGM(1 1 1,2 2 2)
+line_substring|LINESTRINGM(1 1 3,2 2 2)
+line_substring|LINESTRING(1 1 3,2 2 2)
+line_substring|POINT(0 0)
+line_substring|POINT(0.5 0.5 7.5)
+line_interpolate_point|POINT(0 0)
+line_interpolate_point|POINT(0.5 0.5 7.5)

trunk/regress/regress_lrs.sql

@@ -54 +54 @@
 select 'line_interpolate_point', asewkt(line_interpolate_point('LINESTRING(0 0, 1 1)', 0));
 select 'line_interpolate_point', asewkt(line_interpolate_point('LINESTRING(0 0 10, 1 1 5)', 0.5));
+
+-- Repeat all tests with the new function names.
+-- No M value
+select '2d',ST_asewkt(ST_locate_along_measure('POINT(1 2)', 1));
+select '3dz',ST_asewkt(ST_locate_along_measure('POINT(1 2 3)', 1));
+
+-- Points
+select 'PNTM_1',ST_asewkt(ST_locate_along_measure('POINTM(1 2 3)', 1));
+select 'PNTM_2',ST_asewkt(ST_locate_along_measure('POINTM(1 2 3)', 3));
+select 'PNTM_3',ST_asewkt(ST_locate_between_measures('POINTM(1 2 3)', 2, 3));
+select 'PNTM_4',ST_asewkt(ST_locate_between_measures('POINTM(1 2 3)', 3, 4));
+select 'PNTM_5',ST_asewkt(ST_locate_between_measures('POINTM(1 2 4.00001)', 3, 4));
+
+-- Multipoints
+select 'MPNT_1',ST_asewkt(ST_locate_between_measures('MULTIPOINTM(1 2 2)', 2, 5));
+select 'MPNT_2', ST_asewkt(ST_locate_between_measures('MULTIPOINTM(1 2 8, 2 2 5, 2 1 0)', 2, 5));
+select 'MPNT_3', ST_asewkt(ST_locate_between_measures('MULTIPOINTM(1 2 8, 2 2 5.1, 2 1 0)', 2, 5));
+select 'MPNT_4', ST_asewkt(ST_locate_between_measures('MULTIPOINTM(1 2 8, 2 2 5, 2 1 0)', 4, 8));
+
+-- Linestrings
+select 'LINEZM_1', ST_asewkt(ST_locate_between_measures('LINESTRING(0 10 100 0, 0 0 0 10)', 2, 18));
+select 'LINEZM_2', ST_asewkt(ST_locate_between_measures('LINESTRING(0 10 0 0, 0 0 100 10)', 2, 18));
+select 'LINEZM_3', ST_asewkt(ST_locate_between_measures('LINESTRING(0 10 100 0, 0 0 0 10, 10 0 0 0)', 2, 18));
+select 'LINEZM_4', ST_asewkt(ST_locate_between_measures('LINESTRING(0 10 100 0, 0 0 0 20, 10 0 0 0)', 2, 18));
+select 'LINEZM_5', ST_asewkt(ST_locate_between_measures('LINESTRING(0 10 100 0, 0 0 0 20, 0 10 10 40, 10 0 0 0)', 2, 18));
+select 'LINEZM_6', ST_asewkt(ST_locate_between_measures('LINESTRING(0 10 10 40, 10 0 0 0)', 2, 2));
+
+--- line_locate_point
+
+SELECT 'line_locate_point', ST_line_locate_point('LINESTRING(709243.393033887 163969.752725768,708943.240904444 163974.593889146,708675.634380651 163981.832927298)', 'POINT(705780 15883)');
+
+--- postgis-users/2006-January/010613.html
+select 'line_locate_point', ST_line_locate_point(ST_geomfromtext('LINESTRING(-1953743.873 471070.784,-1953735.105 471075.419,-1953720.034 471081.649)', 6269), ST_geomfromtext('POINT(-1953720.034 471081.649)', 6269));
+select 'line_locate_point', ST_line_locate_point(ST_geomfromtext('LINESTRING(-1953743.873 471070.784,-1953735.105 471075.419,-1953720.034 471081.649)', 6269), ST_geomfromtext('POINT(-1953743.873 471070.784)', 6269));
+
+--- line_substring / line_interpolate_point
+
+--- postgis-devel/2006-January/001951.html
+select 'line_substring', ST_asewkt(ST_line_substring(ST_geomfromewkt('SRID=4326;LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 3 3 3 3, 4 4 4 4)'), 0.5, 0.8));
+
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 3 3 3 3, 4 4 4 4)', 0.5, 0.75));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0, 1 1, 2 2)', 0, 0.5));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0, 1 1, 2 2)', 0.5, 1));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0, 2 2)', 0.5, 1));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0, 2 2)', 0, 0.5));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0, 4 4)', .25, 0.5));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRINGM(0 0 0, 4 4 4)', .25, 0.5));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRINGM(0 0 4, 4 4 0)', .25, 0.5));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0 4, 4 4 0)', .25, 0.5));
+
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0, 1 1)', 0, 0));
+select 'line_substring', ST_asewkt(ST_line_substring('LINESTRING(0 0 10, 1 1 5)', 0.5, .5));
+
+--- line_interpolate_point
+
+select 'line_interpolate_point', ST_asewkt(ST_line_interpolate_point('LINESTRING(0 0, 1 1)', 0));
+select 'line_interpolate_point', ST_asewkt(ST_line_interpolate_point('LINESTRING(0 0 10, 1 1 5)', 0.5));

trunk/regress/regress_ogc_expected

@@ -75 +75 @@
 NOTICE:  IllegalArgumentException: Number of points must be 0 or >3
 ERROR:  POSTGIS2GEOS conversion failed
+buffer|POLYGON((1 0,0.707107 -0.707107,0 -1,-0.707107 -0.707107,-1 0,-0.707107 0.707107,0 1,0.707107 0.707107,1 0))
+geomunion|MULTIPOINT(0 0,1 1)
+unite_garray|t
+convexhull|POLYGON((0 0,0 10,10 10,10 0,0 0))
+relate|F0FFFF102
+relate|t
+relate|f
+disjoint|f
+touches|t
+intersects|t
+crosses|f
+crosses|t
+within100|t
+within101|f
+within102|f
+within103|f
+within104|f
+within105|t
+within106|t
+disjoint100|f
+disjoint101|f
+disjoint102|t
+disjoint103|f
+disjoint104|t
+disjoint105|f
+disjoint106|t
+disjoint150|f
+disjoint151|f
+disjoint152|t
+disjoint153|f
+disjoint154|t
+disjoint155|f
+disjoint156|t
+intersects100|t
+intersects101|t
+intersects102|f
+intersects103|t
+intersects104|f
+intersects105|t
+intersects106|f
+intersects150|t
+intersects151|t
+intersects152|f
+intersects153|t
+intersects154|f
+intersects155|t
+intersects156|f
+contains100|t
+contains101|f
+contains102|f
+contains103|f
+contains104|f
+contains105|t
+contains106|t
+within119|f
+within120|f
+overlaps|f
+isvalid|t
+NOTICE:  Self-intersection
+isvalid|f
+isvalid|t
+intersection|POINT(0 0)
+difference|MULTILINESTRING((0 10,0 2),(0 -2,0 -10))
+boundary|MULTILINESTRING((0 0,0 10,10 10,10 0,0 0),(2 2,2 4,4 4,4 2,2 2))
+symdifference|GEOMETRYCOLLECTION(LINESTRING(2 2,4 4),LINESTRING(10 10,20 20),POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,2 4,2 2,4 2,4 4)))
+issimple|t
+equals|t
+pointonsurface|POINT(5 5)
+centroid|POINT(5.08333333333333 5.08333333333333)
+exteriorring|LINESTRING(52 18,66 23,73 9,48 6,52 18)
+polygonize_garray|GEOMETRYCOLLECTION EMPTY
+polygonize_garray|POLYGON((10 0,0 0,0 10,10 10,10 0))
+linemerge149|LINESTRING(-5 -5,0 0,1 1,4 4)
+intersects|f

trunk/regress/regress_ogc.sql

@@ -133 +133 @@
 select '130', geosnoop('POLYGON((0 0, 1 1, 0 0))');
 
+-- Repeat all tests with new function names.
+SELECT 'buffer', ST_astext(ST_SnapToGrid(ST_buffer('POINT(0 0)', 1, 2), 1.0e-6));
+
+SELECT 'geomunion', ST_astext(ST_union('POINT(0 0)', 'POINT(1 1)'));
+SELECT 'unite_garray', ST_equals(ST_unite_garray(ST_geom_accum('{POINT(0 0)}', 'POINT(2 3)')), 'MULTIPOINT(2 3,0 0)');
+SELECT 'convexhull', ST_asewkt(ST_convexhull('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'));
+SELECT 'relate', ST_relate('POINT(0 0)', 'LINESTRING(0 0, 1 1)');
+SELECT 'relate', ST_relate('POINT(0 0)', 'LINESTRING(0 0, 1 1)', 'F0FFFF*02');
+SELECT 'relate', ST_relate('POINT(0 0)', 'LINESTRING(0 0, 1 1)', 'F0FFF0*02');
+SELECT 'disjoint', ST_disjoint('POINT(0 0)', 'LINESTRING(0 0, 1 1)');
+SELECT 'touches', ST_touches('LINESTRING(0 10, 0 -10)', 'LINESTRING(0 0, 1 1)');
+SELECT 'intersects', ST_intersects('LINESTRING(0 10, 0 -10)', 'LINESTRING(0 0, 1 1)');
+SELECT 'crosses', ST_crosses('LINESTRING(0 10, 0 -10)', 'LINESTRING(0 0, 1 1)');
+SELECT 'crosses', ST_crosses('LINESTRING(0 10, 0 -10)', 'LINESTRING(-4 0, 1 1)');
+-- PIP - point within polygon
+SELECT 'within100', ST_within('POINT(5 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on vertex of polygon
+SELECT 'within101', ST_within('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point outside polygon
+SELECT 'within102', ST_within('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on edge of polygon
+SELECT 'within103', ST_within('POINT(0 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point in line with polygon edge
+SELECT 'within104', ST_within('POINT(0 12)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point vertically aligned with polygon vertex 
+SELECT 'within105', ST_within(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - repeated vertex 
+SELECT 'within106', ST_within(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - point within polygon
+SELECT 'disjoint100', ST_disjoint('POINT(5 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on polygon vertex
+SELECT 'disjoint101', ST_disjoint('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point outside polygon
+SELECT 'disjoint102', ST_disjoint('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on polygon edge
+SELECT 'disjoint103', ST_disjoint('POINT(0 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point in line with polygon edge
+SELECT 'disjoint104', ST_disjoint('POINT(0 12)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point vertically aligned with polygon vertex 
+SELECT 'disjoint105', ST_disjoint(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - repeated vertex 
+SELECT 'disjoint106', ST_disjoint(ST_GeomFromText('POINT(521543 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - point within polygon
+SELECT 'disjoint150', ST_disjoint('POINT(5 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on polygon vertex
+SELECT 'disjoint151', ST_disjoint('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point outside polygon
+SELECT 'disjoint152', ST_disjoint('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on polygon edge
+SELECT 'disjoint153', ST_disjoint('POINT(0 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point in line with polygon edge
+SELECT 'disjoint154', ST_disjoint('POINT(0 12)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point vertically aligned with polygon vertex 
+SELECT 'disjoint155', ST_disjoint(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - repeated vertex
+SELECT 'disjoint156', ST_disjoint(ST_GeomFromText('POINT(521543 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - point within polygon
+SELECT 'intersects100', ST_intersects('POINT(5 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on polygon vertex
+SELECT 'intersects101', ST_intersects('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point outside polygon
+SELECT 'intersects102', ST_intersects('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on polygon edge
+SELECT 'intersects103', ST_intersects('POINT(0 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point in line with polygon edge
+SELECT 'intersects104', ST_intersects('POINT(0 12)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point vertically aligned with polygon vertex 
+SELECT 'intersects105', ST_intersects(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - repeated vertex
+SELECT 'intersects106', ST_intersects(ST_GeomFromText('POINT(521543 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - point within polygon
+SELECT 'intersects150', ST_intersects('POINT(5 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on polygon vertex
+SELECT 'intersects151', ST_intersects('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point outside polygon
+SELECT 'intersects152', ST_intersects('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point on polygon edge
+SELECT 'intersects153', ST_intersects('POINT(0 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point in line with polygon edge
+SELECT 'intersects154', ST_intersects('POINT(0 12)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+-- PIP - point vertically aligned with polygon vertex 
+SELECT 'intersects155', ST_intersects(ST_GeomFromText('POINT(521513 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - repeated vertex
+SELECT 'intersects156', ST_intersects(ST_GeomFromText('POINT(521543 5377804)', 32631), ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631));
+-- PIP - point within polygon
+SELECT 'contains100', ST_contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(5 5)');
+-- PIP - point on vertex of polygon
+SELECT 'contains101', ST_contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 0)');
+-- PIP - point outside polygon
+SELECT 'contains102', ST_contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(-1 0)');
+-- PIP - point on edge of polygon
+SELECT 'contains103', ST_contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 5)');
+-- PIP - point in line with polygon edge
+SELECT 'contains104', ST_contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 12)');
+-- PIP - point vertically aligned with polygon vertex 
+SELECT 'contains105', ST_contains(ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631), ST_GeomFromText('POINT(521513 5377804)', 32631));
+-- PIP - repeated vertex 
+SELECT 'contains106', ST_contains(ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631), ST_GeomFromText('POINT(521513 5377804)', 32631));
+-- moved here from regress.sql
+select 'within119', ST_within('LINESTRING(-1 -1, -1 101, 101 101, 101 -1)'::GEOMETRY,'BOX3D(0 0, 100 100)'::BOX3D);
+select 'within120', ST_within('LINESTRING(-1 -1, -1 100, 101 100, 101 -1)'::GEOMETRY,'BOX3D(0 0, 100 100)'::BOX3D);
+SELECT 'overlaps', ST_overlaps('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))','POINT(5 5)');
+SELECT 'isvalid', ST_isvalid('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');
+SELECT 'isvalid', ST_isvalid('POLYGON((0 0, 0 10, 10 10, -5 10, 10 0, 0 0))');
+SELECT 'isvalid', ST_isvalid('GEOMETRYCOLLECTION EMPTY');
+SELECT 'intersection', ST_astext(ST_intersection('LINESTRING(0 10, 0 -10)', 'LINESTRING(0 0, 1 1)'));
+SELECT 'difference', ST_astext(ST_difference('LINESTRING(0 10, 0 -10)'::GEOMETRY, 'LINESTRING(0 2, 0 -2)'::GEOMETRY));
+SELECT 'boundary', ST_astext(ST_boundary('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'));
+SELECT 'symdifference', ST_astext(ST_symdifference('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))', 'LINESTRING(0 0, 20 20)'));
+SELECT 'issimple', ST_issimple('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))');
+SELECT 'equals', ST_equals('LINESTRING(0 0, 1 1)', 'LINESTRING(1 1, 0 0)');
+SELECT 'pointonsurface', ST_astext(ST_pointonsurface('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'));
+SELECT 'centroid', ST_astext(ST_centroid('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'));
+SELECT 'exteriorring', ST_astext(ST_exteriorring(ST_PolygonFromText('POLYGON((52 18,66 23,73 9,48 6,52 18),(59 18,67 18,67 13,59 13,59 18))')));
+SELECT 'polygonize_garray', ST_astext(ST_polygonize_garray('{0102000000020000000000000000000000000000000000000000000000000024400000000000000000:0102000000020000000000000000002440000000000000000000000000000000000000000000000000:0102000000020000000000000000002440000000000000244000000000000000000000000000000000:0102000000020000000000000000002440000000000000244000000000000024400000000000000000:0102000000020000000000000000002440000000000000244000000000000000000000000000002440:0102000000020000000000000000000000000000000000244000000000000000000000000000002440:0102000000020000000000000000000000000000000000244000000000000024400000000000002440:0102000000020000000000000000000000000000000000244000000000000000000000000000000000:0102000000020000000000000000000000000000000000244000000000000024400000000000000000}'));
+
+SELECT 'polygonize_garray', ST_astext(ST_geometryn(ST_polygonize_garray('{LINESTRING(0 0, 10 0):LINESTRING(10 0, 10 10):LINESTRING(10 10, 0 10):LINESTRING(0 10, 0 0)}'), 1));
+
+select 'linemerge149', ST_asewkt(ST_linemerge('GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), LINESTRING(4 4, 1 1), LINESTRING(-5 -5, 0 0))'::geometry));
+
+--- postgis-devel/2005-December/001784.html
+select 'intersects', ST_intersects(
+   ST_polygonfromtext('POLYGON((0.0 0.0,1.0 0.0,1.0 1.0,1.0 0.0,0.0 0.0))'),
+      ST_polygonfromtext('POLYGON((0.0 2.0,1.0 2.0,1.0 3.0,0.0 3.0,0.0 2.0))')
+      );
+
+

trunk/regress/regress_proj_expected

@@ -8 +8 @@
 ERROR:  Input geometry has unknown (-1) SRID
 8|SRID=1000002;POINT(0 0)
+0|EMPTY
+1|SRID=1000001;POINT(574600 5316780)
+2|SRID=1000001;POINT(574600 5316780 171)
+3|SRID=1000001;POINT(574600 5316780 171 -500)
+4|SRID=1000001;LINESTRING(574600 5316780,573140 5427940)
+5|SRID=1000001;LINESTRING(574600 5316780 0 0,573140 5427940 0 0)
+6|16.00000000|48.00000000
+ERROR:  Input geometry has unknown (-1) SRID
+8|SRID=1000002;POINT(0 0)

trunk/regress/regress_proj.sql

@@ -36 +36 @@
 SELECT 8,AsEWKT(transform(GeomFromEWKT('SRID=1000002;POINT(0 0)'),1000002));
 
+-- Repeat all tests with the new function names.
+--- test #0: NULL values
+SELECT 0,coalesce(ST_AsText(ST_transform(NULL, 1000001)),'EMPTY');
+
+--- test #1: a simple projection
+SELECT 1,ST_AsEWKT(ST_SnapToGrid(ST_transform(ST_GeomFromEWKT('SRID=1000002;POINT(16 48)'),1000001),10));
+
+--- test #2: same in 3D
+SELECT 2,ST_AsEWKT(ST_SnapToGrid(ST_transform(ST_GeomFromEWKT('SRID=1000002;POINT(16 48 171)'),1000001),10));
+
+--- test #3: same in 4D
+SELECT 3,ST_AsEWKT(ST_SnapToGrid(ST_transform(ST_GeomFromEWKT('SRID=1000002;POINT(16 48 171 -500)'),1000001),10));
+
+--- test #4: LINESTRING projection, 2 points
+SELECT 4,ST_AsEWKT(ST_SnapToGrid(ST_transform(ST_GeomFromEWKT('SRID=1000002;LINESTRING(16 48, 16 49)'),1000001),10));
+
+--- test #5: LINESTRING projection, 2 points, 4D
+SELECT 5,ST_AsEWKT(ST_SnapToGrid(ST_transform(ST_GeomFromEWKT('SRID=1000002;LINESTRING(16 48 0 0, 16 49 0 0)'),1000001),10));
+
+--- test #6: re-projecting a projected value
+SELECT 6,round(ST_X(ST_transform(ST_transform(ST_GeomFromEWKT('SRID=1000002;POINT(16 48)'),1000001), 1000002))::numeric,8),round(ST_Y(ST_transform(ST_transform(ST_GeomFromEWKT('SRID=1000002;POINT(16 48)'),1000001), 1000002))::numeric,8);
+
+--- test #7: Should yield an error since input SRID is unknown
+SELECT ST_transform(ST_GeomFromEWKT('SRID=-1;POINT(0 0)'),1000002);
+
+--- test #8: Transforming to same SRID
+SELECT 8,ST_AsEWKT(ST_transform(ST_GeomFromEWKT('SRID=1000002;POINT(0 0)'),1000002));
+
 DELETE FROM spatial_ref_sys WHERE srid >= 1000000;
 

trunk/regress/regress.sql

@@ -9 +9 @@
 --- basic datatypes (correct)
 
-select '1',asewkt('POINT( 1 2 )'::GEOMETRY) as geom;
-select '2',asewkt('POINT( 1 2 3)'::GEOMETRY) as geom;
-
-select '3',asewkt('LINESTRING( 0 0, 1 1, 2 2, 3 3 , 4 4)'::GEOMETRY) as geom;
-select '4',asewkt('LINESTRING( 0 0 0 , 1 1 1 , 2 2 2 , 3 3 3, 4 4 4)'::GEOMETRY) as geom;
-select '5',asewkt('LINESTRING( 1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15)'::GEOMETRY) as geom;
-
-select '6',asewkt('POLYGON( (0 0, 10 0, 10 10, 0 10, 0 0) )'::GEOMETRY) as geom;
-select '7',asewkt('POLYGON( (0 0 1 , 10 0 1, 10 10 1, 0 10 1, 0 0 1) )'::GEOMETRY) as geom;
-select '8',asewkt('POLYGON( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5) )'::GEOMETRY) as geom;
-select '9',asewkt('POLYGON( (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 geom;
-select '10',asewkt('POLYGON( (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) )'::GEOMETRY) as geom;
-select '11',asewkt('POLYGON( (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 geom;
-
-select '12',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 ))'::GEOMETRY);
-select '13',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 3))'::GEOMETRY);
-select '14',asewkt('GEOMETRYCOLLECTION(LINESTRING( 0 0, 1 1, 2 2, 3 3 , 4 4))'::GEOMETRY);
-select '15',asewkt('GEOMETRYCOLLECTION(LINESTRING( 1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15))'::GEOMETRY);
-select '16',asewkt('GEOMETRYCOLLECTION(POLYGON( (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) ))'::GEOMETRY);
-select '17',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0),POINT( 1 2 3) )'::GEOMETRY);
-select '18',asewkt('GEOMETRYCOLLECTION(LINESTRING( 0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),POINT( 1 2 3) )'::GEOMETRY);
-select '19',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 ),LINESTRING( 0 0, 1 1, 2 2, 3 3 , 4 4) )'::GEOMETRY);
-select '20',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0 ),POINT( 1 2 3),LINESTRING( 1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15) )'::GEOMETRY);
-select '21',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0 ),POINT( 1 2 3),LINESTRING( 1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15),POLYGON( (0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0) ) )'::GEOMETRY);
-select '22',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0),POINT( 1 2 3),POLYGON( (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);
-
-select '23',asewkt('MULTIPOINT( 1 2)'::GEOMETRY) as geom;
-select '24',asewkt('MULTIPOINT( 1 2 3)'::GEOMETRY) as geom;
-select '25',asewkt('MULTIPOINT( 1 2, 3 4, 5 6)'::GEOMETRY) as geom;
-select '26',asewkt('MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13)'::GEOMETRY) as geom;
-select '27',asewkt('MULTIPOINT( 1 2 0, 1 2 3, 4 5 0, 6 7 8)'::GEOMETRY) as geom;
-select '28',asewkt('MULTIPOINT( 1 2 3,4 5 0)'::GEOMETRY) as geom;
-
-select '29',asewkt('MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4) )'::GEOMETRY) as geom;
-select '30',asewkt('MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4),(0 0, 1 1, 2 2, 3 3 , 4 4))'::GEOMETRY) as geom;
-select '31',asewkt('MULTILINESTRING( (0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15) )'::GEOMETRY) as geom;
-select '32',asewkt('MULTILINESTRING( (1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(0 0 0, 1 1 0, 2 2 0, 3 3 0 , 4 4 0))'::GEOMETRY) as geom;
-
-select '33',asewkt('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)) )'::GEOMETRY) as geom;
-select '34',asewkt('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) ) )'::GEOMETRY) as geom;
-select '35',asewkt('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 geom;
-
-
-select '36',asewkt('GEOMETRYCOLLECTION(MULTIPOINT( 1 2))'::GEOMETRY);
-select '37',asewkt('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 3))'::GEOMETRY);
-select '38',asewkt('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13))'::GEOMETRY);
-select '39',asewkt('GEOMETRYCOLLECTION(MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4) ))'::GEOMETRY);
-select '40',asewkt('GEOMETRYCOLLECTION(MULTILINESTRING( (1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0)))'::GEOMETRY);
-select '41',asewkt('GEOMETRYCOLLECTION(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);
-select '42',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0),MULTIPOINT( 1 2 3))'::GEOMETRY);
-select '43',asewkt('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 0, 3 4 0, 5 6 0),POINT( 1 2 3))'::GEOMETRY);
-select '44',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 3),MULTILINESTRING( (0 0 0, 1 1 0, 2 2 0, 3 3 0 , 4 4 0) ))'::GEOMETRY);
-select '45',asewkt('GEOMETRYCOLLECTION(MULTILINESTRING( (0 0 0, 1 1 0, 2 2 0, 3 3 0 , 4 4 0) ),POINT( 1 2 3))'::GEOMETRY);
-select '46',asewkt('GEOMETRYCOLLECTION(POINT( 1 2 3), 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);
-select '47',asewkt('GEOMETRYCOLLECTION(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) ) ),MULTILINESTRING( (0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15) ),MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13))'::GEOMETRY);
-
-select '48',asewkt('MULTIPOINT( -1 -2 -3, 5.4 6.6 7.77, -5.4 -6.6 -7.77, 1e6 1e-6 -1e6, -1.3e-6 -1.4e-5 0)'::GEOMETRY) as geom;
-
-select '49', asewkt('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1) ))'::GEOMETRY) as geom;
+select '1',ST_asewkt('POINT( 1 2 )'::GEOMETRY) as geom;
+select '2',ST_asewkt('POINT( 1 2 3)'::GEOMETRY) as geom;
+
+select '3',ST_asewkt('LINESTRING( 0 0, 1 1, 2 2, 3 3 , 4 4)'::GEOMETRY) as geom;
+select '4',ST_asewkt('LINESTRING( 0 0 0 , 1 1 1 , 2 2 2 , 3 3 3, 4 4 4)'::GEOMETRY) as geom;
+select '5',ST_asewkt('LINESTRING( 1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15)'::GEOMETRY) as geom;
+
+select '6',ST_asewkt('POLYGON( (0 0, 10 0, 10 10, 0 10, 0 0) )'::GEOMETRY) as geom;
+select '7',ST_asewkt('POLYGON( (0 0 1 , 10 0 1, 10 10 1, 0 10 1, 0 0 1) )'::GEOMETRY) as geom;
+select '8',ST_asewkt('POLYGON( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5) )'::GEOMETRY) as geom;
+select '9',ST_asewkt('POLYGON( (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 geom;
+select '10',ST_asewkt('POLYGON( (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) )'::GEOMETRY) as geom;
+select '11',ST_asewkt('POLYGON( (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 geom;
+
+select '12',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 ))'::GEOMETRY);
+select '13',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 3))'::GEOMETRY);
+select '14',ST_asewkt('GEOMETRYCOLLECTION(LINESTRING( 0 0, 1 1, 2 2, 3 3 , 4 4))'::GEOMETRY);
+select '15',ST_asewkt('GEOMETRYCOLLECTION(LINESTRING( 1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15))'::GEOMETRY);
+select '16',ST_asewkt('GEOMETRYCOLLECTION(POLYGON( (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) ))'::GEOMETRY);
+select '17',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0),POINT( 1 2 3) )'::GEOMETRY);
+select '18',ST_asewkt('GEOMETRYCOLLECTION(LINESTRING( 0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),POINT( 1 2 3) )'::GEOMETRY);
+select '19',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 ),LINESTRING( 0 0, 1 1, 2 2, 3 3 , 4 4) )'::GEOMETRY);
+select '20',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0 ),POINT( 1 2 3),LINESTRING( 1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15) )'::GEOMETRY);
+select '21',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0 ),POINT( 1 2 3),LINESTRING( 1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15),POLYGON( (0 0 0, 10 0 0, 10 10 0, 0 10 0, 0 0 0) ) )'::GEOMETRY);
+select '22',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0),POINT( 1 2 3),POLYGON( (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);
+
+select '23',ST_asewkt('MULTIPOINT( 1 2)'::GEOMETRY) as geom;
+select '24',ST_asewkt('MULTIPOINT( 1 2 3)'::GEOMETRY) as geom;
+select '25',ST_asewkt('MULTIPOINT( 1 2, 3 4, 5 6)'::GEOMETRY) as geom;
+select '26',ST_asewkt('MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13)'::GEOMETRY) as geom;
+select '27',ST_asewkt('MULTIPOINT( 1 2 0, 1 2 3, 4 5 0, 6 7 8)'::GEOMETRY) as geom;
+select '28',ST_asewkt('MULTIPOINT( 1 2 3,4 5 0)'::GEOMETRY) as geom;
+
+select '29',ST_asewkt('MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4) )'::GEOMETRY) as geom;
+select '30',ST_asewkt('MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4),(0 0, 1 1, 2 2, 3 3 , 4 4))'::GEOMETRY) as geom;
+select '31',ST_asewkt('MULTILINESTRING( (0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15) )'::GEOMETRY) as geom;
+select '32',ST_asewkt('MULTILINESTRING( (1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(0 0 0, 1 1 0, 2 2 0, 3 3 0 , 4 4 0))'::GEOMETRY) as geom;
+
+select '33',ST_asewkt('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)) )'::GEOMETRY) as geom;
+select '34',ST_asewkt('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) ) )'::GEOMETRY) as geom;
+select '35',ST_asewkt('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 geom;
+
+
+select '36',ST_asewkt('GEOMETRYCOLLECTION(MULTIPOINT( 1 2))'::GEOMETRY);
+select '37',ST_asewkt('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 3))'::GEOMETRY);
+select '38',ST_asewkt('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13))'::GEOMETRY);
+select '39',ST_asewkt('GEOMETRYCOLLECTION(MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4) ))'::GEOMETRY);
+select '40',ST_asewkt('GEOMETRYCOLLECTION(MULTILINESTRING( (1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0)))'::GEOMETRY);
+select '41',ST_asewkt('GEOMETRYCOLLECTION(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);
+select '42',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 0),MULTIPOINT( 1 2 3))'::GEOMETRY);
+select '43',ST_asewkt('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 0, 3 4 0, 5 6 0),POINT( 1 2 3))'::GEOMETRY);
+select '44',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 3),MULTILINESTRING( (0 0 0, 1 1 0, 2 2 0, 3 3 0 , 4 4 0) ))'::GEOMETRY);
+select '45',ST_asewkt('GEOMETRYCOLLECTION(MULTILINESTRING( (0 0 0, 1 1 0, 2 2 0, 3 3 0 , 4 4 0) ),POINT( 1 2 3))'::GEOMETRY);
+select '46',ST_asewkt('GEOMETRYCOLLECTION(POINT( 1 2 3), 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);
+select '47',ST_asewkt('GEOMETRYCOLLECTION(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) ) ),MULTILINESTRING( (0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),(1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15) ),MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13))'::GEOMETRY);
+
+select '48',ST_asewkt('MULTIPOINT( -1 -2 -3, 5.4 6.6 7.77, -5.4 -6.6 -7.77, 1e6 1e-6 -1e6, -1.3e-6 -1.4e-5 0)'::GEOMETRY) as geom;
+
+select '49', ST_asewkt('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1) ))'::GEOMETRY) as geom;
 --- basic datatype (incorrect)
 
@@ -76 +76 @@
 select '54', 'POINT(a b)'::GEOMETRY as geom;
 select '55', 'MULTIPOINT()'::GEOMETRY as geom;
-select '56', asewkt('POLYGON( (0 0, 10 0, 10 10, 0 10) )'::GEOMETRY);
-select '57', asewkt('POLYGON( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7) )'::GEOMETRY);
-select '58', asewkt('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2,) )'::GEOMETRY);
+select '56', ST_asewkt('POLYGON( (0 0, 10 0, 10 10, 0 10) )'::GEOMETRY);
+select '57', ST_asewkt('POLYGON( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7) )'::GEOMETRY);
+select '58', ST_asewkt('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2,) )'::GEOMETRY);
 
 
 --- funny results
 
-select '59',asewkt('POINT(1 2 3, 4 5 6)'::GEOMETRY);
-select '60',asewkt('POINT(1 2 3 4 5 6 7)'::GEOMETRY);
-select '61',asewkt('LINESTRING(1 1)'::GEOMETRY);
---select '62',replace(asewkt('POINT( 1e700 0)'::GEOMETRY), 'Infinity', 'inf');
---select '63',replace(asewkt('POINT( -1e700 0)'::GEOMETRY), 'Infinity', 'inf');
-select '62',asewkt('POINT( 1e700 0)'::GEOMETRY);
-select '63',asewkt('POINT( -1e700 0)'::GEOMETRY);
-select '64',asewkt('MULTIPOINT(1 1, 2 2'::GEOMETRY);
+select '59',ST_asewkt('POINT(1 2 3, 4 5 6)'::GEOMETRY);
+select '60',ST_asewkt('POINT(1 2 3 4 5 6 7)'::GEOMETRY);
+select '61',ST_asewkt('LINESTRING(1 1)'::GEOMETRY);
+--select '62',replace(ST_asewkt('POINT( 1e700 0)'::GEOMETRY), 'Infinity', 'inf');
+--select '63',replace(ST_asewkt('POINT( -1e700 0)'::GEOMETRY), 'Infinity', 'inf');
+select '62',ST_asewkt('POINT( 1e700 0)'::GEOMETRY);
+select '63',ST_asewkt('POINT( -1e700 0)'::GEOMETRY);
+select '64',ST_asewkt('MULTIPOINT(1 1, 2 2'::GEOMETRY);
 
 
@@ -163 +163 @@
 --- conversion function
 
-select '106',box3d('MULTIPOINT(0 0, 7 7)'::GEOMETRY) as bvol;
+select '106',ST_box3d('MULTIPOINT(0 0, 7 7)'::GEOMETRY) as bvol;
+select '106_',box3d('MULTIPOINT(0 0, 7 7)'::GEOMETRY) as bvol;
 
 -- box3d only type is only used for indexing -- NEVER use one yourself
-select '107',asewkt(geometry('BOX3D(0 0 0, 7 7 7 )'::BOX3D));
+select '107',ST_asewkt(ST_geometry('BOX3D(0 0 0, 7 7 7 )'::BOX3D));
 
 --- debug function testing
 
-select '108',npoints('MULTIPOINT(0 0, 7 7)'::GEOMETRY) as value;
-select '109',npoints('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3))'::GEOMETRY) as value;
-
-select '110', nrings('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 '111', mem_size(dropBBOX('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 '112',numgeometries('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3),MULTIPOINT(1 1, 2 2))'::GEOMETRY) as value;
+select '108',ST_npoints('MULTIPOINT(0 0, 7 7)'::GEOMETRY) as value;
+select '108_',npoints('MULTIPOINT(0 0, 7 7)'::GEOMETRY) as value;
+select '109',ST_npoints('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3))'::GEOMETRY) as value;
+select '109_',npoints('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3))'::GEOMETRY) as value;
+
+select '110', ST_nrings('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 '110_', nrings('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 '111', ST_mem_size(dropBBOX('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 '111_', mem_size(dropBBOX('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 '112',ST_numgeometries('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3),MULTIPOINT(1 1, 2 2))'::GEOMETRY) as value;
+select '112_',numgeometries('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3),MULTIPOINT(1 1, 2 2))'::GEOMETRY) as value;
 
 ---selection
@@ -193 +199 @@
 ---test basic ops on this 
 
-select '121',box3d(a) as box3d_a, box3d(b) as box3d_b from TEST;
+select '121',ST_box3d(a) as box3d_a, ST_box3d(b) as box3d_b from TEST;
+select '121_',box3d(a) as box3d_a, box3d(b) as box3d_b from TEST;
 
 select '122',a <<b from TEST;
@@ -204 +211 @@
 select '128',a ~ b from TEST; 
 
-select '129', mem_size(dropBBOX(a)), mem_size(dropBBOX(b)) from TEST;
-
-select '131', X('POINT(1 2)');
-select '132', Y('POINT(1 2)');
-select '133', Z('POINT(1 2)');
-select '133a', Z('POINT(1 2 3)');
-select '133b', Z('POINTM(1 2 3)');
-select '133c', M('POINT(1 2)');
-select '133d', M('POINTM(1 2 4)');
-select '133e', M('POINT(1 2 4)');
-
-select '137', box3d('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY)'::geometry);
-select '138', box3d('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY, POINT(0 0))'::geometry);
-
-select '139', asewkt(multi(setsrid('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY, POINT(0 0))'::geometry, 2)));
-select '140', asewkt(multi(setsrid('POINT(2 2)'::geometry, 3)));
-select '141', asewkt(multi(setsrid('LINESTRING(2 2, 3 3)'::geometry, 4)));
-select '142', asewkt(multi(setsrid('LINESTRING(2 2, 3 3)'::geometry, 5)));
-select '143', asewkt(multi(setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
-
-select '144', asewkt(force_3dm('POINT(1 2 3)'));
-select '145', asewkt(force_3dz('POINTM(1 2 3)'));
-select '146', asewkt(force_4d('POINTM(1 2 3)'));
-select '147', asewkt(force_4d('POINT(1 2 3)'));
-
-select '148', astext(segmentize('LINESTRING(0 0, 10 0)', 5));
-
-
-select '150', asewkt(force_collection(setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
-
-select '151', geom_accum(NULL, NULL);
+select '129', ST_mem_size(dropBBOX(a)), ST_mem_size(dropBBOX(b)) from TEST;
+
+select '131', ST_X('POINT(1 2)');
+select '131_', ST_X('POINT(1 2)');
+select '132', ST_Y('POINT(1 2)');
+select '132_', ST_Y('POINT(1 2)');
+select '133', ST_Z('POINT(1 2)');
+select '133_', ST_Z('POINT(1 2)');
+select '133a', ST_Z('POINT(1 2 3)');
+select '133a_', ST_Z('POINT(1 2 3)');
+select '133b', ST_Z('POINTM(1 2 3)');
+select '133b_', ST_Z('POINTM(1 2 3)');
+select '133c', ST_M('POINT(1 2)');
+select '133c_', ST_M('POINT(1 2)');
+select '133d', ST_M('POINTM(1 2 4)');
+select '133d_', ST_M('POINTM(1 2 4)');
+select '133e', ST_M('POINT(1 2 4)');
+select '133e_', ST_M('POINT(1 2 4)');
+
+select '137', ST_box3d('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY)'::geometry);
+select '137_', box3d('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY)'::geometry);
+select '138', ST_box3d('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY, POINT(0 0))'::geometry);
+select '138_', box3d('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY, POINT(0 0))'::geometry);
+
+select '139', ST_asewkt(ST_multi(ST_setsrid('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY, POINT(0 0))'::geometry, 2)));
+select '139_', asewkt(multi(setsrid('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY, POINT(0 0))'::geometry, 2)));
+select '140', ST_asewkt(ST_multi(ST_setsrid('POINT(2 2)'::geometry, 3)));
+select '140_', asewkt(multi(setsrid('POINT(2 2)'::geometry, 3)));
+select '141', ST_asewkt(ST_multi(ST_setsrid('LINESTRING(2 2, 3 3)'::geometry, 4)));
+select '141_', asewkt(multi(setsrid('LINESTRING(2 2, 3 3)'::geometry, 4)));
+select '142', ST_asewkt(ST_multi(ST_setsrid('LINESTRING(2 2, 3 3)'::geometry, 5)));
+select '142_', asewkt(multi(setsrid('LINESTRING(2 2, 3 3)'::geometry, 5)));
+select '143', ST_asewkt(ST_multi(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
+select '143_', asewkt(multi(setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
+
+select '144', ST_asewkt(ST_force_3dm('POINT(1 2 3)'));
+select '144_', asewkt(force_3dm('POINT(1 2 3)'));
+select '145', ST_asewkt(ST_force_3dz('POINTM(1 2 3)'));
+select '145_', asewkt(force_3dz('POINTM(1 2 3)'));
+select '146', ST_asewkt(ST_force_4d('POINTM(1 2 3)'));
+select '146_', asewkt(force_4d('POINTM(1 2 3)'));
+select '147', ST_asewkt(ST_force_4d('POINT(1 2 3)'));
+select '147_', asewkt(force_4d('POINT(1 2 3)'));
+
+select '148', ST_astext(ST_segmentize('LINESTRING(0 0, 10 0)', 5));
+select '148_', astext(segmentize('LINESTRING(0 0, 10 0)', 5));
+
+
+select '150', ST_asewkt(ST_force_collection(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
+select '150_', asewkt(force_collection(setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
+
+select '151', ST_geom_accum(NULL, NULL);
+select '151_', geom_accum(NULL, NULL);
 
 -- Drop test table

trunk/regress/removepoint_expected

@@ -12 +12 @@
 LINESTRING(0 0 0 0,1 1 1 1,3 3 3 3,4 4 4 4,5 5 5 5,6 6 6 6,7 7 7 7)
 LINESTRING(0 0 0 0,1 1 1 1,2 2 2 2,3 3 3 3,5 5 5 5,6 6 6 6,7 7 7 7)
+ERROR:  Can't remove points from a single segment line
+ERROR:  Point index out of range (0..2)
+ERROR:  Point index out of range (0..2)
+LINESTRING(1 1,2 2)
+LINESTRING(0 0,1 1)
+LINESTRING(1 1 1,2 2 2)
+LINESTRING(0 0 0,1 1 1)
+LINESTRINGM(1 1 1,2 2 2)
+LINESTRINGM(0 0 0,1 1 1)
+LINESTRING(1 1 1 1,2 2 2 2)
+LINESTRING(0 0 0 0,1 1 1 1)
+LINESTRING(0 0 0 0,1 1 1 1,3 3 3 3,4 4 4 4,5 5 5 5,6 6 6 6,7 7 7 7)
+LINESTRING(0 0 0 0,1 1 1 1,2 2 2 2,3 3 3 3,5 5 5 5,6 6 6 6,7 7 7 7)

trunk/regress/removepoint.sql

@@ -22 +22 @@
 SELECT asewkt(removepoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 3 3 3 3, 4 4 4 4, 5 5 5 5, 6 6 6 6, 7 7 7 7)', 4));
 
+-- Repeat tests for new function names.
+--  Can't remove points from a 2-point linestring
+SELECT ST_removepoint('LINESTRING(0 0, 1 1)', 0);
 
+--  Out of range indexes
+SELECT ST_removepoint('LINESTRING(0 0, 1 1, 2 2)', 3);
+SELECT ST_removepoint('LINESTRING(0 0, 1 1, 2 2)', -1);
+
+-- Removing first/last points
+SELECT ST_asewkt(ST_removepoint('LINESTRING(0 0, 1 1, 2 2)', 0));
+SELECT ST_asewkt(ST_removepoint('LINESTRING(0 0, 1 1, 2 2)', 2));
+
+-- Removing first/last points with higher dimension
+SELECT ST_asewkt(ST_removepoint('LINESTRING(0 0 0, 1 1 1, 2 2 2)', 0));
+SELECT ST_asewkt(ST_removepoint('LINESTRING(0 0 0, 1 1 1, 2 2 2)', 2));
+SELECT ST_asewkt(ST_removepoint('LINESTRINGM(0 0 0, 1 1 1, 2 2 2)', 0));
+SELECT ST_asewkt(ST_removepoint('LINESTRINGM(0 0 0, 1 1 1, 2 2 2)', 2));
+SELECT ST_asewkt(ST_removepoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2)', 0));
+SELECT ST_asewkt(ST_removepoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2)', 2));
+
+-- Removing intermediate points with higher dimension
+SELECT ST_asewkt(ST_removepoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 3 3 3 3, 4 4 4 4, 5 5 5 5, 6 6 6 6, 7 7 7 7)', 2));
+SELECT ST_asewkt(ST_removepoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 3 3 3 3, 4 4 4 4, 5 5 5 5, 6 6 6 6, 7 7 7 7)', 4));
+
+

trunk/regress/setpoint_expected

@@ -11 +11 @@
 LINESTRING(0 0 0 0,90 91 0 92,2 2 2 2,4 4 4 4)
 LINESTRING(90 91 92 93,1 1 1 1,2 2 2 2,4 4 4 4)
+ERROR:  Point index out of range (0..2)
+ERROR:  Point index out of range (0..2)
+ERROR:  First argument must be a LINESTRING
+ERROR:  Third argument must be a POINT
+LINESTRING(90 91 92,1 1 1,2 2 2)
+LINESTRINGM(0 0 0,90 91 92,2 2 2)
+LINESTRINGM(0 0 0,1 1 1,90 91 93)
+LINESTRING(0 0 0,90 91 92,2 2 2)
+LINESTRING(0 0 0 0,1 1 1 1,2 2 2 2,90 91 0 0)
+LINESTRING(0 0 0 0,1 1 1 1,90 91 92 0,4 4 4 4)
+LINESTRING(0 0 0 0,90 91 0 92,2 2 2 2,4 4 4 4)
+LINESTRING(90 91 92 93,1 1 1 1,2 2 2 2,4 4 4 4)

trunk/regress/setpoint.sql

@@ -25 +25 @@
 SELECT asewkt(SetPoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 4 4 4 4)', 0, 'POINT(90 91 92 93)'));
 
+-- Repeat all tests with new function names.
+--  Out of range indexes
+SELECT ST_SetPoint('LINESTRING(0 0, 1 1, 2 2)', 3, 'POINT(9 9)');
+SELECT ST_SetPoint('LINESTRING(0 0, 1 1, 2 2)', -1, 'POINT(9 9)');
+
+--  Invalid inputs
+SELECT ST_SetPoint('MULTIPOINT(0 0, 1 1, 2 2)', 3, 'POINT(9 9)');
+SELECT ST_SetPoint('LINESTRING(0 0, 1 1, 2 2)', -1, 'MULTIPOINT(9 9, 0 0)');
+
+-- Replacing 3dz line with 3dm point 
+SELECT ST_asewkt(ST_SetPoint('LINESTRING(-1 -1 -1, 1 1 1, 2 2 2)', 0, 'POINT(90 91 92)'));
+
+-- Replacing 3dm line with 3dz point 
+SELECT ST_asewkt(ST_SetPoint('LINESTRINGM(0 0 0, 1 1 1, 2 2 2)', 1, 'POINTM(90 91 92)'));
+
+-- Replacing 3dm line with 4d point 
+SELECT ST_asewkt(ST_SetPoint('LINESTRINGM(0 0 0, 1 1 1, 2 2 2)', 2, 'POINT(90 91 92 93)'));
+
+-- Replacing 3dz line with 4d point 
+SELECT ST_asewkt(ST_SetPoint('LINESTRING(0 0 0, 1 1 1, 2 2 2)', 1, 'POINT(90 91 92 93)'));
+
+-- Replacing 4d line with 2d/3dm/3dz/4d point 
+SELECT ST_asewkt(ST_SetPoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 4 4 4 4)', 3, 'POINT(90 91)'));
+SELECT ST_asewkt(ST_SetPoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 4 4 4 4)', 2, 'POINT(90 91 92)'));
+SELECT ST_asewkt(ST_SetPoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 4 4 4 4)', 1, 'POINTM(90 91 92)'));
+SELECT ST_asewkt(ST_SetPoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 4 4 4 4)', 0, 'POINT(90 91 92 93)'));
+

trunk/regress/simplify_expected

@@ -7 +7 @@
 7|POLYGON((0 0,0 51,50 20,7 32,0 0))
 8|POLYGON((0 0,0 51,50 20,30 20,7 32,0 0),(1 1,1 3,18 18,1 1))
+1|LINESTRING(0 0,0 51,50 20,30 20,7 32)
+2|LINESTRING(0 0,0 51,50 20,30 20,7 32)
+3|LINESTRING(0 0,0 51,50 20,30 20,7 32)
+4|LINESTRING(0 0,0 51,50 20,30 20,7 32)
+5|MULTIPOINT(0 0,0 10,0 51,50 20,30 20,7 32)
+6|MULTILINESTRING((0 0,0 51,50 20,7 32),(0 0,20 20))
+7|POLYGON((0 0,0 51,50 20,7 32,0 0))
+8|POLYGON((0 0,0 51,50 20,30 20,7 32,0 0),(1 1,1 3,18 18,1 1))

trunk/regress/simplify.sql

@@ -7 +7 @@
 SELECT '7', astext(simplify('POLYGON((0 0 3 2, 0 10 6 1, 0 51 1 6, 50 20 6 7, 30 20 9 9, 7 32 10 5, 0 0 3 2), (1 1 4 3, 1 3 2 3, 18 18 5 30, 1 1 4 3))', 20));
 SELECT '8', astext(simplify('POLYGON((0 0 3 2, 0 10 6 1, 0 51 1 6, 50 20 6 7, 30 20 9 9, 7 32 10 5, 0 0 3 2), (1 1 4 3, 1 3 2 3, 18 18 5 30, 1 1 4 3))', 1));
+
+-- Repeat all tests with the new function names.
+SELECT '1', ST_astext(ST_simplify('LINESTRING(0 0, 0 10, 0 51, 50 20, 30 20, 7 32)', 2));
+SELECT '2', ST_astext(ST_simplify('LINESTRING(0 0 3, 0 10 6, 0 51 1, 50 20 6, 30 20 9, 7 32 10)', 2));
+SELECT '3', ST_astext(ST_simplify('LINESTRINGM(0 0 3, 0 10 6, 0 51 1, 50 20 6, 30 20 9, 7 32 10)', 2));
+SELECT '4', ST_astext(ST_simplify('LINESTRING(0 0 3 2, 0 10 6 1, 0 51 1 6, 50 20 6 7, 30 20 9 9, 7 32 10 5)', 2));
+SELECT '5', ST_astext(ST_simplify('MULTIPOINT(0 0 3 2, 0 10 6 1, 0 51 1 6, 50 20 6 7, 30 20 9 9, 7 32 10 5)', 20));
+SELECT '6', ST_astext(ST_simplify('MULTILINESTRING((0 0 3 2, 0 10 6 1, 0 51 1 6, 50 20 6 7, 30 20 9 9, 7 32 10 5), (0 0 4 3, 1 1 2 3, 20 20 5 30))', 20));
+SELECT '7', ST_astext(ST_simplify('POLYGON((0 0 3 2, 0 10 6 1, 0 51 1 6, 50 20 6 7, 30 20 9 9, 7 32 10 5, 0 0 3 2), (1 1 4 3, 1 3 2 3, 18 18 5 30, 1 1 4 3))', 20));
+SELECT '8', ST_astext(ST_simplify('POLYGON((0 0 3 2, 0 10 6 1, 0 51 1 6, 50 20 6 7, 30 20 9 9, 7 32 10 5, 0 0 3 2), (1 1 4 3, 1 3 2 3, 18 18 5 30, 1 1 4 3))', 1));

trunk/regress/snaptogrid_expected

@@ -4 +4 @@
 t
 t
+t
+t
+t
+t
+t

trunk/regress/snaptogrid.sql

@@ -8 +8 @@
 SELECT snaptogrid(orig, 0.003) ~= snaptogrid(snaptogrid(orig, 0.003), 0.003) FROM tmp;
 SELECT snaptogrid(orig, 0.0002) ~= snaptogrid(snaptogrid(orig, 0.0002), 0.0002) FROM tmp;
+
+-- Repeat tests with new function names.
+SELECT ST_snaptogrid(orig, 0.001) ~= ST_snaptogrid(ST_snaptogrid(orig, 0.001), 0.001) FROM tmp;
+SELECT ST_snaptogrid(orig, 0.005) ~= ST_snaptogrid(ST_snaptogrid(orig, 0.005), 0.005) FROM tmp;
+SELECT ST_snaptogrid(orig, 0.002) ~= ST_snaptogrid(ST_snaptogrid(orig, 0.002), 0.002) FROM tmp;
+SELECT ST_snaptogrid(orig, 0.003) ~= ST_snaptogrid(ST_snaptogrid(orig, 0.003), 0.003) FROM tmp;
+SELECT ST_snaptogrid(orig, 0.0002) ~= ST_snaptogrid(ST_snaptogrid(orig, 0.0002), 0.0002) FROM tmp;
 DROP TABLE tmp;

trunk/regress/sql-mm-circularstring_expected

@@ +1 @@
+ndims01|4
+geometrytype01|CIRCULARSTRING
+ndims02|3
+geometrytype02|CIRCULARSTRING
+ndims03|3
+geometrytype03|CIRCULARSTRINGM
+ndims04|2
+geometrytype04|CIRCULARSTRING
+isClosed01|t
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  isring() should only be called on a LINE
+isClosed02|t
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  isring() should only be called on a LINE
 ndims01|4
 geometrytype01|CIRCULARSTRING
@@ -117 +131 @@
 ST_LineToCurve04|CIRCULARSTRING(0 0 0 0,0.152240934977426 0.765366864730177 2.24999999999999 -1.5,0.585786437626905 1.4142135623731 1 2)
 ST_LineToCurve04|CIRCULARSTRING(-5 0 0 4,-1.63471937809218e-14 5 0.999999999999998 3,5 0 2 2,9.99999999999998 -5 3 1,15 0 4 0)
+astext01|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)
+astext01|CIRCULARSTRING(-5 0,0 5,5 0,10 -5,15 0)
+astext02|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)
+astext02|CIRCULARSTRING(-5 0,0 5,5 0,10 -5,15 0)
+astext03|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)
+astext03|CIRCULARSTRING(-5 0,0 5,5 0,10 -5,15 0)
+astext04|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)
+astext04|CIRCULARSTRING(-5 0,0 5,5 0,10 -5,15 0)
+asewkt01|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)
+asewkt01|CIRCULARSTRING(-5 0,0 5,5 0,10 -5,15 0)
+asewkt02|CIRCULARSTRINGM(0 0 0,0.267949192431123 1 -2,0.585786437626905 1.4142135623731 2)
+asewkt02|CIRCULARSTRINGM(-5 0 4,0 5 3,5 0 2,10 -5 1,15 0 0)
+asewkt03|CIRCULARSTRING(0 0 0,0.267949192431123 1 3,0.585786437626905 1.4142135623731 1)
+asewkt03|CIRCULARSTRING(-5 0 0,0 5 1,5 0 2,10 -5 3,15 0 4)
+asewkt04|CIRCULARSTRING(0 0 0 0,0.267949192431123 1 3 -2,0.585786437626905 1.4142135623731 1 2)
+asewkt04|CIRCULARSTRING(-5 0 0 4,0 5 1 3,5 0 2 2,10 -5 3 1,15 0 4 0)
+asbinary01|0108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asbinary01|01080000000500000000000000000014c000000000000000000000000000000000000000000000144000000000000014400000000000000000000000000000244000000000000014c00000000000002e400000000000000000
+asbinary02|0108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asbinary02|01080000000500000000000000000014c000000000000000000000000000000000000000000000144000000000000014400000000000000000000000000000244000000000000014c00000000000002e400000000000000000
+asbinary03|0108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asbinary03|01080000000500000000000000000014c000000000000000000000000000000000000000000000144000000000000014400000000000000000000000000000244000000000000014c00000000000002e400000000000000000
+asbinary04|0108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asbinary04|01080000000500000000000000000014c000000000000000000000000000000000000000000000144000000000000014400000000000000000000000000000244000000000000014c00000000000002e400000000000000000
+asewkb01|0108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asewkb01|01080000000500000000000000000014c000000000000000000000000000000000000000000000144000000000000014400000000000000000000000000000244000000000000014c00000000000002e400000000000000000
+asewkb02|01080000400300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f00000000000000c067880133c3bee23fcd3b7f669ea0f63f0000000000000040
+asewkb02|01080000400500000000000000000014c000000000000000000000000000001040000000000000000000000000000014400000000000000840000000000000144000000000000000000000000000000040000000000000244000000000000014c0000000000000f03f0000000000002e4000000000000000000000000000000000
+asewkb03|01080000800300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084067880133c3bee23fcd3b7f669ea0f63f000000000000f03f
+asewkb03|01080000800500000000000000000014c00000000000000000000000000000000000000000000000000000000000001440000000000000f03f000000000000144000000000000000000000000000000040000000000000244000000000000014c000000000000008400000000000002e4000000000000000000000000000001040
+asewkb04|01080000c003000000000000000000000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084000000000000000c067880133c3bee23fcd3b7f669ea0f63f000000000000f03f0000000000000040
+asewkb04|01080000c00500000000000000000014c000000000000000000000000000000000000000000000104000000000000000000000000000001440000000000000f03f00000000000008400000000000001440000000000000000000000000000000400000000000000040000000000000244000000000000014c00000000000000840000000000000f03f0000000000002e40000000000000000000000000000010400000000000000000
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+dimension01|1
+dimension01|1
+dimension02|1
+dimension02|1
+dimension03|1
+dimension03|1
+dimension04|1
+dimension04|1
+SRID01|-1
+SRID01|-1
+SRID02|-1
+SRID02|-1
+SRID03|-1
+SRID03|-1
+SRID04|-1
+SRID04|-1
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+envelope01|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0))
+envelope01|POLYGON((-5 0,-5 5,15 5,15 0,-5 0))
+envelope02|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0))
+envelope02|POLYGON((-5 0,-5 5,15 5,15 0,-5 0))
+envelope03|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0))
+envelope03|POLYGON((-5 0,-5 5,15 5,15 0,-5 0))
+envelope04|POLYGON((0 0,0 1.41421366,0.58578646 1.41421366,0.58578646 0,0 0))
+envelope04|POLYGON((-5 0,-5 5,15 5,15 0,-5 0))
 public.circularstring.the_geom_4d effectively removed.
 public.circularstring.the_geom_3dz effectively removed.

trunk/regress/sql-mm-circularstring.sql

@@ -71 +71 @@
                 0 -2)'));
 SELECT 'isRing02', isRing(geomfromewkt('CIRCULARSTRING(
+                0 -2,
+                -2 0,
+                0 2,
+                -2 0,
+                2 -2,
+                -2 0,
+                -2 -2,
+                -2 0,
+                0 -2)'));
+
+-- Repeat tests with new function names.
+SELECT 'ndims01', ST_ndims(ST_geomfromewkt('CIRCULARSTRING(
+                0 0 0 0, 
+                0.26794919243112270647255365849413 1 3 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2)'));
+SELECT 'geometrytype01', geometrytype(ST_geomfromewkt('CIRCULARSTRING(
+                0 0 0 0, 
+                0.26794919243112270647255365849413 1 3 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2)'));
+SELECT 'ndims02', ST_ndims(ST_geomfromewkt('CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 3, 
+                0.5857864376269049511981127579 1.4142135623730950488016887242097 1)'));
+SELECT 'geometrytype02', geometrytype(ST_geomfromewkt('CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 3, 
+                0.5857864376269049511981127579 1.4142135623730950488016887242097 1)'));
+SELECT 'ndims03', ST_ndims(ST_geomfromewkt('CIRCULARSTRINGM(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 -2, 
+                0.5857864376269049511981127579 1.4142135623730950488016887242097 2)'));
+SELECT 'geometrytype03', geometrytype(ST_geomfromewkt('CIRCULARSTRINGM(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 -2, 
+                0.5857864376269049511981127579 1.4142135623730950488016887242097 2)'));
+SELECT 'ndims04', ST_ndims(ST_geomfromewkt('CIRCULARSTRING(
+                0 0, 
+                0.26794919243112270647255365849413 1, 
+                0.5857864376269049511981127579 1.4142135623730950488016887242097)'));
+SELECT 'geometrytype04', geometrytype(ST_geomfromewkt('CIRCULARSTRING(
+                0 0, 
+                0.26794919243112270647255365849413 1, 
+                0.5857864376269049511981127579 1.4142135623730950488016887242097)'));
+
+SELECT 'isClosed01', ST_isClosed(ST_geomfromewkt('CIRCULARSTRING(
+                0 -2,
+                -2 0,
+                0 2,
+                2 0,
+                0 -2)'));
+SELECT 'isSimple01', ST_isSimple(ST_geomfromewkt('CIRCULARSTRING(
+                0 -2,
+                -2 0,
+                0 2,
+                2 0,
+                0 -2)'));
+SELECT 'isRing01', ST_isRing(ST_geomfromewkt('CIRCULARSTRING(
+                0 -2,
+                -2 0,
+                0 2,
+                2 0,
+                0 -2)'));
+SELECT 'isClosed02', ST_isClosed(ST_geomfromewkt('CIRCULARSTRING(
+                0 -2,
+                -2 0,
+                0 2,
+                -2 0,
+                2 -2,
+                -2 0,
+                -2 -2,
+                -2 0,
+                0 -2)'));
+SELECT 'isSimple02', ST_isSimple(ST_geomfromewkt('CIRCULARSTRING(
+                0 -2,
+                -2 0,
+                0 2,
+                -2 0,
+                2 -2,
+                -2 0,
+                -2 -2,
+                -2 0,
+                0 -2)'));
+SELECT 'isRing02', ST_isRing(ST_geomfromewkt('CIRCULARSTRING(
                 0 -2,
                 -2 0,
@@ -233 +316 @@
 SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.circularstring;
 
+-- Repeat tests with new function names.
+SELECT 'astext01', ST_astext(the_geom_2d) FROM public.circularstring;        
+SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.circularstring;        
+SELECT 'astext03', ST_astext(the_geom_3dz) FROM public.circularstring;        
+SELECT 'astext04', ST_astext(the_geom_4d) FROM public.circularstring;        
+
+SELECT 'asewkt01', ST_asewkt(the_geom_2d) FROM public.circularstring;        
+SELECT 'asewkt02', ST_asewkt(the_geom_3dm) FROM public.circularstring;        
+SELECT 'asewkt03', ST_asewkt(the_geom_3dz) FROM public.circularstring;        
+SELECT 'asewkt04', ST_asewkt(the_geom_4d) FROM public.circularstring;        
+
+SELECT 'asbinary01', encode(ST_asbinary(the_geom_2d), 'hex') FROM public.circularstring;
+SELECT 'asbinary02', encode(ST_asbinary(the_geom_3dm), 'hex') FROM public.circularstring;
+SELECT 'asbinary03', encode(ST_asbinary(the_geom_3dz), 'hex') FROM public.circularstring;
+SELECT 'asbinary04', encode(ST_asbinary(the_geom_4d), 'hex') FROM public.circularstring;
+
+SELECT 'asewkb01', encode(ST_asewkb(the_geom_2d), 'hex') FROM public.circularstring;
+SELECT 'asewkb02', encode(ST_asewkb(the_geom_3dm), 'hex') FROM public.circularstring;
+SELECT 'asewkb03', encode(ST_asewkb(the_geom_3dz), 'hex') FROM public.circularstring;
+SELECT 'asewkb04', encode(ST_asewkb(the_geom_4d), 'hex') FROM public.circularstring;
+
+--Removed due to discrepencies between hardware
+--SELECT 'box2d01', ST_box2d(the_geom_2d) FROM public.circularstring;
+--SELECT 'box2d02', ST_box2d(the_geom_3dm) FROM public.circularstring;
+--SELECT 'box2d03', ST_box2d(the_geom_3dz) FROM public.circularstring;
+--SELECT 'box2d04', ST_box2d(the_geom_4d) FROM public.circularstring;
+
+--SELECT 'box3d01', ST_box3d(the_geom_2d) FROM public.circularstring;
+--SELECT 'box3d02', ST_box3d(the_geom_3dm) FROM public.circularstring;
+--SELECT 'box3d03', ST_box3d(the_geom_3dz) FROM public.circularstring;
+--SELECT 'box3d04', ST_box3d(the_geom_4d) FROM public.circularstring;
+
+SELECT 'isValid01', ST_isValid(the_geom_2d) FROM public.circularstring;
+SELECT 'isValid02', ST_isValid(the_geom_3dm) FROM public.circularstring;
+SELECT 'isValid03', ST_isValid(the_geom_3dz) FROM public.circularstring;
+SELECT 'isValid04', ST_isValid(the_geom_4d) FROM public.circularstring;
+
+SELECT 'dimension01', ST_dimension(the_geom_2d) FROM public.circularstring;
+SELECT 'dimension02', ST_dimension(the_geom_3dm) FROM public.circularstring;
+SELECT 'dimension03', ST_dimension(the_geom_3dz) FROM public.circularstring;
+SELECT 'dimension04', ST_dimension(the_geom_4d) FROM public.circularstring;
+
+SELECT 'SRID01', ST_SRID(the_geom_2d) FROM public.circularstring;
+SELECT 'SRID02', ST_SRID(the_geom_3dm) FROM public.circularstring;
+SELECT 'SRID03', ST_SRID(the_geom_3dz) FROM public.circularstring;
+SELECT 'SRID04', ST_SRID(the_geom_4d) FROM public.circularstring;
+
+SELECT 'accessors01', ST_isEmpty(the_geom_2d), ST_isSimple(the_geom_2d), ST_isClosed(the_geom_2d), ST_isRing(the_geom_2d) FROM public.circularstring;
+SELECT 'accessors02', ST_isEmpty(the_geom_3dm), ST_isSimple(the_geom_3dm), ST_isClosed(the_geom_3dm), ST_isRing(the_geom_3dm) FROM public.circularstring;
+SELECT 'accessors03', ST_isEmpty(the_geom_3dz), ST_isSimple(the_geom_3dz), ST_isClosed(the_geom_3dz), ST_isRing(the_geom_3dz) FROM public.circularstring;
+SELECT 'accessors04', ST_isEmpty(the_geom_4d), ST_isSimple(the_geom_4d), ST_isClosed(the_geom_4d), ST_isRing(the_geom_4d) FROM public.circularstring;
+
+SELECT 'envelope01', ST_asText(ST_snapToGrid(envelope(the_geom_2d), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.circularstring;
+SELECT 'envelope02', ST_asText(ST_snapToGrid(envelope(the_geom_3dm), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.circularstring;
+SELECT 'envelope03', ST_asText(ST_snapToGrid(envelope(the_geom_3dz), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.circularstring;
+SELECT 'envelope04', ST_asText(ST_snapToGrid(envelope(the_geom_4d), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.circularstring;
+
 SELECT DropGeometryColumn('public', 'circularstring', 'the_geom_4d');
 SELECT DropGeometryColumn('public', 'circularstring', 'the_geom_3dz');

trunk/regress/sql-mm-compoundcurve_expected

@@ +1 @@
+ndims01|4
+geometrytype01|COMPOUNDCURVE
+ndims02|3
+geometrytype02|COMPOUNDCURVE
+ndims03|3
+geometrytype03|COMPOUNDCURVEM
+ndims04|2
+geometrytype04|COMPOUNDCURVE
 ndims01|4
 geometrytype01|COMPOUNDCURVE
@@ -67 +75 @@
 ST_LineToCurve|COMPOUNDCURVE(CIRCULARSTRING(0 0 0,0.152240934977426 0.765366864730177 2.24999999999999,0.585786437626905 1.4142135623731 1),(0.585786437626905 1.4142135623731 1,2 0 0,0 0 0))
 ST_LineToCurve|COMPOUNDCURVE(CIRCULARSTRING(0 0 0 0,0.152240934977426 0.765366864730177 2.24999999999999 -1.5,0.585786437626905 1.4142135623731 1 2),(0.585786437626905 1.4142135623731 1 2,2 0 0 0,0 0 0 0))
+astext01|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
+astext02|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
+astext03|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
+astext04|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
+asewkt01|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
+asewkt02|COMPOUNDCURVEM(CIRCULARSTRING(0 0 0,0.267949192431123 1 -2,0.585786437626905 1.4142135623731 2),(0.585786437626905 1.4142135623731 2,2 0 0,0 0 0))
+asewkt03|COMPOUNDCURVE(CIRCULARSTRING(0 0 0,0.267949192431123 1 3,0.585786437626905 1.4142135623731 1),(0.585786437626905 1.4142135623731 1,2 0 0,0 0 0))
+asewkt04|COMPOUNDCURVE(CIRCULARSTRING(0 0 0 0,0.267949192431123 1 3 -2,0.585786437626905 1.4142135623731 1 2),(0.585786437626905 1.4142135623731 1 2,2 0 0 0,0 0 0 0))
+asbinary01|0109000000020000000108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f01020000000300000067880133c3bee23fcd3b7f669ea0f63f0000000000000040000000000000000000000000000000000000000000000000
+asbinary02|0109000000020000000108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f01020000000300000067880133c3bee23fcd3b7f669ea0f63f0000000000000040000000000000000000000000000000000000000000000000
+asbinary03|0109000000020000000108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f01020000000300000067880133c3bee23fcd3b7f669ea0f63f0000000000000040000000000000000000000000000000000000000000000000
+asbinary04|0109000000020000000108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f01020000000300000067880133c3bee23fcd3b7f669ea0f63f0000000000000040000000000000000000000000000000000000000000000000
+asewkb01|0109000000020000000108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f01020000000300000067880133c3bee23fcd3b7f669ea0f63f0000000000000040000000000000000000000000000000000000000000000000
+asewkb02|01090000400200000001080000400300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f00000000000000c067880133c3bee23fcd3b7f669ea0f63f000000000000004001020000400300000067880133c3bee23fcd3b7f669ea0f63f0000000000000040000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000
+asewkb03|01090000800200000001080000800300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084067880133c3bee23fcd3b7f669ea0f63f000000000000f03f01020000800300000067880133c3bee23fcd3b7f669ea0f63f000000000000f03f000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000
+asewkb04|01090000c00200000001080000c003000000000000000000000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084000000000000000c067880133c3bee23fcd3b7f669ea0f63f000000000000f03f000000000000004001020000c00300000067880133c3bee23fcd3b7f669ea0f63f000000000000f03f000000000000004000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+dimension01|1
+dimension02|1
+dimension03|1
+dimension04|1
+SRID01|-1
+SRID02|-1
+SRID03|-1
+SRID04|-1
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+envelope01|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0))
+envelope02|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0))
+envelope03|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0))
+envelope04|POLYGON((0 0,0 1.41421366,2 1.41421366,2 0,0 0))
 public.compoundcurve.the_geom_4d effectively removed.
 public.compoundcurve.the_geom_3dz effectively removed.

trunk/regress/sql-mm-compoundcurve.sql

@@ -49 +49 @@
                 0 0))'));
 SELECT 'geometrytype04', geometrytype(geomfromewkt('COMPOUNDCURVE(CIRCULARSTRING(
+                0 0, 
+                0.26794919243112270647255365849413 1, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097),
+                (0.5857864376269049511983112757903 1.4142135623730950488016887242097,
+                2 0,
+                0 0))'));
+
+-- Repeat tests with new function names.
+SELECT 'ndims01', ST_ndims(ST_geomfromewkt('COMPOUNDCURVE(CIRCULARSTRING(
+                0 0 0 0, 
+                0.26794919243112270647255365849413 1 3 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2),
+                (0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2,
+                2 0 0 0,
+                0 0 0 0))'));
+SELECT 'geometrytype01', geometrytype(ST_geomfromewkt('COMPOUNDCURVE(CIRCULARSTRING(
+                0 0 0 0, 
+                0.26794919243112270647255365849413 1 3 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2),
+                (0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2,
+                2 0 0 0,
+                0 0 0 0))'));
+SELECT 'ndims02', ST_ndims(ST_geomfromewkt('COMPOUNDCURVE(CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 3, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1),
+                (0.5857864376269049511983112757903 1.4142135623730950488016887242097 1,
+                2 0 0,
+                0 0 0))'));
+SELECT 'geometrytype02', geometrytype(ST_geomfromewkt('COMPOUNDCURVE(CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 3, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1),
+                (0.5857864376269049511983112757903 1.4142135623730950488016887242097 1,
+                2 0 0,
+                0 0 0))'));
+SELECT 'ndims03', ST_ndims(ST_geomfromewkt('COMPOUNDCURVEM(CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 2),
+                (0.5857864376269049511983112757903 1.4142135623730950488016887242097 2,
+                2 0 0,
+                0 0 0))'));
+SELECT 'geometrytype03', geometrytype(ST_geomfromewkt('COMPOUNDCURVEM(CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 2),
+                (0.5857864376269049511983112757903 1.4142135623730950488016887242097 2,
+                2 0 0,
+                0 0 0))'));
+SELECT 'ndims04', ST_ndims(ST_geomfromewkt('COMPOUNDCURVE(CIRCULARSTRING(
+                0 0, 
+                0.26794919243112270647255365849413 1, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097),
+                (0.5857864376269049511983112757903 1.4142135623730950488016887242097,
+                2 0,
+                0 0))'));
+SELECT 'geometrytype04', geometrytype(ST_geomfromewkt('COMPOUNDCURVE(CIRCULARSTRING(
                 0 0, 
                 0.26794919243112270647255365849413 1, 
@@ -177 +235 @@
 SELECT 'ST_LineToCurve', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.compoundcurve;
 
+-- Repeat tests on new function names.
+SELECT 'astext01', ST_astext(the_geom_2d) FROM public.compoundcurve;
+SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.compoundcurve;
+SELECT 'astext03', ST_astext(the_geom_3dz) FROM public.compoundcurve;
+SELECT 'astext04', ST_astext(the_geom_4d) FROM public.compoundcurve;
+
+SELECT 'asewkt01', ST_asewkt(the_geom_2d) FROM public.compoundcurve;
+SELECT 'asewkt02', ST_asewkt(the_geom_3dm) FROM public.compoundcurve;
+SELECT 'asewkt03', ST_asewkt(the_geom_3dz) FROM public.compoundcurve;
+SELECT 'asewkt04', ST_asewkt(the_geom_4d) FROM public.compoundcurve;
+
+SELECT 'asbinary01', encode(ST_asbinary(the_geom_2d), 'hex') FROM public.compoundcurve;
+SELECT 'asbinary02', encode(ST_asbinary(the_geom_3dm), 'hex') FROM public.compoundcurve;
+SELECT 'asbinary03', encode(ST_asbinary(the_geom_3dz), 'hex') FROM public.compoundcurve;
+SELECT 'asbinary04', encode(ST_asbinary(the_geom_4d), 'hex') FROM public.compoundcurve;
+
+SELECT 'asewkb01', encode(ST_asewkb(the_geom_2d), 'hex') FROM public.compoundcurve;
+SELECT 'asewkb02', encode(ST_asewkb(the_geom_3dm), 'hex') FROM public.compoundcurve;
+SELECT 'asewkb03', encode(ST_asewkb(the_geom_3dz), 'hex') FROM public.compoundcurve;
+SELECT 'asewkb04', encode(ST_asewkb(the_geom_4d), 'hex') FROM public.compoundcurve;
+
+-- Removed due to discrepencies between hardware
+--SELECT 'box2d01', ST_box2d(the_geom_2d) FROM public.compoundcurve;
+--SELECT 'box2d02', ST_box2d(the_geom_3dm) FROM public.compoundcurve;
+--SELECT 'box2d03', ST_box2d(the_geom_3dz) FROM public.compoundcurve;
+--SELECT 'box2d04', ST_box2d(the_geom_4d) FROM public.compoundcurve;
+
+--SELECT 'box3d01', ST_box3d(the_geom_2d) FROM public.compoundcurve;
+--SELECT 'box3d02', ST_box3d(the_geom_3dm) FROM public.compoundcurve;
+--SELECT 'box3d03', ST_box3d(the_geom_3dz) FROM public.compoundcurve;
+--SELECT 'box3d04', ST_box3d(the_geom_4d) FROM public.compoundcurve;
+
+SELECT 'isValid01', ST_isValid(the_geom_2d) FROM public.compoundcurve;
+SELECT 'isValid02', ST_isValid(the_geom_3dm) FROM public.compoundcurve;
+SELECT 'isValid03', ST_isValid(the_geom_3dz) FROM public.compoundcurve;
+SELECT 'isValid04', ST_isValid(the_geom_4d) FROM public.compoundcurve;
+
+SELECT 'dimension01', ST_dimension(the_geom_2d) FROM public.compoundcurve;
+SELECT 'dimension02', ST_dimension(the_geom_3dm) FROM public.compoundcurve;
+SELECT 'dimension03', ST_dimension(the_geom_3dz) FROM public.compoundcurve;
+SELECT 'dimension04', ST_dimension(the_geom_4d) FROM public.compoundcurve;
+
+SELECT 'SRID01', ST_SRID(the_geom_2d) FROM public.compoundcurve;
+SELECT 'SRID02', ST_SRID(the_geom_3dm) FROM public.compoundcurve;
+SELECT 'SRID03', ST_SRID(the_geom_3dz) FROM public.compoundcurve;
+SELECT 'SRID04', ST_SRID(the_geom_4d) FROM public.compoundcurve;
+
+SELECT 'accessor01', ST_isEmpty(the_geom_2d), ST_isSimple(the_geom_2d), ST_isClosed(the_geom_2d), ST_isRing(the_geom_2d) FROM public.compoundcurve;
+SELECT 'accessor02', ST_isEmpty(the_geom_3dm), ST_isSimple(the_geom_3dm), ST_isClosed(the_geom_3dm), ST_isRing(the_geom_3dm) FROM public.compoundcurve;
+SELECT 'accessor03', ST_isEmpty(the_geom_3dz), ST_isSimple(the_geom_3dz), ST_isClosed(the_geom_3dz), ST_isRing(the_geom_3dz) FROM public.compoundcurve;
+SELECT 'accessor04', ST_isEmpty(the_geom_4d), ST_isSimple(the_geom_4d), ST_isClosed(the_geom_4d), ST_isRing(the_geom_4d) FROM public.compoundcurve;
+
+SELECT 'envelope01', ST_asText(ST_snapToGrid(ST_envelope(the_geom_2d), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.compoundcurve;
+SELECT 'envelope02', ST_asText(ST_snapToGrid(ST_envelope(the_geom_3dm), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.compoundcurve;
+SELECT 'envelope03', ST_asText(ST_snapToGrid(ST_envelope(the_geom_3dz), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.compoundcurve;
+SELECT 'envelope04', ST_asText(ST_snapToGrid(ST_envelope(the_geom_4d), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.compoundcurve;
+
 SELECT DropGeometryColumn('public', 'compoundcurve', 'the_geom_4d');
 SELECT DropGeometryColumn('public', 'compoundcurve', 'the_geom_3dz');

trunk/regress/sql-mm-curvepoly_expected

@@ +1 @@
+ndims01|4
+geometrytype01|CURVEPOLYGON
+ndims02|3
+geometrytype02|CURVEPOLYGON
+ndims03|3
+geometrytype03|CURVEPOLYGONM
+ndims04|2
+geometrytype04|CURVEPOLYGON
 ndims01|4
 geometrytype01|CURVEPOLYGON
@@ -87 +95 @@
 ST_LineToCurve03|CURVEPOLYGON(CIRCULARSTRING(-2 0 0,-1 -1 0.999999999999998,0 0 2,0.999999999999997 -1 3,2 0 4,1.41421356237309 1.4142135623731 3,-2.09798541386808e-15 2 2,-1.4142135623731 1.41421356237309 0.999999999999999,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1))
 ST_LineToCurve04|CURVEPOLYGON(CIRCULARSTRING(-2 0 0 0,-1 -1 0.999999999999998 2,0 0 2 4,0.999999999999997 -1 3 6,2 0 4 8,1.41421356237309 1.4142135623731 3 6,-2.09798541386808e-15 2 2 4,-1.4142135623731 1.41421356237309 0.999999999999999 2,-2 0 0 0),(-1 0 1 2,0 0.5 2 4,1 0 3 6,0 1 3 4,-1 0 1 2))
+astext01|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
+astext02|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
+astext03|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
+astext04|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
+asewkt01|CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
+asewkt02|CURVEPOLYGONM(CIRCULARSTRING(-2 0 0,-1 -1 2,0 0 4,1 -1 6,2 0 8,0 2 4,-2 0 0),(-1 0 2,0 0.5 4,1 0 6,0 1 4,-1 0 2))
+asewkt03|CURVEPOLYGON(CIRCULARSTRING(-2 0 0,-1 -1 1,0 0 2,1 -1 3,2 0 4,0 2 2,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1))
+asewkt04|CURVEPOLYGON(CIRCULARSTRING(-2 0 0 0,-1 -1 1 2,0 0 2 4,1 -1 3 6,2 0 4 8,0 2 2 4,-2 0 0 0),(-1 0 1 2,0 0.5 2 4,1 0 3 6,0 1 3 4,-1 0 1 2))
+asbinary01|010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000
+asbinary02|010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000
+asbinary03|010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000
+asbinary04|010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000
+asewkb01|010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000
+asewkb02|010d0000400200000001080000400700000000000000000000c000000000000000000000000000000000000000000000f0bf000000000000f0bf0000000000000040000000000000000000000000000000000000000000001040000000000000f03f000000000000f0bf000000000000184000000000000000400000000000000000000000000000204000000000000000000000000000000040000000000000104000000000000000c000000000000000000000000000000000010200004005000000000000000000f0bf000000000000000000000000000000400000000000000000000000000000e03f0000000000001040000000000000f03f000000000000000000000000000018400000000000000000000000000000f03f0000000000001040000000000000f0bf00000000000000000000000000000040
+asewkb03|010d0000800200000001080000800700000000000000000000c000000000000000000000000000000000000000000000f0bf000000000000f0bf000000000000f03f000000000000000000000000000000000000000000000040000000000000f03f000000000000f0bf000000000000084000000000000000400000000000000000000000000000104000000000000000000000000000000040000000000000004000000000000000c000000000000000000000000000000000010200008005000000000000000000f0bf0000000000000000000000000000f03f0000000000000000000000000000e03f0000000000000040000000000000f03f000000000000000000000000000008400000000000000000000000000000f03f0000000000000840000000000000f0bf0000000000000000000000000000f03f
+asewkb04|010d0000c00200000001080000c00700000000000000000000c0000000000000000000000000000000000000000000000000000000000000f0bf000000000000f0bf000000000000f03f00000000000000400000000000000000000000000000000000000000000000400000000000001040000000000000f03f000000000000f0bf000000000000084000000000000018400000000000000040000000000000000000000000000010400000000000002040000000000000000000000000000000400000000000000040000000000000104000000000000000c000000000000000000000000000000000000000000000000001020000c005000000000000000000f0bf0000000000000000000000000000f03f00000000000000400000000000000000000000000000e03f00000000000000400000000000001040000000000000f03f0000000000000000000000000000084000000000000018400000000000000000000000000000f03f00000000000008400000000000001040000000000000f0bf0000000000000000000000000000f03f0000000000000040
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+dimension01|2
+dimension02|2
+dimension03|2
+dimension04|2
+SRID01|-1
+SRID02|-1
+SRID03|-1
+SRID04|-1
+envelope01|POLYGON((-2 0,-2 2,2 2,2 0,-2 0))
+envelope02|POLYGON((-2 0,-2 2,2 2,2 0,-2 0))
+envelope03|POLYGON((-2 0,-2 2,2 2,2 0,-2 0))
+envelope04|POLYGON((-2 0,-2 2,2 2,2 0,-2 0))
+startPoint01|t
+startPoint02|t
+startPoint03|t
+startPoint04|t
+endPoint01|t
+endPoint02|t
+endPoint03|t
+endPoint04|t
+exteriorRing01|CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0)
+exteriorRing02|CIRCULARSTRINGM(-2 0 0,-1 -1 2,0 0 4,1 -1 6,2 0 8,0 2 4,-2 0 0)
+exteriorRing03|CIRCULARSTRING(-2 0 0,-1 -1 1,0 0 2,1 -1 3,2 0 4,0 2 2,-2 0 0)
+exteriorRing04|CIRCULARSTRING(-2 0 0 0,-1 -1 1 2,0 0 2 4,1 -1 3 6,2 0 4 8,0 2 2 4,-2 0 0 0)
+numInteriorRings01|1
+numInteriorRings02|1
+numInteriorRings03|1
+numInteriorRings04|1
+interiorRingN-101|LINESTRING(-1 0,0 0.5,1 0,0 1,-1 0)
+interiorRingN-102|LINESTRINGM(-1 0 2,0 0.5 4,1 0 6,0 1 4,-1 0 2)
+interiorRingN-103|LINESTRING(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1)
+interiorRingN-104|LINESTRING(-1 0 1 2,0 0.5 2 4,1 0 3 6,0 1 3 4,-1 0 1 2)
+interiorRingN-201|
+interiorRingN-202|
+interiorRingN-203|
+interiorRingN-204|
 public.curvepolygon.the_geom_2d effectively removed.
 public.curvepolygon.the_geom_3dm effectively removed.

trunk/regress/sql-mm-curvepoly.sql

@@ -104 +104 @@
                 -1 0))'));
 
+-- Repeat tests with new function names.
+SELECT 'ndims01', ST_ndims(ST_geomfromewkt('CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0 0,
+                -1 -1 1 2,
+                0 0 2 4,
+                1 -1 3 6,
+                2 0 4 8,
+                0 2 2 4,
+                -2 0 0 0),
+                (-1 0 1 2,
+                0 0.5 2 4,
+                1 0 3 6,
+                0 1 3 4,
+                -1 0 1 2))'));
+SELECT 'geometrytype01', geometrytype(ST_geomfromewkt('CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0 0,
+                -1 -1 1 2,
+                0 0 2 4,
+                1 -1 3 6,
+                2 0 4 8,
+                0 2 2 4,
+                -2 0 0 0),
+                (-1 0 1 2,
+                0 0.5 2 4,
+                1 0 3 6,
+                0 1 3 4,
+                -1 0 1 2))'));
+SELECT 'ndims02', ST_ndims(ST_geomfromewkt('CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0,
+                -1 -1 1,
+                0 0 2,
+                1 -1 3,
+                2 0 4,
+                0 2 2,
+                -2 0 0),
+                (-1 0 1,
+                0 0.5 2,
+                1 0 3,
+                0 1 3,
+                -1 0 1))'));
+SELECT 'geometrytype02', geometrytype(ST_geomfromewkt('CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0,
+                -1 -1 1,
+                0 0 2,
+                1 -1 3,
+                2 0 4,
+                0 2 2,
+                -2 0 0),
+                (-1 0 1,
+                0 0.5 2,
+                1 0 3,
+                0 1 3,
+                -1 0 1))'));
+SELECT 'ndims03', ST_ndims(ST_geomfromewkt('CURVEPOLYGONM(CIRCULARSTRING(
+                -2 0 0,
+                -1 -1 2,
+                0 0 4,
+                1 -1 6,
+                2 0 8,
+                0 2 4,
+                -2 0 0),
+                (-1 0 2,
+                0 0.5 4,
+                1 0 6,
+                0 1 4,
+                -1 0 2))'));
+SELECT 'geometrytype03', geometrytype(ST_geomfromewkt('CURVEPOLYGONM(CIRCULARSTRING(
+                -2 0 0,
+                -1 -1 2,
+                0 0 4,
+                1 -1 6,
+                2 0 8,
+                0 2 4,
+                -2 0 0),
+                (-1 0 2,
+                0 0.5 4,
+                1 0 6,
+                0 1 4,
+                -1 0 2))'));
+SELECT 'ndims04', ST_ndims(ST_geomfromewkt('CURVEPOLYGON(CIRCULARSTRING(
+                -2 0,
+                -1 -1,
+                0 0,
+                1 -1,
+                2 0,
+                0 2,
+                -2 0),
+                (-1 0,
+                0 0.5,
+                1 0,
+                0 1,
+                -1 0))'));
+SELECT 'geometrytype04', geometrytype(ST_geomfromewkt('CURVEPOLYGON(CIRCULARSTRING(
+                -2 0,
+                -1 -1,
+                0 0,
+                1 -1,
+                2 0,
+                0 2,
+                -2 0),
+                (-1 0,
+                0 0.5,
+                1 0,
+                0 1,
+                -1 0))'));
+
 CREATE TABLE public.curvepolygon (id INTEGER, description VARCHAR);
 SELECT AddGeometryColumn('public', 'curvepolygon', 'the_geom_2d', -1, 'CURVEPOLYGON', 2);
@@ -273 +379 @@
 SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.curvepolygon;
 
+-- Repeat tests with new function names.
+SELECT 'astext01', ST_astext(the_geom_2d) FROM public.curvepolygon;
+SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.curvepolygon;
+SELECT 'astext03', ST_astext(the_geom_3dz) FROM public.curvepolygon;
+SELECT 'astext04', ST_astext(the_geom_4d) FROM public.curvepolygon;
+
+SELECT 'asewkt01', ST_asewkt(the_geom_2d) FROM public.curvepolygon;
+SELECT 'asewkt02', ST_asewkt(the_geom_3dm) FROM public.curvepolygon;
+SELECT 'asewkt03', ST_asewkt(the_geom_3dz) FROM public.curvepolygon;
+SELECT 'asewkt04', ST_asewkt(the_geom_4d) FROM public.curvepolygon;
+
+SELECT 'asbinary01', encode(ST_asbinary(the_geom_2d), 'hex') FROM public.curvepolygon;
+SELECT 'asbinary02', encode(ST_asbinary(the_geom_3dm), 'hex') FROM public.curvepolygon;
+SELECT 'asbinary03', encode(ST_asbinary(the_geom_3dz), 'hex') FROM public.curvepolygon;
+SELECT 'asbinary04', encode(ST_asbinary(the_geom_4d), 'hex') FROM public.curvepolygon;
+
+SELECT 'asewkb01', encode(ST_asewkb(the_geom_2d), 'hex') FROM public.curvepolygon;
+SELECT 'asewkb02', encode(ST_asewkb(the_geom_3dm), 'hex') FROM public.curvepolygon;
+SELECT 'asewkb03', encode(ST_asewkb(the_geom_3dz), 'hex') FROM public.curvepolygon;
+SELECT 'asewkb04', encode(ST_asewkb(the_geom_4d), 'hex') FROM public.curvepolygon;
+
+-- Removed due to descrepencies between hardware
+--SELECT 'box2d01', ST_box2d(the_geom_2d) FROM public.curvepolygon;
+--SELECT 'box2d02', ST_box2d(the_geom_3dm) FROM public.curvepolygon;
+--SELECT 'box2d03', ST_box2d(the_geom_3dz) FROM public.curvepolygon;
+--SELECT 'box2d04', ST_box2d(the_geom_4d) FROM public.curvepolygon;
+
+--SELECT 'box3d01', ST_box3d(the_geom_2d) FROM public.curvepolygon;
+--SELECT 'box3d02', ST_box3d(the_geom_3dm) FROM public.curvepolygon;
+--SELECT 'box3d03', ST_box3d(the_geom_3dz) FROM public.curvepolygon;
+--SELECT 'box3d04', ST_box3d(the_geom_4d) FROM public.curvepolygon;
+
+SELECT 'isValid01', ST_isValid(the_geom_2d) FROM public.curvepolygon;
+SELECT 'isValid02', ST_isValid(the_geom_3dm) FROM public.curvepolygon;
+SELECT 'isValid03', ST_isValid(the_geom_3dz) FROM public.curvepolygon;
+SELECT 'isValid04', ST_isValid(the_geom_4d) FROM public.curvepolygon;
+
+SELECT 'dimension01', ST_dimension(the_geom_2d) FROM public.curvepolygon;
+SELECT 'dimension02', ST_dimension(the_geom_3dm) FROM public.curvepolygon;
+SELECT 'dimension03', ST_dimension(the_geom_3dz) FROM public.curvepolygon;
+SELECT 'dimension04', ST_dimension(the_geom_4d) FROM public.curvepolygon;
+
+SELECT 'SRID01', ST_SRID(the_geom_2d) FROM public.curvepolygon;
+SELECT 'SRID02', ST_SRID(the_geom_3dm) FROM public.curvepolygon;
+SELECT 'SRID03', ST_SRID(the_geom_3dz) FROM public.curvepolygon;
+SELECT 'SRID04', ST_SRID(the_geom_4d) FROM public.curvepolygon;
+
+SELECT 'envelope01', ST_asText(ST_snapToGrid(ST_envelope(the_geom_2d), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.curvepolygon;
+SELECT 'envelope02', ST_asText(ST_snapToGrid(ST_envelope(the_geom_3dm), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.curvepolygon;
+SELECT 'envelope03', ST_asText(ST_snapToGrid(ST_envelope(the_geom_3dz), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.curvepolygon;
+SELECT 'envelope04', ST_asText(ST_snapToGrid(ST_envelope(the_geom_4d), 'POINT(0 0 0 0)'::geometry, 1e-8, 1e-8, 1e-8, 1e-8)) FROM public.curvepolygon;
+
+SELECT 'startPoint01', (ST_startPoint(the_geom_2d) is null) FROM public.curvepolygon;
+SELECT 'startPoint02', (ST_startPoint(the_geom_3dm) is null) FROM public.curvepolygon;
+SELECT 'startPoint03', (ST_startPoint(the_geom_3dz) is null) FROM public.curvepolygon;
+SELECT 'startPoint04', (ST_startPoint(the_geom_4d) is null) FROM public.curvepolygon;
+
+SELECT 'endPoint01', (ST_endPoint(the_geom_2d) is null) FROM public.curvepolygon;
+SELECT 'endPoint02', (ST_endPoint(the_geom_3dm) is null) FROM public.curvepolygon;
+SELECT 'endPoint03', (ST_endPoint(the_geom_3dz) is null) FROM public.curvepolygon;
+SELECT 'endPoint04', (ST_endPoint(the_geom_4d) is null) FROM public.curvepolygon;
+
+SELECT 'exteriorRing01', ST_asEWKT(ST_exteriorRing(the_geom_2d)) FROM public.curvepolygon;
+SELECT 'exteriorRing02', ST_asEWKT(ST_exteriorRing(the_geom_3dm)) FROM public.curvepolygon;
+SELECT 'exteriorRing03', ST_asEWKT(ST_exteriorRing(the_geom_3dz)) FROM public.curvepolygon;
+SELECT 'exteriorRing04', ST_asEWKT(ST_exteriorRing(the_geom_4d)) FROM public.curvepolygon;
+
+SELECT 'numInteriorRings01', ST_numInteriorRings(the_geom_2d) FROM public.curvepolygon;
+SELECT 'numInteriorRings02', ST_numInteriorRings(the_geom_3dm) FROM public.curvepolygon;
+SELECT 'numInteriorRings03', ST_numInteriorRings(the_geom_3dz) FROM public.curvepolygon;
+SELECT 'numInteriorRings04', ST_numInteriorRings(the_geom_4d) FROM public.curvepolygon;
+
+SELECT 'interiorRingN-101', ST_asEWKT(ST_interiorRingN(the_geom_2d, 1)) FROM public.curvepolygon;
+SELECT 'interiorRingN-102', ST_asEWKT(ST_interiorRingN(the_geom_3dm, 1)) FROM public.curvepolygon;
+SELECT 'interiorRingN-103', ST_asEWKT(ST_interiorRingN(the_geom_3dz, 1)) FROM public.curvepolygon;
+SELECT 'interiorRingN-104', ST_asEWKT(ST_interiorRingN(the_geom_4d, 1)) FROM public.curvepolygon;
+
+SELECT 'interiorRingN-201', ST_asEWKT(ST_interiorRingN(the_geom_2d, 2)) FROM public.curvepolygon;
+SELECT 'interiorRingN-202', ST_asEWKT(ST_interiorRingN(the_geom_3dm, 2)) FROM public.curvepolygon;
+SELECT 'interiorRingN-203', ST_asEWKT(ST_interiorRingN(the_geom_3dz, 2)) FROM public.curvepolygon;
+SELECT 'interiorRingN-204', ST_asEWKT(ST_interiorRingN(the_geom_4d, 2)) FROM public.curvepolygon;
+
 SELECT DropGeometryColumn('public', 'curvepolygon', 'the_geom_2d');
 SELECT DropGeometryColumn('public', 'curvepolygon', 'the_geom_3dm');

trunk/regress/sql-mm-multicurve_expected

@@ +1 @@
+ndims01|4
+geometrytype01|MULTICURVE
+ndims02|3
+geometrytype02|MULTICURVE
+ndims03|3
+geometrytype03|MULTICURVEM
+ndims04|2
+geometrytype04|MULTICURVE
 ndims01|4
 geometrytype01|MULTICURVE
@@ -67 +75 @@
 ST_LineToCurve03|MULTICURVE((5 5 1,3 5 2,3 3 3,0 3 1),CIRCULARSTRING(0 0 0,0.152240934977426 0.765366864730177 2.24999999999999,0.585786437626905 1.4142135623731 1))
 ST_LineToCurve04|MULTICURVE((5 5 1 3,3 5 2 2,3 3 3 1,0 3 1 1),CIRCULARSTRING(0 0 0 0,0.152240934977426 0.765366864730177 2.24999999999999 -1.5,0.585786437626905 1.4142135623731 1 2))
+astext01|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731))
+astext02|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731))
+astext03|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731))
+astext04|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731))
+asewkt01|MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731))
+asewkt02|MULTICURVEM((5 5 3,3 5 2,3 3 1,0 3 1),CIRCULARSTRING(0 0 0,0.267949192431123 1 -2,0.585786437626905 1.4142135623731 2))
+asewkt03|MULTICURVE((5 5 1,3 5 2,3 3 3,0 3 1),CIRCULARSTRING(0 0 0,0.267949192431123 1 3,0.585786437626905 1.4142135623731 1))
+asewkt04|MULTICURVE((5 5 1 3,3 5 2 2,3 3 3 1,0 3 1 1),CIRCULARSTRING(0 0 0 0,0.267949192431123 1 3 -2,0.585786437626905 1.4142135623731 1 2))
+asbinary01|010e00000002000000010200000004000000000000000000144000000000000014400000000000000840000000000000144000000000000008400000000000000840000000000000000000000000000008400108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asbinary02|010e00000002000000010200000004000000000000000000144000000000000014400000000000000840000000000000144000000000000008400000000000000840000000000000000000000000000008400108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asbinary03|010e00000002000000010200000004000000000000000000144000000000000014400000000000000840000000000000144000000000000008400000000000000840000000000000000000000000000008400108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asbinary04|010e00000002000000010200000004000000000000000000144000000000000014400000000000000840000000000000144000000000000008400000000000000840000000000000000000000000000008400108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asewkb01|010e00000002000000010200000004000000000000000000144000000000000014400000000000000840000000000000144000000000000008400000000000000840000000000000000000000000000008400108000000030000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f67880133c3bee23fcd3b7f669ea0f63f
+asewkb02|010e0000400200000001020000400400000000000000000014400000000000001440000000000000084000000000000008400000000000001440000000000000004000000000000008400000000000000840000000000000f03f00000000000000000000000000000840000000000000f03f01080000400300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f00000000000000c067880133c3bee23fcd3b7f669ea0f63f0000000000000040
+asewkb03|010e0000800200000001020000800400000000000000000014400000000000001440000000000000f03f00000000000008400000000000001440000000000000004000000000000008400000000000000840000000000000084000000000000000000000000000000840000000000000f03f01080000800300000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084067880133c3bee23fcd3b7f669ea0f63f000000000000f03f
+asewkb04|010e0000c00200000001020000c00400000000000000000014400000000000001440000000000000f03f00000000000008400000000000000840000000000000144000000000000000400000000000000040000000000000084000000000000008400000000000000840000000000000f03f00000000000000000000000000000840000000000000f03f000000000000f03f01080000c003000000000000000000000000000000000000000000000000000000000000000000000056cd9e5e1426d13f000000000000f03f000000000000084000000000000000c067880133c3bee23fcd3b7f669ea0f63f000000000000f03f0000000000000040
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+dimension01|1
+dimension02|1
+dimension03|1
+dimension04|1
+numGeometries01|2
+numGeometries02|2
+numGeometries03|2
+numGeometries04|2
+geometryN-201|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)
+geometryN-202|CIRCULARSTRINGM(0 0 0,0.267949192431123 1 -2,0.585786437626905 1.4142135623731 2)
+geometryN-203|CIRCULARSTRING(0 0 0,0.267949192431123 1 3,0.585786437626905 1.4142135623731 1)
+geometryN-204|CIRCULARSTRING(0 0 0 0,0.267949192431123 1 3 -2,0.585786437626905 1.4142135623731 1 2)
+geometryN-301|t
+geometryN-302|t
+geometryN-303|t
+geometryN-304|t
 public.multicurve.the_geom_2d effectively removed.
 public.multicurve.the_geom_3dm effectively removed.

trunk/regress/sql-mm-multicurve.sql

@@ -63 +63 @@
                 0.5857864376269049511983112757903 1.4142135623730950488016887242097))'));
 SELECT 'geometrytype04', geometrytype(geomfromewkt('MULTICURVE((
+                5 5,
+                3 5,
+                3 3,
+                0 3)
+                ,CIRCULARSTRING(
+                0 0, 
+                0.26794919243112270647255365849413 1, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097))'));
+
+-- Repeat the tests with the new function names.
+SELECT 'ndims01', ST_ndims(ST_geomfromewkt('MULTICURVE((
+                5 5 1 3,
+                3 5 2 2,
+                3 3 3 1,
+                0 3 1 1)
+                ,CIRCULARSTRING(
+                0 0 0 0, 
+                0.26794919243112270647255365849413 1 3 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2))'));
+SELECT 'geometrytype01', geometrytype(ST_geomfromewkt('MULTICURVE((
+                5 5 1 3,
+                3 5 2 2,
+                3 3 3 1,
+                0 3 1 1)
+                ,CIRCULARSTRING(
+                0 0 0 0, 
+                0.26794919243112270647255365849413 1 3 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1 2))'));
+SELECT 'ndims02', ST_ndims(ST_geomfromewkt('MULTICURVE((
+                5 5 1,
+                3 5 2,
+                3 3 3,
+                0 3 1)
+                ,CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 3, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1))'));
+SELECT 'geometrytype02', geometrytype(ST_geomfromewkt('MULTICURVE((
+                5 5 1,
+                3 5 2,
+                3 3 3,
+                0 3 1)
+                ,CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 3, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 1))'));
+SELECT 'ndims03', ST_ndims(ST_geomfromewkt('MULTICURVEM((
+                5 5 3,
+                3 5 2,
+                3 3 1,
+                0 3 1)
+                ,CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 2))'));
+SELECT 'geometrytype03', geometrytype(ST_geomfromewkt('MULTICURVEM((
+                5 5 3,
+                3 5 2,
+                3 3 1,
+                0 3 1)
+                ,CIRCULARSTRING(
+                0 0 0, 
+                0.26794919243112270647255365849413 1 -2, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097 2))'));
+SELECT 'ndims04', ST_ndims(ST_geomfromewkt('MULTICURVE((
+                5 5,
+                3 5,
+                3 3,
+                0 3)
+                ,CIRCULARSTRING(
+                0 0, 
+                0.26794919243112270647255365849413 1, 
+                0.5857864376269049511983112757903 1.4142135623730950488016887242097))'));
+SELECT 'geometrytype04', geometrytype(ST_geomfromewkt('MULTICURVE((
                 5 5,
                 3 5,
@@ -200 +274 @@
 SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.multicurve;
 
+-- Repeat all tests with the new function names.
+SELECT 'astext01', ST_astext(the_geom_2d) FROM public.multicurve;
+SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.multicurve;
+SELECT 'astext03', ST_astext(the_geom_3dz) FROM public.multicurve;
+SELECT 'astext04', ST_astext(the_geom_4d) FROM public.multicurve;
+
+SELECT 'asewkt01', ST_asewkt(the_geom_2d) FROM public.multicurve;
+SELECT 'asewkt02', ST_asewkt(the_geom_3dm) FROM public.multicurve;
+SELECT 'asewkt03', ST_asewkt(the_geom_3dz) FROM public.multicurve;
+SELECT 'asewkt04', ST_asewkt(the_geom_4d) FROM public.multicurve;
+
+SELECT 'asbinary01', encode(ST_asbinary(the_geom_2d), 'hex') FROM public.multicurve;
+SELECT 'asbinary02', encode(ST_asbinary(the_geom_3dm), 'hex') FROM public.multicurve;
+SELECT 'asbinary03', encode(ST_asbinary(the_geom_3dz), 'hex') FROM public.multicurve;
+SELECT 'asbinary04', encode(ST_asbinary(the_geom_4d), 'hex') FROM public.multicurve;
+
+SELECT 'asewkb01', encode(ST_asewkb(the_geom_2d), 'hex') FROM public.multicurve;
+SELECT 'asewkb02', encode(ST_asewkb(the_geom_3dm), 'hex') FROM public.multicurve;
+SELECT 'asewkb03', encode(ST_asewkb(the_geom_3dz), 'hex') FROM public.multicurve;
+SELECT 'asewkb04', encode(ST_asewkb(the_geom_4d), 'hex') FROM public.multicurve;
+
+-- Removed due to descrepencies between hardware
+--SELECT 'box2d01', ST_box2d(the_geom_2d) FROM public.multicurve;
+--SELECT 'box2d02', ST_box2d(the_geom_3dm) FROM public.multicurve;
+--SELECT 'box2d03', ST_box2d(the_geom_3dz) FROM public.multicurve;
+--SELECT 'box2d04', ST_box2d(the_geom_4d) FROM public.multicurve;
+
+--SELECT 'box3d01', ST_box3d(the_geom_2d) FROM public.multicurve;
+--SELECT 'box3d02', ST_box3d(the_geom_3dm) FROM public.multicurve;
+--SELECT 'box3d03', ST_box3d(the_geom_3dz) FROM public.multicurve;
+--SELECT 'box3d04', ST_box3d(the_geom_4d) FROM public.multicurve;
+
+SELECT 'isValid01', ST_isValid(the_geom_2d) FROM public.multicurve;
+SELECT 'isValid02', ST_isValid(the_geom_3dm) FROM public.multicurve;
+SELECT 'isValid03', ST_isValid(the_geom_3dz) FROM public.multicurve;
+SELECT 'isValid04', ST_isValid(the_geom_4d) FROM public.multicurve;
+
+SELECT 'dimension01', ST_dimension(the_geom_2d) FROM public.multicurve;
+SELECT 'dimension02', ST_dimension(the_geom_3dm) FROM public.multicurve;
+SELECT 'dimension03', ST_dimension(the_geom_3dz) FROM public.multicurve;
+SELECT 'dimension04', ST_dimension(the_geom_4d) FROM public.multicurve;
+
+SELECT 'numGeometries01', ST_numGeometries(the_geom_2d) FROM public.multicurve;
+SELECT 'numGeometries02', ST_numGeometries(the_geom_3dm) FROM public.multicurve;
+SELECT 'numGeometries03', ST_numGeometries(the_geom_3dz) FROM public.multicurve;
+SELECT 'numGeometries04', ST_numGeometries(the_geom_4d) FROM public.multicurve;
+
+SELECT 'geometryN-201', ST_asEWKT(ST_geometryN(the_geom_2d, 2)) FROM public.multicurve;
+SELECT 'geometryN-202', ST_asEWKT(ST_geometryN(the_geom_3dm, 2)) FROM public.multicurve;
+SELECT 'geometryN-203', ST_asEWKT(ST_geometryN(the_geom_3dz, 2)) FROM public.multicurve;
+SELECT 'geometryN-204', ST_asEWKT(ST_geometryN(the_geom_4d, 2)) FROM public.multicurve;
+
+SELECT 'geometryN-301', (ST_asEWKT(ST_geometryN(the_geom_2d, 3)) is null) FROM public.multicurve;
+SELECT 'geometryN-302', (ST_asEWKT(ST_geometryN(the_geom_3dm, 3)) is null) FROM public.multicurve;
+SELECT 'geometryN-303', (ST_asEWKT(ST_geometryN(the_geom_3dz, 3)) is null) FROM public.multicurve;
+SELECT 'geometryN-304', (ST_asEWKT(ST_geometryN(the_geom_4d, 3)) is null) FROM public.multicurve;
+
 SELECT DropGeometryColumn('public', 'multicurve', 'the_geom_2d');
 SELECT DropGeometryColumn('public', 'multicurve', 'the_geom_3dm');

trunk/regress/sql-mm-multisurface_expected

@@ +1 @@
+ndims01|4
+geometrytype01|MULTISURFACE
+ndims02|3
+geometrytype02|MULTISURFACE
+ndims03|3
+geometrytype03|MULTISURFACEM
+ndims04|2
+geometrytype04|MULTISURFACE
 ndims01|4
 geometrytype01|MULTISURFACE
@@ -75 +83 @@
 ST_LineToCurve03|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0 0,-1 -1 0.999999999999998,0 0 2,0.999999999999997 -1 3,2 0 4,1.41421356237309 1.4142135623731 3,-2.09798541386808e-15 2 2,-1.4142135623731 1.41421356237309 0.999999999999999,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1)),((7 8 7,10 10 5,6 14 3,4 11 4,7 8 7)))
 ST_LineToCurve04|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0 0 0,-1 -1 0.999999999999998 2,0 0 2 4,0.999999999999997 -1 3 6,2 0 4 8,1.41421356237309 1.4142135623731 3 6,-2.09798541386808e-15 2 2 4,-1.4142135623731 1.41421356237309 0.999999999999999 2,-2 0 0 0),(-1 0 1 2,0 0.5 2 4,1 0 3 6,0 1 3 4,-1 0 1 2)),((7 8 7 8,10 10 5 5,6 14 3 1,4 11 4 6,7 8 7 8)))
+astext01|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
+astext02|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
+astext03|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
+astext04|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
+asewkt01|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
+asewkt02|MULTISURFACEM(CURVEPOLYGON(CIRCULARSTRING(-2 0 0,-1 -1 2,0 0 4,1 -1 6,2 0 8,0 2 4,-2 0 0),(-1 0 2,0 0.5 4,1 0 6,0 1 4,-1 0 2)),((7 8 8,10 10 5,6 14 1,4 11 6,7 8 8)))
+asewkt03|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0 0,-1 -1 1,0 0 2,1 -1 3,2 0 4,0 2 2,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1)),((7 8 7,10 10 5,6 14 3,4 11 4,7 8 7)))
+asewkt04|MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(-2 0 0 0,-1 -1 1 2,0 0 2 4,1 -1 3 6,2 0 4 8,0 2 2 4,-2 0 0 0),(-1 0 1 2,0 0.5 2 4,1 0 3 6,0 1 3 4,-1 0 1 2)),((7 8 7 8,10 10 5 5,6 14 3 1,4 11 4 6,7 8 7 8)))
+asbinary01|010f00000002000000010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000010300000001000000050000000000000000001c4000000000000020400000000000002440000000000000244000000000000018400000000000002c40000000000000104000000000000026400000000000001c400000000000002040
+asbinary02|010f00000002000000010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000010300000001000000050000000000000000001c4000000000000020400000000000002440000000000000244000000000000018400000000000002c40000000000000104000000000000026400000000000001c400000000000002040
+asbinary03|010f00000002000000010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000010300000001000000050000000000000000001c4000000000000020400000000000002440000000000000244000000000000018400000000000002c40000000000000104000000000000026400000000000001c400000000000002040
+asbinary04|010f00000002000000010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000010300000001000000050000000000000000001c4000000000000020400000000000002440000000000000244000000000000018400000000000002c40000000000000104000000000000026400000000000001c400000000000002040
+asewkb01|010f00000002000000010d0000000200000001080000000700000000000000000000c00000000000000000000000000000f0bf000000000000f0bf00000000000000000000000000000000000000000000f03f000000000000f0bf000000000000004000000000000000000000000000000000000000000000004000000000000000c00000000000000000010200000005000000000000000000f0bf00000000000000000000000000000000000000000000e03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f0bf0000000000000000010300000001000000050000000000000000001c4000000000000020400000000000002440000000000000244000000000000018400000000000002c40000000000000104000000000000026400000000000001c400000000000002040
+asewkb02|010f00004002000000010d0000400200000001080000400700000000000000000000c000000000000000000000000000000000000000000000f0bf000000000000f0bf0000000000000040000000000000000000000000000000000000000000001040000000000000f03f000000000000f0bf000000000000184000000000000000400000000000000000000000000000204000000000000000000000000000000040000000000000104000000000000000c000000000000000000000000000000000010200004005000000000000000000f0bf000000000000000000000000000000400000000000000000000000000000e03f0000000000001040000000000000f03f000000000000000000000000000018400000000000000000000000000000f03f0000000000001040000000000000f0bf00000000000000000000000000000040010300004001000000050000000000000000001c400000000000002040000000000000204000000000000024400000000000002440000000000000144000000000000018400000000000002c40000000000000f03f0000000000001040000000000000264000000000000018400000000000001c4000000000000020400000000000002040
+asewkb03|010f00008002000000010d0000800200000001080000800700000000000000000000c000000000000000000000000000000000000000000000f0bf000000000000f0bf000000000000f03f000000000000000000000000000000000000000000000040000000000000f03f000000000000f0bf000000000000084000000000000000400000000000000000000000000000104000000000000000000000000000000040000000000000004000000000000000c000000000000000000000000000000000010200008005000000000000000000f0bf0000000000000000000000000000f03f0000000000000000000000000000e03f0000000000000040000000000000f03f000000000000000000000000000008400000000000000000000000000000f03f0000000000000840000000000000f0bf0000000000000000000000000000f03f010300008001000000050000000000000000001c4000000000000020400000000000001c4000000000000024400000000000002440000000000000144000000000000018400000000000002c4000000000000008400000000000001040000000000000264000000000000010400000000000001c4000000000000020400000000000001c40
+asewkb04|010f0000c002000000010d0000c00200000001080000c00700000000000000000000c0000000000000000000000000000000000000000000000000000000000000f0bf000000000000f0bf000000000000f03f00000000000000400000000000000000000000000000000000000000000000400000000000001040000000000000f03f000000000000f0bf000000000000084000000000000018400000000000000040000000000000000000000000000010400000000000002040000000000000000000000000000000400000000000000040000000000000104000000000000000c000000000000000000000000000000000000000000000000001020000c005000000000000000000f0bf0000000000000000000000000000f03f00000000000000400000000000000000000000000000e03f00000000000000400000000000001040000000000000f03f0000000000000000000000000000084000000000000018400000000000000000000000000000f03f00000000000008400000000000001040000000000000f0bf0000000000000000000000000000f03f000000000000004001030000c001000000050000000000000000001c4000000000000020400000000000001c400000000000002040000000000000244000000000000024400000000000001440000000000000144000000000000018400000000000002c400000000000000840000000000000f03f00000000000010400000000000002640000000000000104000000000000018400000000000001c4000000000000020400000000000001c400000000000002040
+box2d01|BOX(-2 0,10 14)
+box2d02|BOX(-2 0,10 14)
+box2d03|BOX(-2 0,10 14)
+box2d04|BOX(-2 0,10 14)
+box3d01|BOX3D(-2 0 0,10 14 0)
+box3d02|BOX3D(-2 0 0,10 14 0)
+box3d03|BOX3D(-2 0 0,10 14 7)
+box3d04|BOX3D(-2 0 0,10 14 7)
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
+dimension01|2
+dimension02|2
+dimension03|2
+dimension04|2
+numGeometries01|2
+numGeometries02|2
+numGeometries03|2
+numGeometries04|2
+geometryN-201|POLYGON((7 8,10 10,6 14,4 11,7 8))
+geometryN-202|POLYGONM((7 8 8,10 10 5,6 14 1,4 11 6,7 8 8))
+geometryN-203|POLYGON((7 8 7,10 10 5,6 14 3,4 11 4,7 8 7))
+geometryN-204|POLYGON((7 8 7 8,10 10 5 5,6 14 3 1,4 11 4 6,7 8 7 8))
+geometryN-301|t
+geometryN-302|t
+geometryN-303|t
+geometryN-304|t
 public.multisurface.the_geom_2d effectively removed.
 public.multisurface.the_geom_3dm effectively removed.

trunk/regress/sql-mm-multisurface.sql

@@ -160 +160 @@
                 7 8)))'));
 
+-- Repeat these tests with the new function names.
+SELECT 'ndims01', ST_ndims(ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0 0,
+                -1 -1 1 2,
+                0 0 2 4,
+                1 -1 3 6,
+                2 0 4 8,
+                0 2 2 4,
+                -2 0 0 0),
+                (-1 0 1 2,
+                0 0.5 2 4,
+                1 0 3 6,
+                0 1 3 4,
+                -1 0 1 2)),
+                ((7 8 7 8,
+                10 10 5 5,
+                6 14 3 1,
+                4 11 4 6,
+                7 8 7 8)))'));
+SELECT 'geometrytype01', geometrytype(ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0 0,
+                -1 -1 1 2,
+                0 0 2 4,
+                1 -1 3 6,
+                2 0 4 8,
+                0 2 2 4,
+                -2 0 0 0),
+                (-1 0 1 2,
+                0 0.5 2 4,
+                1 0 3 6,
+                0 1 3 4,
+                -1 0 1 2)),
+                ((7 8 7 8,
+                10 10 5 5,
+                6 14 3 1,
+                4 11 4 6,
+                7 8 7 8),
+                (9 9 7 8,
+                8 12 7 8,
+                7 10 7 8,
+                9 9 7 8)))'));
+SELECT 'ndims02', ST_ndims(ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0,
+                -1 -1 1,
+                0 0 2,
+                1 -1 3,
+                2 0 4,
+                0 2 2,
+                -2 0 0),
+                (-1 0 1,
+                0 0.5 2,
+                1 0 3,
+                0 1 3,
+                -1 0 1)),
+                ((7 8 7,
+                10 10 5,
+                6 14 3,
+                4 11 4,
+                7 8 7),
+                (9 9 7,
+                8 12 7,
+                7 10 7,
+                9 9 7)))'));
+SELECT 'geometrytype02', geometrytype(ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0,
+                -1 -1 1,
+                0 0 2,
+                1 -1 3,
+                2 0 4,
+                0 2 2,
+                -2 0 0),
+                (-1 0 1,
+                0 0.5 2,
+                1 0 3,
+                0 1 3,
+                -1 0 1)),
+                ((7 8 7,
+                10 10 5,
+                6 14 3,
+                4 11 4,
+                7 8 7),
+                (9 9 7,
+                8 12 7,
+                7 10 7,
+                9 9 7)))'));
+SELECT 'ndims03', ST_ndims(ST_geomfromewkt('MULTISURFACEM(CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0,
+                -1 -1 2,
+                0 0 4,
+                1 -1 6,
+                2 0 8,
+                0 2 4,
+                -2 0 0),
+                (-1 0 2,
+                0 0.5 4,
+                1 0 6,
+                0 1 4,
+                -1 0 2)),
+                ((7 8 8,
+                10 10 5,
+                6 14 1,
+                4 11 6,
+                7 8 8),
+                (9 9 8,
+                8 12 8,
+                7 10 8,
+                9 9 8)))'));
+SELECT 'geometrytype03', geometrytype(ST_geomfromewkt('MULTISURFACEM(CURVEPOLYGON(CIRCULARSTRING(
+                -2 0 0,
+                -1 -1 2,
+                0 0 4,
+                1 -1 6,
+                2 0 8,
+                0 2 4,
+                -2 0 0),
+                (-1 0 2,
+                0 0.5 4,
+                1 0 6,
+                0 1 4,
+                -1 0 2)),
+                ((7 8 8,
+                10 10 5,
+                6 14 1,
+                4 11 6,
+                7 8 8)))'));
+SELECT 'ndims04', ST_ndims(ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+                -2 0,
+                -1 -1,
+                0 0,
+                1 -1,
+                2 0,
+                0 2,
+                -2 0),
+                (-1 0,
+                0 0.5,
+                1 0,
+                0 1,
+                -1 0)),
+                ((7 8,
+                10 10,
+                6 14,
+                4 11,
+                7 8)))'));
+SELECT 'geometrytype04', geometrytype(ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+                -2 0,
+                -1 -1,
+                0 0,
+                1 -1,
+                2 0,
+                0 2,
+                -2 0),
+                (-1 0,
+                0 0.5,
+                1 0,
+                0 1,
+                -1 0)),
+                ((7 8,
+                10 10,
+                6 14,
+                4 11,
+                7 8)))'));
+
 CREATE TABLE public.multisurface (id INTEGER, description VARCHAR);
 SELECT AddGeometryColumn('public', 'multisurface', 'the_geom_2d', -1, 'MULTISURFACE', 2);
@@ -171 +333 @@
         1, 'multisurface');
 UPDATE public.multisurface
-        SET the_geom_4d = geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+        SET the_geom_4d = ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
                 -2 0 0 0,
                 -1 -1 1 2,
@@ -191 +353 @@
         WHERE id = 1;
 UPDATE public.multisurface
-        SET the_geom_3dz = geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+        SET the_geom_3dz = ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
                 -2 0 0,
                 -1 -1 1,
@@ -211 +373 @@
         WHERE id = 1;
 UPDATE public.multisurface        
-        SET the_geom_3dm = geomfromewkt('MULTISURFACEM(CURVEPOLYGON(CIRCULARSTRING(
+        SET the_geom_3dm = ST_geomfromewkt('MULTISURFACEM(CURVEPOLYGON(CIRCULARSTRING(
                 -2 0 0,
                 -1 -1 2,
@@ -231 +393 @@
         WHERE id = 1;
 UPDATE public.multisurface
-        SET the_geom_2d = geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
+        SET the_geom_2d = ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(
                 -2 0,
                 -1 -1,
@@ -326 +488 @@
 SELECT 'ST_LineToCurve04', asewkt(ST_LineToCurve(ST_CurveToLine(the_geom_4d))) FROM public.multisurface;
 
+-- Repeat tests with new function names.
+SELECT 'astext01', ST_astext(the_geom_2d) FROM public.multisurface;
+SELECT 'astext02', ST_astext(the_geom_3dm) FROM public.multisurface;
+SELECT 'astext03', ST_astext(the_geom_3dz) FROM public.multisurface;
+SELECT 'astext04', ST_astext(the_geom_4d) FROM public.multisurface;
+
+SELECT 'asewkt01', ST_asewkt(the_geom_2d) FROM public.multisurface;
+SELECT 'asewkt02', ST_asewkt(the_geom_3dm) FROM public.multisurface;
+SELECT 'asewkt03', ST_asewkt(the_geom_3dz) FROM public.multisurface;
+SELECT 'asewkt04', ST_asewkt(the_geom_4d) FROM public.multisurface;
+
+SELECT 'asbinary01', encode(ST_asbinary(the_geom_2d), 'hex') FROM public.multisurface;
+SELECT 'asbinary02', encode(ST_asbinary(the_geom_3dm), 'hex') FROM public.multisurface;
+SELECT 'asbinary03', encode(ST_asbinary(the_geom_3dz), 'hex') FROM public.multisurface;
+SELECT 'asbinary04', encode(ST_asbinary(the_geom_4d), 'hex') FROM public.multisurface;
+
+SELECT 'asewkb01', encode(ST_asewkb(the_geom_2d), 'hex') FROM public.multisurface;
+SELECT 'asewkb02', encode(ST_asewkb(the_geom_3dm), 'hex') FROM public.multisurface;
+SELECT 'asewkb03', encode(ST_asewkb(the_geom_3dz), 'hex') FROM public.multisurface;
+SELECT 'asewkb04', encode(ST_asewkb(the_geom_4d), 'hex') FROM public.multisurface;
+
+SELECT 'box2d01', ST_box2d(the_geom_2d) FROM public.multisurface;
+SELECT 'box2d02', ST_box2d(the_geom_3dm) FROM public.multisurface;
+SELECT 'box2d03', ST_box2d(the_geom_3dz) FROM public.multisurface;
+SELECT 'box2d04', ST_box2d(the_geom_4d) FROM public.multisurface;
+
+SELECT 'box3d01', ST_box3d(the_geom_2d) FROM public.multisurface;
+SELECT 'box3d02', ST_box3d(the_geom_3dm) FROM public.multisurface;
+SELECT 'box3d03', ST_box3d(the_geom_3dz) FROM public.multisurface;
+SELECT 'box3d04', ST_box3d(the_geom_4d) FROM public.multisurface;
+
+SELECT 'isValid01', ST_isValid(the_geom_2d) FROM public.multisurface;
+SELECT 'isValid02', ST_isValid(the_geom_3dm) FROM public.multisurface;
+SELECT 'isValid03', ST_isValid(the_geom_3dz) FROM public.multisurface;
+SELECT 'isValid04', ST_isValid(the_geom_4d) FROM public.multisurface;
+
+SELECT 'dimension01', ST_dimension(the_geom_2d) FROM public.multisurface;
+SELECT 'dimension02', ST_dimension(the_geom_3dm) FROM public.multisurface;
+SELECT 'dimension03', ST_dimension(the_geom_3dz) FROM public.multisurface;
+SELECT 'dimension04', ST_dimension(the_geom_4d) FROM public.multisurface;
+
+SELECT 'numGeometries01', ST_numGeometries(the_geom_2d) FROM public.multisurface;
+SELECT 'numGeometries02', ST_numGeometries(the_geom_3dm) FROM public.multisurface;
+SELECT 'numGeometries03', ST_numGeometries(the_geom_3dz) FROM public.multisurface;
+SELECT 'numGeometries04', ST_numGeometries(the_geom_4d) FROM public.multisurface;
+
+SELECT 'geometryN-201', ST_asEWKT(ST_geometryN(the_geom_2d, 2)) FROM public.multisurface;
+SELECT 'geometryN-202', ST_asEWKT(ST_geometryN(the_geom_3dm, 2)) FROM public.multisurface;
+SELECT 'geometryN-203', ST_asEWKT(ST_geometryN(the_geom_3dz, 2)) FROM public.multisurface;
+SELECT 'geometryN-204', ST_asEWKT(ST_geometryN(the_geom_4d, 2)) FROM public.multisurface;
+
+SELECT 'geometryN-301', (ST_geometryN(the_geom_2d, 3) is null) FROM public.multisurface;
+SELECT 'geometryN-302', (ST_geometryN(the_geom_3dm, 3) is null) FROM public.multisurface;
+SELECT 'geometryN-303', (ST_geometryN(the_geom_3dz, 3) is null) FROM public.multisurface;
+SELECT 'geometryN-304', (ST_geometryN(the_geom_4d, 3) is null) FROM public.multisurface;
+
 SELECT DropGeometryColumn('public', 'multisurface', 'the_geom_2d');
 SELECT DropGeometryColumn('public', 'multisurface', 'the_geom_3dm');

trunk/regress/sql-mm-serialize.sql

@@ -159 +159 @@
 
     
-SELECT id, CASE WHEN ewkt = asEWKT(serialized::geometry) THEN 'pass' ELSE 'fail' END AS result FROM serialize_test ORDER BY id;
-SELECT id, CASE WHEN asEWKB(geomFromEWKT(ewkt)) = serialized THEN 'pass' ELSE 'fail' END AS result FROM serialize_test ORDER BY id;
+SELECT id, CASE WHEN ewkt = ST_asEWKT(serialized::geometry) THEN 'pass' ELSE 'fail' END AS result FROM serialize_test ORDER BY id;
+SELECT id, CASE WHEN ST_asEWKB(geomFromEWKT(ewkt)) = serialized THEN 'pass' ELSE 'fail' END AS result FROM serialize_test ORDER BY id;
 
 DROP TABLE serialize_test;

trunk/regress/wkt.sql

@@ -1 @@
-select astext('POINT EMPTY');
-select astext('POINT(EMPTY)');
-select astext('POINT(0 0)');
-select astext('POINT((0 0))');
+select ST_astext('POINT EMPTY');
+select ST_astext('POINT(EMPTY)');
+select ST_astext('POINT(0 0)');
+select ST_astext('POINT((0 0))');
 
-select astext('MULTIPOINT EMPTY');
-select astext('MULTIPOINT(EMPTY)');
+select ST_astext('MULTIPOINT EMPTY');
+select ST_astext('MULTIPOINT(EMPTY)');
 -- This is supported for backward compatibility
-select astext('MULTIPOINT(0 0, 2 0)');
-select astext('MULTIPOINT((0 0), (2 0))');
-select astext('MULTIPOINT((0 0), (2 0), EMPTY)');
+select ST_astext('MULTIPOINT(0 0, 2 0)');
+select ST_astext('MULTIPOINT((0 0), (2 0))');
+select ST_astext('MULTIPOINT((0 0), (2 0), EMPTY)');
 
-select astext('LINESTRING EMPTY');
-select astext('LINESTRING(EMPTY)');
-select astext('LINESTRING(0 0, 1 1)');
-select astext('LINESTRING((0 0, 1 1))');
-select astext('LINESTRING((0 0), (1 1))');
+select ST_astext('LINESTRING EMPTY');
+select ST_astext('LINESTRING(EMPTY)');
+select ST_astext('LINESTRING(0 0, 1 1)');
+select ST_astext('LINESTRING((0 0, 1 1))');
+select ST_astext('LINESTRING((0 0), (1 1))');
 
-select astext('MULTILINESTRING EMPTY');
-select astext('MULTILINESTRING(EMPTY)');
-select astext('MULTILINESTRING(0 0, 2 0)');
-select astext('MULTILINESTRING((0 0, 2 0))');
-select astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2))');
-select astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2), EMPTY)');
-select astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2), (EMPTY))');
+select ST_astext('MULTILINESTRING EMPTY');
+select ST_astext('MULTILINESTRING(EMPTY)');
+select ST_astext('MULTILINESTRING(0 0, 2 0)');
+select ST_astext('MULTILINESTRING((0 0, 2 0))');
+select ST_astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2))');
+select ST_astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2), EMPTY)');
+select ST_astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2), (EMPTY))');
 
-select astext('POLYGON EMPTY');
-select astext('POLYGON(EMPTY)');
-select astext('POLYGON((0 0,1 0,1 1,0 1,0 0))');
-select astext('POLYGON((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2))');
+select ST_astext('POLYGON EMPTY');
+select ST_astext('POLYGON(EMPTY)');
+select ST_astext('POLYGON((0 0,1 0,1 1,0 1,0 0))');
+select ST_astext('POLYGON((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2))');
 
-select astext('MULTIPOLYGON EMPTY');
-select astext('MULTIPOLYGON(EMPTY)');
-select astext('MULTIPOLYGON((EMPTY))');
-select astext('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2)))');
+select ST_astext('MULTIPOLYGON EMPTY');
+select ST_astext('MULTIPOLYGON(EMPTY)');
+select ST_astext('MULTIPOLYGON((EMPTY))');
+select ST_astext('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2)))');
 
-select astext('GEOMETRYCOLLECTION EMPTY');
+select ST_astext('GEOMETRYCOLLECTION EMPTY');
 -- This is supported for backward compatibility
-select astext('GEOMETRYCOLLECTION(EMPTY)');
-select astext('GEOMETRYCOLLECTION((EMPTY))');
+select ST_astext('GEOMETRYCOLLECTION(EMPTY)');
+select ST_astext('GEOMETRYCOLLECTION((EMPTY))');