Style-only change: tab to spaces in ST_AddIsoEdge, shorten name of test topology

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

diff --git a/topology/sql/sqlmm.sql b/topology/sql/sqlmm.sql
index b93b04608e6d5ed7ad0ef37897332047b2b605d2..30b6e69f8edefd8d02a0f041a7cc2ddfd87d3faf 100644 (file)
--- a/topology/sql/sqlmm.sql
+++ b/topology/sql/sqlmm.sql
@@ -1496,6 +1496,8 @@ LANGUAGE 'plpgsql' VOLATILE;
 -- Not in the specs:
 -- * Reset containing_face for starting and ending point,
 --   as they stop being isolated nodes
+-- * Refuse to add a closed edge, as it would not be isolated
+--   (ie: would create a ring)
 --
 -- }{
 --
@@ -1503,78 +1505,78 @@ CREATE OR REPLACE FUNCTION topology.ST_AddIsoEdge(atopology varchar, anode integ
        RETURNS INTEGER AS
 $$
 DECLARE
-       aface INTEGER;
-       face GEOMETRY;
-       snodegeom GEOMETRY;
-       enodegeom GEOMETRY;
-       count INTEGER;
-       rec RECORD;
-       edgeid INTEGER;
+  aface INTEGER;
+  face GEOMETRY;
+  snodegeom GEOMETRY;
+  enodegeom GEOMETRY;
+  count INTEGER;
+  rec RECORD;
+  edgeid INTEGER;
 BEGIN
 
-       --
-       -- All arguments required
-       -- 
-       IF atopology IS NULL
-          OR anode IS NULL
-          OR anothernode IS NULL
-          OR acurve IS NULL
-       THEN
-               RAISE EXCEPTION
-                'SQL/MM Spatial exception - null argument';
-       END IF;
+  --
+  -- All arguments required
+  -- 
+  IF atopology IS NULL
+     OR anode IS NULL
+     OR anothernode IS NULL
+     OR acurve IS NULL
+  THEN
+    RAISE EXCEPTION
+     'SQL/MM Spatial exception - null argument';
+  END IF;
 
-       --
-       -- Acurve must be a LINESTRING
-       --
-       IF substring(geometrytype(acurve), 1, 4) != 'LINE'
-       THEN
-               RAISE EXCEPTION
-                'SQL/MM Spatial exception - invalid curve';
-       END IF;
+  --
+  -- Acurve must be a LINESTRING
+  --
+  IF substring(geometrytype(acurve), 1, 4) != 'LINE'
+  THEN
+    RAISE EXCEPTION
+     'SQL/MM Spatial exception - invalid curve';
+  END IF;
 
-       --
-       -- Acurve must be a simple
-       --
-       IF NOT ST_IsSimple(acurve)
-       THEN
-               RAISE EXCEPTION
-                'SQL/MM Spatial exception - curve not simple';
-       END IF;
+  --
+  -- Acurve must be a simple
+  --
+  IF NOT ST_IsSimple(acurve)
+  THEN
+    RAISE EXCEPTION
+     'SQL/MM Spatial exception - curve not simple';
+  END IF;
 
-       --
-       -- Check for:
-       --    existence of nodes
-       --    nodes faces match
-       -- Extract:
-       --    nodes face id
-       --    nodes geoms
-       --
-       aface := NULL;
-       count := 0;
-       FOR rec IN EXECUTE 'SELECT geom, containing_face, node_id FROM '
-               || quote_ident(atopology) || '.node
-               WHERE node_id = ' || anode ||
-               ' OR node_id = ' || anothernode
-       LOOP 
-               IF count > 0 AND aface != rec.containing_face THEN
-                       RAISE EXCEPTION
-                       'SQL/MM Spatial exception - nodes in different faces';
-               ELSE
-                       aface := rec.containing_face;
-               END IF;
+  --
+  -- Check for:
+  --    existence of nodes
+  --    nodes faces match
+  -- Extract:
+  --    nodes face id
+  --    nodes geoms
+  --
+  aface := NULL;
+  count := 0;
+  FOR rec IN EXECUTE 'SELECT geom, containing_face, node_id FROM '
+    || quote_ident(atopology) || '.node
+    WHERE node_id = ' || anode ||
+    ' OR node_id = ' || anothernode
+  LOOP 
+    IF count > 0 AND aface != rec.containing_face THEN
+      RAISE EXCEPTION
+      'SQL/MM Spatial exception - nodes in different faces';
+    ELSE
+      aface := rec.containing_face;
+    END IF;
 
-               -- Get nodes geom
-               IF rec.node_id = anode THEN
-                       snodegeom = rec.geom;
-               ELSE
-                       enodegeom = rec.geom;
-               END IF;
+    -- Get nodes geom
+    IF rec.node_id = anode THEN
+      snodegeom = rec.geom;
+    ELSE
+      enodegeom = rec.geom;
+    END IF;
 
-               count = count+1;
+    count = count+1;
 
-       END LOOP;
-       IF count < 2 THEN
+  END LOOP;
+  IF count < 2 THEN
     IF count = 1 AND anode = anothernode THEN
       RAISE EXCEPTION
        'Closed edges would not be isolated, try ST_AddEdgeNewFaces';
@@ -1582,82 +1584,84 @@ BEGIN
       RAISE EXCEPTION
        'SQL/MM Spatial exception - non-existent node';
     END IF;
-       END IF;
+  END IF;
 
 
-       --
-       -- Check nodes isolation.
-       -- 
-       FOR rec IN EXECUTE 'SELECT edge_id FROM '
-               || quote_ident(atopology) || '.edge_data ' ||
-               ' WHERE start_node =  ' || anode ||
-               ' OR end_node = ' || anode ||
-               ' OR start_node = ' || anothernode ||
-               ' OR end_node = ' || anothernode
-       LOOP
-               RAISE EXCEPTION
-                'SQL/MM Spatial exception - not isolated node';
-       END LOOP;
+  --
+  -- Check nodes isolation.
+  -- 
+  FOR rec IN EXECUTE 'SELECT edge_id FROM '
+    || quote_ident(atopology) || '.edge_data ' ||
+    ' WHERE start_node =  ' || anode ||
+    ' OR end_node = ' || anode ||
+    ' OR start_node = ' || anothernode ||
+    ' OR end_node = ' || anothernode
+  LOOP
+    RAISE EXCEPTION
+     'SQL/MM Spatial exception - not isolated node';
+  END LOOP;
 
-       --
-       -- Check acurve to be within endpoints containing face 
-       -- (unless it is the world face, I suppose)
-       -- 
-       IF aface IS NOT NULL THEN
+  --
+  -- Check acurve to be within endpoints containing face 
+  -- (unless it is the world face, I suppose)
+  -- 
+  IF aface IS NOT NULL THEN
 
-               --
-               -- Extract endpoints face geometry
-               --
-               FOR rec IN EXECUTE 'SELECT topology.ST_GetFaceGeometry('
-                       || quote_literal(atopology) ||
-                       ',' || aface || ') as face'
-               LOOP
-                       face := rec.face;
-               END LOOP;
-
-               --
-               -- Check acurve to be within face
-               --
-               IF NOT ST_Within(acurve, face) THEN
-       RAISE EXCEPTION
-       'SQL/MM Spatial exception - geometry not within face.';
-               END IF;
+    --
+    -- Extract endpoints face geometry
+    --
+    FOR rec IN EXECUTE 'SELECT topology.ST_GetFaceGeometry('
+      || quote_literal(atopology) ||
+      ',' || aface || ') as face'
+    LOOP
+      face := rec.face;
+    END LOOP;
 
-       END IF;
+    --
+    -- Check acurve to be within face
+    --
+    IF NOT ST_Within(acurve, face) THEN
+      RAISE EXCEPTION
+        'SQL/MM Spatial exception - geometry not within face.';
+    END IF;
 
-       --
-       -- l) Check that start point of acurve match start node
-       -- geoms.
-       -- 
-       IF ST_X(snodegeom) != ST_X(ST_StartPoint(acurve)) OR
-          ST_Y(snodegeom) != ST_Y(ST_StartPoint(acurve)) THEN
-  RAISE EXCEPTION
-  'SQL/MM Spatial exception - start node not geometry start point.';
-       END IF;
+  END IF;
 
-       --
-       -- m) Check that end point of acurve match end node
-       -- geoms.
-       -- 
-       IF ST_X(enodegeom) != ST_X(ST_EndPoint(acurve)) OR
-          ST_Y(enodegeom) != ST_Y(ST_EndPoint(acurve)) THEN
-  RAISE EXCEPTION
-  'SQL/MM Spatial exception - end node not geometry end point.';
-       END IF;
+  --
+  -- l) Check that start point of acurve match start node
+  -- geoms.
+  -- 
+  IF ST_X(snodegeom) != ST_X(ST_StartPoint(acurve)) OR
+     ST_Y(snodegeom) != ST_Y(ST_StartPoint(acurve))
+  THEN
+    RAISE EXCEPTION
+      'SQL/MM Spatial exception - start node not geometry start point.';
+  END IF;
 
-       --
-       -- n) Check if curve crosses (contains) any node
-       -- I used _contains_ here to leave endpoints out
-       -- 
-       FOR rec IN EXECUTE 'SELECT node_id FROM '
-               || quote_ident(atopology) || '.node '
-               || ' WHERE geom && ' || quote_literal(acurve::text) 
-               || ' AND ST_Contains(' || quote_literal(acurve::text)
-               || ',geom)'
-       LOOP
-               RAISE EXCEPTION
-               'SQL/MM Spatial exception - geometry crosses a node';
-       END LOOP;
+  --
+  -- m) Check that end point of acurve match end node
+  -- geoms.
+  -- 
+  IF ST_X(enodegeom) != ST_X(ST_EndPoint(acurve)) OR
+     ST_Y(enodegeom) != ST_Y(ST_EndPoint(acurve))
+  THEN
+    RAISE EXCEPTION
+      'SQL/MM Spatial exception - end node not geometry end point.';
+  END IF;
+
+  --
+  -- n) Check if curve crosses (contains) any node
+  -- I used _contains_ here to leave endpoints out
+  -- 
+  FOR rec IN EXECUTE 'SELECT node_id FROM '
+    || quote_ident(atopology) || '.node '
+    || ' WHERE geom && ' || quote_literal(acurve::text) 
+    || ' AND ST_Contains(' || quote_literal(acurve::text)
+    || ',geom)'
+  LOOP
+    RAISE EXCEPTION
+      'SQL/MM Spatial exception - geometry crosses a node';
+  END LOOP;
 
   --
   -- o) Check if curve intersects any other edge
@@ -1669,21 +1673,21 @@ BEGIN
     RAISE EXCEPTION 'SQL/MM Spatial exception - geometry intersects an edge';
   END LOOP;
 
-       --
-       -- Get new edge id from sequence
-       --
-       FOR rec IN EXECUTE 'SELECT nextval(''' ||
-               atopology || '.edge_data_edge_id_seq'')'
-       LOOP
-               edgeid = rec.nextval;
-       END LOOP;
+  --
+  -- Get new edge id from sequence
+  --
+  FOR rec IN EXECUTE 'SELECT nextval(''' ||
+    atopology || '.edge_data_edge_id_seq'')'
+  LOOP
+    edgeid = rec.nextval;
+  END LOOP;
 
   -- TODO: this should likely be an exception instead !
   IF aface IS NULL THEN aface := 0; END IF;
 
-       --
-       -- Insert the new row
-       --
+  --
+  -- Insert the new row
+  --
   EXECUTE 'INSERT INTO ' || quote_ident(atopology)
     || '.edge VALUES(' || edgeid || ',' || anode
     || ',' || anothernode || ',' || (-edgeid)

diff --git a/topology/test/regress/st_addisoedge.sql b/topology/test/regress/st_addisoedge.sql
index d566dafa6a066d63372f7dddabed80eae46e4273..7121876aaf05437b6e2938d05ed63e3411d20648 100644 (file)
--- a/topology/test/regress/st_addisoedge.sql
+++ b/topology/test/regress/st_addisoedge.sql
@@ -1,72 +1,72 @@
 set client_min_messages to WARNING;
 
-SELECT topology.CreateTopology('sqlmm_topology') > 0;
+SELECT topology.CreateTopology('tt') > 0;
 
 -- Put some points in
-INSERT INTO sqlmm_topology.node (containing_face, geom) VALUES
+INSERT INTO tt.node (containing_face, geom) VALUES
   (0, 'POINT(0 0)') RETURNING 'N' || node_id; -- 1
-INSERT INTO sqlmm_topology.node (containing_face, geom) VALUES
+INSERT INTO tt.node (containing_face, geom) VALUES
   (0, 'POINT(10 0)') RETURNING 'N' || node_id; -- 2
-INSERT INTO sqlmm_topology.node (containing_face, geom) VALUES
+INSERT INTO tt.node (containing_face, geom) VALUES
   (0, 'POINT(5 0)') RETURNING 'N' || node_id; -- 3
-INSERT INTO sqlmm_topology.node (containing_face, geom) VALUES
+INSERT INTO tt.node (containing_face, geom) VALUES
   (0, 'POINT(5 10)') RETURNING 'N' || node_id; -- 4
-INSERT INTO sqlmm_topology.node (containing_face, geom) VALUES
+INSERT INTO tt.node (containing_face, geom) VALUES
   (0, 'POINT(10 10)') RETURNING 'N' || node_id; -- 5
-INSERT INTO sqlmm_topology.node (containing_face, geom) VALUES
+INSERT INTO tt.node (containing_face, geom) VALUES
   (0, 'POINT(20 10)') RETURNING 'N' || node_id; -- 6
 
 -- null input
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', 1, 2, NULL);
+SELECT topology.ST_AddIsoEdge('tt', 1, 2, NULL);
 SELECT topology.ST_AddIsoEdge(NULL, 1, 2, 'LINESTRING(0 0, 1 1)');
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', 1, NULL, 'LINESTRING(0 0, 1 1)');
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', NULL, 2, 'LINESTRING(0 0, 1 1)');
+SELECT topology.ST_AddIsoEdge('tt', 1, NULL, 'LINESTRING(0 0, 1 1)');
+SELECT topology.ST_AddIsoEdge('tt', NULL, 2, 'LINESTRING(0 0, 1 1)');
 
 -- invalid curve
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', 1, 2, 'POINT(0 0)');
+SELECT topology.ST_AddIsoEdge('tt', 1, 2, 'POINT(0 0)');
 
 -- non-simple curve
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', 1, 2, 'LINESTRING(0 0, 10 0, 5 5, 5 -5)');
+SELECT topology.ST_AddIsoEdge('tt', 1, 2, 'LINESTRING(0 0, 10 0, 5 5, 5 -5)');
 
 -- non-existing nodes
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', 10000, 2, 'LINESTRING(0 0, 1 1)');
+SELECT topology.ST_AddIsoEdge('tt', 10000, 2, 'LINESTRING(0 0, 1 1)');
 
 -- Curve endpoints mismatch
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', 1, 2, 'LINESTRING(0 0, 1 1)');
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', 1, 2, 'LINESTRING(0 1, 10 0)');
+SELECT topology.ST_AddIsoEdge('tt', 1, 2, 'LINESTRING(0 0, 1 1)');
+SELECT topology.ST_AddIsoEdge('tt', 1, 2, 'LINESTRING(0 1, 10 0)');
 
 -- Node crossing 
-SELECT topology.ST_AddIsoEdge('sqlmm_topology', 1, 2, 'LINESTRING(0 0, 10 0)');
+SELECT topology.ST_AddIsoEdge('tt', 1, 2, 'LINESTRING(0 0, 10 0)');
 
 -- Good one
-SELECT 'E' || topology.ST_AddIsoEdge('sqlmm_topology',
+SELECT 'E' || topology.ST_AddIsoEdge('tt',
   4, 5, 'LINESTRING(5 10, 5 9, 10 10)');
 
 -- Another good one
-SELECT 'E' || topology.ST_AddIsoEdge('sqlmm_topology',
+SELECT 'E' || topology.ST_AddIsoEdge('tt',
   1, 2, 'LINESTRING(0 0, 2 1, 10 5, 10 0)');
 
 -- Check that containing_face became NULL for the nodes which are
 -- not isolated anymore (#976)
-SELECT 'N' || node_id, containing_face FROM sqlmm_topology.node
+SELECT 'N' || node_id, containing_face FROM tt.node
   ORDER BY node_id;
 
 -- Not isolated edge (shares endpoint with previous)
-SELECT topology.ST_AddIsoEdge('sqlmm_topology',
+SELECT topology.ST_AddIsoEdge('tt',
   4, 6, 'LINESTRING(5 10, 10 9, 20 10)');
-SELECT topology.ST_AddIsoEdge('sqlmm_topology',
+SELECT topology.ST_AddIsoEdge('tt',
   5, 6, 'LINESTRING(10 10, 20 10)');
 
 -- Not isolated edge (shares endpoint with self)
-SELECT topology.ST_AddIsoEdge('sqlmm_topology',
+SELECT topology.ST_AddIsoEdge('tt',
   3, 3, 'LINESTRING(5 0, 4 -2, 6 -2, 5 0)');
 
 -- Edge intersection (geometry intersects an edge)
-SELECT topology.ST_AddIsoEdge('sqlmm_topology',
+SELECT topology.ST_AddIsoEdge('tt',
   3, 6, 'LINESTRING(5 0, 20 10)');
 
 -- TODO: check closed edge (not-isolated I guess...)
 -- on different faces (TODO req. nodes contained in face)
 
 
-SELECT topology.DropTopology('sqlmm_topology');
+SELECT topology.DropTopology('tt');

diff --git a/topology/test/regress/st_addisoedge_expected b/topology/test/regress/st_addisoedge_expected
index f62f1242dca40dc23f526c92459ac6ff26448e22..e42bdf0bc047f8fd3d0827aea61b5a5837251ebd 100644 (file)
--- a/topology/test/regress/st_addisoedge_expected
+++ b/topology/test/regress/st_addisoedge_expected
@@ -27,4 +27,4 @@ ERROR:  SQL/MM Spatial exception - not isolated node
 ERROR:  SQL/MM Spatial exception - not isolated node
 ERROR:  Closed edges would not be isolated, try ST_AddEdgeNewFaces
 ERROR:  SQL/MM Spatial exception - geometry intersects an edge
-Topology 'sqlmm_topology' dropped
+Topology 'tt' dropped