Changeset 2616 for trunk/regress/sql-mm-compoundcurve.sql

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.

Files:

• trunk/regress/sql-mm-compoundcurve.sql (modified) (2 diffs)

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');