[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-85-g6c04f5c
git at osgeo.org
git at osgeo.org
Wed Oct 7 14:03:29 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 6c04f5c1670a505f807e4348f9744042a5644233 (commit)
from 9cb11a998a00fbe73e3440be8a6f4cb8714bb383 (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 6c04f5c1670a505f807e4348f9744042a5644233
Author: Regina Obe <lr at pcorp.us>
Date: Wed Oct 7 17:03:21 2020 -0400
Simplify make valid examples by just using wkt
diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index 1c1d404..3756667 100644
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -105,6 +105,8 @@ IMAGES= \
../images/st_longestline03.png \
../images/st_makevalid01.png \
../images/st_makevalid02.png \
+ ../images/st_makevalid03.png \
+ ../images/st_makevalid04.png \
../images/st_maximuminscribedcircle01.png \
../images/st_maximuminscribedcircle02.png \
../images/st_minimumboundingcircle01.png \
diff --git a/doc/html/image_src/st_makevalid01.wkt b/doc/html/image_src/st_makevalid01.wkt
index e881128..848bf64 100644
--- a/doc/html/image_src/st_makevalid01.wkt
+++ b/doc/html/image_src/st_makevalid01.wkt
@@ -1,4 +1,2 @@
-Style1;POLYGON((186.464466094067 193.535533905933,187.222148834902 194.157348061513,188.086582838175 194.619397662556,189.024548389919 194.903926402016,190 195,190.975451610081 194.903926402016,191.913417161825 194.619397662556,192.777851165098 194.157348061513,193.535533905933 193.535533905933,194.157348061513 192.777851165098,194.619397662556 191.913417161825,194.903926402016 190.975451610081,195 190,194.903926402016 189.024548389919,194.619397662556 188.086582838175,194.157348061513 187.222148834902,193.535533905933 186.464466094067,133.746635644486 126.675567832621,127.77851165098 131.573480615127,125.643565366808 132.714633178674,186.464466094067 193.535533905933))
-Style1;POLYGON((63.324432167379 56.2533643555136,133.746635644486 126.675567832621,135.355339059327 125.355339059327,141.573480615127 117.77851165098,146.193976625564 109.134171618255,149.039264020162 99.7545161008065,150 90,149.039264020162 80.2454838991936,146.193976625564 70.8658283817455,141.573480615127 62.2214883490199,135.355339059327 54.6446609406727,127.77851165098 48.4265193848728,119.134171618255 43.8060233744357,109.754516100806 40.9607359798385,100 40,90.2454838991937 40.9607359798385,80.8658283817456 43.8060233744356,72.22148834902 48.4265193848727,64.6446609406727 54.6446609406725,63.324432167379 56.2533643555136))
-Style1;POLYGON((63.324432167379 56.2533643555136,13.5355339059327 6.46446609406726,12.777851165098 5.84265193848727,11.9134171618254 5.38060233744356,10.9754516100806 5.09607359798385,10 5,9.02454838991936 5.09607359798385,8.08658283817455 5.38060233744357,7.22214883490199 5.84265193848727,6.46446609406726 6.46446609406726,5.84265193848728 7.22214883490199,5.38060233744357 8.08658283817455,5.09607359798385 9.02454838991935,5 9.99999999999999,5.09607359798385 10.9754516100806,5.38060233744356 11.9134171618254,5.84265193848727 12.777851165098,6.46446609406726 13.5355339059327,57.2853668213262 64.3564346331917,58.4265193848728 62.2214883490198,63.324432167379 56.2533643555136))
-Style1;POLYGON((125.643565366808 132.714633178674,57.2853668213262 64.3564346331917,53.8060233744357 70.8658283817454,50.9607359798385 80.2454838991934,50 89.9999999999998,50.9607359798384 99.7545161008062,53.8060233744356 109.134171618254,58.4265193848726 117.77851165098,64.6446609406725 125.355339059327,72.2214883490197 131.573480615127,80.8658283817453 136.193976625564,90.2454838991934 139.039264020161,99.9999999999998 140,109.754516100806 139.039264020162,119.134171618254 136.193976625564,125.643565366808 132.714633178674))
+Style1;POLYGON((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,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,186 194))
+Style2;POLYGON((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))
diff --git a/doc/html/image_src/st_makevalid02.wkt b/doc/html/image_src/st_makevalid02.wkt
index 21bc319..cd83f28 100644
--- a/doc/html/image_src/st_makevalid02.wkt
+++ b/doc/html/image_src/st_makevalid02.wkt
@@ -1 +1,4 @@
-Style2;GEOMETRYCOLLECTION(POLYGON((76 20.7142857142857,79 22,91 50,83.5 67.5,101 60,129 72,130.285714285714 75,141 50,129 22,101 10,76 20.7142857142857)),POLYGON((80.2857142857143 75,83.5 67.5,76 70.7142857142857,79 72,80.2857142857143 75)),POLYGON((83.5 82.5,80.2857142857143 75,79 78,76 79.2857142857143,83.5 82.5)),POLYGON((130.285714285714 75,129 78,101 90,83.5 82.5,91 100,83.5 117.5,101 110,129 122,130.285714285714 125,141 100,130.285714285714 75)),POLYGON((80.2857142857143 125,83.5 117.5,76 120.714285714286,79 122,80.2857142857143 125)),POLYGON((83.5 132.5,80.2857142857143 125,79 128,76 129.285714285714,83.5 132.5)),POLYGON((130.285714285714 125,129 128,101 140,83.5 132.5,91 150,79 178,76 179.285714285714,101 190,129 178,141 150,130.285714285714 125)),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((76 70.7142857142857,68.5 67.5,71.7142857142857 75,73 72,76 70.7142857142857)),POLYGON((76 79.285714
2857143,73 78,71.7142857142857 75,68.5 82.5,76 79.2857142857143)),POLYGON((68.5 82.5,51 90,23 78,21.7142857142857 75,11 100,21.7142857142857 125,23 122,51 110,68.5 117.5,61 100,68.5 82.5)),POLYGON((76 120.714285714286,68.5 117.5,71.7142857142857 125,73 122,76 120.714285714286)),POLYGON((76 129.285714285714,73 128,71.7142857142857 125,68.5 132.5,76 129.285714285714)),POLYGON((68.5 132.5,51 140,23 128,21.7142857142857 125,11 150,23 178,51 190,76 179.285714285714,73 178,61 150,68.5 132.5)))
+Style2;POLYGON((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.7692307692308 64.7692307692308,58 62,64 56))
+Style2;POLYGON((56.7692307692308 64.7692307692308,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.230769230769 133.230769230769,56.7692307692308 64.7692307692308))
+Style2;POLYGON((125.230769230769 133.230769230769,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,128 132,125.230769230769 133.230769230769))
+Style2;POLYGON((134 126,135 125,142 118,146 109,149 100,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,64 56,134 126))
diff --git a/doc/html/image_src/st_makevalid03.wkt b/doc/html/image_src/st_makevalid03.wkt
new file mode 100644
index 0000000..5bc9825
--- /dev/null
+++ b/doc/html/image_src/st_makevalid03.wkt
@@ -0,0 +1,6 @@
+Style1;POLYGON((91 50,79 22,51 10,23 22,11 50,23 78,51 90,79 78,91 50))
+Style2;POLYGON((91 100,79 72,51 60,23 72,11 100,23 128,51 140,79 128,91 100))
+Style3;POLYGON((91 150,79 122,51 110,23 122,11 150,23 178,51 190,79 178,91 150))
+Style4;POLYGON((141 50,129 22,101 10,73 22,61 50,73 78,101 90,129 78,141 50))
+Style5;POLYGON((141 100,129 72,101 60,73 72,61 100,73 128,101 140,129 128,141 100))
+Style6;POLYGON((141 150,129 122,101 110,73 122,61 150,73 178,101 190,129 178,141 150))
diff --git a/doc/html/image_src/st_makevalid04.wkt b/doc/html/image_src/st_makevalid04.wkt
new file mode 100644
index 0000000..db66f9b
--- /dev/null
+++ b/doc/html/image_src/st_makevalid04.wkt
@@ -0,0 +1,14 @@
+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))
diff --git a/doc/reference_processing.xml b/doc/reference_processing.xml
index 930db1d..de80a1a 100644
--- a/doc/reference_processing.xml
+++ b/doc/reference_processing.xml
@@ -1855,43 +1855,47 @@ 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>This will create a valid multipolygon noded which looks like a circle with a prong.</para>
- <para>Note: ST_Collect simply collects all the polygons into an invalid MULTIPOLYGON because the polygons overlap. Use ST_MakeValid to convert to a valid multipolygon.</para>
+ <caption><para>before_geom: overlapping polygons</para></caption>
+ </mediaobject>
+ </informalfigure>
+ <informalfigure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/st_makevalid02.png" />
+ </imageobject>
+ <caption><para>after_geom: non-overlapping polygons</para>
</caption>
</mediaobject>
</informalfigure>
<programlisting>
-SELECT ST_MakeValid( ST_Collect(line,circle) )
-FROM (SELECT
- ST_Buffer(
- ST_MakeLine(ST_MakePoint(10, 10),ST_MakePoint(190, 190)),
- 5) As line,
- ST_Buffer(ST_GeomFromText('POINT(100 90)'), 50) As circle) As foo;
- </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,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,186 194)),
+((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>
</para>
</entry>
</row>
<row>
- <entry><para><informalfigure>
+ <entry><para>
+ <informalfigure>
<mediaobject>
- <imageobject>
- <imagedata fileref="images/st_makevalid02.png" />
- </imageobject>
- <caption><para>This will create a valid multipolygon from overlapping collection of polygons.</para>
- <para>Note: ST_Collect simply collects all the polygons into an invalid MULTIPOLYGON because the polygons overlap. Use ST_MakeValid to convert to a valid multipolygon if you want to maintain boundaries.</para>
- </caption>
+ <imageobject><imagedata fileref="images/st_makevalid03.png" /></imageobject>
+ <caption><para>before_geom: overlapping polygons</para></caption>
</mediaobject>
</informalfigure>
- <programlisting>
-SELECT ST_MakeValid( ST_Collect(line,circle) )
-FROM (SELECT
-ST_Buffer(
-ST_MakeLine(ST_MakePoint(10, 10),ST_MakePoint(190, 190)),
- 5) As line,
-ST_Buffer(ST_GeomFromText('POINT(100 90)'), 50) As circle) As foo;
- </programlisting>
-</para>
-</entry>
+ <informalfigure>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/st_makevalid04.png" /></imageobject>
+ <caption><para>after_geom: Non-overlapping polygons</para></caption>
+ </mediaobject>
+ </informalfigure>
+ <programlisting>SELECT c.geom AS before_geom, ST_MakeValid(c.geom) AS after_geom
+ 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)),
+ ((141 50,129 22,101 10,73 22,61 50,73 78,101 90,129 78,141 50)),
+ ((141 100,129 72,101 60,73 72,61 100,73 128,101 140,129 128,141 100)),
+ ((141 150,129 122,101 110,73 122,61 150,73 178,101 190,129 178,141 150)))'::geometry AS geom) AS c;</programlisting>
+ </para></entry>
</row>
</tbody>
</tgroup>
-----------------------------------------------------------------------
Summary of changes:
doc/html/image_src/Makefile.in | 2 ++
doc/html/image_src/st_makevalid01.wkt | 6 ++--
doc/html/image_src/st_makevalid02.wkt | 5 +++-
doc/html/image_src/st_makevalid03.wkt | 6 ++++
doc/html/image_src/st_makevalid04.wkt | 14 +++++++++
doc/reference_processing.xml | 56 +++++++++++++++++++----------------
6 files changed, 58 insertions(+), 31 deletions(-)
create mode 100644 doc/html/image_src/st_makevalid03.wkt
create mode 100644 doc/html/image_src/st_makevalid04.wkt
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list