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

[svn_geos at osgeo.org]

Author: strk
Date: 2010-06-20 23:40:21 +0000 (Sun, 20 Jun 2010)
New Revision: 3041

Modified:
   trunk/php/geos.c
   trunk/php/test/test.php
Log:
Geometry type constants


Modified: trunk/php/geos.c
===================================================================
--- trunk/php/geos.c	2010-06-20 23:35:53 UTC (rev 3040)
+++ trunk/php/geos.c	2010-06-20 23:40:21 UTC (rev 3041)
@@ -1521,6 +1521,23 @@
     REGISTER_LONG_CONSTANT("GEOSBUF_JOIN_BEVEL", GEOSBUF_JOIN_BEVEL,
         CONST_CS|CONST_PERSISTENT);
 
+    REGISTER_LONG_CONSTANT("GEOS_POINT", GEOS_POINT,
+        CONST_CS|CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GEOS_LINESTRING", GEOS_LINESTRING,
+        CONST_CS|CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GEOS_LINEARRING", GEOS_LINEARRING,
+        CONST_CS|CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GEOS_POLYGON", GEOS_POLYGON,
+        CONST_CS|CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GEOS_MULTIPOINT", GEOS_MULTIPOINT,
+        CONST_CS|CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GEOS_MULTILINESTRING", GEOS_MULTILINESTRING,
+        CONST_CS|CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GEOS_MULTIPOLYGON", GEOS_MULTIPOLYGON,
+        CONST_CS|CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GEOS_GEOMETRYCOLLECTION", GEOS_GEOMETRYCOLLECTION,
+        CONST_CS|CONST_PERSISTENT);
+
     return SUCCESS;
 }
 

Modified: trunk/php/test/test.php
===================================================================
--- trunk/php/test/test.php	2010-06-20 23:35:53 UTC (rev 3040)
+++ trunk/php/test/test.php	2010-06-20 23:40:21 UTC (rev 3041)
@@ -20,9 +20,19 @@
         $this->assertEquals(1, GEOSBUF_CAP_ROUND);
         $this->assertEquals(2, GEOSBUF_CAP_FLAT);
         $this->assertEquals(3, GEOSBUF_CAP_SQUARE);
+
         $this->assertEquals(1, GEOSBUF_JOIN_ROUND);
         $this->assertEquals(2, GEOSBUF_JOIN_MITRE);
         $this->assertEquals(3, GEOSBUF_JOIN_BEVEL);
+
+        $this->assertEquals(0, GEOS_POINT);
+        $this->assertEquals(1, GEOS_LINESTRING);
+        $this->assertEquals(2, GEOS_LINEARRING);
+        $this->assertEquals(3, GEOS_POLYGON);
+        $this->assertEquals(4, GEOS_MULTIPOINT);
+        $this->assertEquals(5, GEOS_MULTILINESTRING);
+        $this->assertEquals(6, GEOS_MULTIPOLYGON);
+        $this->assertEquals(7, GEOS_GEOMETRYCOLLECTION);
     }
 
     public function testWKTReader__construct()