Changeset 2195

Show
Ignore:
Timestamp:
12/14/05 17:19:24 (6 years ago)
Author:
strk
Message:

Moved GEOS/JTS function from regress to ogc test

Location:
trunk/regress
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • trunk/regress/regress_expected

    r2165 r2195  
    117117117|4.24264068711929 
    118118118|5.19615242270663 
    119 119|f 
    120 120|f 
    121119121|BOX3D(1.19894826 1.20265412 0,999.932129 999.692932 0)|BOX3D(1.40486765 1.3484304 0,999.857666 999.936401 0) 
    122120122|f 
     
    128126128|f 
    129127129|34009|34009 
    130 NOTICE:  IllegalArgumentException: Number of points must be 0 or >3 
    131 ERROR:  POSTGIS2GEOS conversion failed 
    132128131|1 
    133129132|2 
     
    153149147|POINT(1 2 3 0) 
    154150148|LINESTRING(0 0,5 0,10 0) 
    155 149|LINESTRING(-5 -5,0 0,1 1,4 4) 
    156151150|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0))) 
    157152151| 
  • trunk/regress/regress_ogc_expected

    r2179 r2195  
    1414within|f 
    1515within|f 
     16within119|f 
     17within120|f 
    1618contains|f 
    1719contains|f 
     
    3335polygonize_garray|GEOMETRYCOLLECTION EMPTY 
    3436polygonize_garray|POLYGON((10 0,0 0,0 10,10 10,10 0)) 
     37linemerge149|LINESTRING(-5 -5,0 0,1 1,4 4) 
    3538intersects|f 
     39NOTICE:  IllegalArgumentException: Number of points must be 0 or >3 
     40ERROR:  POSTGIS2GEOS conversion failed 
  • trunk/regress/regress_ogc.sql

    r2179 r2195  
     1--- 
     2--- Tests for GEOS/JTS implemented functions 
     3--- 
     4--- 
     5 
    16-- Ouput is snapped to grid to account for small floating numbers 
    27-- differences between architectures 
     
    1722SELECT 'within', within('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'); 
    1823SELECT 'within', within('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'); 
     24-- moved here from regress.sql 
     25select 'within119', within('LINESTRING(-1 -1, -1 101, 101 101, 101 -1)'::GEOMETRY,'BOX3D(0 0, 100 100)'::BOX3D); 
     26select 'within120', within('LINESTRING(-1 -1, -1 100, 101 100, 101 -1)'::GEOMETRY,'BOX3D(0 0, 100 100)'::BOX3D); 
    1927SELECT 'contains', contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))','POINT(-1 0)'); 
    2028SELECT 'contains', contains('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))','POINT(0 0)'); 
     
    3745SELECT 'polygonize_garray', astext(geometryn(polygonize_garray('{LINESTRING(0 0, 10 0):LINESTRING(10 0, 10 10):LINESTRING(10 10, 0 10):LINESTRING(0 10, 0 0)}'), 1)); 
    3846 
     47select 'linemerge149', asewkt(linemerge('GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), LINESTRING(4 4, 1 1), LINESTRING(-5 -5, 0 0))'::geometry)); 
     48 
    3949--- postgis-devel/2005-December/001784.html 
    4050select 'intersects', intersects( 
     
    4353      ); 
    4454 
     55select '130', geosnoop('POLYGON((0 0, 1 1, 0 0))'); 
    4556 
  • trunk/regress/regress.sql

    r2194 r2195  
    195195---selection 
    196196 
    197 select '119', within('LINESTRING(-1 -1, -1 101, 101 101, 101 -1)'::GEOMETRY,'BOX3D(0 0, 100 100)'::BOX3D); 
    198 select '120', within('LINESTRING(-1 -1, -1 100, 101 100, 101 -1)'::GEOMETRY,'BOX3D(0 0, 100 100)'::BOX3D); 
    199197 
    200198 
     
    220218 
    221219select '129', mem_size(dropBBOX(a)), mem_size(dropBBOX(b)) from TEST; 
    222  
    223 select '130', geosnoop('POLYGON((0 0, 1 1, 0 0))'); 
    224220 
    225221select '131', X('POINT(1 2)'); 
     
    253249select '148', astext(segmentize('LINESTRING(0 0, 10 0)', 5)); 
    254250 
    255 select '149', asewkt(linemerge('GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), LINESTRING(4 4, 1 1), LINESTRING(-5 -5, 0 0))'::geometry)); 
    256251 
    257252select '150', asewkt(force_collection(setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));