[postgis-tickets] [SCM] PostGIS branch main updated. 3.1.0rc1-347-g48c9573

[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  48c9573e074d982f2afa85471ca38ddda307cd10 (commit)
       via  952a531c01788a90b6feaa549d81e0a527c20bab (commit)
      from  9bb683f7d6da350b1c9607baaf237d6259988c95 (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 48c9573e074d982f2afa85471ca38ddda307cd10
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 15 01:03:01 2021 +0200

    Consider collection TopoGeometries when preventing healing faces

diff --git a/topology/postgis_topology.c b/topology/postgis_topology.c
index aae7e48..fc181e7 100644
--- a/topology/postgis_topology.c
+++ b/topology/postgis_topology.c
@@ -2450,8 +2450,8 @@ cb_checkTopoGeomRemEdge ( const LWT_BE_TOPOLOGY* topo,
                     "l.schema_name, l.table_name, l.feature_column FROM "
                     "topology.layer l INNER JOIN \"%s\".relation r "
                     "ON (l.layer_id = r.layer_id) WHERE l.level = 0 AND "
-                    "l.feature_type = 2 AND l.topology_id = %d"
-                    " AND abs(r.element_id) = %" LWTFMT_ELEMID,
+                    "l.feature_type IN ( 2, 4 ) AND l.topology_id = %d"
+                    " AND r.element_type = 2 AND abs(r.element_id) = %" LWTFMT_ELEMID,
                     topo->name, topo->id, rem_edge );
 
   POSTGIS_DEBUGF(1, "cb_checkTopoGeomRemEdge query 1: %s", sql->data);
@@ -2503,9 +2503,9 @@ cb_checkTopoGeomRemEdge ( const LWT_BE_TOPOLOGY* topo,
                       "r.layer_id, l.schema_name, l.table_name, l.feature_column, "
                       "array_agg(r.element_id) as elems FROM topology.layer l "
                       " INNER JOIN \"%s\".relation r ON (l.layer_id = r.layer_id) "
-                      "WHERE l.level = 0 and l.feature_type = 3 "
+                      "WHERE l.level = 0 and l.feature_type IN (3, 4) "
                       "AND l.topology_id = %d"
-                      " AND r.element_id = ANY (ARRAY[%" LWTFMT_ELEMID ",%" LWTFMT_ELEMID
+                      " AND r.element_type = 3 AND r.element_id = ANY (ARRAY[%" LWTFMT_ELEMID ",%" LWTFMT_ELEMID
                       "]::int4[]) group by r.topogeo_id, r.layer_id, l.schema_name, "
                       "l.table_name, l.feature_column ) t WHERE NOT t.elems @> ARRAY[%"
                       LWTFMT_ELEMID ",%" LWTFMT_ELEMID "]::int4[]",

commit 952a531c01788a90b6feaa549d81e0a527c20bab
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 15 01:02:39 2021 +0200

    Add NEWS item for issue #3248

diff --git a/NEWS b/NEWS
index 0412f35..df0063e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PostGIS 3.2.0
   - #4933, topology.GetFaceByPoint will not work with topologies having invalid edge linking.
 
  * Enhancements *
+  - #3248, Prevent removing isolated edges if used in a TopoGeometry
+           (Sandro Santilli)
   - #3231, Prevent removing isolated nodes if used in a TopoGeometry
            (Sandro Santilli)
   - #3239, Prevent headling topology edges if the connecting node is

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

Summary of changes:
 NEWS                        | 2 ++
 topology/postgis_topology.c | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
PostGIS