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

[svn_geos at osgeo.org]

Author: strk
Date: 2010-06-21 10:30:48 +0000 (Mon, 21 Jun 2010)
New Revision: 3059

Modified:
   trunk/php/TODO
   trunk/php/geos.c
   trunk/php/test/test.php
Log:
Rename getGeometryN to geometryN, for interface consistency


Modified: trunk/php/TODO
===================================================================
--- trunk/php/TODO	2010-06-21 10:21:31 UTC (rev 3058)
+++ trunk/php/TODO	2010-06-21 10:30:48 UTC (rev 3059)
@@ -1,13 +1,13 @@
 In order of priority
 
-- Complete interfaces of Geometry
- - Normalize ? (is the only modifier function)
- - CoordSeq accessors ?
- - Constructors ?
-- Find a way to have GEOSGeometry contents shown on var_dump
+- Add GEOSGeometry::Normalize (make non-mutating !)
 - Implement serialization/deserialization for Geometry
 - Documentation !! (doxygen-based?)
+- Find a way to have GEOSGeometry contents shown on var_dump
+- Use the re-entrant interface
 - Add interfaces for WKBReader/WKBWriter ?
 - Add interface for algorithms (Orientation Index) ?
 - Add interfaces for prepared geometries ?
 - Add interfaces for STRTree ?
+- Add interfaces for GEOSCoordSeq ?
+- Add Geometry Constructors ?

Modified: trunk/php/geos.c
===================================================================
--- trunk/php/geos.c	2010-06-21 10:21:31 UTC (rev 3058)
+++ trunk/php/geos.c	2010-06-21 10:30:48 UTC (rev 3059)
@@ -205,7 +205,7 @@
 PHP_METHOD(Geometry, getSRID);
 PHP_METHOD(Geometry, setSRID);
 PHP_METHOD(Geometry, numGeometries);
-PHP_METHOD(Geometry, getGeometryN);
+PHP_METHOD(Geometry, geometryN);
 PHP_METHOD(Geometry, numInteriorRings);
 PHP_METHOD(Geometry, numPoints);
 PHP_METHOD(Geometry, getX);
@@ -261,7 +261,7 @@
     PHP_ME(Geometry, getSRID, NULL, 0)
     PHP_ME(Geometry, setSRID, NULL, 0)
     PHP_ME(Geometry, numGeometries, NULL, 0)
-    PHP_ME(Geometry, getGeometryN, NULL, 0)
+    PHP_ME(Geometry, geometryN, NULL, 0)
     PHP_ME(Geometry, numInteriorRings, NULL, 0)
     PHP_ME(Geometry, numPoints, NULL, 0)
     PHP_ME(Geometry, getX, NULL, 0)
@@ -1253,9 +1253,9 @@
 }
 
 /**
- * GEOSGeometry GEOSGeometry::getGeometryN()
+ * GEOSGeometry GEOSGeometry::geometryN()
  */
-PHP_METHOD(Geometry, getGeometryN)
+PHP_METHOD(Geometry, geometryN)
 {
     GEOSGeometry *geom;
     const GEOSGeometry *c;

Modified: trunk/php/test/test.php
===================================================================
--- trunk/php/test/test.php	2010-06-21 10:21:31 UTC (rev 3058)
+++ trunk/php/test/test.php	2010-06-21 10:30:48 UTC (rev 3059)
@@ -1341,19 +1341,19 @@
         $this->assertEquals(6, $g->numGeometries());
     }
 
-    public function testGeometry_getGeometryN()
+    public function testGeometry_geometryN()
     {
         $reader = new GEOSWKTReader();
 
         $g = $reader->read('POINT(0 0)');
-        $c = $g->getGeometryN(0);
+        $c = $g->geometryN(0);
         $this->assertTrue( $g->equalsExact($c) );
 
         $g = $reader->read('MULTIPOINT (0 1, 2 3)');
-        $this->assertEquals($reader->read('POINT(0 1)'), $g->getGeometryN(0));
-        $this->assertEquals($reader->read('POINT(2 3)'), $g->getGeometryN(1));
+        $this->assertEquals($reader->read('POINT(0 1)'), $g->geometryN(0));
+        $this->assertEquals($reader->read('POINT(2 3)'), $g->geometryN(1));
 
-        $c = $g->getGeometryN(2);
+        $c = $g->geometryN(2);
         $this->assertNull( $c );
 
     }