add new st_linecrossing graphic, experiment with new style, put in informal table

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

diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index c876736cf9c739e33661bfae099897e13ee58620..80cb4d440113557324cfdab2070f16d93211cf5d 100644 (file)
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -59,6 +59,7 @@ IMAGES= \
        ../images/st_isvalid07.png \
        ../images/st_isvalid08.png \
        ../images/st_linecrossingdirection01.png \
+       ../images/st_linecrossingdirection02.png \
        ../images/st_line_interpolate_point01.png \
        ../images/st_line_substring01.png \
        ../images/st_minimumboundingcircle01.png \

diff --git a/doc/html/image_src/st_linecrossingdirection01.wkt b/doc/html/image_src/st_linecrossingdirection01.wkt
index af93732d7423b0c2e8ee65faeb5834236227eb66..4ce016b8f751fdd730d3760c1b8368113f397a27 100644 (file)
--- a/doc/html/image_src/st_linecrossingdirection01.wkt
+++ b/doc/html/image_src/st_linecrossingdirection01.wkt
@@ -1,3 +1,2 @@
-Style2;LINESTRING(25 169,89 114,40 70,86 43)
-Style2;GEOMETRYCOLLECTION(POINT(25 169),POLYGON((80.84 41.66,84.66 48.16,86 43,80.84 41.66)) )
+Style2;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169),POLYGON((78.26 40.98,83.98 50.74,86 43,78.26 40.98)) )
 Style1-thinline;GEOMETRYCOLLECTION(LINESTRING(171 154,20 140,71 74,161 53),POINT(171 154),POLYGON((153.15 48.12,156.12 60.85,161 53,153.15 48.12)) )

diff --git a/doc/html/image_src/st_linecrossingdirection02.wkt b/doc/html/image_src/st_linecrossingdirection02.wkt
index c7f03eaa6647967326d05290558484366d102644..e094292dc3b6c37c03a7d98f38792a40eb7011a8 100644 (file)
--- a/doc/html/image_src/st_linecrossingdirection02.wkt
+++ b/doc/html/image_src/st_linecrossingdirection02.wkt
@@ -1,3 +1,2 @@
-Style2;LINESTRING(25 169,89 114,40 70,86 43)
-Style2;GEOMETRYCOLLECTION(POINT(25 169),POLYGON((80.84 41.66,84.66 48.16,86 43,80.84 41.66)) )
-Style1-thinline;GEOMETRYCOLLECTION(LINESTRING(171 154, 20 140, 71 74, 2.99 90.16),POINT(171 154),POLYGON((153.15 48.12,156.12 60.85,161 53,153.15 48.12)) )
+Style2-thinline;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169), POLYGON((80.84 41.66,84.66 48.16,86 43,80.84 41.66)) )
+Style1-thinline;GEOMETRYCOLLECTION(LINESTRING(171 154, 20 140, 71 74, 2.99 90.16),POINT(171 154),POLYGON((6.66 84.21,2.99 90.16,8.94 93.83,6.66 84.21)) )

diff --git a/doc/html/image_src/styles.conf b/doc/html/image_src/styles.conf
index 423bd549c98b4732715360c1f85ea757099fc29d..6d8ffc9835de6e4cdfd30b301501960cc574fcbd 100644 (file)
--- a/doc/html/image_src/styles.conf
+++ b/doc/html/image_src/styles.conf
@@ -1,7 +1,7 @@
 # This file describes the styles used to render the png images
 # The styleName attribute for every style should be unique.
 #
-# To use a style, prefix the wkt string with the styleName;  i.e. 
+# To use a style, prefix the wkt string with the styleName;  i.e.
 #    Style1;POINT(50 50)
 #
 #    convert -list color
@@ -51,3 +51,13 @@ polygonFillColor = DarkSeaGreen4
 polygonStrokeColor = DarkGreen
 polygonStrokeWidth = 0
 
+[Style]
+# The second layer in the rendered WKT image
+styleName = Style2-thinline
+pointSize = 6
+pointColor = DarkSeaGreen4
+lineWidth = 3
+lineColor = DarkSeaGreen4
+polygonFillColor = DarkSeaGreen4
+polygonStrokeColor = DarkGreen
+polygonStrokeWidth = 0

diff --git a/doc/reference.xml b/doc/reference.xml
index b38996246c1fae46e4b320de623d51333d6ddc63..8852434c3c0d4fe2a3b5c0ce08c208926f39258a 100644 (file)
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -9677,38 +9677,63 @@ WHERE ST_Crosses(roads.the_geom, highways.the_geom);</programlisting>
        <refsection>
          <title>Examples</title>
   <!-- TODO: We really badly need diagrams here and more examples -->
-                       <informalfigure>
-                         <mediaobject>
-                               <imageobject>
-                                 <imagedata fileref="images/st_linecrossingdirection01.png" />
-                               </imageobject>
-                               <caption><para>Line 1 fat line, Line 2 thin line, ball is start point,
+               <informaltable>
+                 <tgroup cols="2">
+                       <tbody>
+                         <row>
+                               <entry><para><informalfigure>
+                                       <mediaobject>
+                                         <imageobject>
+                                               <imagedata fileref="images/st_linecrossingdirection01.png" />
+                                         </imageobject>
+                                         <caption><para>Line 1 (green), Line 2 ball is start point,
                                        triangle are end points. Query below. </para></caption>
-                         </mediaobject>
-                       </informalfigure>
-<programlisting>SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2 , 
+                                       </mediaobject>
+                                 </informalfigure>
+                                 <programlisting>
+SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2 ,
          ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
-FROM (SELECT 
+FROM (SELECT
                ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
-               ST_GeomFromText('LINESTRING(171 154,20 140,71 74,161 53)') As line2 
+               ST_GeomFromText('LINESTRING(171 154,20 140,71 74,161 53)') As line2
        ) As foo;
 
  l1_cross_l2 | l2_cross_l1
 -------------+-------------
                   3 |          -3
-</programlisting>
-<programlisting>
-SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2 , 
+                               </programlisting>
+                       </para>
+               </entry>
+
+               <entry>
+                       <para><informalfigure>
+                               <mediaobject>
+                                 <imageobject>
+                                       <imagedata fileref="images/st_linecrossingdirection02.png" />
+                                 </imageobject>
+                                 <caption><para>Line 1 (green), Line 2 ball is start point,
+                                               triangle are end points. Query below.</para></caption>
+                               </mediaobject>
+                         </informalfigure>
+                         <programlisting>
+SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2 ,
          ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
-FROM (SELECT 
+FROM (SELECT
        ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
        ST_GeomFromText('LINESTRING (171 154, 20 140, 71 74, 2.99 90.16)') As line2
        ) As foo;
 
-        l1_cross_l2 | l2_cross_l1
+ l1_cross_l2 | l2_cross_l1
 -------------+-------------
-           2 |          -3
-</programlisting>
+                  2 |          -3
+                               </programlisting>
+                       </para>
+               </entry>
+         </row>
+         </tbody>
+       </tgroup>
+</informaltable>
+
 <programlisting>
 SELECT s1.gid, s2.gid, ST_LineCrossingDirection(s1.the_geom, s2.the_geom)
        FROM streets s1 CROSS JOIN streets s2 ON (s1.gid != s2.gid AND s1.the_geom &amp;&amp; s2.the_geom )