[geos-commits] r3074 - in trunk/php: . test
svn_geos at osgeo.org
svn_geos at osgeo.org
Thu Jun 24 10:10:19 EDT 2010
Author: strk
Date: 2010-06-24 14:10:19 +0000 (Thu, 24 Jun 2010)
New Revision: 3074
Modified:
trunk/php/geos.c
trunk/php/test/test.php
Log:
PHP: GEOSWKTWriter::getOutputDimension and test
Modified: trunk/php/geos.c
===================================================================
--- trunk/php/geos.c 2010-06-24 13:58:47 UTC (rev 3073)
+++ trunk/php/geos.c 2010-06-24 14:10:19 UTC (rev 3074)
@@ -1668,6 +1668,7 @@
PHP_METHOD(WKTWriter, setTrim);
PHP_METHOD(WKTWriter, setRoundingPrecision);
PHP_METHOD(WKTWriter, setOutputDimension);
+PHP_METHOD(WKTWriter, getOutputDimension);
PHP_METHOD(WKTWriter, setOld3D);
static function_entry WKTWriter_methods[] = {
@@ -1676,6 +1677,7 @@
PHP_ME(WKTWriter, setTrim, NULL, 0)
PHP_ME(WKTWriter, setRoundingPrecision, NULL, 0)
PHP_ME(WKTWriter, setOutputDimension, NULL, 0)
+ PHP_ME(WKTWriter, getOutputDimension, NULL, 0)
PHP_ME(WKTWriter, setOld3D, NULL, 0)
{NULL, NULL, NULL}
};
@@ -1778,6 +1780,9 @@
GEOSWKTWriter_setRoundingPrecision(writer, prec);
}
+/**
+ * void GEOSWKTWriter::setOutputDimension()
+ */
PHP_METHOD(WKTWriter, setOutputDimension)
{
GEOSWKTWriter *writer;
@@ -1794,6 +1799,21 @@
GEOSWKTWriter_setOutputDimension(writer, dim);
}
+/**
+ * long GEOSWKTWriter::getOutputDimension()
+ */
+PHP_METHOD(WKTWriter, getOutputDimension)
+{
+ GEOSWKTWriter *writer;
+ long int ret;
+
+ writer = (GEOSWKTWriter*)getRelay(getThis(), WKTWriter_ce_ptr);
+
+ ret = GEOSWKTWriter_getOutputDimension(writer);
+
+ RETURN_LONG(ret);
+}
+
PHP_METHOD(WKTWriter, setOld3D)
{
GEOSWKTWriter *writer;
Modified: trunk/php/test/test.php
===================================================================
--- trunk/php/test/test.php 2010-06-24 13:58:47 UTC (rev 3073)
+++ trunk/php/test/test.php 2010-06-24 14:10:19 UTC (rev 3074)
@@ -202,6 +202,12 @@
}
+ public function testWKTWriter_getOutputDimension()
+ {
+ $writer = new GEOSWKTWriter();
+ $this->assertEquals(2, $writer->getOutputDimension());
+ }
+
public function testWKTWriter_setOutputDimension()
{
$reader = new GEOSWKTReader();
@@ -219,7 +225,7 @@
$this->assertEquals('POINT Z (1 2 3)', $writer->write($g3d));
$this->assertEquals('POINT (3 2)', $writer->write($g2d));
- # 1 is invalid
+ # 1 is invalid
try {
$writer->setOutputDimension(1);
$this->assertTrue(FALSE);
@@ -227,7 +233,7 @@
$this->assertContains('must be 2 or 3', $e->getMessage());
}
- # 4 is invalid
+ # 4 is invalid
try {
$writer->setOutputDimension(4);
$this->assertTrue(FALSE);
More information about the geos-commits
mailing list