Snck3rs/contao-leaflet-maps
1
0
Fork 1
mirror of https://github.com/netzmacht/contao-leaflet-maps.git synced 2025-12-02 04:53:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework filter handling to overcome static map identifier setting.

Browse Source
This commit is contained in:
David Molineus
2017-10-11 14:27:37 +02:00
parent abaf24821f
commit bf0fb35b21
35 changed files with 331 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mapper/Layer/GroupLayerMapper.php
View File

@@ -12,9 +12,10 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Contao\Model;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
use Netzmacht\Contao\Leaflet\Request\Request;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Definition\Group\LayerGroup;
use Netzmacht\LeafletPHP\Definition\Layer;
@@ -36,7 +37,7 @@ class GroupLayerMapper extends AbstractLayerMapper
/**
* {@inheritdoc}
*/
protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null)
protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null)
{
if ($model->groupType === 'feature') {
return 'Netzmacht\LeafletPHP\Definition\Group\FeatureGroup';
@@ -50,9 +51,9 @@ class GroupLayerMapper extends AbstractLayerMapper
*/
protected function build(
Definition $definition,
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
Definition $parent = null
) {
if (!$definition instanceof LayerGroup) {

10
src/Mapper/Layer/MarkerClusterLayerMapper.php
View File

@@ -12,11 +12,11 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Contao\Model;
use Netzmacht\Contao\Leaflet\ContaoAssets;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager;
use Netzmacht\Contao\Leaflet\Request\Request;
use Netzmacht\JavascriptBuilder\Type\AnonymousFunction;
use Netzmacht\JavascriptBuilder\Type\Expression;
use Netzmacht\LeafletPHP\Definition;
@@ -86,12 +86,12 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper
*/
protected function build(
Definition $definition,
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
Definition $parent = null
) {
parent::build($definition, $model, $mapper, $filter, $parent);
parent::build($definition, $model, $mapper, $request, $parent);
/** @var MarkerClusterGroup $definition */

31
src/Mapper/Layer/MarkersLayerMapper.php
View File

@@ -12,11 +12,12 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Contao\Model;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper;
use Netzmacht\Contao\Leaflet\Model\MarkerModel;
use Netzmacht\Contao\Leaflet\Frontend\RequestUrl;
use Netzmacht\Contao\Leaflet\Request\Request;
use Netzmacht\JavascriptBuilder\Type\Expression;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection;
@@ -39,7 +40,7 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
/**
* {@inheritdoc}
*/
protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null)
protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null)
{
if ($model->deferred) {
return 'Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson';
@@ -52,9 +53,9 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
* {@inheritdoc}
*/
protected function buildConstructArguments(
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
$elementId = null
) {
if ($model->deferred) {
@@ -71,7 +72,7 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
return array(
$this->getElementId($model, $elementId),
RequestUrl::create($model->id, null, null, $filter),
RequestUrl::create($model->id, null, null, $request),
array(),
$layer
);
@@ -79,11 +80,11 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
return array(
$this->getElementId($model, $elementId),
RequestUrl::create($model->id, null, null, $filter)
RequestUrl::create($model->id, null, null, $request)
);
}
return parent::buildConstructArguments($model, $mapper, $filter, $elementId);
return parent::buildConstructArguments($model, $mapper, $request, $elementId);
}
/**
@@ -91,9 +92,9 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
*/
protected function build(
Definition $definition,
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
Definition $parent = null
) {
if ($definition instanceof GeoJson) {
@@ -123,10 +124,10 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
/**
* {@inheritdoc}
*/
public function handleGeoJson(\Model $model, DefinitionMapper $mapper, Filter $filter = null)
public function handleGeoJson(Model $model, DefinitionMapper $mapper, Request $request = null)
{
$feature = new FeatureCollection();
$collection = $this->loadMarkerModels($model, $filter);
$collection = $this->loadMarkerModels($model, $request);
if ($collection) {
foreach ($collection as $item) {
@@ -145,15 +146,15 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
/**
* Load all layer markers.
*
* @param \Model $model The layer model.
* @param Filter $filter The request filter.
* @param Model $model The layer model.
* @param Request $request Optional building request.
*
* @return \Model\Collection|null
*/
protected function loadMarkerModels(\Model $model, Filter $filter = null)
protected function loadMarkerModels(Model $model, Request $request = null)
{
if ($model->boundsMode == 'fit') {
return MarkerModel::findByFilter($model->id, $filter);
return MarkerModel::findByFilter($model->id, $request->getFilter());
}
return MarkerModel::findByFilter($model->id);

6
src/Mapper/Layer/OverpassLayerMapper.php
View File

@@ -12,11 +12,11 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Model;
use Contao\Model;
use Netzmacht\Contao\Leaflet\Definition\Layer\OverpassLayer;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Model\IconModel;
use Netzmacht\Contao\Leaflet\Request\Request;
use Netzmacht\JavascriptBuilder\Type\Expression;
use Netzmacht\LeafletPHP\Definition;
@@ -62,7 +62,7 @@ class OverpassLayerMapper extends AbstractLayerMapper
Definition $definition,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
Definition $parent = null
) {
if (!$definition instanceof OverpassLayer) {

13
src/Mapper/Layer/ProviderLayerMapper.php
View File

@@ -12,9 +12,10 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Contao\Model;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Mapper\OptionsBuilder;
use Netzmacht\Contao\Leaflet\Request\Request;
use Netzmacht\LeafletPHP\Definition;
/**
@@ -53,7 +54,7 @@ class ProviderLayerMapper extends AbstractLayerMapper
/**
* {@inheritdoc}
*/
protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null)
protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null)
{
if (isset($this->providers[$model->tile_provider]['class'])) {
return $this->providers[$model->tile_provider]['class'];
@@ -67,9 +68,9 @@ class ProviderLayerMapper extends AbstractLayerMapper
*/
protected function build(
Definition $definition,
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
Definition $parent = null
) {
if (!empty($this->providers[$model->tile_provider]['options'])) {
@@ -85,9 +86,9 @@ class ProviderLayerMapper extends AbstractLayerMapper
* {@inheritdoc}
*/
protected function buildConstructArguments(
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
$elementId = null
) {
return array(

6
src/Mapper/Layer/ReferenceLayerMapper.php
View File

@@ -12,9 +12,9 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
use Netzmacht\Contao\Leaflet\Request\Request;
use Netzmacht\LeafletPHP\Definition;
/**
@@ -37,7 +37,7 @@ class ReferenceLayerMapper extends AbstractLayerMapper
public function handle(
$model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
$elementId = null,
Definition $parent = null
) {
@@ -49,6 +49,6 @@ class ReferenceLayerMapper extends AbstractLayerMapper
$elementId = $model->standalone ? $this->getElementId($model, $elementId) : null;
return $mapper->handle($reference, $filter, $elementId);
return $mapper->handle($reference, $request, $elementId);
}
}

28
src/Mapper/Layer/TileLayerMapper.php
View File

@@ -12,8 +12,10 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Contao\Model;
use Contao\StringUtil;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Request\Request;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Definition\Raster\TileLayer;
use Netzmacht\LeafletPHP\Value\LatLngBounds;
@@ -64,12 +66,12 @@ class TileLayerMapper extends AbstractLayerMapper
* {@inheritdoc}
*/
protected function buildConstructArguments(
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
$elementId = null
) {
$arguments = parent::buildConstructArguments($model, $mapper, $filter, $elementId);
$arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId);
$arguments[] = $model->tileUrl;
@@ -81,26 +83,26 @@ class TileLayerMapper extends AbstractLayerMapper
*/
protected function build(
Definition $definition,
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
Definition $parent = null
) {
parent::build($definition, $model, $mapper, $filter, $parent);
parent::build($definition, $model, $mapper, $request, $parent);
/** @var TileLayer $definition */
$filter = deserialize($model->bounds);
$bounds = StringUtil::deserialize($model->bounds);
if ($filter[0] && $filter[1]) {
$filter = array_map(
if ($request[0] && $request[1]) {
$bounds = array_map(
function ($value) {
return explode(',', $value, 3);
},
$filter
$bounds
);
$filter = LatLngBounds::fromArray($filter);
$definition->setBounds($filter);
$bounds = LatLngBounds::fromArray($bounds);
$definition->setBounds($bounds);
}
}
}

31
src/Mapper/Layer/VectorsLayerMapper.php
View File

@@ -12,16 +12,17 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Contao\Model;
use Contao\Model\Collection;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper;
use Netzmacht\Contao\Leaflet\Model\VectorModel;
use Netzmacht\Contao\Leaflet\Frontend\RequestUrl;
use Netzmacht\Contao\Leaflet\Request\Request;
use Netzmacht\JavascriptBuilder\Type\Expression;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection;
use Netzmacht\LeafletPHP\Definition\Group\GeoJson;
use Netzmacht\LeafletPHP\Definition\Vector;
/**
* Class VectorsLayerMapper maps the layer model for the Vectors layer definition.
@@ -40,7 +41,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
/**
* {@inheritdoc}
*/
protected function getClassName(\Model $model, DefinitionMapper $mapper, Filter $filter = null)
protected function getClassName(Model $model, DefinitionMapper $mapper, Request $request = null)
{
if ($model->deferred) {
return 'Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson';
@@ -53,9 +54,9 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
* {@inheritdoc}
*/
protected function buildConstructArguments(
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
$elementId = null
) {
if ($model->deferred) {
@@ -79,7 +80,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
return array(
$this->getElementId($model, $elementId),
RequestUrl::create($model->id, null, null, $filter),
RequestUrl::create($model->id, null, null, $request),
array(),
$layer
);
@@ -87,11 +88,11 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
return array(
$this->getElementId($model, $elementId),
RequestUrl::create($model->id, null, null, $filter)
RequestUrl::create($model->id, null, null, $request)
);
}
return parent::buildConstructArguments($model, $mapper, $filter, $elementId);
return parent::buildConstructArguments($model, $mapper, $request, $elementId);
}
/**
@@ -99,9 +100,9 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
*/
protected function build(
Definition $definition,
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Request $request = null,
Definition $parent = null
) {
if ($definition instanceof GeoJson) {
@@ -129,7 +130,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
/**
* {@inheritdoc}
*/
public function handleGeoJson(\Model $model, DefinitionMapper $mapper, Filter $filter = null)
public function handleGeoJson(Model $model, DefinitionMapper $mapper, Request $request = null)
{
$definition = new FeatureCollection();
$collection = $this->loadVectorModels($model);
@@ -151,13 +152,13 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
/**
* Load vector models.
*
* @param \Model $model The layer model.
* @param Model $model The layer model.
*
* @return \Model\Collection|null
* @return Collection|null
*/
protected function loadVectorModels(\Model $model)
protected function loadVectorModels(Model $model)
{
return VectorModel::findActiveBy('pid', $model->id, array('order' => 'sorting'));
return VectorModel::findActiveBy('pid', $model->id, ['order' => 'sorting']);
}
/**