Fixed regress tests to pass with GEOS-3.0.0

git-svn-id: http://svn.osgeo.org/postgis/trunk@2474 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/CHANGES b/CHANGES
index ce8fd69c190c61d6fa135f1004772624a41a7278..46bb6c3e4dcd93bea35295151a046279e104aff3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ PostGIS 1.1.4CVS
         - Added EJB2 support generously donated by the
           "Geodetix s.r.l. Company" http://www.geodetix.it/
         - Reorganized java directory layout a little.
+       - Fixed regress tests to pass with GEOS-3.0.0
 
 PostGIS 1.1.3
 2006/06/30

diff --git a/regress/regress_ogc.sql b/regress/regress_ogc.sql
index efb6896b56de94fd5a5200da57c4aeefc6381fbc..821176bb2373f00dbe8db800f0b32f438425d57e 100644 (file)
--- a/regress/regress_ogc.sql
+++ b/regress/regress_ogc.sql
@@ -8,7 +8,7 @@
 SELECT 'buffer', astext(SnapToGrid(buffer('POINT(0 0)', 1, 2), 1.0e-6));
 
 SELECT 'geomunion', astext(geomunion('POINT(0 0)', 'POINT(1 1)'));
-SELECT 'unite_garray', astext(unite_garray(geom_accum('{POINT(0 0)}', 'POINT(2 3)')));
+SELECT 'unite_garray', equals(unite_garray(geom_accum('{POINT(0 0)}', 'POINT(2 3)')), 'MULTIPOINT(2 3,0 0)');
 SELECT 'convexhull', asewkt(convexhull('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'));
 SELECT 'relate', relate('POINT(0 0)', 'LINESTRING(0 0, 1 1)');
 SELECT 'relate', relate('POINT(0 0)', 'LINESTRING(0 0, 1 1)', 'F0FFFF*02');

diff --git a/regress/regress_ogc_expected b/regress/regress_ogc_expected
index 86a9dfa298e74d42cdba1b1d57f13b3337e59ed0..527aceb5ba4d521aab7bfdc6455466f5ec14108b 100644 (file)
--- a/regress/regress_ogc_expected
+++ b/regress/regress_ogc_expected
@@ -1,6 +1,6 @@
 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|MULTIPOINT(2 3,0 0)
+unite_garray|t
 convexhull|POLYGON((0 0,0 10,10 10,10 0,0 0))
 relate|F0FFFF102
 relate|t