[postgis-tickets] [SCM] PostGIS branch main updated. 3.1.0rc1-355-g003080f

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, main has been updated
       via  003080f251566e9b91577c2f8177cbb3c25e4d81 (commit)
      from  92b06f13feb21f1b903c2b7f713c39ca5fd1cc8a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 003080f251566e9b91577c2f8177cbb3c25e4d81
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 15 16:50:53 2021 +0200

    Remove redundant AddNode() function
    
    Closes #2592

diff --git a/topology/sql/populate.sql.in b/topology/sql/populate.sql.in
index 38a83fa..361f13a 100644
--- a/topology/sql/populate.sql.in
+++ b/topology/sql/populate.sql.in
@@ -85,7 +85,7 @@ $$ LANGUAGE 'plpgsql' STABLE STRICT;
 -- geografici basati su QuantumGIS e Postgis (CIG 0494241492)"
 --
 -- }{
-CREATE OR REPLACE FUNCTION topology.AddNode(atopology varchar, apoint geometry, allowEdgeSplitting boolean, setContainingFace boolean DEFAULT false)
+CREATE OR REPLACE FUNCTION topology.AddNode(atopology varchar, apoint geometry, allowEdgeSplitting boolean DEFAULT false, setContainingFace boolean DEFAULT false)
 	RETURNS int
 AS
 $$
@@ -177,19 +177,6 @@ LANGUAGE 'plpgsql' VOLATILE;
 
 --{
 --
--- AddNode(atopology, point)
---
-CREATE OR REPLACE FUNCTION topology.AddNode(atopology varchar, apoint geometry)
-	RETURNS int
-AS
-$$
-  SELECT topology.AddNode($1, $2, false, false);
-$$
-LANGUAGE 'sql' VOLATILE;
---} AddNode
-
---{
---
 -- AddEdge(atopology, line)
 --
 -- Add an edge primitive to a topology and get its identifier.
diff --git a/topology/topology_drop_before.sql.in b/topology/topology_drop_before.sql.in
index 686f8aa..03e93c6 100644
--- a/topology/topology_drop_before.sql.in
+++ b/topology/topology_drop_before.sql.in
@@ -23,3 +23,8 @@ DROP FUNCTION IF EXISTS topology._ST_AddFaceSplit(varchar, integer, integer, boo
 
 -- Added optional bbox parameter in 3.2.0
 DROP FUNCTION IF EXISTS topology.validatetopology(varchar);
+
+-- Merged the two function into one with both allowEdgeSplitting and setContainingFace parameters
+-- being optional (3.2.0)
+DROP FUNCTION IF EXISTS topology.AddNode(varchar, geometry);
+DROP FUNCTION IF EXISTS topology.AddNode(varchar, geometry, boolean, boolean);

-----------------------------------------------------------------------

Summary of changes:
 topology/sql/populate.sql.in         | 15 +--------------
 topology/topology_drop_before.sql.in |  5 +++++
 2 files changed, 6 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
PostGIS