[postgis-tickets] [SCM] PostGIS branch main updated. 3.1.0rc1-284-gcde6f3d
git at osgeo.org
git at osgeo.org
Wed Jul 7 14:46:58 PDT 2021
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 cde6f3d524dcbcd7e30c53bed8949c5ddde8dc7a (commit)
via a2e00cbcd86a519e73485233c2ffa84983ee9905 (commit)
from a724cfca065ca748aa8894639477ceb4ed76d5d6 (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 cde6f3d524dcbcd7e30c53bed8949c5ddde8dc7a
Merge: a2e00cb a724cfc
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Wed Jul 7 14:46:53 2021 -0700
Merge branch 'main' of https://git.osgeo.org/gitea/postgis/postgis into main
commit a2e00cbcd86a519e73485233c2ffa84983ee9905
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Wed Jul 7 14:46:02 2021 -0700
Add example pictures of the structure make valid method and rework text formatting a litte
diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index 3756667..1add81c 100644
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -107,6 +107,8 @@ IMAGES= \
../images/st_makevalid02.png \
../images/st_makevalid03.png \
../images/st_makevalid04.png \
+ ../images/st_makevalid05.png \
+ ../images/st_makevalid06.png \
../images/st_maximuminscribedcircle01.png \
../images/st_maximuminscribedcircle02.png \
../images/st_minimumboundingcircle01.png \
diff --git a/doc/html/image_src/st_makevalid05.wkt b/doc/html/image_src/st_makevalid05.wkt
new file mode 100644
index 0000000..6a0ac50
--- /dev/null
+++ b/doc/html/image_src/st_makevalid05.wkt
@@ -0,0 +1 @@
+Style2;MULTIPOLYGON(((149 80,146 71,142 62,135 55,128 48,119 44,110 41,100 40,90 41,81 44,72 48,65 55,64 56,14 6,13 6,12 5,11 5,10 5,9 5,8 5,7 6,6 6,6 7,5 8,5 9,5 10,5 11,5 12,6 13,6 14,56.76923076923077 64.76923076923077,54 71,51 80,50 90,51 100,54 109,58 118,65 125,72 132,81 136,90 139,100 140,110 139,119 136,125.23076923076923 133.23076923076923,186 194,187 194,188 195,189 195,190 195,191 195,192 195,193 194,194 194,194 193,195 192,195 191,195 190,195 189,195 188,194 187,194 186,134 126,135 125,142 118,146 109,149 100,150 90,149 80)))
diff --git a/doc/html/image_src/st_makevalid06.wkt b/doc/html/image_src/st_makevalid06.wkt
new file mode 100644
index 0000000..6b062c4
--- /dev/null
+++ b/doc/html/image_src/st_makevalid06.wkt
@@ -0,0 +1 @@
+Style2;MULTIPOLYGON(((23 22,11 50,21.714285714285715 75,11 100,21.714285714285715 125,11 150,23 178,51 190,76 179.28571428571428,101 190,129 178,141 150,130.28571428571428 125,141 100,130.28571428571428 75,141 50,129 22,101 10,76 20.714285714285715,51 10,23 22)))
diff --git a/doc/reference_validation.xml b/doc/reference_validation.xml
index dd4b245..7cf7db0 100644
--- a/doc/reference_validation.xml
+++ b/doc/reference_validation.xml
@@ -340,19 +340,28 @@ SELECT ST_IsValidReason('LINESTRING(220227 150406,2220227 150407,222020 150410)'
<para>
The <varname>params</varname> argument can be used to supply an options
string to select the method to use for building valid geometry.
- The options string is in the format "key1=value2 key2=value2".
+ The options string is in the format "method=linework|structure keepcollapsed=true|false".
</para>
- <para>The "method" key has two values. "linework" is the original
- algorithm, and builds valid geometries by first extracting all lines,
- noding that linework together, then building a value output from the
- linework. "structure" is an algorithm that distinguishes between
+
+ <para>The "method" key has two values.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>"linework" is the original algorithm, and builds valid geometries
+ by first extracting all lines, noding that linework together, then building
+ a value output from the linework.</para>
+ </listitem>
+ <listitem>
+ <para>"structure" is an algorithm that distinguishes between
interior and exterior rings, building new geometry by unioning
- exterior rings, and then differencing all interior rings.
- </para>
- <para>The "keepcollapsed" is only valid for the "structure" algorithm,
- and takes a value of "true" or "false". When set to "false",
- geometry components that collapse to a lower dimensionality,
- for example a one-point linestring would be dropped.
+ exterior rings, and then differencing all interior rings.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The "keepcollapsed" key is only valid for the "structure" algorithm,
+ and takes a value of "true" or "false". When set to "false",
+ geometry components that collapse to a lower dimensionality,
+ for example a one-point linestring would be dropped.
</para>
<para>Performed by the GEOS module.</para>
@@ -389,7 +398,16 @@ SELECT ST_IsValidReason('LINESTRING(220227 150406,2220227 150407,222020 150410)'
</caption>
</mediaobject>
</informalfigure>
- <programlisting>SELECT f.geom AS before_geom, ST_MakeValid( f.geom) AS after_geom
+ <informalfigure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/st_makevalid05.png" />
+ </imageobject>
+ <caption><para>after_geom_structure: MULTIPOLYGON of 1 non-overlapping polygon</para>
+ </caption>
+ </mediaobject>
+ </informalfigure>
+ <programlisting>SELECT f.geom AS before_geom, ST_MakeValid(f.geom) AS after_geom, ST_MakeValid(f.geom, 'method=structure') AS after_geom_structure
FROM (SELECT 'MULTIPOLYGON(((186 194,187 194,188 195,189 195,190 195,
191 195,192 195,193 194,194 194,194 193,195 192,195 191,
195 190,195 189,195 188,194 187,194 186,14 6,13 6,12 5,11 5,
@@ -415,7 +433,15 @@ FROM (SELECT 'MULTIPOLYGON(((186 194,187 194,188 195,189 195,190 195,
<caption><para>after_geom: MULTIPOLYGON of 14 Non-overlapping polygons</para></caption>
</mediaobject>
</informalfigure>
- <programlisting>SELECT c.geom AS before_geom, ST_MakeValid(c.geom) AS after_geom
+ <informalfigure>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/st_makevalid06.png" /></imageobject>
+ <caption><para>after_geom_structure: MULTIPOLYGON of 1 Non-overlapping polygon</para></caption>
+ </mediaobject>
+ </informalfigure>
+ <programlisting>SELECT c.geom AS before_geom,
+ ST_MakeValid(c.geom) AS after_geom,
+ ST_MakeValid(c.geom, 'method=structure') AS after_geom_structure
FROM (SELECT 'MULTIPOLYGON(((91 50,79 22,51 10,23 22,11 50,23 78,51 90,79 78,91 50)),
((91 100,79 72,51 60,23 72,11 100,23 128,51 140,79 128,91 100)),
((91 150,79 122,51 110,23 122,11 150,23 178,51 190,79 178,91 150)),
-----------------------------------------------------------------------
Summary of changes:
doc/html/image_src/Makefile.in | 2 ++
doc/html/image_src/st_makevalid05.wkt | 1 +
doc/html/image_src/st_makevalid06.wkt | 1 +
doc/reference_validation.xml | 52 ++++++++++++++++++++++++++---------
4 files changed, 43 insertions(+), 13 deletions(-)
create mode 100644 doc/html/image_src/st_makevalid05.wkt
create mode 100644 doc/html/image_src/st_makevalid06.wkt
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list