Adding STGeomFromGeoJSON and MakeEnvelope

Author: Jon West

README.md

@@ -53,6 +53,7 @@ Currently the following SQL functions are supported in DQL (more coming):
 * ST_Envelope
 * ST_Expand
 * ST_Extent
+* ST_GeomFromGeoJSON
 * ST_GeomFromText
 * ST_Intersection
 * ST_Intersects

lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STGeomFromGeoJSON.php

@@ -0,0 +1,42 @@
+<?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\ORM\Query\AST\Functions\PostgreSql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * ST_GeomFromGeoJSON DQL function
+ * @author  Derek J. Lambert <dlambert@dereklambert.com>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class ST_GeomFromGeoJSON extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_GeomFromGeoJSON';
+
+    protected $minGeomExpr = 1;
+
+    protected $maxGeomExpr = 1;
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STMakeEnvelope.php

@@ -39,7 +39,7 @@ class STMakeEnvelope extends AbstractSpatialDQLFunction
 
     protected $functionName = 'ST_MakeEnvelope';
 
-    protected $minGeomExpr = 2;
+    protected $minGeomExpr = 5;
 
-    protected $maxGeomExpr = 2;
+    protected $maxGeomExpr = 5;
 }