Admit defeat and render geometries old-fashoined way

git-svn-id: http://svn.osgeo.org/postgis/trunk@10017 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index b4f7cef5ae9195caf21b605fdf2e2e0bf7d3083a..606b03355f58e5098cf578cbee0bbf4fd152cf53 100644 (file)
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -56,8 +56,6 @@ IMAGES= \
        ../images/st_crosses02.png \
        ../images/st_crosses03.png \
        ../images/st_crosses04.png \
-       ../images/st_delaunaytriangles02.png \
-       ../images/st_delaunaytriangles03.png \
        ../images/st_difference01.png \
        ../images/st_dumppoints01.png \
        ../images/st_issimple01.png \

diff --git a/doc/html/image_src/st_delaunaytriangles02.wkt b/doc/html/image_src/st_delaunaytriangles02.wkt
deleted file mode 100644 (file)
index 693564e..0000000
--- a/doc/html/image_src/st_delaunaytriangles02.wkt
+++ /dev/null
@@ -1,3 +0,0 @@
-Style1;POLYGON((175 150,125 100,50 60,20 40,175 150))\r
-Style1;POLYGON((130 170,129.5 166,128.5 162.25,126.75 159,124.25 155.75,121 153.25,117.75 151.5,114 150.5,110 150,106 150.5,102.25 151.5,99 153.25,95.75 155.75,93.25 159,91.5 162.25,90.5 166,90 170,90.5 174,91.5 177.75,93.25 181,95.75 184.25,99 186.75,102.25 188.5,106 189.5,110 190,114 189.5,117.75 188.5,121 186.75,124.25 184.25,126.75 181,128.5 177.75,129.5 174,130 170))\r
-Style2;GEOMETRYCOLLECTION(LINESTRING(121.1114 186.6294,175 150),LINESTRING(117.6537 188.4776,121.1114 186.6294),LINESTRING(113.9018 189.6157,117.6537 188.4776),LINESTRING(110 190,113.9018 189.6157),LINESTRING(106.0982 189.6157,110 190),LINESTRING(102.3463 188.4776,106.0982 189.6157),LINESTRING(98.8886 186.6294,102.3463 188.4776),LINESTRING(95.8579 184.1421,98.8886 186.6294),LINESTRING(93.3706 181.1114,95.8579 184.1421),LINESTRING(91.5224 177.6537,93.3706 181.1114),LINESTRING(20 40,91.5224 177.6537),LINESTRING(20 40,125 100),LINESTRING(125 100,175 150),LINESTRING(124.1421 155.8579,125 100),LINESTRING(124.1421 155.8579,175 150),LINESTRING(124.1421 155.8579,126.6294 158.8886),LINESTRING(126.6294 158.8886,175 150),LINESTRING(126.6294 158.8886,128.4776 162.3463),LINESTRING(128.4776 162.3463,175 150),LINESTRING(128.4776 162.3463,129.6157 166.0982),LINESTRING(129.6157 166.0982,175 150),LINESTRING(129.6157 166.0982,130 170),LINESTRING(130 170,175 150),LINESTRING(129.6157 173.9018,130 170),LINESTRING(129.6157 173.9018,175 150),LINESTRING(128.4776 177.6537,129.6157 173.9018),LINESTRING(128.4776 177.6537,175 150),LINESTRING(126.6294 181.1114,128.4776 177.6537),LINESTRING(126.6294 181.1114,175 150),LINESTRING(124.1421 184.1421,126.6294 181.1114),LINESTRING(124.1421 184.1421,175 150),LINESTRING(121.1114 186.6294,124.1421 184.1421),LINESTRING(117.6537 188.4776,124.1421 184.1421),LINESTRING(121.1114 153.3706,124.1421 184.1421),LINESTRING(117.6537 188.4776,121.1114 153.3706),LINESTRING(93.3706 181.1114,121.1114 153.3706),LINESTRING(93.3706 181.1114,117.6537 188.4776),LINESTRING(93.3706 181.1114,102.3463 188.4776),LINESTRING(102.3463 188.4776,117.6537 188.4776),LINESTRING(93.3706 181.1114,98.8886 186.6294),LINESTRING(90.3843 173.9018,121.1114 153.3706),LINESTRING(90.3843 173.9018,93.3706 181.1114),LINESTRING(90.3843 173.9018,91.5224 177.6537),LINESTRING(20 40,90.3843 173.9018),LINESTRING(90 170,90.3843 173.9018),LINESTRING(20 40,90 170),LINESTRING(90 170,90.3843 166.0982),LINESTRING(20 40,90.3843 166.0982),LINESTRING(50 60,90.3843 166.0982),LINESTRING(20 40,50 60),LINESTRING(50 60,125 100),LINESTRING(50 60,98.8886 153.3706),LINESTRING(98.8886 153.3706,125 100),LINESTRING(98.8886 153.3706,102.3463 151.5224),LINESTRING(102.3463 151.5224,125 100),LINESTRING(102.3463 151.5224,106.0982 150.3843),LINESTRING(106.0982 150.3843,125 100),LINESTRING(106.0982 150.3843,110 150),LINESTRING(110 150,125 100),LINESTRING(110 150,113.9018 150.3843),LINESTRING(113.9018 150.3843,125 100),LINESTRING(113.9018 150.3843,117.6537 151.5224),LINESTRING(117.6537 151.5224,125 100),LINESTRING(117.6537 151.5224,121.1114 153.3706),LINESTRING(121.1114 153.3706,125 100),LINESTRING(121.1114 153.3706,124.1421 155.8579),LINESTRING(121.1114 153.3706,126.6294 158.8886),LINESTRING(121.1114 153.3706,130 170),LINESTRING(126.6294 158.8886,130 170),LINESTRING(110 150,117.6537 151.5224),LINESTRING(110 150,121.1114 153.3706),LINESTRING(106.0982 150.3843,121.1114 153.3706),LINESTRING(102.3463 151.5224,121.1114 153.3706),LINESTRING(90.3843 173.9018,102.3463 151.5224),LINESTRING(95.8579 155.8579,102.3463 151.5224),LINESTRING(90.3843 173.9018,95.8579 155.8579),LINESTRING(93.3706 158.8886,95.8579 155.8579),LINESTRING(90.3843 173.9018,93.3706 158.8886),LINESTRING(90 170,93.3706 158.8886),LINESTRING(90.3843 166.0982,93.3706 158.8886),LINESTRING(91.5224 162.3463,93.3706 158.8886),LINESTRING(90.3843 166.0982,91.5224 162.3463),LINESTRING(50 60,91.5224 162.3463),LINESTRING(50 60,93.3706 158.8886),LINESTRING(50 60,95.8579 155.8579),LINESTRING(95.8579 155.8579,98.8886 153.3706),LINESTRING(124.1421 184.1421,130 170),LINESTRING(124.1421 184.1421,128.4776 177.6537),LINESTRING(128.4776 177.6537,130 170),LINESTRING(126.6294 158.8886,129.6157 166.0982),LINESTRING(106.0982 189.6157,117.6537 188.4776),LINESTRING(106.0982 189.6157,113.9018 189.6157))\r

diff --git a/doc/html/image_src/st_delaunaytriangles03.wkt b/doc/html/image_src/st_delaunaytriangles03.wkt
deleted file mode 100644 (file)
index d919212..0000000
--- a/doc/html/image_src/st_delaunaytriangles03.wkt
+++ /dev/null
@@ -1,3 +0,0 @@
-Style1;POLYGON((175 150,125 100,50 60,20 40,175 150))\r
-Style1;POLYGON((130 170,129.5 166,128.5 162.25,126.75 159,124.25 155.75,121 153.25,117.75 151.5,114 150.5,110 150,106 150.5,102.25 151.5,99 153.25,95.75 155.75,93.25 159,91.5 162.25,90.5 166,90 170,90.5 174,91.5 177.75,93.25 181,95.75 184.25,99 186.75,102.25 188.5,106 189.5,110 190,114 189.5,117.75 188.5,121 186.75,124.25 184.25,126.75 181,128.5 177.75,129.5 174,130 170))\r
-Style2;GEOMETRYCOLLECTION(POLYGON((20 40,125 100,50 60,20 40)),POLYGON((20 40,50 60,90.3842943919354 166.098193559677,20 40)),POLYGON((20 40,90.3842943919354 166.098193559677,90 170,20 40)),POLYGON((20 40,90 170,90.3842943919354 173.901806440323,20 40)),POLYGON((20 40,90.3842943919354 173.901806440323,91.5224093497742 177.653668647302,20 40)),POLYGON((91.5224093497742 177.653668647302,90.3842943919354 173.901806440323,93.3706077539491 181.111404660392,91.5224093497742 177.653668647302)),POLYGON((93.3706077539491 181.111404660392,90.3842943919354 173.901806440323,121.111404660392 153.370607753949,93.3706077539491 181.111404660392)),POLYGON((93.3706077539491 181.111404660392,121.111404660392 153.370607753949,117.653668647302 188.477590650226,93.3706077539491 181.111404660392)),POLYGON((93.3706077539491 181.111404660392,117.653668647302 188.477590650226,102.346331352698 188.477590650226,93.3706077539491 181.111404660392)),POLYGON((93.3706077539491 181.111404660392,102.346331352698 188.477590650226,98.8885953396079 186.629392246051,93.3706077539491 181.111404660392)),POLYGON((93.3706077539491 181.111404660392,98.8885953396079 186.629392246051,95.857864376269 184.142135623731,93.3706077539491 181.111404660392)),POLYGON((102.346331352698 188.477590650226,117.653668647302 188.477590650226,106.098193559677 189.615705608065,102.346331352698 188.477590650226)),POLYGON((106.098193559677 189.615705608065,117.653668647302 188.477590650226,113.901806440323 189.615705608065,106.098193559677 189.615705608065)),POLYGON((106.098193559677 189.615705608065,113.901806440323 189.615705608065,110 190,106.098193559677 189.615705608065)),POLYGON((117.653668647302 188.477590650226,121.111404660392 153.370607753949,124.142135623731 184.142135623731,117.653668647302 188.477590650226)),POLYGON((117.653668647302 188.477590650226,124.142135623731 184.142135623731,121.111404660392 186.629392246051,117.653668647302 188.477590650226)),POLYGON((121.111404660392 186.629392246051,124.142135623731 184.142135623731,175 150,121.111404660392 186.629392246051)),POLYGON((175 150,124.142135623731 184.142135623731,126.629392246051 181.111404660392,175 150)),POLYGON((175 150,126.629392246051 181.111404660392,128.477590650226 177.653668647302,175 150)),POLYGON((175 150,128.477590650226 177.653668647302,129.615705608065 173.901806440323,175 150)),POLYGON((175 150,129.615705608065 173.901806440323,130 170,175 150)),POLYGON((175 150,130 170,129.615705608065 166.098193559677,175 150)),POLYGON((175 150,129.615705608065 166.098193559677,128.477590650226 162.346331352698,175 150)),POLYGON((175 150,128.477590650226 162.346331352698,126.629392246051 158.888595339608,175 150)),POLYGON((175 150,126.629392246051 158.888595339608,124.142135623731 155.857864376269,175 150)),POLYGON((175 150,124.142135623731 155.857864376269,125 100,175 150)),POLYGON((125 100,124.142135623731 155.857864376269,121.111404660392 153.370607753949,125 100)),POLYGON((125 100,121.111404660392 153.370607753949,117.653668647302 151.522409349774,125 100)),POLYGON((125 100,117.653668647302 151.522409349774,113.901806440323 150.384294391935,125 100)),POLYGON((125 100,113.901806440323 150.384294391935,110 150,125 100)),POLYGON((125 100,110 150,106.098193559677 150.384294391935,125 100)),POLYGON((125 100,106.098193559677 150.384294391935,102.346331352698 151.522409349774,125 100)),POLYGON((125 100,102.346331352698 151.522409349774,98.888595339608 153.370607753949,125 100)),POLYGON((125 100,98.888595339608 153.370607753949,50 60,125 100)),POLYGON((50 60,98.888595339608 153.370607753949,95.8578643762691 155.857864376269,50 60)),POLYGON((50 60,95.8578643762691 155.857864376269,93.3706077539491 158.888595339608,50 60)),POLYGON((50 60,93.3706077539491 158.888595339608,91.5224093497743 162.346331352698,50 60)),POLYGON((50 60,91.5224093497743 162.346331352698,90.3842943919354 166.098193559677,50 60)),POLYGON((90.3842943919354 166.098193559677,91.5224093497743 162.346331352698,93.3706077539491 158.888595339608,90.3842943919354 166.098193559677)),POLYGON((90.3842943919354 166.098193559677,93.3706077539491 158.888595339608,90 170,90.3842943919354 166.098193559677)),POLYGON((90 170,93.3706077539491 158.888595339608,90.3842943919354 173.901806440323,90 170)),POLYGON((90.3842943919354 173.901806440323,93.3706077539491 158.888595339608,95.8578643762691 155.857864376269,90.3842943919354 173.901806440323)),POLYGON((90.3842943919354 173.901806440323,95.8578643762691 155.857864376269,102.346331352698 151.522409349774,90.3842943919354 173.901806440323)),POLYGON((90.3842943919354 173.901806440323,102.346331352698 151.522409349774,121.111404660392 153.370607753949,90.3842943919354 173.901806440323)),POLYGON((121.111404660392 153.370607753949,102.346331352698 151.522409349774,106.098193559677 150.384294391935,121.111404660392 153.370607753949)),POLYGON((121.111404660392 153.370607753949,106.098193559677 150.384294391935,110 150,121.111404660392 153.370607753949)),POLYGON((121.111404660392 153.370607753949,110 150,117.653668647302 151.522409349774,121.111404660392 153.370607753949)),POLYGON((117.653668647302 151.522409349774,110 150,113.901806440323 150.384294391935,117.653668647302 151.522409349774)),POLYGON((102.346331352698 151.522409349774,95.8578643762691 155.857864376269,98.888595339608 153.370607753949,102.346331352698 151.522409349774)),POLYGON((121.111404660392 153.370607753949,124.142135623731 155.857864376269,126.629392246051 158.888595339608,121.111404660392 153.370607753949)),POLYGON((121.111404660392 153.370607753949,126.629392246051 158.888595339608,130 170,121.111404660392 153.370607753949)),POLYGON((121.111404660392 153.370607753949,130 170,124.142135623731 184.142135623731,121.111404660392 153.370607753949)),POLYGON((124.142135623731 184.142135623731,130 170,128.477590650226 177.653668647302,124.142135623731 184.142135623731)),POLYGON((124.142135623731 184.142135623731,128.477590650226 177.653668647302,126.629392246051 181.111404660392,124.142135623731 184.142135623731)),POLYGON((128.477590650226 177.653668647302,130 170,129.615705608065 173.901806440323,128.477590650226 177.653668647302)),POLYGON((130 170,126.629392246051 158.888595339608,129.615705608065 166.098193559677,130 170)),POLYGON((129.615705608065 166.098193559677,126.629392246051 158.888595339608,128.477590650226 162.346331352698,129.615705608065 166.098193559677)))\r

diff --git a/doc/html/images/st_delaunaytriangles01.png b/doc/html/images/st_delaunaytriangles01.png
new file mode 100644 (file)
index 0000000..b02ef8a
Binary files /dev/null and b/doc/html/images/st_delaunaytriangles01.png differ

diff --git a/doc/html/images/st_delaunaytriangles02.png b/doc/html/images/st_delaunaytriangles02.png
new file mode 100644 (file)
index 0000000..afe0a68
Binary files /dev/null and b/doc/html/images/st_delaunaytriangles02.png differ

diff --git a/doc/html/images/st_delaunaytriangles03.png b/doc/html/images/st_delaunaytriangles03.png
new file mode 100644 (file)
index 0000000..079d4ef
Binary files /dev/null and b/doc/html/images/st_delaunaytriangles03.png differ

diff --git a/doc/reference_processing.xml b/doc/reference_processing.xml
index a89446cc427323f22d3f3b1155baedcfc4a5977d..c36c441b12e8b678d8c4a57af20f44711d7d7d43 100644 (file)
--- a/doc/reference_processing.xml
+++ b/doc/reference_processing.xml
@@ -910,13 +910,27 @@ togheter.
                        <informaltable>
                                  <tgroup cols="2">
                                        <tbody>
+                                        <row><entry><para><informalfigure>
+                                                       <mediaobject>
+                                                         <imageobject>
+                                                               <imagedata fileref="images/st_delaunaytriangles01.png" />
+                                                         </imageobject>
+                                                         <caption><para>ST_DelaunayTriangles of 2 polygons  delaunay triangle polygons</para></caption>
+                                                       </mediaobject>
+                                                 </informalfigure></para>
+<programlisting>-- our original geometry --
+       ST_Union(ST_GeomFromText('POLYGON((175 150, 20 40, 
+                       50 60, 125 100, 175 150))'),
+               ST_Buffer(ST_GeomFromText('POINT(110 170)'), 20)
+               )</programlisting></entry>
+                                     </row>
                                          <row>
                                                <entry><para><informalfigure>
                                                        <mediaobject>
                                                          <imageobject>
                                                                <imagedata fileref="images/st_delaunaytriangles03.png" />
                                                          </imageobject>
-                                                         <caption><para>ST_DelaunayTriangles of 2 polygons overlaid with delaunay triangle polygons</para></caption>
+                                                         <caption><para>ST_DelaunayTriangles of 2 polygons  delaunay triangle polygons each triangle themed in different color</para></caption>
                                                        </mediaobject>
                                                  </informalfigure>
                                <programlisting>
@@ -929,8 +943,8 @@ SELECT
                )) 
         As  dtriag;
                                </programlisting>
-                                                 </para></entry>
-                                               <entry><para><informalfigure>
+                                                 </para></entry></row>
+                               <row><entry><para><informalfigure>
                                                        <mediaobject>
                                                          <imageobject>
                                                                <imagedata fileref="images/st_delaunaytriangles02.png" />
@@ -938,15 +952,13 @@ SELECT
                                                          <caption><para>-- geometries overlaid with multilinestring representation of delaunay triangles</para></caption>
                                                        </mediaobject>
                                                  </informalfigure>
-                               <programlisting>
-SELECT 
+                               <programlisting>SELECT 
        ST_DelaunayTriangles(
                ST_Union(ST_GeomFromText('POLYGON((175 150, 20 40, 
                        50 60, 125 100, 175 150))'),
                ST_Buffer(ST_GeomFromText('POINT(110 170)'), 20)
                ),0.001,1) 
-        As  dtriag;
-                               </programlisting>
+        As  dtriag;</programlisting>
                                                </para></entry>
                                          </row>
                </tbody>