Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Run composer require checker and solve issues.

Browse Source
This commit is contained in:
David Molineus
2018-08-23 14:35:25 +02:00
parent e73a4d4bdf
commit 3d45f6b2eb
29 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/AbstractActiveModel.php
View File

@@ -12,6 +12,7 @@
namespace Netzmacht\Contao\Leaflet\Model;
use Contao\Model;
use Contao\Model\Collection;
/**
@@ -19,7 +20,7 @@ use Contao\Model\Collection;
*
* @package Netzmacht\Contao\Leaflet\Model
*/
abstract class AbstractActiveModel extends \Model
abstract class AbstractActiveModel extends Model
{
/**
* Find an active model by its model id.

7
src/Model/ControlModel.php
View File

@@ -12,7 +12,8 @@
namespace Netzmacht\Contao\Leaflet\Model;
use Model\Collection;
use Contao\Database;
use Contao\Model\Collection;
/**
* Class ControlModel for the tl_leaflet_vector table.
@@ -42,7 +43,7 @@ LEFT JOIN tl_leaflet_control_layer c ON l.id = c.lid
WHERE c.cid=?
SQL;
$result = \Database::getInstance()
$result = Database::getInstance()
->prepare($query)
->execute($this->id);
@@ -68,7 +69,7 @@ c ON l.id = c.lid
WHERE c.cid=? AND l.active=1
SQL;
$result = \Database::getInstance()
$result = Database::getInstance()
->prepare($query)
->execute($this->id);

2
src/Model/LayerModel.php
View File

@@ -12,7 +12,7 @@
namespace Netzmacht\Contao\Leaflet\Model;
use Model\Collection;
use Contao\Model\Collection;
/**
* Class LayerModel for the tl_leaflet_layer table.

10
src/Model/MapModel.php
View File

@@ -12,7 +12,9 @@
namespace Netzmacht\Contao\Leaflet\Model;
use Model\Collection;
use Contao\Database;
use Contao\Model;
use Contao\Model\Collection;
/**
* Class MapModel for the tl_leaflet_map table.
@@ -22,7 +24,7 @@ use Model\Collection;
*
* @package Netzmacht\Contao\Leaflet\Model
*/
class MapModel extends \Model
class MapModel extends Model
{
/**
* Model table.
@@ -39,7 +41,7 @@ class MapModel extends \Model
public function findLayers()
{
$query = 'SELECT l.* FROM tl_leaflet_layer l LEFT JOIN tl_leaflet_map_layer m ON l.id = m.lid WHERE m.mid=?';
$result = \Database::getInstance()
$result = Database::getInstance()
->prepare($query)
->execute($this->id);
@@ -65,7 +67,7 @@ ON l.id = m.lid
WHERE m.mid=? AND l.active=1
SQL;
$result = \Database::getInstance()->prepare($query)->execute($this->id);
$result = Database::getInstance()->prepare($query)->execute($this->id);
if ($result->numRows) {
return Collection::createFromDbResult($result, 'tl_leaflet_layer');

4
src/Model/MarkerModel.php
View File

@@ -36,7 +36,7 @@ class MarkerModel extends AbstractActiveModel
* @param int $pid The parent id.
* @param Filter $filter The filter.
*
* @return \Model\Collection|null
* @return \Contao\Model\Collection|null
*/
public static function findByFilter($pid, Filter $filter = null)
{
@@ -59,7 +59,7 @@ class MarkerModel extends AbstractActiveModel
* @param int $pid The layer id.
* @param BboxFilter $filter The bbox filter.
*
* @return \Model\Collection|null
* @return \Contao\Model\Collection|null
*/
public static function findByBBoxFilter($pid, BboxFilter $filter)
{