Snck3rs/contao-leaflet-maps
1
0
Fork 1
mirror of https://github.com/netzmacht/contao-leaflet-maps.git synced 2025-12-01 12:33:45 +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

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);
}
}
}