rebase merge and other stuff

.gitignore

@@ -3,3 +3,4 @@ composer.lock*
 doctrine2-spatial.iml
 .idea*
 .idea/*
+/nbproject

README.md

@@ -68,21 +68,40 @@ Currently the following SQL functions are supported in DQL (more coming):
 * ST_StartPoint
 * ST_Summary
 * ST_Perimeter
-* ST_Touches
-* ST_Transform
 
 ### MySQL
 * Area
 * AsBinary
 * AsText
+* Buffer
 * Contains
+* Crosses
 * Disjoint
 * Envelope
 * GeomFromText
 * GLength
+* Intersects
 * LineString
 * MBRContains
 * MBRDisjoint
+* MBREqual
+* MBRIntersects
+* MBROverlaps
+* MBRTouches
+* MBRWithin
+* Overlaps
+* ST_Disjoint
+* STartPoint
+* ST_Contains
+* ST_Crosses
+* ST_Disjoint
+* ST_Equals
+* ST_Intersects
+* ST_Overlaps
+* ST_Touches
+* ST_Within
+* Touches
+* Within
 * StartPoint
 * LineString
 * LineStringFromWKB

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "creof/doctrine2-spatial",
+    "name": "slavenin/doctrine2-spatial",
     "type": "library",
     "description": "Doctrine2 multi-platform support for spatial types and functions",
     "keywords": ["orm", "dbal", "database", "postgresql", "mysql", "opengis", "postgis", "gis", "spatial", "geometry", "geography"],

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/Buffer.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (C) 2013 luca capra
+ *
+ * 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\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * Buffer DQL function
+ *
+ * @author  luca capra <[email protected]>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class Buffer extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('mysql');
+
+    protected $functionName = 'Buffer';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}
+

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/DistanceFromMultyLine.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * Description of STContains
+ *
+ * @author Maximilian
+ */
+class DistanceFromMultyLine extends AbstractSpatialDQLFunction
+{
+	protected $platforms = array('mysql');
+
+    protected $functionName = 'distance_from_multyline';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/GeodistPt.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * Description of STContains
+ *
+ * @author Maximilian
+ */
+class GeodistPt extends AbstractSpatialDQLFunction
+{
+	protected $platforms = array('mysql');
+
+    protected $functionName = 'geodist_pt';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/STBuffer.php

@@ -0,0 +1,43 @@
+<?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\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * Description of ST_Intersects
+ *
+ * @author Maximilian
+ */
+class STBuffer extends AbstractSpatialDQLFunction
+{
+	 protected $platforms = array('mysql');
+
+    protected $functionName = 'ST_Buffer';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/STEquals.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (C) 2013 luca capra
+ *
+ * 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\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * ST_Equals DQL function
+ *
+ * @author  luca capra <[email protected]>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class STEquals extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('mysql');
+
+    protected $functionName = 'ST_Equals';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/STWithin.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (C) 2013 luca capra
+ *
+ * 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\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * ST_Within DQL function
+ *
+ * @author  luca capra <[email protected]>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class STWithin extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('mysql');
+
+    protected $functionName = 'ST_Within';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/ST_Buffer.php

@@ -0,0 +1,43 @@
+<?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\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * Description of ST_Intersects
+ *
+ * @author Maximilian
+ */
+class ST_Buffer extends AbstractSpatialDQLFunction
+{
+	 protected $platforms = array('mysql');
+
+    protected $functionName = 'ST_Buffer';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/ST_Intersects.php

@@ -0,0 +1,43 @@
+<?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\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * Description of ST_Intersects
+ *
+ * @author Maximilian
+ */
+class ST_Intersects extends AbstractSpatialDQLFunction
+{
+	 protected $platforms = array('mysql');
+
+    protected $functionName = 'ST_Intersects';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}