Changeset 2367

Timestamp:

05/22/06 08:29:19 (6 years ago)

Author:

strk

Message:

Moved 'measures' query into a specific file, added a test for bug #108

Location:

trunk/regress

Files:

• Makefile (modified) (1 diff)
• measures_expected (added)
• measures.sql (added)
• regress_expected (modified) (2 diffs)
• regress.sql (modified) (2 diffs)

trunk/regress/Makefile

@@ -3 +3 @@
 include ../Makefile.config
 
-TESTS=regress regress_index lwgeom_regress regress_lrs removepoint setpoint simplify snaptogrid affine wkt
+TESTS=regress regress_index lwgeom_regress regress_lrs removepoint setpoint simplify snaptogrid affine wkt measures
 
 ifeq ($(USE_GEOS),1)

trunk/regress/regress_expected

@@ -111 +111 @@
 111|528
 112|3
-113|291
-114|140
-115|140
-116|4.24264068711929
-117|4.24264068711929
-118|5.19615242270663
 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
@@ -134 +128 @@
 133d|4
 133e|
-134|0
-135|13
-136|13
 137|
 138|BOX3D(0 0 0,0 0 0)

trunk/regress/regress.sql

@@ -180 +180 @@
 select '112',numgeometries('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3),MULTIPOINT(1 1, 2 2))'::GEOMETRY) as value;
 
---- geo ops
-
-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;
-
-select '114', 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', 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', length2d('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2) )'::GEOMETRY) as value;
-select '117', length3d('MULTILINESTRING((0 0, 1 1),(0 0, 1 1, 2 2) )'::GEOMETRY) as value;
-select '118', length3d('MULTILINESTRING((0 0 0, 1 1 1),(0 0 0, 1 1 1, 2 2 2) )'::GEOMETRY) as value;
-
 ---selection
 
@@ -228 +215 @@
 select '133e', M('POINT(1 2 4)');
 
-select '134', distance('POINT(1 2)', 'POINT(1 2)');
-select '135', distance('POINT(5 0)', 'POINT(10 12)');
-
-select '136', distance('POINT(0 0)', translate('POINT(0 0)', 5, 12, 0));
-
 select '137', box3d('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY)'::geometry);
 select '138', box3d('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY, POINT(0 0))'::geometry);