From e10897a22ad447fe283836f2704b3d87052a8d4f Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Sun, 4 Oct 2015 23:28:10 +0000
Subject: [PATCH] add an ST_3DIntersection graphic.  Fix graphic link on
 ST_3DDifference

git-svn-id: http://svn.osgeo.org/postgis/trunk@14187 b70326c6-7e19-0410-871a-916f4a2858ee
---
 doc/html/images/st_3dintersection01.png | Bin 0 -> 5718 bytes
 doc/reference_sfcgal.xml                |  71 +++++++++++++++++++-----
 2 files changed, 56 insertions(+), 15 deletions(-)
 create mode 100644 doc/html/images/st_3dintersection01.png

diff --git a/doc/html/images/st_3dintersection01.png b/doc/html/images/st_3dintersection01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3568cc185c17d0031d2b862c36635cc46441bcb4
GIT binary patch
literal 5718
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

literal 0
HcmV?d00001

diff --git a/doc/reference_sfcgal.xml b/doc/reference_sfcgal.xml
index 47385e664..03050a432 100644
--- a/doc/reference_sfcgal.xml
+++ b/doc/reference_sfcgal.xml
@@ -501,16 +501,57 @@ MULTIPOLYGON(
 
 	  <refsection>
 		<title>Description</title>
-
+		<para>Return a geometry that is the shared portion between geom1 and geom2.</para>
 		<para>Availability: 2.1.0</para>
 		<para>&sfcgal_required;</para>
 		<para>&Z_support;</para>
 		<para>&P_support;</para>
 		<para>&T_support;</para>
 	  </refsection>
-	  
-	  		<refsection>
-		<title>Examples: 3D linestring and Polygon</title>	
+	 
+	  <refsection>
+		<title>Examples</title>	
+		<para>3D images were generated using PostGIS <xref linkend="ST_AsX3D" /> and rendering in HTML using <ulink url="http://www.x3dom.org">X3Dom HTML Javascript rendering library</ulink>.</para>
+            <informaltable>
+            <tgroup cols="2">
+            <tbody>
+              <row>
+                <entry><para>
+                <programlisting>SELECT ST_Extrude(ST_Buffer(ST_GeomFromText('POINT(100 90)'),
+ 50, 'quad_segs=2'),0,0,30) AS geom1, 
+        ST_Extrude(ST_Buffer(ST_GeomFromText('POINT(80 80)'),
+ 50, 'quad_segs=1'),0,0,30) AS geom2;
+                </programlisting>
+                <informalfigure>
+                    <mediaobject>
+                      <imageobject>
+                        <imagedata fileref="images/st_3ddifference01.png" />
+                      </imageobject>
+                      <caption><para>Original 3D geometries overlaid. geom2 is shown semi-transparent</para></caption>
+                    </mediaobject>
+                  </informalfigure></para>
+              </entry>
+              <entry><para>
+              <programlisting>SELECT ST_3DIntersection(geom1,geom2)
+FROM ( SELECT ST_Extrude(ST_Buffer(ST_GeomFromText('POINT(100 90)'),
+ 50, 'quad_segs=2'),0,0,30) AS geom1, 
+        ST_Extrude(ST_Buffer(ST_GeomFromText('POINT(80 80)'),
+ 50, 'quad_segs=1'),0,0,30) AS geom2 ) As t;</programlisting>
+              <informalfigure>
+                    <mediaobject>
+                      <imageobject>
+                        <imagedata fileref="images/st_32intersection01.png" />
+                      </imageobject>
+                      <caption><para>What's left after removing geom2</para></caption>
+                    </mediaobject>
+                  </informalfigure></para>
+              </entry>
+              </row>
+             </tbody>
+            </tgroup>
+        </informaltable>
+		
+		<para>3D linestrings and polygons</para>
 		<programlisting>	SELECT ST_AsText(ST_3DIntersection(linestring, polygon)) As wkt
 FROM  ST_GeomFromText('LINESTRING Z (2 2 6,1.5 1.5 7,1 1 8,0.5 0.5 8,0 0 10)') AS linestring
  CROSS JOIN ST_GeomFromText('POLYGON((0 0 8, 0 1 8, 1 1 8, 1 0 8, 0 0 8))') AS polygon;
@@ -594,7 +635,7 @@ FROM  ST_GeomFromText('LINESTRING Z (2 2 6,1.5 1.5 7,1 1 8,0.5 0.5 8,0 0 10)') A
                 <informalfigure>
                     <mediaobject>
                       <imageobject>
-                        <imagedata fileref="images/st_difference01.png" />
+                        <imagedata fileref="images/st_3ddifference01.png" />
                       </imageobject>
                       <caption><para>Original 3D geometries overlaid. geom2 is the part that will be removed.</para></caption>
                     </mediaobject>
@@ -609,7 +650,7 @@ FROM ( SELECT ST_Extrude(ST_Buffer(ST_GeomFromText('POINT(100 90)'),
               <informalfigure>
                     <mediaobject>
                       <imageobject>
-                        <imagedata fileref="images/st_difference02.png" />
+                        <imagedata fileref="images/st_3ddifference02.png" />
                       </imageobject>
                       <caption><para>What's left after removing geom2</para></caption>
                     </mediaobject>
@@ -622,15 +663,15 @@ FROM ( SELECT ST_Extrude(ST_Buffer(ST_GeomFromText('POINT(100 90)'),
 	      
 	  </refsection>
 	  
-	    <refsection>
-		<title>See Also</title>
-
-                <para>
-        <xref linkend="ST_Extrude" />,
-        <xref linkend="ST_AsX3D" />,
-        <xref linkend="ST_3DUnion" />
-                </para>
-        </refsection>
+      <refsection>
+        <title>See Also</title>
+        
+        <para>
+            <xref linkend="ST_Extrude" />,
+            <xref linkend="ST_AsX3D" />,  <xref linkend="ST_3DIntersection" />
+            <xref linkend="ST_3DUnion" />
+        </para>
+      </refsection>
 	</refentry>
 
 	<refentry id="ST_3DUnion">
-- 
2.40.0