Added some diagrams to the st_overlaps docmentation

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

diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index 3d4ecc270e45852c2b5c8e376664a00d25dbd231..cf51b3922206d7a5e7fda7b3de7f29daa74baf37 100644 (file)
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -83,13 +83,16 @@ IMAGES= \
        ../images/st_longestline01.png \
        ../images/st_longestline02.png \
        ../images/st_longestline03.png \
+       ../images/st_minimumboundingcircle01.png \
        ../images/st_offsetcurve01.png \
        ../images/st_offsetcurve02.png \
        ../images/st_offsetcurve03.png \
        ../images/st_offsetcurve04.png \
        ../images/st_offsetcurve05.png \
        ../images/st_offsetcurve06.png \
-       ../images/st_minimumboundingcircle01.png \
+       ../images/st_overlaps01.png \
+       ../images/st_overlaps02.png \
+       ../images/st_overlaps03.png \
        ../images/st_sharedpaths01.png \
        ../images/st_sharedpaths02.png \
        ../images/st_shortestline01.png \

diff --git a/doc/html/image_src/st_overlaps01.wkt b/doc/html/image_src/st_overlaps01.wkt
new file mode 100644 (file)
index 0000000..a6bcca4
--- /dev/null
+++ b/doc/html/image_src/st_overlaps01.wkt
@@ -0,0 +1,2 @@
+Style1-alpha;MULTIPOINT ( (20 20), (40 90), (80 130), (140 100), (110 40), (120 170), (150 70) )
+Style2-alpha;MULTIPOINT ( (180 10), (40 90), (80 130), (160 150), (110 40), (50 50), (50 160) )

diff --git a/doc/html/image_src/st_overlaps02.wkt b/doc/html/image_src/st_overlaps02.wkt
new file mode 100644 (file)
index 0000000..e126eb4
--- /dev/null
+++ b/doc/html/image_src/st_overlaps02.wkt
@@ -0,0 +1,2 @@
+Style1-alpha;LINESTRING ( 10 10, 40 90, 70 110, 140 110, 170 130, 190 190 )
+Style2-alpha;LINESTRING ( 10 190, 50 130, 90 110, 130 110, 160 70, 180 10 )

diff --git a/doc/html/image_src/st_overlaps03.wkt b/doc/html/image_src/st_overlaps03.wkt
new file mode 100644 (file)
index 0000000..6121b59
--- /dev/null
+++ b/doc/html/image_src/st_overlaps03.wkt
@@ -0,0 +1,3 @@
+Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+

diff --git a/doc/reference_measure.xml b/doc/reference_measure.xml
index d98fa406a0f867cdc3bec7e28a03d002cdabafd4..52902fcfc01ead76ee389c7581bfab9eaf2defdc 100644 (file)
--- a/doc/reference_measure.xml
+++ b/doc/reference_measure.xml
@@ -3253,7 +3253,41 @@ SELECT ST_OrderingEquals(ST_Reverse(ST_GeomFromText('LINESTRING(0 0, 10 10)')),
 
          <refsection>
                <title>Examples</title>
+          <para>The following illustrations all return <varname>TRUE</varname>.</para>
 
+         <informaltable>
+               <tgroup cols="3">
+                 <tbody>
+                       <row>
+                         <entry><para><informalfigure>
+                                 <mediaobject>
+                                       <imageobject>
+                                         <imagedata fileref="images/st_overlaps01.png" />
+                                       </imageobject>
+                                       <caption><para><varname>MULTIPOINT</varname> / <varname>MULTIPOINT</varname></para></caption>
+                                 </mediaobject>
+                               </informalfigure></para></entry>
+
+                         <entry><para><informalfigure>
+                                 <mediaobject>
+                                       <imageobject>
+                                         <imagedata fileref="images/st_overlaps02.png" />
+                                       </imageobject>
+                                       <caption><para><varname>LINESTRING</varname> / <varname>LINESTRING</varname></para></caption>
+                                 </mediaobject>
+                               </informalfigure></para></entry>
+                         <entry><para><informalfigure>
+                                 <mediaobject>
+                                       <imageobject>
+                                         <imagedata fileref="images/st_overlaps03.png" />
+                                       </imageobject>
+                                       <caption><para><varname>POLYGON</varname> / <varname>POLYGON</varname></para></caption>
+                                 </mediaobject>
+                               </informalfigure></para></entry>
+                       </row>
+                 </tbody>
+               </tgroup>
+         </informaltable>
                <programlisting>--a point on a line is contained by the line and is of a lower dimension, and therefore does not overlap the line
                        nor crosses
 
@@ -3295,6 +3329,8 @@ FROM (SELECT ST_Buffer(ST_GeomFromText('POINT(1 0.5)'), 3)  As a,
 -------------+-------------+----------------+--------------+-------+-------+---------------------
  t           | f           | t              | f            |     2 |     2 |              2
 </programlisting>
+         
+
          </refsection>
 
          <refsection>