Snck3rs/contao-leaflet-maps
1
0
Fork 1
mirror of https://github.com/netzmacht/contao-leaflet-maps.git synced 2025-12-03 05:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework element id generation.

Browse Source
This commit is contained in:
David Molineus
2015-01-09 13:41:09 +01:00
parent 37851110b0
commit efb36256c7
12 changed files with 128 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php
View File

@@ -15,9 +15,11 @@ use Netzmacht\Contao\Leaflet\Model\ControlModel;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
use Netzmacht\Contao\Leaflet\Model\MapModel;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Definition\Control;
use Netzmacht\LeafletPHP\Definition\Layer;
use Netzmacht\LeafletPHP\Definition\Map;
use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds;
use Netzmacht\LeafletPHP\Plugins\LeafletProviders\Provider;
class MapMapper extends AbstractMapper
{
@@ -63,11 +65,15 @@ class MapMapper extends AbstractMapper
/**
* @inheritdoc
*/
protected function buildConstructArguments(\Model $model, DefinitionMapper $mapper, LatLngBounds $bounds = null)
{
protected function buildConstructArguments(
\Model $model,
DefinitionMapper $mapper,
LatLngBounds $bounds = null,
$elementId = null
) {
return array(
$mapper->getMapId(),
$mapper->getMapId()
$this->getElementId($model, $elementId),
$this->getElementId($model, $elementId)
);
}
@@ -96,15 +102,16 @@ class MapMapper extends AbstractMapper
*/
private function buildControls(Map $map, MapModel $model, DefinitionMapper $mapper, LatLngBounds $bounds = null)
{
$collection = ControlModel::findBy(
array('pid=?', 'active=1'),
array($model->id),
array('order' => 'sorting')
);
$collection = ControlModel::findActiveBy('pid', $model->id, array('order' => 'sorting'));
if ($collection) {
foreach ($collection as $control) {
$control = $mapper->handle($control, $bounds);
if (!$collection) {
return;
}
foreach ($collection as $control) {
$control = $mapper->handle($control, $bounds);
if ($control instanceof Control) {
$map->addControl($control);
}
}
@@ -130,9 +137,9 @@ class MapMapper extends AbstractMapper
}
$layer = $mapper->handle($layer, $bounds);
/** @var Provider $layer */
$map->addLayer($layer);
if ($layer instanceof Layer) {
$map->addLayer($layer);
}
}
}
}