[postgis-tickets] [SCM] PostGIS branch main updated. 3.1.0rc1-288-gef07b87

[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  ef07b87bf8dba9c148cbfc297d3342455247cd4c (commit)
      from  1674bd635c2a82c67de074f095fd6241f4cc70fb (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 ef07b87bf8dba9c148cbfc297d3342455247cd4c
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 8 17:15:21 2021 +0200

    Reword face labeling error, and order expected output in tests

diff --git a/topology/sql/manage/ValidateTopology.sql.in b/topology/sql/manage/ValidateTopology.sql.in
index a6b119c..ceca2ec 100644
--- a/topology/sql/manage/ValidateTopology.sql.in
+++ b/topology/sql/manage/ValidateTopology.sql.in
@@ -338,7 +338,7 @@ BEGIN
       IF array_upper(rec.side_faces,1) != 1
       THEN
         RAISE DEBUG 'Side faces found on ring %: %', nextEdge, rec.side_faces;
-        retrec.error = 'Edgering side location conflict';
+        retrec.error = 'mixed face labeling in ring';
         retrec.id1 = nextEdge;
         retrec.id2 = NULL;
         RETURN NEXT retrec;
diff --git a/topology/test/regress/validatetopology.sql b/topology/test/regress/validatetopology.sql
index cfccf39..b51b3c5 100644
--- a/topology/test/regress/validatetopology.sql
+++ b/topology/test/regress/validatetopology.sql
@@ -139,7 +139,10 @@ SET
   next_right_edge = -next_right_edge
 where edge_id in (3,25);
 set client_min_messages to WARNING;
-SELECT '#3042.1', * FROM ValidateTopology('city_data');
+SELECT '#3042', * FROM ValidateTopology('city_data')
+UNION
+SELECT '#3042', '---', null, null
+ORDER BY 1,2,3,4;
 ROLLBACK;
 
 -- Test correctness of side-labeling
@@ -150,7 +153,10 @@ UPDATE city_data.edge_data
   SET left_face = right_face, right_face = left_face
   WHERE edge_id = 19;
 --set client_min_messages to DEBUG;
-SELECT '#4944', * FROM ValidateTopology('city_data');
+SELECT '#4944', * FROM ValidateTopology('city_data')
+UNION
+SELECT '#4944', '---', null, null
+ORDER BY 1,2,3,4;
 ROLLBACK;
 
 SELECT NULL FROM topology.DropTopology('city_data');
diff --git a/topology/test/regress/validatetopology_expected b/topology/test/regress/validatetopology_expected
index 7c7e792..f21a9dd 100644
--- a/topology/test/regress/validatetopology_expected
+++ b/topology/test/regress/validatetopology_expected
@@ -9,38 +9,40 @@
 #3233.3|not-isolated node has not-null containing_face|1|
 #4830.0|---||
 #4830.1|---||
-#4830.1|Edgering side location conflict|3|
 #4830.1|edge not covered by both its side faces|4|
 #4830.1|edge not covered by both its side faces|6|
+#4830.1|mixed face labeling in ring|3|
 #4830.2|---||
-#4830.2|Edgering side location conflict|3|
 #4830.2|edge not covered by both its side faces|4|
 #4830.2|edge not covered by both its side faces|6|
+#4830.2|mixed face labeling in ring|3|
 #4830.3|---||
-#4830.3|Edgering side location conflict|-7|
 #4830.3|edge not covered by both its side faces|7|
 #4830.3|edge not covered by both its side faces|8|
+#4830.3|mixed face labeling in ring|-7|
 #4830.4|---||
-#4830.4|Edgering side location conflict|-7|
 #4830.4|edge not covered by both its side faces|7|
 #4830.4|edge not covered by both its side faces|8|
+#4830.4|mixed face labeling in ring|-7|
 #4830.5|---||
 #4830.5|edge covered by some face has universal face on both sides|9|
-#3042.1|invalid next_right_edge|3|2
-#3042.1|invalid next_left_edge|3|-3
-#3042.1|invalid next_right_edge|19|-10
-#3042.1|invalid next_left_edge|10|-20
-#3042.1|invalid next_left_edge|20|-9
-#3042.1|invalid next_left_edge|9|19
-#3042.1|invalid next_right_edge|25|25
-#3042.1|invalid next_left_edge|25|-25
-#3042.1|Edgering side location conflict|19|
-#3042.1|Edgering side location conflict|13|
-#3042.1|Edgering side location conflict|-22|
-#3042.1|Edgering side location conflict|-7|
-#3042.1|Edgering side location conflict|-10|
-#3042.1|Edgering side location conflict|-3|
-#3042.1|Edgering side location conflict|-9|
-#3042.1|Edgering side location conflict|-20|
-#4944|Edgering side location conflict|19|
-#4944|Edgering side location conflict|-19|
+#3042|---||
+#3042|invalid next_left_edge|3|-3
+#3042|invalid next_left_edge|9|19
+#3042|invalid next_left_edge|10|-20
+#3042|invalid next_left_edge|20|-9
+#3042|invalid next_left_edge|25|-25
+#3042|invalid next_right_edge|3|2
+#3042|invalid next_right_edge|19|-10
+#3042|invalid next_right_edge|25|25
+#3042|mixed face labeling in ring|-22|
+#3042|mixed face labeling in ring|-20|
+#3042|mixed face labeling in ring|-10|
+#3042|mixed face labeling in ring|-9|
+#3042|mixed face labeling in ring|-7|
+#3042|mixed face labeling in ring|-3|
+#3042|mixed face labeling in ring|13|
+#3042|mixed face labeling in ring|19|
+#4944|---||
+#4944|mixed face labeling in ring|-19|
+#4944|mixed face labeling in ring|19|

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

Summary of changes:
 topology/sql/manage/ValidateTopology.sql.in     |  2 +-
 topology/test/regress/validatetopology.sql      | 10 ++++--
 topology/test/regress/validatetopology_expected | 46 +++++++++++++------------
 3 files changed, 33 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
PostGIS