[mapserver-commits] r12035 - branches/branch-6-0/docs/en/mapscript branches/branch-6-0/docs/en/mapscript/php trunk/docs/en/mapscript trunk/docs/en/mapscript/php

[svn at osgeo.org]

Author: havatv
Date: 2011-08-10 03:50:24 -0700 (Wed, 10 Aug 2011)
New Revision: 12035

Modified:
   branches/branch-6-0/docs/en/mapscript/mapscript.txt
   branches/branch-6-0/docs/en/mapscript/php/index.txt
   trunk/docs/en/mapscript/mapscript.txt
   trunk/docs/en/mapscript/php/index.txt
Log:
Added simplify and topologyPreservingSimplify to the mapscript documentation (#2753).  For PHP, return values were changed to shapeObj.  Fixed geos version error.

Modified: branches/branch-6-0/docs/en/mapscript/mapscript.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/mapscript.txt	2011-08-10 10:39:55 UTC (rev 12034)
+++ branches/branch-6-0/docs/en/mapscript/mapscript.txt	2011-08-10 10:50:24 UTC (rev 12035)
@@ -2583,16 +2583,16 @@
     Set the shape value at index *i* to *value*.
 
 simplify( double tolerance ): shapeObj
-    Given a tolerance, returns a simplified shape object using
-    the GEOS library (>3.3.0) or NULL on error.
+    Given a tolerance, returns a simplified shape object or NULL on
+    error. Requires GEOS support (>=3.0).
 
 symDifference( shapeObj shape ) : shapeObj
     Returns the computed symmetric difference of the supplied and existing
     shape. Requires GEOS support. Returns NULL/undef on failure.
 
 topologySimplifyPreservingSimplify( double tolerance ): shapeObj
-    Given a tolerance, returns a simplified shape object using
-    the GEOS library (>3.3.0) or NULL on error.
+    Given a tolerance, returns a simplified shape object or NULL on
+    error. Requires GEOS support (>=3.0).
 
 touches( shapeObj shape2 ) : int
     Returns MS_TRUE if the shape and shape2 touch. Returns -1 on error and

Modified: branches/branch-6-0/docs/en/mapscript/php/index.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/php/index.txt	2011-08-10 10:39:55 UTC (rev 12034)
+++ branches/branch-6-0/docs/en/mapscript/php/index.txt	2011-08-10 10:50:24 UTC (rev 12035)
@@ -2349,12 +2349,14 @@
     added.
 
 shapeObj simplify(double tolerance)
-    Given a tolerance, returns a simplified shape object using 
-    underlying GEOS library or NULL on error.
+    Given a tolerance, returns a simplified shape object or NULL on
+    error.  Only available if php/mapscript is built with GEOS library
+    (>=3.0).
 
 shapeObj topologySimplifyPreservingSimplify(double tolerance)
-    Given a tolerance, returns a simplified shape object using 
-    underlying GEOS library or NULL on error.
+    Given a tolerance, returns a simplified shape object or NULL on
+    error.  Only available if php/mapscript is built with GEOS library
+    (>=3.0).
 
 void free()
     Free the object properties and break the internal references. 

Modified: trunk/docs/en/mapscript/mapscript.txt
===================================================================
--- trunk/docs/en/mapscript/mapscript.txt	2011-08-10 10:39:55 UTC (rev 12034)
+++ trunk/docs/en/mapscript/mapscript.txt	2011-08-10 10:50:24 UTC (rev 12035)
@@ -2583,16 +2583,16 @@
     Set the shape value at index *i* to *value*.
 
 simplify( double tolerance ): shapeObj
-    Given a tolerance, returns a simplified shape object using
-    the GEOS library (>3.3.0) or NULL on error.
+    Given a tolerance, returns a simplified shape object or NULL on
+    error. Requires GEOS support (>=3.0).
 
 symDifference( shapeObj shape ) : shapeObj
     Returns the computed symmetric difference of the supplied and existing
     shape. Requires GEOS support. Returns NULL/undef on failure.
 
 topologySimplifyPreservingSimplify( double tolerance ): shapeObj
-    Given a tolerance, returns a simplified shape object using
-    the GEOS library (>3.3.0) or NULL on error.
+    Given a tolerance, returns a simplified shape object or NULL on
+    error. Requires GEOS support (>=3.0).
 
 touches( shapeObj shape2 ) : int
     Returns MS_TRUE if the shape and shape2 touch. Returns -1 on error and

Modified: trunk/docs/en/mapscript/php/index.txt
===================================================================
--- trunk/docs/en/mapscript/php/index.txt	2011-08-10 10:39:55 UTC (rev 12034)
+++ trunk/docs/en/mapscript/php/index.txt	2011-08-10 10:50:24 UTC (rev 12035)
@@ -2349,12 +2349,14 @@
     added.
 
 shapeObj simplify(double tolerance)
-    Given a tolerance, returns a simplified shape object using 
-    underlying GEOS library or NULL on error.
+    Given a tolerance, returns a simplified shape object or NULL on
+    error.  Only available if php/mapscript is built with GEOS library
+    (>=3.0).
 
 shapeObj topologySimplifyPreservingSimplify(double tolerance)
-    Given a tolerance, returns a simplified shape object using 
-    underlying GEOS library or NULL on error.
+    Given a tolerance, returns a simplified shape object or NULL on
+    error.  Only available if php/mapscript is built with GEOS library
+    (>=3.0).
 
 void free()
     Free the object properties and break the internal references.