Snck3rs/contao-leaflet-maps
1
0
Fork 1
mirror of https://github.com/netzmacht/contao-leaflet-maps.git synced 2026-03-01 01:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor overpass support using own implementation of overpass layer.

Browse Source
This commit is contained in:
David Molineus
2016-11-14 11:00:10 +01:00
parent 130848c1f3
commit c61e2d9cc9
7 changed files with 447 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Netzmacht/Contao/Leaflet/Mapper/Layer/OverpassLayerMapper.php
View File

@@ -10,12 +10,12 @@
namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
use Model;
use Netzmacht\Contao\Leaflet\Definition\Layer\OverpassLayer;
use Netzmacht\Contao\Leaflet\Filter\Filter;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Mapper\OptionsBuilder;
use Netzmacht\JavascriptBuilder\Type\Expression;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Plugins\OverpassLayer\OverpassLayer;
/**
* Class OverpassLayerMapper
@@ -36,7 +36,7 @@ class OverpassLayerMapper extends AbstractLayerMapper
*
* @var string
*/
protected static $definitionClass = 'Netzmacht\LeafletPHP\Plugins\OverpassLayer\OverpassLayer';
protected static $definitionClass = 'Netzmacht\Contao\Leaflet\Definition\Layer\OverpassLayer';
/**
* {@inheritdoc}
@@ -47,8 +47,8 @@ class OverpassLayerMapper extends AbstractLayerMapper
$this->optionsBuilder
->addOption('query', 'overpassQuery')
->addOption('minzoom', 'minZoom')
->addOption('debug')
->addOption('minZoom')
->addOption('boundsMode')
->addOption('overpassEndpoint', 'endpoint');
}
@@ -57,7 +57,7 @@ class OverpassLayerMapper extends AbstractLayerMapper
*/
protected function build(
Definition $definition,
\Model $model,
Model $model,
DefinitionMapper $mapper,
Filter $filter = null,
Definition $parent = null
@@ -66,17 +66,12 @@ class OverpassLayerMapper extends AbstractLayerMapper
return;
}
$minZoomIndicatorOptions = $definition->getMinZoomIndicatorOptions();
$minZoomIndicatorOptionsBuilder = new OptionsBuilder();
$minZoomIndicatorOptionsBuilder
->addOption('position', 'minZoomIndicatorPosition')
->addOption('minZoomMessageNoLayer', 'minZoomIndicatorMessageNoLayer')
->addOption('minZoomMessage', 'minZoomIndicatorMessage');
if ($model->pointToLayer) {
$definition->setPointToLayer(new Expression($model->pointToLayer));
}
$minZoomIndicatorOptionsBuilder->build($minZoomIndicatorOptions, $model);
if ($model->overpassCallback) {
$definition->setCallback(new Expression($model->overpassCallback));
if ($model->onEachFeature) {
$definition->setOnEachFeature(new Expression($model->onEachFeature));
}
}
}