Merge branch 'release/3.0.0' of github.com:netzmacht/contao-leaflet-maps into release/3.0.0

This commit is contained in:
David Molineus
2017-11-13 10:03:16 +01:00
2 changed files with 3 additions and 3 deletions

View File

@@ -33,6 +33,7 @@ services:
arguments: arguments:
- '@netzmacht.contao_toolkit.dca.manager' - '@netzmacht.contao_toolkit.dca.manager'
- '@database_connection' - '@database_connection'
- '@netzmacht.contao_toolkit.repository_manager'
- '%netzmacht.contao_leaflet.controls%' - '%netzmacht.contao_leaflet.controls%'
netzmacht.contao_leaflet.listeners.dca.layer: netzmacht.contao_leaflet.listeners.dca.layer:
@@ -68,7 +69,7 @@ services:
- '%netzmacht.contao_leaflet.icons%' - '%netzmacht.contao_leaflet.icons%'
netzmacht.contao_leaflet.listeners.dca.style: netzmacht.contao_leaflet.listeners.dca.style:
class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener class: Netzmacht\Contao\Leaflet\Listener\Dca\StyleDcaListener
arguments: arguments:
- '%netzmacht.contao_leaflet.styles%' - '%netzmacht.contao_leaflet.styles%'

View File

@@ -128,8 +128,7 @@ class FileLayerMapper extends AbstractLayerMapper
return parent::createInstance($model, $mapper, $request, $elementId); return parent::createInstance($model, $mapper, $request, $elementId);
} }
$customId = $layerId . '_data'; $customLayer = new GeoJson($layerId);
$customLayer = new GeoJson($customId);
$layer->setCustomLayer($customLayer); $layer->setCustomLayer($customLayer);