Merge pull request #8 from amenadiel/feature/multipolygon_merge

Feature/multipolygon merge

Author: ddproxy

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 MULTIPOLYGON 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

@@ -284,4 +284,22 @@ private function toStringMultiPolygon(array $multiPolygon)
 
         return implode(',', $strings);
     }
+
+    /**
+     * @param array[] $multipolygon
+     *
+     * @return string
+     */
+     private function toStringMultiPolygon(array $polygons)
+     {
+      //   return $this->toStringMultiLineString($polygon);
+
+          $strings = null;
+
+         foreach ($polygons as $polygon) {
+             $strings[] = '(' . $this->toStringPolygon($polygon) . ')';
+         }
+
+         return implode(',', $strings);
+     }
 }

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

@@ -35,7 +35,7 @@
 abstract class AbstractMultiPolygon extends AbstractGeometry
 {
     /**
-     * @var array[] $polygons
+     * @var AbstractPolygon[]
      */
     protected $polygons = array();
 

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

@@ -26,7 +26,7 @@
 use CrEOF\Spatial\PHP\Types\AbstractMultiPolygon;
 
 /**
- * Polygon object for POLYGON geometry type
+ * Polygon object for MULTIPOLYGON geometry type
  *
  * @author  Derek J. Lambert <dlambert@dereklambert.com>
  * @license http://dlambert.mit-license.org MIT