Feature/spatialite integration

Component/DataStore.php

@@ -3,7 +3,6 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Statement;
-use FOM\UserBundle\Entity\User;
 use Mapbender\DataSourceBundle\Component\Drivers\BaseDriver;
 use Mapbender\DataSourceBundle\Component\Drivers\DoctrineBaseDriver;
 use Mapbender\DataSourceBundle\Component\Drivers\Interfaces\Base;
@@ -12,7 +11,7 @@
 use Mapbender\DataSourceBundle\Component\Drivers\YAML;
 use Mapbender\DataSourceBundle\Entity\DataItem;
 use Symfony\Component\Config\Definition\Exception\Exception;
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -23,8 +22,10 @@
  * @package Mapbender\DataSourceBundle
  * @author  Andriy Oblivantsev <eslider@gmail.com>
  */
-class DataStore extends ContainerAware
+class DataStore
 {
+    use ContainerAwareTrait;
+
     const ORACLE_PLATFORM        = 'oracle';
     const POSTGRESQL_PLATFORM    = 'postgresql';
     const SQLITE_PLATFORM        = 'sqlite';

Component/Drivers/DoctrineBaseDriver.php

@@ -244,27 +244,7 @@ public function getSelectQueryBuilder(array $fields = array())
      */
     public function search(array $criteria = array())
     {
-
-        /** @var Statement $statement */
-        $maxResults   = isset($criteria['maxResults']) ? intval($criteria['maxResults']) : self::MAX_RESULTS;
-        $where        = isset($criteria['where']) ? $criteria['where'] : null;
-        $queryBuilder = $this->getSelectQueryBuilder();
-        //        $returnType   = isset($criteria['returnType']) ? $criteria['returnType'] : null;
-
-        // add filter (https://trac.wheregroup.com/cp/issues/3733)
-        if (!empty($this->sqlFilter)) {
-            $queryBuilder->andWhere($this->sqlFilter);
-        }
-
-        // add second filter (https://trac.wheregroup.com/cp/issues/4643)
-        if ($where) {
-            $queryBuilder->andWhere($where);
-        }
-
-        $queryBuilder->setMaxResults($maxResults);
-        // $queryBuilder->setParameters($params);
-        $statement  = $queryBuilder->execute();
-        $rows       = $statement->fetchAll();
+        $rows = $this->getSearchQueryBuilder($criteria)->execute()->fetchAll();
         $hasResults = count($rows) > 0;
 
         // Cast array to DataItem array list
@@ -439,6 +419,34 @@ public function getLastInsertId()
         return $this->getConnection()->lastInsertId();
     }
 
+    /**
+     * Get search query builder
+     *
+     * @param array $criteria
+     * @return QueryBuilder
+     */
+    public function getSearchQueryBuilder(array $criteria)
+    {
+        /** @var Statement $statement */
+        $maxResults   = isset($criteria['maxResults']) ? intval($criteria['maxResults']) : self::MAX_RESULTS;
+        $where        = isset($criteria['where']) ? $criteria['where'] : null;
+        $queryBuilder = $this->getSelectQueryBuilder();
+        //        $returnType   = isset($criteria['returnType']) ? $criteria['returnType'] : null;
+
+        // add filter (https://trac.wheregroup.com/cp/issues/3733)
+        if (!empty($this->sqlFilter)) {
+            $queryBuilder->andWhere($this->sqlFilter);
+        }
+
+        // add second filter (https://trac.wheregroup.com/cp/issues/4643)
+        if ($where) {
+            $queryBuilder->andWhere($where);
+        }
+
+        $queryBuilder->setMaxResults($maxResults);
+        return $queryBuilder;
+    }
+
     /**
      * Extract ordered type list from two associate key lists of data and types.
      *
@@ -459,4 +467,17 @@ protected function extractTypeValues(array $data, array $types)
 
         return $typeValues;
     }
+
+    /**
+     * Return next possible ID
+     *
+     * @return mixed
+     */
+    public function getNextPossibleId()
+    {
+        $con = $this->connection;
+        return $con->fetchColumn('SELECT MAX('
+            . $con->quoteIdentifier($this->getUniqueId())
+            . ")+1 FROM " . $con->quoteIdentifier($this->getTableName()));
+    }
 }

Component/Drivers/PostgreSQL.php

@@ -326,6 +326,17 @@ public function getGeomAttributeAsWkt($geometryAttribute, $sridTo)
         return "ST_ASTEXT(ST_TRANSFORM($geomFieldName, $sridTo)) AS $geomFieldName";
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getGeomAttributeAsJson($geometryAttribute, $sridTo)
+    {
+        $connection    = $this->getConnection();
+        $geomFieldName = $connection->quoteIdentifier($geometryAttribute);
+        $sridTo        = is_numeric($sridTo)?intval($sridTo):$connection->quote($sridTo);
+        return "ST_AsGeoJSON(ST_TRANSFORM($geomFieldName, $sridTo)) AS $geomFieldName";
+    }
+
     /**
      * @inheritdoc
      */

Component/Drivers/SQLite.php

@@ -1,14 +1,36 @@
 <?php
+
 namespace Mapbender\DataSourceBundle\Component\Drivers;
 
+use Eslider\SpatialiteShellDriver;
+use Mapbender\DataSourceBundle\Component\Drivers\Interfaces\Geographic;
+use Mapbender\DataSourceBundle\Entity\Feature;
+
 /**
  * Class SQLite
  *
  * @package Mapbender\DataSourceBundle\Component\Drivers
  * @author  Andriy Oblivantsev <eslider@gmail.com>
  */
-class SQLite extends DoctrineBaseDriver
+class SQLite extends PostgreSQL implements Geographic
 {
+    /**
+     * Get spatial driver instance
+     *
+     * @return SpatialiteShellDriver|null
+     */
+    public function getSpatialDriver()
+    {
+        static $driver = null;
+
+        if (!$driver) {
+            $dbPath = isset($this->settings['path']) ? $this->settings['path'] : $this->container->get('kernel')->getRootDir() . "/app/db/";
+            $driver = new SpatialiteShellDriver($dbPath);
+        }
+
+        return $driver;
+    }
+
     /**
      * Get table fields
      *
@@ -29,4 +51,112 @@ public function getStoreFields()
         }
         return $columns;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function search(array $criteria = array())
+    {
+        $sql        = $this->getSearchQueryBuilder($criteria)->getSQL();
+        $rows       = $this->getSpatialDriver()->query($sql);
+        $hasResults = count($rows) > 0;
+
+        // Cast array to DataItem array list
+        if ($hasResults) {
+            $this->prepareResults($rows);
+        }
+
+        return $rows;
+    }
+
+    /**
+     * Add geometry column
+     *
+     * @param        $tableName
+     * @param        $type
+     * @param        $srid
+     * @param string $geomFieldName
+     * @param string $schemaName
+     * @param int    $dimensions
+     * @return mixed
+     */
+    public function addGeometryColumn($tableName,
+        $type,
+        $srid,
+        $geomFieldName = "geom",
+        $schemaName = "public",
+        $dimensions = 2)
+    {
+        $spatialDriver = $this->getSpatialDriver();
+        return $spatialDriver->addGeometryColumn($tableName, $geomFieldName, $srid, $type);
+    }
+
+    /**
+     * Get table geometry type
+     *
+     * @param        $tableName
+     * @param string $schema
+     * @return mixed
+     */
+    public function getTableGeomType($tableName, $schema = null)
+    {
+        $connection = $this->getSpatialDriver();
+        if (strpos($tableName, '.')) {
+            list($schema, $tableName) = explode('.', $tableName);
+        }
+        $_schema = $schema ? $connection->quote($schema) : 'current_schema()';
+
+        $type = $connection->query("SELECT \"type\"
+                FROM geometry_columns
+                WHERE f_table_schema = " . $_schema . "
+                AND f_table_name = " . $connection->quote($tableName))->fetchColumn();
+        return $type;
+    }
+
+    /**
+     * @param      $ewkt
+     * @param null $srid
+     * @return mixed
+     * @internal param $wkt
+     */
+    public function transformEwkt($ewkt, $srid = null)
+    {
+        $db      = $this->getSpatialDriver();
+        $type    = $this->getTableGeomType($this->getTableName());
+        $wktType = static::getWktType($ewkt);
+
+        if ($type
+            && $wktType != $type
+            && in_array(strtoupper($wktType), Feature::$simpleGeometries)
+            && in_array(strtoupper($type), Feature::$complexGeometries)
+        ) {
+            $ewkt = 'SRID=' . $srid . ';' . $db->fetchColumn("SELECT ST_ASTEXT(ST_TRANSFORM(ST_MULTI(" . $db->quote($ewkt) . "),$srid))");
+        }
+
+        $srid = is_numeric($srid) ? intval($srid) : $db->quote($srid);
+        $ewkt = $db->quote($ewkt);
+
+        return $db->fetchColumn("SELECT ST_TRANSFORM(ST_GEOMFROMTEXT($ewkt), $srid)");
+    }
+
+    /**
+     * Get WKB geometry attribute as WKT
+     *
+     * @param  string $tableName
+     * @param  string $geomFieldName
+     * @return string SQL
+     */
+    public function findGeometryFieldSrid($tableName, $geomFieldName)
+    {
+        $connection = $this->getSpatialDriver();
+        $schemaName = "current_schema()";
+        if (strpos($tableName, ".")) {
+            list($schemaName, $tableName) = explode('.', $tableName);
+            $schemaName = $connection->quote($schemaName);
+        }
+
+        return $connection->fetchColumn("SELECT Find_SRID(" . $schemaName . ", 
+            " . $connection->quote($tableName) . ", 
+            " . $connection->quote($geomFieldName) . ")");
+    }
 }

Component/FeatureType.php

@@ -6,6 +6,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use Mapbender\CoreBundle\Component\Application as AppComponent;
 use Mapbender\DataSourceBundle\Component\Drivers\BaseDriver;
+use Mapbender\DataSourceBundle\Component\Drivers\DoctrineBaseDriver;
 use Mapbender\DataSourceBundle\Component\Drivers\Interfaces\Geographic;
 use Mapbender\DataSourceBundle\Component\Drivers\Oracle;
 use Mapbender\DataSourceBundle\Component\Drivers\PostgreSQL;
@@ -191,7 +192,17 @@ public function save($featureData, $autoUpdate = true)
         if ($this->allowSave) {
             // Insert if no ID given
             if (!$autoUpdate || !$feature->hasId()) {
-                $feature = $this->insert($feature);
+                try{
+                    $feature = $this->insert($feature);
+                } catch (\Exception $e){
+                    // Fallback, if can't save, course no auto ID set
+                    // then try it to set it manuel and try to save it one more time.
+                    $driver = $this->getDriver();
+                    if($driver instanceof  DoctrineBaseDriver){
+                        $feature->setId($driver->getNextPossibleId());
+                        $feature = $this->insert($feature);
+                    }
+                }
             } // Replace if has ID
             else {
                 $feature = $this->update($feature);
@@ -313,6 +324,8 @@ public function update($featureData)
      *
      * @param array $criteria
      * @return Feature[]
+     * @throws \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
+     * @throws \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
      */
     public function search(array $criteria = array())
     {

Controller/BaseController.php

@@ -15,7 +15,7 @@ class BaseController extends Controller
      */
     protected function getRequestData()
     {
-        $content = $this->getRequest()->getContent();
+        $content = $this->get('request_stack')->getCurrentRequest()->getContent();
         $request = array_merge($_POST, $_GET);
         if (!empty($content)) {
             $request = array_merge($request, json_decode($content, true));