From: Sandro Santilli <strk@keybit.net>
Date: Mon, 24 Feb 2014 06:45:40 +0000 (+0000)
Subject: Fully qualify calls to topology methods (#2653)
X-Git-Tag: 2.2.0rc1~1229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a01c0216918f958069462d5ec827fa273c4cb5b;p=postgis

Fully qualify calls to topology methods (#2653)

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

diff --git a/topology/sql/export/TopoJSON.sql.in b/topology/sql/export/TopoJSON.sql.in
index 2a2ab6a4f..847875cfe 100644
--- a/topology/sql/export/TopoJSON.sql.in
+++ b/topology/sql/export/TopoJSON.sql.in
@@ -116,7 +116,7 @@ BEGIN
     EXECUTE 'SET search_path TO ' || quote_ident(toponame) || ',' || old_search_path;
 
     SELECT array_agg(id) as f
-    FROM ( SELECT (GetTopoGeomElements(tg))[1] as id ) as f
+    FROM ( SELECT (topology.GetTopoGeomElements(tg))[1] as id ) as f
     INTO all_faces;
 
 #ifdef POSTGIS_TOPOLOGY_DEBUG
diff --git a/topology/sql/populate.sql.in b/topology/sql/populate.sql.in
index b564e1da2..def40f729 100644
--- a/topology/sql/populate.sql.in
+++ b/topology/sql/populate.sql.in
@@ -134,7 +134,7 @@ BEGIN
     USING apoint
 	LOOP
     IF allowEdgeSplitting THEN
-      RETURN ST_ModEdgeSplit(atopology, rec.edge_id, apoint);
+      RETURN topology.ST_ModEdgeSplit(atopology, rec.edge_id, apoint);
     ELSE
 		  RAISE EXCEPTION 'An edge crosses the given node.';
     END IF;
@@ -757,7 +757,7 @@ BEGIN
         RAISE WARNING 'Edge within % distance from node still does not contain the node after snapping to it with tolerance %', tol, snaptol;
       END IF;
 #endif
-      PERFORM ST_ChangeEdgeGeom(atopology, rec.edge_id, snapedge);
+      PERFORM topology.ST_ChangeEdgeGeom(atopology, rec.edge_id, snapedge);
     END IF;
     id := topology.ST_ModEdgeSplit(atopology, rec.edge_id, prj);
   ELSE
@@ -1032,7 +1032,7 @@ BEGIN
 #endif
   FOR rec IN EXECUTE sql USING apoly LOOP
     -- check for actual containment
-    fgeom := ST_PointOnSurface(ST_GetFaceGeometry(atopology, rec.face_id));
+    fgeom := ST_PointOnSurface(topology.ST_GetFaceGeometry(atopology, rec.face_id));
     IF NOT ST_Covers(apoly, fgeom) THEN
 #ifdef POSTGIS_TOPOLOGY_DEBUG
       RAISE DEBUG 'Face % not covered by input polygon', rec.face_id;
diff --git a/topology/sql/sqlmm.sql.in b/topology/sql/sqlmm.sql.in
index 503873084..59fddcf3d 100644
--- a/topology/sql/sqlmm.sql.in
+++ b/topology/sql/sqlmm.sql.in
@@ -2503,7 +2503,7 @@ DECLARE
 BEGIN
   WITH edgestar AS (
     SELECT *, count(*) over () AS cnt
-    FROM GetNodeEdges(atopology, anode)
+    FROM topology.GetNodeEdges(atopology, anode)
   )
   SELECT ARRAY[ (
       SELECT p.edge AS prev FROM edgestar p
@@ -2829,7 +2829,7 @@ BEGIN
     sql := 'UPDATE ' || quote_ident(atopology)
       || '.face SET mbr = $1 WHERE face_id = $2' ;
     EXECUTE sql USING
-      ST_Envelope(ST_GetFaceGeometry(atopology, oldedge.left_face)),
+      ST_Envelope(topology.ST_GetFaceGeometry(atopology, oldedge.left_face)),
       oldedge.left_face
       ;
   END IF;
@@ -2837,7 +2837,7 @@ BEGIN
     sql := 'UPDATE ' || quote_ident(atopology)
       || '.face SET mbr = $1 WHERE face_id = $2';
     EXECUTE sql USING
-      ST_Envelope(ST_GetFaceGeometry(atopology, oldedge.right_face)),
+      ST_Envelope(topology.ST_GetFaceGeometry(atopology, oldedge.right_face)),
       oldedge.right_face
     ;
   END IF;