[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-617-g94199925c
git at osgeo.org
git at osgeo.org
Mon Feb 28 04:11:01 PST 2022
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, master has been updated
via 94199925ccb2e24ed2dfd9ce07f829fa233a4321 (commit)
via efd0954b64d6d19f3c4362daa0cb44bdb534c0ea (commit)
from 1d5778cdfadfbc02725b77cb2563737766de66d1 (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 94199925ccb2e24ed2dfd9ce07f829fa233a4321
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Feb 28 13:08:10 2022 +0100
Allow make update-po and update-pot in out-of-source builds
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b7e093553..e02f5f459 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -168,7 +168,7 @@ XML_GENERATED_SOURCES = \
XML_INPUTS = $(XML_SOURCES) $(XML_GENERATED_SOURCES)
-XML_INPUTS_POT = $(XML_SOURCES:%.xml=po/templates/%.xml.pot)
+XML_INPUTS_POT = $(XML_SOURCES:%.xml=$(srcdir)/po/templates/%.xml.pot)
VPATH = $(srcdir)
@@ -176,7 +176,7 @@ VPATH = $(srcdir)
ifeq ($(XML2POT),)
$(XML_INPUTS_POT): requirements_not_met_xml2pot
else
-$(XML_INPUTS_POT): po/templates/%.xml.pot: %.xml
+$(XML_INPUTS_POT): $(srcdir)/po/templates/%.xml.pot: %.xml
@if test -f $@; then \
$(XML2POT) $< > $@.tmp; \
changed=`diff $@.tmp $@ \
@@ -206,8 +206,8 @@ update-po: $(XML_INPUTS_POT)
@for lang in $(translations); do \
echo "Creating po files for language $$lang..." ; \
for pot in $(XML_INPUTS_POT); do \
- mkdir -p po/$$lang; \
- po=po/$$lang/`basename $$pot .pot`.po; \
+ mkdir -p $(srcdir)/po/$$lang; \
+ po=$(srcdir)/po/$$lang/`basename $$pot .pot`.po; \
if test -f $$po; then \
$(MSGMERGE) --no-fuzzy-matching --update $$po $$pot; \
else \
commit efd0954b64d6d19f3c4362daa0cb44bdb534c0ea
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Feb 28 12:58:32 2022 +0100
Improve ValidateTopology documentation
diff --git a/doc/extras_topology.xml b/doc/extras_topology.xml
index 5aa96ee98..1a3624391 100644
--- a/doc/extras_topology.xml
+++ b/doc/extras_topology.xml
@@ -573,126 +573,227 @@ detailing issues with topology, optionally limiting the check to the
area specified by the <varname>bbox</varname> parameter.
</para>
- <para>List of possible errors and what the returned ids represent are displayed below:</para>
+ <para>List of possible errors, what they mean and what the returned ids represent are displayed below:</para>
<informaltable rowsep="1" frame="all">
- <tgroup cols="3">
- <thead><row><entry>Error</entry><entry>id1</entry><entry>id2</entry></row></thead>
+ <tgroup cols="4">
+ <thead>
+ <row>
+ <entry>Error</entry>
+ <entry>id1</entry>
+ <entry>id2</entry>
+ <entry>Meaning</entry>
+ </row>
+ </thead>
<tbody>
<row>
<entry>coincident nodes</entry>
- <entry>node_id</entry>
- <entry>null</entry>
+ <entry>Identifier of first node.</entry>
+ <entry>Identifier of second node.</entry>
+ <entry>
+Two nodes have the same geometry.
+ </entry>
</row>
<row>
<entry>edge crosses node</entry>
- <entry>edge_id</entry>
- <entry>node_id</entry>
+ <entry>Identifier of the edge.</entry>
+ <entry>Identifier of the node.</entry>
+ <entry>
+An edge has a node in its interior.
+See <xref linkend="ST_Relate"/>.
+ </entry>
</row>
<row>
<entry>invalid edge</entry>
- <entry>edge_id</entry>
- <entry>null</entry>
+ <entry>Identifier of the edge.</entry>
+ <entry></entry>
+ <entry>
+An edge geometry is invalid.
+See <xref linkend="ST_IsValid" />.
+ </entry>
</row>
<row>
<entry>edge not simple</entry>
- <entry>edge_id</entry>
- <entry>null</entry>
+ <entry>Identifier of the edge.</entry>
+ <entry></entry>
+ <entry>
+An edge geometry has self-intersections.
+See <xref linkend="ST_IsSimple" />.
+ </entry>
</row>
<row>
<entry>edge crosses edge</entry>
- <entry>edge_id</entry>
- <entry>edge_id</entry>
+ <entry>Identifier of first edge.</entry>
+ <entry>Identifier of second edge.</entry>
+ <entry>
+Two edges have an interior intersection.
+See <xref linkend="ST_Relate"/>.
+ </entry>
</row>
<row>
<entry>edge start node geometry mis-match</entry>
- <entry>edge_id</entry>
- <entry>node_id</entry>
+ <entry>Identifier of the edge.</entry>
+ <entry>
+Identifier of the indicated start node.
+ </entry>
+ <entry>
+The geometry of the node indicated as the starting node for an edge does
+not match the first point of the edge geometry.
+See <xref linkend="ST_StartPoint"/>.
+ </entry>
</row>
<row>
<entry>edge end node geometry mis-match</entry>
- <entry>edge_id</entry>
- <entry>node_id</entry>
+ <entry>Identifier of the edge.</entry>
+ <entry>
+Identifier of the indicated end node.
+ </entry>
+ <entry>
+The geometry of the node indicated as the ending node for an edge does
+not match the last point of the edge geometry.
+See <xref linkend="ST_EndPoint"/>.
+ </entry>
</row>
<row>
<entry>face without edges</entry>
- <entry>face_id</entry>
- <entry>null</entry>
+ <entry>
+Identifier of the orphaned face.
+ </entry>
+ <entry></entry>
+ <entry>
+No edge reports an existing face on either of its sides
+(left_face, right_face).
+ </entry>
</row>
<row>
<entry>face has no rings</entry>
- <entry>face_id</entry>
- <entry>null</entry>
+ <entry>
+Identifier of the partially-defined face.
+ </entry>
+ <entry></entry>
+ <entry>
+Edges reporting a face on their sides do not form a ring.
+ </entry>
</row>
<row>
<entry>face has wrong mbr</entry>
- <entry>face_id</entry>
- <entry>null</entry>
+ <entry>
+Identifier of the face with wrong mbr cache.
+ </entry>
+ <entry></entry>
+ <entry>
+Minimum bounding rectangle of a face does not match minimum bounding
+box of the collection of edges reporting the face on their sides.
+ </entry>
</row>
<row>
<entry>hole not in advertised face</entry>
- <entry>signed edge_id identifying the ring</entry>
- <entry>null</entry>
+ <entry>
+Signed identifier of an edge, identifying the ring.
+See <xref linkend="GetRingEdges"/>.
+ </entry>
+ <entry></entry>
+ <entry>
+A ring of edges reporting a face on its exterior
+is contained in different face.
+ </entry>
</row>
<row>
- <entry>not-isolated node has not-null containing_face</entry>
- <entry>node_id</entry>
- <entry>null</entry>
+ <entry>not-isolated node has not- containing_face</entry>
+ <entry>
+Identifier of the ill-defined node.
+ </entry>
+ <entry></entry>
+ <entry>
+A node which is reported as being on the boundary of one or more edges
+is indicating a containing face.
+ </entry>
</row>
<row>
- <entry>isolated node has null containing_face</entry>
- <entry>node_id</entry>
- <entry>null</entry>
+ <entry>isolated node has containing_face</entry>
+ <entry>
+Identifier of the ill-defined node.
+ </entry>
+ <entry></entry>
+ <entry>
+A node which is not reported as being on the boundary of any edges
+is lacking the indication of a containing face.
+ </entry>
</row>
<row>
<entry>isolated node has wrong containing_face</entry>
- <entry>node_id</entry>
- <entry>null</entry>
+ <entry>
+Identifier of the misrepresented node.
+ </entry>
+ <entry></entry>
+ <entry>
+A node which is not reported as being on the boundary of any edges
+indicates a containing face which is not the actual face containing it.
+See <xref linkend="GetFaceContainingPoint" />.
+ </entry>
</row>
<row>
<entry>invalid next_right_edge</entry>
- <entry>edge_id</entry>
- <entry>null</entry>
+ <entry>
+Identifier of the misrepresented edge.
+ </entry>
+ <entry>
+Signed id of the edge which should be indicated as the next right edge.
+ </entry>
+ <entry>
+The edge indicated as the next edge encountered walking on the right
+side of an edge is wrong.
+ </entry>
</row>
<row>
<entry>invalid next_left_edge</entry>
- <entry>edge_id</entry>
- <entry>null</entry>
+ <entry>
+Identifier of the misrepresented edge.
+ </entry>
+ <entry>
+Signed id of the edge which should be indicated as the next left edge.
+ </entry>
+ <entry>
+The edge indicated as the next edge encountered walking on the
+left side of an edge is wrong.
+ </entry>
</row>
<row>
<entry>mixed face labeling in ring</entry>
- <entry>signed edge_id identifying the ring</entry>
- <entry>null</entry>
+ <entry>
+Signed identifier of an edge, identifying the ring.
+See <xref linkend="GetRingEdges"/>.
+ </entry>
+ <entry></entry>
+ <entry>
+Edges in a ring indicate conflicting faces on the walking side.
+This is also known as a "Side Location Conflict".
+ </entry>
</row>
<row>
<entry>non-closed ring</entry>
- <entry>signed edge_id identifying the ring</entry>
- <entry>null</entry>
+ <entry>
+Signed identifier of an edge, identifying the ring.
+See <xref linkend="GetRingEdges"/>.
+ </entry>
+ <entry></entry>
+ <entry>
+A ring of edges formed by following next_left_edge/next_right_edge
+attributes starts and ends on different nodes.
+ </entry>
</row>
<row>
<entry>face has multiple shells</entry>
- <entry>face_id</entry>
- <entry>signed edge_id identifying the ring</entry>
- </row>
- <row>
- <entry>face overlaps face</entry>
- <entry>face_id</entry>
- <entry>face_id</entry>
- </row>
- <row>
- <entry>face within face</entry>
- <entry>inner face_id</entry>
- <entry>outer face_id</entry>
- </row>
- <row>
- <entry>invalid next_left_edge</entry>
- <entry>edge_id</entry>
- <entry>expected next_left_edge value</entry>
- </row>
- <row>
- <entry>invalid next_right_edge</entry>
- <entry>edge_id</entry>
- <entry>expected next_right_edge value</entry>
+ <entry>
+Identifier of the contended face.
+ </entry>
+ <entry>
+Signed identifier of an edge, identifying the ring.
+See <xref linkend="GetRingEdges"/>.
+ </entry>
+ <entry>
+More than a one ring of edges indicate the same face on its interior.
+ </entry>
</row>
</tbody>
</tgroup>
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.in | 8 +-
doc/extras_topology.xml | 227 ++++++++++++++++++++++++++++++++++--------------
2 files changed, 168 insertions(+), 67 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list