[postgis-tickets] r14984 - Style only change: remove trailing spaces
Sandro Santilli
strk at kbt.io
Mon Jul 4 05:54:26 PDT 2016
Author: strk
Date: 2016-07-04 05:54:26 -0700 (Mon, 04 Jul 2016)
New Revision: 14984
Modified:
trunk/topology/sql/export/TopoJSON.sql.in
trunk/topology/sql/manage/CopyTopology.sql.in
trunk/topology/sql/manage/ManageHelper.sql.in
trunk/topology/sql/manage/TopologySummary.sql.in
trunk/topology/sql/polygonize.sql.in
trunk/topology/sql/populate.sql.in
trunk/topology/sql/predicates.sql.in
trunk/topology/sql/query/GetRingEdges.sql.in
trunk/topology/sql/query/getedgebypoint.sql.in
trunk/topology/sql/query/getnodebypoint.sql.in
trunk/topology/sql/sqlmm.sql.in
trunk/topology/sql/topoelement/topoelement_agg.sql.in
trunk/topology/sql/topogeometry/cleartopogeom.sql.in
trunk/topology/sql/topogeometry/simplify.sql.in
trunk/topology/sql/topogeometry/totopogeom.sql.in
trunk/topology/sql/topogeometry/type.sql.in
Log:
Style only change: remove trailing spaces
Modified: trunk/topology/sql/export/TopoJSON.sql.in
===================================================================
--- trunk/topology/sql/export/TopoJSON.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/export/TopoJSON.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -152,7 +152,7 @@
FOR rec in -- {
WITH RECURSIVE
_edges AS (
- SELECT e.*,
+ SELECT e.*,
e.left_face = ANY ( faces ) as lf,
e.right_face = ANY ( faces ) as rf
FROM edge e
@@ -298,9 +298,9 @@
RAISE EXCEPTION 'Collection TopoGeometries are not supported by AsTopoJSON';
END IF;
-
+
RETURN json;
-
+
END
$$ LANGUAGE 'plpgsql' VOLATILE; -- writes into visited table
-- } AsTopoJSON(TopoGeometry, visited_table)
Modified: trunk/topology/sql/manage/CopyTopology.sql.in
===================================================================
--- trunk/topology/sql/manage/CopyTopology.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/manage/CopyTopology.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -44,7 +44,7 @@
-- Update faces sequence
EXECUTE 'SELECT setval(' || quote_literal(
quote_ident(newtopo) || '.face_face_id_seq'
- ) || ', (SELECT last_value FROM '
+ ) || ', (SELECT last_value FROM '
|| quote_ident(atopology) || '.face_face_id_seq))';
-- Copy nodes
@@ -54,7 +54,7 @@
-- Update node sequence
EXECUTE 'SELECT setval(' || quote_literal(
quote_ident(newtopo) || '.node_node_id_seq'
- ) || ', (SELECT last_value FROM '
+ ) || ', (SELECT last_value FROM '
|| quote_ident(atopology) || '.node_node_id_seq))';
-- Copy edges
@@ -64,20 +64,20 @@
-- Update edge sequence
EXECUTE 'SELECT setval(' || quote_literal(
quote_ident(newtopo) || '.edge_data_edge_id_seq'
- ) || ', (SELECT last_value FROM '
+ ) || ', (SELECT last_value FROM '
|| quote_ident(atopology) || '.edge_data_edge_id_seq))';
- -- Copy layers and their TopoGeometry sequences
+ -- Copy layers and their TopoGeometry sequences
FOR rec IN SELECT * FROM topology.layer WHERE topology_id = oldtopo_id
LOOP
INSERT INTO topology.layer (topology_id, layer_id, feature_type,
- level, child_id, schema_name, table_name, feature_column)
+ level, child_id, schema_name, table_name, feature_column)
VALUES (newtopo_id, rec.layer_id, rec.feature_type,
rec.level, rec.child_id, newtopo,
'LAYER' || rec.layer_id, '');
-- Create layer's TopoGeometry sequences
- EXECUTE 'SELECT last_value FROM '
- || quote_ident(atopology) || '.topogeo_s_' || rec.layer_id
+ EXECUTE 'SELECT last_value FROM '
+ || quote_ident(atopology) || '.topogeo_s_' || rec.layer_id
INTO STRICT n;
EXECUTE 'CREATE SEQUENCE ' || quote_ident(newtopo)
|| '.topogeo_s_' || rec.layer_id;
Modified: trunk/topology/sql/manage/ManageHelper.sql.in
===================================================================
--- trunk/topology/sql/manage/ManageHelper.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/manage/ManageHelper.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://www.postgis.net
--
@@ -30,14 +30,14 @@
var_result := a_schema_name || ' already in database search_path';
ELSE
var_cur_search_path := var_cur_search_path || ', '
- || quote_ident(a_schema_name);
+ || quote_ident(a_schema_name);
EXECUTE 'ALTER DATABASE ' || quote_ident(current_database())
|| ' SET search_path = ' || var_cur_search_path;
var_result := a_schema_name || ' has been added to end of database search_path ';
END IF;
EXECUTE 'SET search_path = ' || var_cur_search_path;
-
+
RETURN var_result;
END
$$
Modified: trunk/topology/sql/manage/TopologySummary.sql.in
===================================================================
--- trunk/topology/sql/manage/TopologySummary.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/manage/TopologySummary.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -58,7 +58,7 @@
)
THEN
ret = ret || 'missing schema';
- RETURN ret;
+ RETURN ret;
ELSE
ret = ret || 'missing nodes, ';
END IF;
@@ -110,7 +110,7 @@
ret = ret || 'Polygonal';
WHEN rec.feature_type = 4 THEN
ret = ret || 'Mixed';
- ELSE
+ ELSE
ret = ret || '???';
END CASE;
@@ -131,7 +131,7 @@
END;
IF rec.level > 0 THEN
- ret = ret || ' Hierarchy level ' || rec.level
+ ret = ret || ' Hierarchy level ' || rec.level
|| ', child layer ' || rec.child_id || E'\n';
END IF;
Modified: trunk/topology/sql/polygonize.sql.in
===================================================================
--- trunk/topology/sql/polygonize.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/polygonize.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
Modified: trunk/topology/sql/populate.sql.in
===================================================================
--- trunk/topology/sql/populate.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/populate.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -96,7 +96,7 @@
BEGIN
--
-- Atopology and apoint are required
- --
+ --
IF atopology IS NULL OR apoint IS NULL THEN
RAISE EXCEPTION 'Invalid null argument';
END IF;
@@ -111,7 +111,7 @@
--
-- Check if a coincident node already exists
- --
+ --
-- We use index AND x/y equality
--
FOR rec IN EXECUTE 'SELECT node_id FROM '
@@ -127,7 +127,7 @@
-- (endpoints are fine)
--
FOR rec IN EXECUTE 'SELECT edge_id FROM '
- || quote_ident(atopology) || '.edge '
+ || quote_ident(atopology) || '.edge '
|| 'WHERE ST_DWithin($1, geom, 0) AND '
|| 'NOT ST_Equals($1, ST_StartPoint(geom)) AND '
|| 'NOT ST_Equals($1, ST_EndPoint(geom))'
@@ -164,12 +164,12 @@
-- Insert the new row
--
EXECUTE 'INSERT INTO ' || quote_ident(atopology)
- || '.node(node_id, containing_face, geom)
+ || '.node(node_id, containing_face, geom)
VALUES(' || nodeid || ',' || coalesce(containing_face::text, 'NULL')
|| ',$1)' USING apoint;
RETURN nodeid;
-
+
END
$$
LANGUAGE 'plpgsql' VOLATILE;
@@ -209,7 +209,7 @@
-- e dell' Ambiente [RT-SIGTA].
-- For the project: "Sviluppo strumenti software per il trattamento di dati
-- geografici basati su QuantumGIS e Postgis (CIG 0494241492)"
---
+--
CREATE OR REPLACE FUNCTION topology.AddEdge(atopology varchar, aline geometry)
RETURNS int
AS
@@ -217,11 +217,11 @@
DECLARE
edgeid int;
rec RECORD;
- ix geometry;
+ ix geometry;
BEGIN
--
-- Atopology and apoint are required
- --
+ --
IF atopology IS NULL OR aline IS NULL THEN
RAISE EXCEPTION 'Invalid null argument';
END IF;
@@ -262,7 +262,7 @@
-- on anything but endpoints
--
-- Following DE-9 Intersection Matrix represent
- -- the only relation we accept.
+ -- the only relation we accept.
--
-- F F 1
-- F * *
@@ -357,7 +357,7 @@
USING aline;
RETURN edgeid;
-
+
END
$$
LANGUAGE 'plpgsql' VOLATILE;
@@ -395,7 +395,7 @@
-- e dell' Ambiente [RT-SIGTA].
-- For the project: "Sviluppo strumenti software per il trattamento di dati
-- geografici basati su QuantumGIS e Postgis (CIG 0494241492)"
---
+--
CREATE OR REPLACE FUNCTION topology.AddFace(atopology varchar, apoly geometry, force_new boolean DEFAULT FALSE)
RETURNS int
AS
@@ -424,7 +424,7 @@
BEGIN
--
-- Atopology and apoly are required
- --
+ --
IF atopology IS NULL OR apoly IS NULL THEN
RAISE EXCEPTION 'Invalid null argument';
END IF;
@@ -494,20 +494,20 @@
loc = ST_LineLocatePoint(edgeseg, p3);
-- WARNING: this is as robust as length of edgeseg allows...
IF loc > 0.9 THEN
- -- shift last point down
+ -- shift last point down
p2 = ST_LineInterpolatePoint(edgeseg, loc - 0.1);
ELSIF loc < 0.1 THEN
-- shift first point up
- p1 = ST_LineInterpolatePoint(edgeseg, loc + 0.1);
+ p1 = ST_LineInterpolatePoint(edgeseg, loc + 0.1);
ELSE
-- when ring start point is in between, we swap the points
p3 = p1; p1 = p2; p2 = p3;
END IF;
END IF;
- right_side = ST_LineLocatePoint(bounds, p1) <
+ right_side = ST_LineLocatePoint(bounds, p1) <
ST_LineLocatePoint(bounds, p2);
-
+
#ifdef POSTGIS_TOPOLOGY_DEBUG
RAISE DEBUG 'Edge % (left:%, right:%) - ring : % - right_side : %',
rec.edge_id, rec.left_face, rec.right_face, rrec.path, right_side;
@@ -552,7 +552,7 @@
-- If the test fail either we need to add more edges
-- from the polygon ring or we need to split
-- some of the existing ones.
- --
+ --
bounds = ST_Boundary(apoly);
IF NOT ST_isEmpty(ST_SymDifference(bounds, all_edges)) THEN
IF NOT ST_isEmpty(ST_Difference(bounds, all_edges)) THEN
@@ -587,7 +587,7 @@
END LOOP;
--
- -- Insert new face
+ -- Insert new face
--
EXECUTE 'INSERT INTO '
|| quote_ident(atopology)
@@ -626,7 +626,7 @@
--
- -- Set left_face/right_face of any contained edge
+ -- Set left_face/right_face of any contained edge
--
EXECUTE 'UPDATE '
|| quote_ident(atopology)
@@ -637,9 +637,9 @@
|| ' WHERE ST_Contains($1, geom)'
USING apoly;
- --
- -- Set containing_face of any contained node
- --
+ --
+ -- Set containing_face of any contained node
+ --
EXECUTE 'UPDATE '
|| quote_ident(atopology)
|| '.node SET containing_face = '
@@ -648,22 +648,22 @@
USING apoly;
RETURN faceid;
-
+
END
$$
LANGUAGE 'plpgsql' VOLATILE;
--} AddFace
-- ----------------------------------------------------------------------------
---
+--
-- Functions to incrementally populate a topology
---
+--
-- ----------------------------------------------------------------------------
--{
-- TopoGeo_AddPoint(toponame, pointgeom, tolerance)
--
--- Add a Point into a topology, with an optional tolerance
+-- Add a Point into a topology, with an optional tolerance
--
CREATE OR REPLACE FUNCTION topology.TopoGeo_AddPoint(atopology varchar, apoint geometry, tolerance float8 DEFAULT 0)
RETURNS int AS
@@ -674,7 +674,7 @@
--{
-- TopoGeo_addLinestring(toponame, linegeom, tolerance)
--
--- Add a LineString into a topology
+-- Add a LineString into a topology
--
-- }{
CREATE OR REPLACE FUNCTION topology.TopoGeo_addLinestring(atopology varchar, aline geometry, tolerance float8 DEFAULT 0)
@@ -686,7 +686,7 @@
--{
-- TopoGeo_AddPolygon(toponame, polygeom, tolerance)
--
--- Add a Polygon into a topology
+-- Add a Polygon into a topology
--
-- }{
CREATE OR REPLACE FUNCTION topology.TopoGeo_AddPolygon(atopology varchar, apoly geometry, tolerance float8 DEFAULT 0)
@@ -698,7 +698,7 @@
--{
-- TopoGeo_AddGeometry(toponame, geom, tolerance)
--
--- Add a Geometry into a topology
+-- Add a Geometry into a topology
--
CREATE OR REPLACE FUNCTION topology.TopoGeo_AddGeometry(atopology varchar, ageom geometry, tolerance float8 DEFAULT 0)
RETURNS void AS
Modified: trunk/topology/sql/predicates.sql.in
===================================================================
--- trunk/topology/sql/predicates.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/predicates.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -10,7 +10,7 @@
-- the terms of the GNU General Public Licence. See the COPYING file.
--
-- Author: Sandro Santilli <strk at keybit.net>
---
+--
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--
-- Overloaded spatial predicates for TopoGeometry inputs
@@ -79,9 +79,9 @@
IF tg2.type = 1 THEN -- point/point
---------------------------------------------------------
- --
+ --
-- Two [multi]point features intersect if they share
- -- any Node
+ -- any Node
--
--
--
@@ -105,13 +105,13 @@
RETURN FALSE; -- no elements shared
--
---------------------------------------------------------
-
+
ELSIF tg2.type = 2 THEN -- point/line
---------------------------------------------------------
- --
+ --
-- A [multi]point intersects a [multi]line if they share
- -- any Node.
+ -- any Node.
--
--
--
@@ -145,7 +145,7 @@
ELSIF tg2.type = 3 THEN -- point/polygon
---------------------------------------------------------
- --
+ --
-- A [multi]point intersects a [multi]polygon if any
-- Node of the point is contained in any face of the
-- polygon OR ( is end_node or start_node of any edge
@@ -232,9 +232,9 @@
ELSIF tg1.type = 2 THEN -- [multi]line
IF tg2.type = 2 THEN -- line/line
---------------------------------------------------------
- --
+ --
-- A [multi]line intersects a [multi]line if they share
- -- any Node.
+ -- any Node.
--
--
--
@@ -275,7 +275,7 @@
ELSIF tg2.type = 3 THEN -- line/polygon
---------------------------------------------------------
- --
+ --
-- A [multi]line intersects a [multi]polygon if they share
-- any Node (touch-only case), or if any line edge has any
-- polygon face on the left or right (full-containment case
@@ -311,7 +311,7 @@
|| ' AND ( '
- -- Check if E1 have left-or-right face
+ -- Check if E1 have left-or-right face
-- being part of R2.element_id
|| ' e1.left_face = r2.element_id '
|| ' OR '
@@ -354,7 +354,7 @@
IF tg2.type = 3 THEN -- polygon/polygon
---------------------------------------------------------
- --
+ --
-- A [multi]polygon intersects a [multi]polygon if they share
-- any Node (touch-only case), or if any face edge has any of the
-- other polygon face on the left or right (full-containment case
@@ -395,7 +395,7 @@
-- Check if any edge from a polygon face
-- has any of the other polygon face
- -- on the left or right
+ -- on the left or right
|| ' e1.left_face = r2.element_id '
|| ' OR '
|| ' e1.right_face = r2.element_id '
@@ -483,7 +483,7 @@
SELECT name FROM topology.topology into toponame
WHERE id = tg1.topology_id;
- -- Two geometries are equal if they are composed by
+ -- Two geometries are equal if they are composed by
-- the same TopoElements
FOR rec IN EXECUTE 'SELECT * FROM '
|| ' topology.GetTopoGeomElements('
Modified: trunk/topology/sql/query/GetRingEdges.sql.in
===================================================================
--- trunk/topology/sql/query/GetRingEdges.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/query/GetRingEdges.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -24,7 +24,7 @@
-- Return a list of edges (sequence, id) resulting by starting from the
-- given edge and following the leftmost turn at each encountered node.
--
--- Edge ids are signed, they are negative if traversed backward.
+-- Edge ids are signed, they are negative if traversed backward.
-- Sequence numbers start with 1.
--
-- Use a negative starting_edge to follow its rigth face rather than
Modified: trunk/topology/sql/query/getedgebypoint.sql.in
===================================================================
--- trunk/topology/sql/query/getedgebypoint.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/query/getedgebypoint.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -22,7 +22,7 @@
--
-- Returns return the integer ID if there is an edge on the Point.
--
--- When the Point is even a Node it raise an exception.
+-- When the Point is even a Node it raise an exception.
-- This case is testable with the GetNodeByPoint(atopology, apoint, tol)
--
-- If there isn't any edge in the Point, GetEdgeByPoint return 0.
Modified: trunk/topology/sql/query/getnodebypoint.sql.in
===================================================================
--- trunk/topology/sql/query/getnodebypoint.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/query/getnodebypoint.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
Modified: trunk/topology/sql/sqlmm.sql.in
===================================================================
--- trunk/topology/sql/sqlmm.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/sqlmm.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -10,8 +10,8 @@
-- the terms of the GNU General Public Licence. See the COPYING file.
--
-- Author: Sandro Santilli <strk at keybit.net>
---
---
+--
+--
/* #define POSTGIS_TOPOLOGY_DEBUG 1 */
@@ -38,7 +38,7 @@
-- ST_GetFaceEdges(atopology, aface)
--
--
---
+--
CREATE OR REPLACE FUNCTION topology.ST_GetFaceEdges(toponame varchar, face_id integer)
RETURNS SETOF topology.GetFaceEdges_ReturnType AS
'MODULE_PATHNAME', 'ST_GetFaceEdges'
@@ -52,12 +52,12 @@
-- ST_NewEdgeHeal(atopology, anedge, anotheredge)
--
-- Not in the specs:
--- * Refuses to heal two edges if any of the two is closed
+-- * Refuses to heal two edges if any of the two is closed
-- * Raise an exception when trying to heal an edge with itself
-- * Raise an exception if any TopoGeometry is defined by only one
-- of the two edges
-- * Update references in the Relation table.
---
+--
CREATE OR REPLACE FUNCTION topology.ST_NewEdgeHeal(toponame varchar, e1id integer, e2id integer)
RETURNS int AS
'MODULE_PATHNAME','ST_NewEdgeHeal'
@@ -72,7 +72,7 @@
--
-- Not in the specs:
-- * Returns the id of the node being removed
--- * Refuses to heal two edges if any of the two is closed
+-- * Refuses to heal two edges if any of the two is closed
-- * Raise an exception when trying to heal an edge with itself
-- * Raise an exception if any TopoGeometry is defined by only one
-- of the two edges
@@ -93,12 +93,12 @@
-- Not in the specs:
-- * Raise an exception if any TopoGeometry is defined by only one
-- of the two faces that will dissolve.
--- * Raise an exception if any TopoGeometry is defined by
+-- * Raise an exception if any TopoGeometry is defined by
-- the edge being removed.
-- * Properly set containg_face on nodes that remains isolated by the drop
-- * Update containg_face for isolated nodes in the dissolved faces
-- * Update references in the Relation table
---
+--
-- }{
CREATE OR REPLACE FUNCTION topology.ST_RemEdgeNewFace(toponame varchar, e1id integer)
RETURNS int AS
@@ -115,7 +115,7 @@
-- Not in the specs:
-- * Raise an exception if any TopoGeometry is defined by only one
-- of the two faces that will dissolve.
--- * Raise an exception if any TopoGeometry is defined by
+-- * Raise an exception if any TopoGeometry is defined by
-- the edge being removed.
-- * Properly set containg_face on nodes that remains isolated by the drop
-- * Update containg_face for isolated nodes in the dissolved faces
@@ -135,7 +135,7 @@
-- X.3.16
--
-- ST_GetFaceGeometry(atopology, aface)
---
+--
CREATE OR REPLACE FUNCTION topology.ST_GetFaceGeometry(toponame varchar, aface integer)
RETURNS GEOMETRY AS
'MODULE_PATHNAME', 'ST_GetFaceGeometry'
@@ -145,7 +145,7 @@
--{
-- Topo-Geo and Topo-Net 3: Routine Details
--- X.3.1
+-- X.3.1
--
-- ST_AddIsoNode(atopology, aface, apoint)
--
@@ -157,7 +157,7 @@
--{
-- Topo-Geo and Topo-Net 3: Routine Details
--- X.3.2
+-- X.3.2
--
-- ST_MoveIsoNode(atopology, anode, apoint)
--
@@ -169,7 +169,7 @@
--{
-- Topo-Geo and Topo-Net 3: Routine Details
--- X.3.3
+-- X.3.3
--
-- ST_RemoveIsoNode(atopology, anode)
--
@@ -192,7 +192,7 @@
--{
-- Topo-Geo and Topo-Net 3: Routine Details
--- X.3.7
+-- X.3.7
--
-- ST_RemoveIsoEdge(atopology, anedge)
--
@@ -204,7 +204,7 @@
--{
-- Topo-Geo and Topo-Net 3: Routine Details
--- X.3.8
+-- X.3.8
--
-- ST_NewEdgesSplit(atopology, anedge, apoint)
--
@@ -219,7 +219,7 @@
--{
-- Topo-Geo and Topo-Net 3: Routine Details
--- X.3.9
+-- X.3.9
--
-- ST_ModEdgeSplit(atopology, anedge, apoint)
--
@@ -234,10 +234,10 @@
--{
-- Topo-Geo and Topo-Net 3: Routine Details
--- X.3.4
+-- X.3.4
--
-- ST_AddIsoEdge(atopology, anode, anothernode, acurve)
---
+--
-- Not in the specs:
-- * Reset containing_face for starting and ending point,
-- as they stop being isolated nodes
@@ -259,7 +259,7 @@
-- @param anedge the directed edge to get adjacents from
-- if positive `anode' is assumed to be its start node
-- if negative `anode' is assumed to be its end node
---
+--
-- @todo DROP, NOT NEEDED ANYMORE (might need to go in some _drop, I guess)
-- {
CREATE OR REPLACE FUNCTION topology._ST_AdjacentEdges(atopology varchar, anode integer, anedge integer)
@@ -507,7 +507,7 @@
FOR rec IN SELECT geom FROM ST_Dump(points)
LOOP
-- Use the node to split edges
- SELECT ST_Collect(geom)
+ SELECT ST_Collect(geom)
FROM ST_Dump(ST_Split(nodededges, rec.geom))
INTO STRICT nodededges;
END LOOP;
@@ -524,7 +524,7 @@
WITH edges AS ( SELECT geom FROM ST_Dump(nodededges) )
SELECT ST_Union( -- TODO: ST_UnaryUnion ?
- COALESCE(ST_UnaryUnion(ST_Collect(geom)),
+ COALESCE(ST_UnaryUnion(ST_Collect(geom)),
ST_SetSRID('POINT EMPTY'::geometry, topoinfo.SRID)),
COALESCE(points,
ST_SetSRID('POINT EMPTY'::geometry, topoinfo.SRID))
@@ -540,7 +540,7 @@
#endif
--
- -- Add all nodes as isolated so that
+ -- Add all nodes as isolated so that
-- later calls to AddEdgeModFace will tweak their being
-- isolated or not...
--
@@ -548,8 +548,8 @@
LOOP
PERFORM topology.ST_AddIsoNode(atopology, 0, rec.geom);
END LOOP;
-
+
FOR rec IN SELECT geom FROM ST_Dump(nodededges)
LOOP
SELECT topology.GetNodeByPoint(atopology, st_startpoint(rec.geom), 0)
Modified: trunk/topology/sql/topoelement/topoelement_agg.sql.in
===================================================================
--- trunk/topology/sql/topoelement/topoelement_agg.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/topoelement/topoelement_agg.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -10,7 +10,7 @@
--
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--
--- TopoElement management functions
+-- TopoElement management functions
--
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--
Modified: trunk/topology/sql/topogeometry/cleartopogeom.sql.in
===================================================================
--- trunk/topology/sql/topogeometry/cleartopogeom.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/topogeometry/cleartopogeom.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -11,7 +11,7 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-- {
--- Clear the contents of a TopoGeometry
+-- Clear the contents of a TopoGeometry
--
-- }{
CREATE OR REPLACE FUNCTION topology.clearTopoGeom(tg topology.TopoGeometry)
Modified: trunk/topology/sql/topogeometry/simplify.sql.in
===================================================================
--- trunk/topology/sql/topogeometry/simplify.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/topogeometry/simplify.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -100,7 +100,7 @@
ELSIF tg.type = 2 THEN -- [multi]line -- }{
- sql :=
+ sql :=
'SELECT st_multi(ST_LineMerge(ST_Node(ST_Collect(ST_Simplify(e.geom,'
|| tolerance || '))))) as g FROM '
|| quote_ident(topology_info.name) || '.edge e, '
@@ -110,10 +110,10 @@
|| ' AND r.element_type = 2 '
|| ' AND abs(r.element_id) = e.edge_id';
EXECUTE sql INTO geom;
-
+
ELSIF tg.type = 1 THEN -- [multi]point -- }{
- -- Can't simplify points...
+ -- Can't simplify points...
geom := topology.Geometry(tg);
ELSIF tg.type = 4 THEN -- mixed collection -- }{
Modified: trunk/topology/sql/topogeometry/totopogeom.sql.in
===================================================================
--- trunk/topology/sql/topogeometry/totopogeom.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/topogeometry/totopogeom.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
@@ -66,7 +66,7 @@
END IF;
- --
+ --
-- Check type compatibility and create empty TopoGeometry
-- 1:puntal, 2:lineal, 3:areal, 4:collection
--
@@ -187,7 +187,7 @@
END IF;
- --
+ --
-- Check type compatibility and set TopoGeometry type
-- 1:puntal, 2:lineal, 3:areal, 4:collection
--
@@ -230,7 +230,7 @@
'Unexpected feature dimension %', ST_Dimension(ageom);
END IF;
- -- Now that we have an empty topogeometry, we loop over distinct components
+ -- Now that we have an empty topogeometry, we loop over distinct components
-- and add them to the definition of it. We add them as soon
-- as possible so that each element can further edit the
-- definition by splitting
Modified: trunk/topology/sql/topogeometry/type.sql.in
===================================================================
--- trunk/topology/sql/topogeometry/type.sql.in 2016-07-02 16:34:16 UTC (rev 14983)
+++ trunk/topology/sql/topogeometry/type.sql.in 2016-07-04 12:54:26 UTC (rev 14984)
@@ -1,5 +1,5 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---
+--
-- PostGIS - Spatial Types for PostgreSQL
-- http://postgis.net
--
More information about the postgis-tickets
mailing list