Uncomment new tests for #1641

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

diff --git a/topology/test/regress/topogeo_addlinestring.sql b/topology/test/regress/topogeo_addlinestring.sql
index 8260e5286052353e73d871cc9d204f7c3cf8375d..baa5846922a2bbb93a9048ac7d15a1a63c771f3c 100644 (file)
--- a/topology/test/regress/topogeo_addlinestring.sql
+++ b/topology/test/regress/topogeo_addlinestring.sql
@@ -160,20 +160,20 @@ SELECT '#1641.2', TopoGeo_addLineString('city_data',
 ) ORDER BY 2;
 SELECT check_changes();
 
--- Fails w/out tolerance as of 2.0.0
+-- Now w/out explicit tolerance (will use local min)
 -- clean all up first
---DELETE FROM city_data.edge_data; 
---DELETE FROM city_data.node; 
---DELETE FROM city_data.face where face_id > 0; 
---
---SELECT '#1641.3', TopoGeo_addLineString('city_data',
---  'LINESTRING(-0.223586 0.474301, 0.142550 0.406124)' 
---) ORDER BY 2;
---SELECT check_changes();
---SELECT '#1641.4', TopoGeo_addLineString('city_data',
---  'LINESTRING(0.095989 0.113619, -0.064646 0.470149)'
---) ORDER BY 2;
---SELECT check_changes();
+DELETE FROM city_data.edge_data; 
+DELETE FROM city_data.node; 
+DELETE FROM city_data.face where face_id > 0; 
+
+SELECT '#1641.3', TopoGeo_addLineString('city_data',
+  'LINESTRING(-0.223586 0.474301, 0.142550 0.406124)' 
+) ORDER BY 2;
+SELECT check_changes();
+SELECT '#1641.4', TopoGeo_addLineString('city_data',
+  'LINESTRING(0.095989 0.113619, -0.064646 0.470149)'
+) ORDER BY 2;
+SELECT check_changes();
 
 -- Cleanups
 DROP FUNCTION check_changes();

diff --git a/topology/test/regress/topogeo_addlinestring_expected b/topology/test/regress/topogeo_addlinestring_expected
index 80acfe60c69c26ba33d0b52c6683e41ff02089da..e59deb480daa98611dbd524630396a3f1d39014a 100644 (file)
--- a/topology/test/regress/topogeo_addlinestring_expected
+++ b/topology/test/regress/topogeo_addlinestring_expected
@@ -131,4 +131,17 @@ E|58|sn55|en58
 E|59|sn58|en56
 E|60|sn57|en58
 E|61|sn58|en59
+#1641.3|62
+N|60||POINT(-0.2 0.4)
+N|61||POINT(0.2 0.4)
+E|62|sn60|en61
+#1641.4|64
+#1641.4|65
+N|62||POINT(0 0.2)
+N|63||POINT(0 0.4)
+N|64||POINT(0 0.4)
+E|62|sn60|en63
+E|63|sn63|en61
+E|64|sn62|en63
+E|65|sn63|en64
 Topology 'city_data' dropped