[geos-commits] r3011 - in trunk/php: . test

svn_geos at osgeo.org svn_geos at osgeo.org
Fri Jun 18 12:15:08 EDT 2010


Author: strk
Date: 2010-06-18 16:15:08 +0000 (Fri, 18 Jun 2010)
New Revision: 3011

Modified:
   trunk/php/geos.c
   trunk/php/test/test.php
Log:
WKTWriter::setTrim


Modified: trunk/php/geos.c
===================================================================
--- trunk/php/geos.c	2010-06-18 16:12:21 UTC (rev 3010)
+++ trunk/php/geos.c	2010-06-18 16:15:08 UTC (rev 3011)
@@ -28,7 +28,7 @@
 #include "Zend/zend_exceptions.h" /* for zend_throw_exception_object */
 
 /* GEOS stuff */
-#include <geos_c.h>
+#include "geos_c.h"
 
 /* Own stuff */
 #include "php_geos.h"
@@ -278,10 +278,12 @@
 
 PHP_METHOD(WKTWriter, __construct);
 PHP_METHOD(WKTWriter, write);
+PHP_METHOD(WKTWriter, setTrim);
 
 static function_entry WKTWriter_methods[] = {
     PHP_ME(WKTWriter, __construct, NULL, 0)
     PHP_ME(WKTWriter, write, NULL, 0)
+    PHP_ME(WKTWriter, setTrim, NULL, 0)
     {NULL, NULL, NULL}
 };
 
@@ -307,7 +309,6 @@
     return Gen_create_obj(type, WKTWriter_dtor, &WKTWriter_object_handlers);
 }
 
-
 PHP_METHOD(WKTWriter, __construct)
 {
 	GEOSWKTWriter* obj;
@@ -355,6 +356,24 @@
 
 }
 
+PHP_METHOD(WKTWriter, setTrim)
+{
+    GEOSWKTWriter *writer;
+    zend_bool trimval;
+    char trim;
+
+    writer = (GEOSWKTWriter*)getRelay(getThis(), WKTWriter_ce_ptr);
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &trimval)
+        == FAILURE)
+    {
+        RETURN_NULL();
+    }
+
+    trim = trimval;
+    GEOSWKTWriter_setTrim(writer, trim);
+}
+
 /* ------ Initialization / Deinitialization / Meta ------------------ */
 
 /* per-module initialization */

Modified: trunk/php/test/test.php
===================================================================
--- trunk/php/test/test.php	2010-06-18 16:12:21 UTC (rev 3010)
+++ trunk/php/test/test.php	2010-06-18 16:15:08 UTC (rev 3011)
@@ -23,8 +23,16 @@
 $geom = $reader->read("POINT(0 0)");
 $num = $geom->numGeometries();
 echo 'Geom has ' . $num . " geometries, WKT follows:\n";
-echo $writer->write($geom) . "\n";
+echo "[DEFAULT UNTRIMMED]: ".$writer->write($geom) . "\n";
+$writer->setTrim(TRUE);
+echo "[TRIMMED]: ".$writer->write($geom) . "\n";
+$writer->setTrim(FALSE);
+echo "[UNTRIMMED]: ".$writer->write($geom) . "\n";
 
+$writer->setTrim(TRUE);
+
+echo "We'll do trimmed WKT from now on";
+
 $geom = $reader->read("MULTIPOINT(0 0, 1 1)");
 $num = $geom->numGeometries();
 echo 'Geom has ' . $num . " geometries. WKT follows:\n";



More information about the geos-commits mailing list