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

Small fixed.

Browse Source
This commit is contained in:
David Molineus
2015-01-12 15:11:35 +01:00
parent 58b370b22a
commit 4dc6b396da
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.check-author.yml Normal file
View File

@@ -0,0 +1,3 @@
exclude:
languages

2
module/languages/en/tl_leaflet_layer.php
View File

@@ -39,7 +39,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_variant'][1] = 'Tile vari
$GLOBALS['TL_LANG']['tl_leaflet_layer']['active'][0] = 'Activate layer';
$GLOBALS['TL_LANG']['tl_leaflet_layer']['active'][1] = 'Activate layer on the map.';
$GLOBALS['TL_LANG']['tl_leaflet_layer']['reference'][0] = 'Reference';
$GLOBALS['TL_LANG']['tl_leaflet_layer']['reference'][1] = 'Choose the reference layer.';
$GLOBALS['TL_LANG']['tl_leaflet_layer']['reference'][1] = 'Choose the reference layer. Otherwise the same javscript object is used.';
$GLOBALS['TL_LANG']['tl_leaflet_layer']['standalone'][0] = 'Standalone';
$GLOBALS['TL_LANG']['tl_leaflet_layer']['standalone'][1] = 'Integrate reference as a copy of the referenced layer.';
$GLOBALS['TL_LANG']['tl_leaflet_layer']['markerCluster'][0] = 'Marker cluster';

2
src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
View File

@@ -75,7 +75,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
}
}
if ($definition instanceof GeoJson) {
if ($definition instanceof GeoJson || $definition instanceof GeoJsonAjax) {
if ($model->pointToLayer) {
$definition->setPointToLayer(new Expression($model->pointToLayer));
}

21
src/Netzmacht/Contao/Leaflet/Subscriber/EncoderSubscriber.php
View File

@@ -12,7 +12,9 @@
namespace Netzmacht\Contao\Leaflet\Subscriber;
use Netzmacht\Javascript\Event\BuildEvent;
use Netzmacht\Javascript\Event\EncodeValueEvent;
use Netzmacht\LeafletPHP\Definition\Map;
use Netzmacht\LeafletPHP\Definition\Type\Icon;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
@@ -29,9 +31,12 @@ class EncoderSubscriber implements EventSubscriberInterface
{
return array(
BuildEvent::NAME => array(
array('startWrapper', 1000),
array('endWrapper', -1000)
)
array('startWrapper', 100),
array('endWrapper', -100),
),
EncodeValueEvent::NAME => array(
array('encodeIcons', 100)
),
);
}
@@ -71,4 +76,14 @@ class EncoderSubscriber implements EventSubscriberInterface
$event->getOutput()->addLine($line);
}
}
public function encodeIcons(EncodeValueEvent $event)
{
$value = $event->getValue();
if ($value instanceof Icon) {
$event->addLine('ContaoLeaflet.getIcon(\'' . $value->getId() . '\')');
$event->stopPropagation();
}
}
}