From f7d0472b1b0675ac8c097f6f82eebfea9247c841 Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Sat, 1 Oct 2011 02:58:06 +0000
Subject: [PATCH] get rid of obsolete proto, replace with new onesfor
 ST_Intersects. Clarify distinctions between raster/goemtry and
 geometry/raster operations

git-svn-id: http://svn.osgeo.org/postgis/trunk@7926 b70326c6-7e19-0410-871a-916f4a2858ee
---
 doc/reference_raster.xml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index 42eff2b44..64f15a97b 100644
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -5697,7 +5697,7 @@ a_rid | b_rid | overleft
 				  <parameter>nband=NULL</parameter>
 				</paramdef>
 			  </funcprototype>
-
+			  
 			  <funcprototype>
 				<funcdef>boolean <function>ST_Intersects</function></funcdef>
 				<paramdef>
@@ -5708,13 +5708,25 @@ a_rid | b_rid | overleft
 				  <type>raster </type>
 				  <parameter>rastb</parameter>
 				</paramdef>
-				<paramdef choice='opt'>
+			  </funcprototype>
+
+			  <funcprototype>
+				<funcdef>boolean <function>ST_Intersects</function></funcdef>
+				<paramdef>
+				  <type>raster </type>
+				  <parameter>rasta</parameter>
+				</paramdef>
+				<paramdef>
 				  <type>integer </type>
-				  <parameter>nbanda=NULL</parameter>
+				  <parameter>nbanda</parameter>
+				</paramdef>
+				<paramdef>
+				  <type>raster </type>
+				  <parameter>rastb</parameter>
 				</paramdef>
 				<paramdef choice='opt'>
 				  <type>integer </type>
-				  <parameter>nbandb=NULL</parameter>
+				  <parameter>nbandb=1</parameter>
 				</paramdef>
 			  </funcprototype>
 			</funcsynopsis>
@@ -5723,8 +5735,8 @@ a_rid | b_rid | overleft
 		  <refsection>
 			<title>Description</title>
 
-			<para>Returns true if the geometry intersects with the raster. Nodata values  are taken into account so that if the geometry intersects only with nodata  values, the function returns false. If no bands are specified only convex hull of raster is used (nodata values are not considered).</para>
-
+			<para>Returns true if the geometry intersects with the raster. Nodata values  are taken into account so that if the geometry intersects only with nodata  values, the function returns false. If no band is specified band 1 is assumed.</para>
+			<note><para>For the case of raster/geometry  and geometry/raster.  ST_Intersects(raster,nband,geometry) is done in raster space (e.g. the geometry is converted to a raster before tested), ST_Intersects(geometry, raster)is done in geometry space -- raster is converted to geometry before checked.  </para></note>
 			<note><para>This operand will make use of any indexes that may be available on the
 				geometries / rasters.</para></note>
 				
-- 
2.49.0