Give more detail on topology editing function exception

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

diff --git a/NEWS b/NEWS
index 4543fed231ba5de35e57653b523fc867e4e0346d..cfc0c8f43b342c19a8f3ea8fc78dbb7bd7325058 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ PostGIS 2.0.1
   - #1763, topology.toTopoGeom use with custom search_path.
   - #1755, ST_GeographyFromText support for higher dimensions.
 
+* Enhancements *
+
+  - More detailed exception message from topology editing functions.
+
 PostGIS 2.0.0
 2012/04/03
    

diff --git a/topology/sql/sqlmm.sql.in.c b/topology/sql/sqlmm.sql.in.c
index a6b6a1d8e42b5cc7cbc5ae3b46b812e965fe2dff..2e89c3f788bb5165c9544ba509f6616f4c1ab616 100644 (file)
--- a/topology/sql/sqlmm.sql.in.c
+++ b/topology/sql/sqlmm.sql.in.c
@@ -2695,7 +2695,7 @@ BEGIN
 
     IF ST_RelateMatch(rec.im, '1FFF*FFF2') THEN
       RAISE EXCEPTION
-        'SQL/MM Spatial exception - coincident edge';
+        'SQL/MM Spatial exception - coincident edge %', rec.edge_id;
     END IF;
 
     -- NOT IN THE SPECS: geometry touches an edge
@@ -2706,7 +2706,7 @@ BEGIN
 
     IF ST_RelateMatch(rec.im, 'T********') THEN
       RAISE EXCEPTION
-        'SQL/MM Spatial exception - geometry crosses an edge';
+        'SQL/MM Spatial exception - geometry crosses edge %', rec.edge_id;
     END IF;
 
   END LOOP; -- }
@@ -3258,7 +3258,7 @@ BEGIN
 
     IF ST_RelateMatch(rec.im, '1FFF*FFF2') THEN
       RAISE EXCEPTION
-        'SQL/MM Spatial exception - coincident edge';
+        'SQL/MM Spatial exception - coincident edge %', rec.edge_id;
     END IF;
 
     -- NOT IN THE SPECS: geometry touches an edge
@@ -3269,7 +3269,7 @@ BEGIN
 
     IF ST_RelateMatch(rec.im, 'T********') THEN
       RAISE EXCEPTION
-        'SQL/MM Spatial exception - geometry crosses an edge';
+        'SQL/MM Spatial exception - geometry crosses edge %', rec.edge_id;
     END IF;
 
   END LOOP;
@@ -3893,7 +3893,7 @@ BEGIN
 
     IF ST_RelateMatch(rec.im, '1FFF*FFF2') THEN
       RAISE EXCEPTION
-        'SQL/MM Spatial exception - coincident edge';
+        'SQL/MM Spatial exception - coincident edge %', rec.edge_id;
     END IF;
 
     -- NOT IN THE SPECS: geometry touches an edge
@@ -3904,7 +3904,7 @@ BEGIN
 
     IF ST_RelateMatch(rec.im, 'T********') THEN
       RAISE EXCEPTION
-        'SQL/MM Spatial exception - geometry crosses an edge';
+        'SQL/MM Spatial exception - geometry crosses edge %', rec.edge_id;
     END IF;
 
   END LOOP;

diff --git a/topology/test/regress/st_addedgemodface_expected b/topology/test/regress/st_addedgemodface_expected
index 6899f73f62d3a7060dc19682d0ec5ea511b221b1..d2b46a67f8b0f381921f8a07eb2b7f959f9fcb0c 100644 (file)
--- a/topology/test/regress/st_addedgemodface_expected
+++ b/topology/test/regress/st_addedgemodface_expected
@@ -12,9 +12,9 @@ ERROR:  SQL/MM Spatial exception - non-existent node
 ERROR:  SQL/MM Spatial exception - curve not simple
 ERROR:  Invalid edge (no two distinct vertices exist)
 ERROR:  Invalid edge (no two distinct vertices exist)
-ERROR:  SQL/MM Spatial exception - coincident edge
-ERROR:  SQL/MM Spatial exception - geometry crosses an edge
-ERROR:  SQL/MM Spatial exception - geometry crosses an edge
+ERROR:  SQL/MM Spatial exception - coincident edge 8
+ERROR:  SQL/MM Spatial exception - geometry crosses edge 5
+ERROR:  SQL/MM Spatial exception - geometry crosses edge 4
 ERROR:  Spatial exception - geometry intersects edge 4
 L1
 L2

diff --git a/topology/test/regress/st_addedgenewfaces_expected b/topology/test/regress/st_addedgenewfaces_expected
index 5d98cfd95871c4cb099d27cf5128ad408a7aa54a..a37ba5d59ffc4d216fecdcb0737083cd49aed139 100644 (file)
--- a/topology/test/regress/st_addedgenewfaces_expected
+++ b/topology/test/regress/st_addedgenewfaces_expected
@@ -12,9 +12,9 @@ ERROR:  SQL/MM Spatial exception - non-existent node
 ERROR:  SQL/MM Spatial exception - curve not simple
 ERROR:  Invalid edge (no two distinct vertices exist)
 ERROR:  Invalid edge (no two distinct vertices exist)
-ERROR:  SQL/MM Spatial exception - coincident edge
-ERROR:  SQL/MM Spatial exception - geometry crosses an edge
-ERROR:  SQL/MM Spatial exception - geometry crosses an edge
+ERROR:  SQL/MM Spatial exception - coincident edge 8
+ERROR:  SQL/MM Spatial exception - geometry crosses edge 5
+ERROR:  SQL/MM Spatial exception - geometry crosses edge 4
 ERROR:  Spatial exception - geometry intersects edge 4
 L1
 L2

diff --git a/topology/test/regress/st_changeedgegeom_expected b/topology/test/regress/st_changeedgegeom_expected
index 290db81f67470631fb17c32328e0890579b0b020..efca63b81c33bc12addcc276235072e6ff0bb12a 100644 (file)
--- a/topology/test/regress/st_changeedgegeom_expected
+++ b/topology/test/regress/st_changeedgegeom_expected
@@ -9,7 +9,7 @@ ERROR:  SQL/MM Spatial exception - start node not geometry start point.
 ERROR:  SQL/MM Spatial exception - end node not geometry end point.
 ERROR:  SQL/MM Spatial exception - geometry crosses a node
 ERROR:  SQL/MM Spatial exception - non-existent edge 666
-ERROR:  SQL/MM Spatial exception - geometry crosses an edge
+ERROR:  SQL/MM Spatial exception - geometry crosses edge 1
 T2|Edge 5 changed
 T3|Edge 5 changed
 T4|Edge 26 changed