[mapserver-commits] r7251 - in branches/branch-5-0/mapserver: . mapscript/php3

[svn at osgeo.org]

Author: Assefa
Date: 2008-01-08 12:04:53 -0500 (Tue, 08 Jan 2008)
New Revision: 7251

Modified:
   branches/branch-5-0/mapserver/HISTORY.TXT
   branches/branch-5-0/mapserver/mapscript/php3/README
   branches/branch-5-0/mapserver/mapscript/php3/php_mapscript.c
Log:
on a shape object union_geos function should be called union

Modified: branches/branch-5-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-0/mapserver/HISTORY.TXT	2008-01-08 14:59:03 UTC (rev 7250)
+++ branches/branch-5-0/mapserver/HISTORY.TXT	2008-01-08 17:04:53 UTC (rev 7251)
@@ -12,6 +12,10 @@
 
 Current Version (SVN branch-5-0)
 --------------------------------
+
+- PHP/Mapscript: on a shape object union_geos function should be called union
+  (#2466)
+
 - SLD using a single BBOX filter should generate an SQL ststement for 
   oracle/postgis/ogr (#2450)
 

Modified: branches/branch-5-0/mapserver/mapscript/php3/README
===================================================================
--- branches/branch-5-0/mapserver/mapscript/php3/README	2008-01-08 14:59:03 UTC (rev 7250)
+++ branches/branch-5-0/mapserver/mapscript/php3/README	2008-01-08 17:04:53 UTC (rev 7251)
@@ -1344,8 +1344,13 @@
         Only available if php/mapscript is built with GEOS 
         library.
 
+  shapeobj union(shapeobj shape)
+        Returns a shape object representing the union of the shape object 
+        with the one passed as parameter. 
+        Only available if php/mapscript is built with GEOS 
+        library
 
-   shapeobj union_geos(shapeobj shape)
+   shapeobj union_geos(shapeobj shape) (Deprecated in v5.2. Use union instead)
         Returns a shape object representing the union of the shape object 
         with the one passed as parameter. 
         Only available if php/mapscript is built with GEOS 

Modified: branches/branch-5-0/mapserver/mapscript/php3/php_mapscript.c
===================================================================
--- branches/branch-5-0/mapserver/mapscript/php3/php_mapscript.c	2008-01-08 14:59:03 UTC (rev 7250)
+++ branches/branch-5-0/mapserver/mapscript/php3/php_mapscript.c	2008-01-08 17:04:53 UTC (rev 7251)
@@ -851,6 +851,7 @@
     {"boundary",        php3_ms_shape_boundary,         NULL},
     {"containsshape",   php3_ms_shape_contains_geos,    NULL},
     {"union_geos",      php3_ms_shape_Union,            NULL},
+    {"union",           php3_ms_shape_Union,            NULL},
     {"intersection",    php3_ms_shape_intersection,     NULL},
     {"difference",      php3_ms_shape_difference,       NULL},
     {"symdifference",   php3_ms_shape_symdifference,    NULL},