[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-87-g78acea3
git at osgeo.org
git at osgeo.org
Wed Oct 7 16:48:38 PDT 2020
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 78acea375c90a6428b0d8863750fbc9b62ee9bfe (commit)
from 828aca7b7cc0efc1eb21014edd4bdcf88de647b9 (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 78acea375c90a6428b0d8863750fbc9b62ee9bfe
Author: Regina Obe <lr at pcorp.us>
Date: Wed Oct 7 19:48:26 2020 -0400
More wordsmitting and change to geometrycollection, evidentally our image magick can handle only 13 polygons unless in geometrycollection
diff --git a/doc/html/image_src/st_makevalid04.wkt b/doc/html/image_src/st_makevalid04.wkt
index db66f9b..e26331f 100644
--- a/doc/html/image_src/st_makevalid04.wkt
+++ b/doc/html/image_src/st_makevalid04.wkt
@@ -1,14 +1 @@
-Style2;POLYGON((76 20.7142857142857,51 10,23 22,11 50,21.7142857142857 75,23 72,51 60,68.5 67.5,61 50,73 22,76 20.7142857142857))
-Style2;POLYGON((21.7142857142857 75,11 100,21.7142857142857 125,23 122,51 110,68.5 117.5,61 100,68.5 82.5,51 90,23 78,21.7142857142857 75))
-Style2;POLYGON((21.7142857142857 125,11 150,23 178,51 190,76 179.285714285714,73 178,61 150,68.5 132.5,51 140,23 128,21.7142857142857 125))
-Style2;POLYGON((76 179.285714285714,101 190,129 178,141 150,130.285714285714 125,129 128,101 140,83.5 132.5,91 150,79 178,76 179.285714285714))
-Style2;POLYGON((130.285714285714 125,141 100,130.285714285714 75,129 78,101 90,83.5 82.5,91 100,83.5 117.5,101 110,129 122,130.285714285714 125))
-Style2;POLYGON((130.285714285714 75,141 50,129 22,101 10,76 20.7142857142857,79 22,91 50,83.5 67.5,101 60,129 72,130.285714285714 75))
-Style2;POLYGON((80.2857142857143 75,83.5 67.5,76 70.7142857142857,79 72,80.2857142857143 75))
-Style2;POLYGON((76 70.7142857142857,68.5 67.5,71.7142857142857 75,73 72,76 70.7142857142857))
-Style2;POLYGON((71.7142857142857 75,68.5 82.5,76 79.2857142857143,73 78,71.7142857142857 75))
-Style2;POLYGON((76 79.2857142857143,83.5 82.5,80.2857142857143 75,79 78,76 79.2857142857143))
-Style2;POLYGON((80.2857142857143 125,83.5 117.5,76 120.714285714286,79 122,80.2857142857143 125))
-Style2;POLYGON((76 120.714285714286,68.5 117.5,71.7142857142857 125,73 122,76 120.714285714286))
-Style2;POLYGON((71.7142857142857 125,68.5 132.5,76 129.285714285714,73 128,71.7142857142857 125))
-Style2;POLYGON((76 129.285714285714,83.5 132.5,80.2857142857143 125,79 128,76 129.285714285714))
+Style2;GEOMETRYCOLLECTION(POLYGON((76 20.7142857142857,51 10,23 22,11 50,21.7142857142857 75,23 72,51 60,68.5 67.5,61 50,73 22,76 20.7142857142857)),POLYGON((21.7142857142857 75,11 100,21.7142857142857 125,23 122,51 110,68.5 117.5,61 100,68.5 82.5,51 90,23 78,21.7142857142857 75)),POLYGON((21.7142857142857 125,11 150,23 178,51 190,76 179.285714285714,73 178,61 150,68.5 132.5,51 140,23 128,21.7142857142857 125)),POLYGON((76 179.285714285714,101 190,129 178,141 150,130.285714285714 125,129 128,101 140,83.5 132.5,91 150,79 178,76 179.285714285714)),POLYGON((130.285714285714 125,141 100,130.285714285714 75,129 78,101 90,83.5 82.5,91 100,83.5 117.5,101 110,129 122,130.285714285714 125)),POLYGON((130.285714285714 75,141 50,129 22,101 10,76 20.7142857142857,79 22,91 50,83.5 67.5,101 60,129 72,130.285714285714 75)),POLYGON((80.2857142857143 75,83.5 67.5,76 70.7142857142857,79 72,80.2857142857143 75)),POLYGON((76 70.7142857142857,68.5 67.5,71.7142857142857 75,73 72,76 70.7142857142857)),POLY
GON((71.7142857142857 75,68.5 82.5,76 79.2857142857143,73 78,71.7142857142857 75)),POLYGON((76 79.2857142857143,83.5 82.5,80.2857142857143 75,79 78,76 79.2857142857143)),POLYGON((80.2857142857143 125,83.5 117.5,76 120.714285714286,79 122,80.2857142857143 125)),POLYGON((76 120.714285714286,68.5 117.5,71.7142857142857 125,73 122,76 120.714285714286)),POLYGON((71.7142857142857 125,68.5 132.5,76 129.285714285714,73 128,71.7142857142857 125)),POLYGON((76 129.285714285714,83.5 132.5,80.2857142857143 125,79 128,76 129.285714285714)) )
diff --git a/doc/reference_processing.xml b/doc/reference_processing.xml
index 833399c..ab663d0 100644
--- a/doc/reference_processing.xml
+++ b/doc/reference_processing.xml
@@ -1855,7 +1855,7 @@ FROM (SELECT ST_Translate(ST_Force3D(ST_Boundary(ST_Buffer(ST_Point(1,3), 2,2)))
<imageobject>
<imagedata fileref="images/st_makevalid01.png" />
</imageobject>
- <caption><para>before_geom: overlapping polygons</para></caption>
+ <caption><para>before_geom: MULTIPOLYGON of overlapping polygons</para></caption>
</mediaobject>
</informalfigure>
<informalfigure>
@@ -1863,12 +1863,11 @@ FROM (SELECT ST_Translate(ST_Force3D(ST_Boundary(ST_Buffer(ST_Point(1,3), 2,2)))
<imageobject>
<imagedata fileref="images/st_makevalid02.png" />
</imageobject>
- <caption><para>after_geom: non-overlapping polygons</para>
+ <caption><para>after_geom: MULTIPOLYGON of non-overlapping polygons</para>
</caption>
</mediaobject>
</informalfigure>
- <programlisting>
-SELECT f.geom AS before_geom, ST_MakeValid( f.geom) AS after_geom
+ <programlisting>SELECT f.geom AS before_geom, ST_MakeValid( f.geom) AS after_geom
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,
@@ -1876,7 +1875,7 @@ FROM (SELECT 'MULTIPOLYGON(((186 194,187 194,188 195,189 195,190 195,
((150 90,149 80,146 71,142 62,135 55,128 48,119 44,110 41,100 40,
90 41,81 44,72 48,65 55,58 62,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,128 132,135 125,142 118,146 109,149 100,150 90)))'::geometry AS geom) AS f ;</programlisting>
+119 136,128 132,135 125,142 118,146 109,149 100,150 90)))'::geometry AS geom) AS f;</programlisting>
</para>
</entry>
</row>
@@ -1885,13 +1884,13 @@ FROM (SELECT 'MULTIPOLYGON(((186 194,187 194,188 195,189 195,190 195,
<informalfigure>
<mediaobject>
<imageobject><imagedata fileref="images/st_makevalid03.png" /></imageobject>
- <caption><para>before_geom: overlapping polygons</para></caption>
+ <caption><para>before_geom: MULTIPOLYGON of overlapping polygons</para></caption>
</mediaobject>
</informalfigure>
<informalfigure>
<mediaobject>
<imageobject><imagedata fileref="images/st_makevalid04.png" /></imageobject>
- <caption><para>after_geom: Non-overlapping polygons</para></caption>
+ <caption><para>after_geom: MULTIPOLYGON of Non-overlapping polygons</para></caption>
</mediaobject>
</informalfigure>
<programlisting>SELECT c.geom AS before_geom, ST_MakeValid(c.geom) AS after_geom
-----------------------------------------------------------------------
Summary of changes:
doc/html/image_src/st_makevalid04.wkt | 15 +--------------
doc/reference_processing.xml | 13 ++++++-------
2 files changed, 7 insertions(+), 21 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list