Add multi-polygon support

lib/CrEOF/Spatial/DBAL/Types/Geometry/MultiPolygonType.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (C) 2012 Derek J. Lambert
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace CrEOF\Spatial\DBAL\Types\Geometry;
+
+use CrEOF\Spatial\DBAL\Types\GeometryType;
+use CrEOF\Spatial\PHP\Types\Geometry\GeometryInterface;
+
+/**
+ * Doctrine POLYGON type
+ *
+ * @author  Derek J. Lambert <dlambert@dereklambert.com>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class MultiPolygonType extends GeometryType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getSQLType()
+    {
+        return GeometryInterface::MULTIPOLYGON;
+    }
+}

lib/CrEOF/Spatial/PHP/Types/AbstractGeometry.php

@@ -92,6 +92,9 @@ protected function validatePointValue($point)
             case (is_array($point) && count($point) == 2 && is_numeric($point[0]) && is_numeric($point[1])):
                 return array_values($point);
                 break;
+            case (is_array($point) && count($point) > 2 && is_array($point[0])):
+                return array_values($point);
+                break;
             default:
                 throw InvalidValueException::invalidType($this, GeometryInterface::POINT, $point);
         }

lib/CrEOF/Spatial/PHP/Types/AbstractMultiPolygon.php

@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright (C) 2012 Derek J. Lambert
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace CrEOF\Spatial\PHP\Types;
+
+use CrEOF\Spatial\Exception\InvalidValueException;
+use CrEOF\Spatial\PHP\Types\AbstractPoint;
+
+/**
+ * Abstract Polygon object for POLYGON spatial types
+ *
+ * @author  Derek J. Lambert <dlambert@dereklambert.com>
+ * @license http://dlambert.mit-license.org MIT
+ */
+abstract class AbstractMultiPolygon extends AbstractGeometry
+{
+    /**
+     * @var array[] $rings
+     */
+    protected $rings = array();
+
+    /**
+     * @param AbstractLineString[]|array[] $rings
+     * @param null|int                     $srid
+     */
+    public function __construct(array $rings, $srid = null)
+    {
+        $this->setRings($rings)
+            ->setSrid($srid);
+    }
+
+    /**
+     * @param AbstractLineString|array[] $ring
+     *
+     * @return self
+     */
+    public function addRing($ring)
+    {
+        $this->rings[] = $this->validateRingValue($ring);
+
+        return $this;
+    }
+
+    /**
+     * @return AbstractLineString[]
+     */
+    public function getRings()
+    {
+        $rings = array();
+
+        for ($i = 0; $i < count($this->rings); $i++) {
+            $rings[] = $this->getRing($i);
+        }
+
+        return $rings;
+    }
+
+    /**
+     * @param int $index
+     *
+     * @return AbstractLineString
+     */
+    public function getRing($index)
+    {
+        if (-1 == $index) {
+            $index = count($this->rings) - 1;
+        }
+
+        $lineStringClass = $this->getNamespace() . '\LineString';
+
+        return new $lineStringClass($this->rings[$index], $this->srid);
+    }
+
+    /**
+     * @param AbstractLineString[] $rings
+     *
+     * @return self
+     */
+    public function setRings(array $rings)
+    {
+        $this->rings = $this->validatePolygonValue($rings);
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return self::POLYGON;
+    }
+
+    /**
+     * @return array[]
+     */
+    public function toArray()
+    {
+        return $this->rings;
+    }
+}

lib/CrEOF/Spatial/PHP/Types/Geometry/MultiPolygon.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright (C) 2012 Derek J. Lambert
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace CrEOF\Spatial\PHP\Types\Geometry;
+
+use CrEOF\Spatial\PHP\Types\AbstractMultiPolygon;
+
+/**
+ * Polygon object for POLYGON geometry type
+ *
+ * @author  Derek J. Lambert <dlambert@dereklambert.com>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class MultiPolygon extends AbstractMultiPolygon
+{
+
+}