-
-
-headline; ?> version; ?>
-
-
About
-
-
-- The Leaflet maps integration for Contao CMS is an Open Source Software license under the LGPL 3.0. - This extension is only exists because of great other Open Source Software which it heavenly depends on. -
-- This software ships with an visible attribution to netzmacht creative in the map attribution control. - If you want to remove this attribution, you have to purchase a commercial license. - For more details visit the project website. -
+
+
- headline; ?> + version; ?> +
- >
- 
-
-
-
- netzmacht
- David Molineus
-
- DAB Bank München
- IBAN: DE52701204008354237003
- BIC: DABBDEMMXXX
-
-
Support Contao Leaflet
- -
-
-
- Report issues
-If you found a bug, got some troubles or have a feature request - feel free to open an issue.
- -
-
Contribute
-There are many ways you can contribute. Translations, - documentation or code contributions are welcome. +
+
-' . $this->javascript .''; ?>
+' . $this->javascript . ''; ?>
diff --git a/src/Bundle/Resources/public/css/about.css b/src/Bundle/Resources/public/css/about.css
index 0e71c71..87f8827 100644
--- a/src/Bundle/Resources/public/css/about.css
+++ b/src/Bundle/Resources/public/css/about.css
@@ -3,7 +3,6 @@
padding: 15px;
}
-
.netzmacht-leaflet-credits a {
color: #669A00;
}
@@ -17,7 +16,7 @@
.netzmacht-leaflet-credits h1 {
color: #fff;
font-size: 1.4em;
- text-shadow: 0 -1px 1px rgba(0,0,0,0.35);
+ text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.35);
}
.netzmacht-leaflet-credits .row:after {
diff --git a/src/Bundle/Resources/public/css/backend.css b/src/Bundle/Resources/public/css/backend.css
index 36cc7b9..09d7686 100644
--- a/src/Bundle/Resources/public/css/backend.css
+++ b/src/Bundle/Resources/public/css/backend.css
@@ -1,9 +1,9 @@
-.tl_listing_container.tree_view ul > li.tl_file {
+.tl_listing_container.tree_view ul > li.tl_file {
background: url('./../img/fol-placeholder.gif') no-repeat 6px 4px;
}
-.tl_listing_container.tree_view ul > li.tl_file > div {
+.tl_listing_container.tree_view ul > li.tl_file > div {
line-height: 18px;
}
@@ -11,15 +11,15 @@
padding-left: 26px;
}
-.tl_listing_container.tree_view ul > li.parent > ul {
+.tl_listing_container.tree_view ul > li.parent > ul {
padding-left: 20px;
}
-.tl_listing_container.tree_view ul > li > .tl_left > a {
+.tl_listing_container.tree_view ul > li > .tl_left > a {
margin-left: -20px;
}
-.tl_listing_container.tree_view ul[class="level_1"] li.tl_file > .tl_left {
+.tl_listing_container.tree_view ul[class="level_1"] li.tl_file > .tl_left {
padding-left: 20px !important;
}
diff --git a/src/Bundle/Resources/public/js/backend.js b/src/Bundle/Resources/public/js/backend.js
index 1e5f383..94c802d 100644
--- a/src/Bundle/Resources/public/js/backend.js
+++ b/src/Bundle/Resources/public/js/backend.js
@@ -30,7 +30,7 @@ var ContaoLeafletAjaxRequest = {
published = (image.get('data-state') == 1),
div = el.getParent('div'),
index, next, icon, icond, pa;
- img = div.getParent('li').getFirst('.tl_left img.list-icon');
+ img = div.getParent('li').getFirst('.tl_left img.list-icon');
// Change the icon
if (img !== null && img.nodeName.toLowerCase() == 'img') {
diff --git a/src/Encoder/ContaoAssets.php b/src/Encoder/ContaoAssets.php
index e3e39cc..902b21d 100644
--- a/src/Encoder/ContaoAssets.php
+++ b/src/Encoder/ContaoAssets.php
@@ -44,7 +44,7 @@ class ContaoAssets implements Assets
private $cache = [
'stylesheets' => [],
'javascripts' => [],
- 'map' => []
+ 'map' => [],
];
/**
diff --git a/src/Encoder/Subscriber/EncoderSubscriber.php b/src/Encoder/Subscriber/EncoderSubscriber.php
index db11ad0..55fe1eb 100644
--- a/src/Encoder/Subscriber/EncoderSubscriber.php
+++ b/src/Encoder/Subscriber/EncoderSubscriber.php
@@ -34,7 +34,7 @@ class EncoderSubscriber implements EventSubscriberInterface
public static function getSubscribedEvents()
{
return [
- EncodeValueEvent::NAME => [
+ EncodeValueEvent::NAME => [
['encodeIcons', 1000],
['loadLayer', 100],
],
diff --git a/src/Filter/BboxFilter.php b/src/Filter/BboxFilter.php
index d319abe..4b637e8 100644
--- a/src/Filter/BboxFilter.php
+++ b/src/Filter/BboxFilter.php
@@ -68,7 +68,7 @@ class BboxFilter implements Filter
*/
public function getValues()
{
- return array('bounds' => $this->bounds);
+ return ['bounds' => $this->bounds];
}
/**
diff --git a/src/Filter/DistanceFilter.php b/src/Filter/DistanceFilter.php
index 590ce57..6c062e3 100644
--- a/src/Filter/DistanceFilter.php
+++ b/src/Filter/DistanceFilter.php
@@ -88,9 +88,9 @@ class DistanceFilter implements Filter
*/
public function getValues()
{
- return array(
+ return [
'radius' => $this->radius,
- 'center' => $this->center
- );
+ 'center' => $this->center,
+ ];
}
}
diff --git a/src/Frontend/DataController.php b/src/Frontend/DataController.php
index 166f522..c5dd4cc 100644
--- a/src/Frontend/DataController.php
+++ b/src/Frontend/DataController.php
@@ -28,13 +28,13 @@ class DataController
*
* @var array
*/
- private $input = array(
+ private $input = [
'format' => 'geojson',
'type' => 'layer',
'id' => null,
'filter' => null,
- 'values' => null
- );
+ 'values' => null,
+ ];
/**
* Debug mode.
@@ -140,9 +140,9 @@ class DataController
default:
$error = true;
- return array($data, $error);
+ return [$data, $error];
}
- return array($data, $error);
+ return [$data, $error];
}
}
diff --git a/src/Frontend/RequestUrl.php b/src/Frontend/RequestUrl.php
index 4a6f038..8603a9d 100644
--- a/src/Frontend/RequestUrl.php
+++ b/src/Frontend/RequestUrl.php
@@ -57,12 +57,12 @@ class RequestUrl implements \JsonSerializable
*/
public static function create($dataId, $type = null, $format = null, Request $request = null)
{
- $params = array(
+ $params = [
'for' => $request ? $request->getMapIdentifier() : null,
'type' => $type != 'layer' ? $type : null,
'id' => $dataId,
- 'format' => $format != 'geojson' ? $format : null
- );
+ 'format' => $format != 'geojson' ? $format : null,
+ ];
$hash = base64_encode(implode(',', $params));
$query = 'leaflet=' . $hash;
diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php
index f9f33f4..b490b8f 100644
--- a/src/Listener/Dca/ControlDcaListener.php
+++ b/src/Listener/Dca/ControlDcaListener.php
@@ -110,7 +110,7 @@ class ControlDcaListener extends AbstractListener
*/
public function getZoomControls()
{
- $collection = ControlModel::findBy('type', 'zoom', array('order' => 'title'));
+ $collection = ControlModel::findBy('type', 'zoom', ['order' => 'title']);
return OptionsBuilder::fromCollection($collection, 'title')->getOptions();
}
@@ -166,7 +166,7 @@ class ControlDcaListener extends AbstractListener
'lid' => $layer['layer'],
'cid' => $dataContainer->id,
'mode' => $layer['mode'],
- 'sorting' => $sorting
+ 'sorting' => $sorting,
];
$this->connection->insert('tl_leaflet_control_layer', $data);
@@ -177,10 +177,10 @@ class ControlDcaListener extends AbstractListener
[
'tstamp' => time(),
'sorting' => $sorting,
- 'mode' => $layer['mode']
+ 'mode' => $layer['mode'],
],
[
- 'id' => $values[$layer['layer']]['id']
+ 'id' => $values[$layer['layer']]['id'],
]
);
diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php
index d1ce1cd..23a2d6d 100644
--- a/src/Listener/Dca/LayerDcaListener.php
+++ b/src/Listener/Dca/LayerDcaListener.php
@@ -52,7 +52,7 @@ class LayerDcaListener extends AbstractListener
* @var Connection
*/
private $connection;
-
+
/**
* Tile providers configuration.
*
@@ -149,7 +149,7 @@ class LayerDcaListener extends AbstractListener
return $this->tileProviders[$dataContainer->activeRecord->tile_provider]['variants'];
}
- return array();
+ return [];
}
/**
@@ -233,8 +233,8 @@ class LayerDcaListener extends AbstractListener
public function getPasteButtons($dataContainer, $row, $table, $whatever, $children)
{
$pasteAfterUrl = \Controller::addToUrl(
- 'act='.$children['mode'].'&mode=1&pid='.$row['id']
- .(!is_array($children['id']) ? '&id='.$children['id'] : '')
+ 'act=' . $children['mode'] . '&mode=1&pid=' . $row['id']
+ . (!is_array($children['id']) ? '&id=' . $children['id'] : '')
. '&rt=' . RequestToken::get()
);
@@ -254,7 +254,7 @@ class LayerDcaListener extends AbstractListener
'act=%s&mode=2&pid=%s%s',
$children['mode'],
$row['id'],
- !is_array($children['id']) ? '&id='.$children['id'] : ''
+ !is_array($children['id']) ? '&id=' . $children['id'] : ''
) . '&rt=' . RequestToken::get()
);
@@ -365,7 +365,7 @@ class LayerDcaListener extends AbstractListener
*/
public function getBoundsModes($dataContainer)
{
- $options = array();
+ $options = [];
if ($dataContainer->activeRecord && !empty($this->layers[$dataContainer->activeRecord->type]['boundsMode'])) {
foreach ($this->layers[$dataContainer->activeRecord->type]['boundsMode'] as $mode => $enabled) {
@@ -413,7 +413,7 @@ class LayerDcaListener extends AbstractListener
*/
public function getIcons()
{
- $collection = IconModel::findAll(array('order' => 'title'));
+ $collection = IconModel::findAll(['order' => 'title']);
$builder = OptionsBuilder::fromCollection(
$collection,
function ($model) {
diff --git a/src/Listener/Dca/LeafletDcaListener.php b/src/Listener/Dca/LeafletDcaListener.php
index d9f5126..704538d 100644
--- a/src/Listener/Dca/LeafletDcaListener.php
+++ b/src/Listener/Dca/LeafletDcaListener.php
@@ -100,8 +100,8 @@ class LeafletDcaListener
*/
public function getLayers()
{
- $options = array();
- $collection = LayerModel::findBy('pid', '0', array('order' => 'title'));
+ $options = [];
+ $collection = LayerModel::findBy('pid', '0', ['order' => 'title']);
if ($collection) {
foreach ($collection as $model) {
diff --git a/src/Listener/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php
index acc2c47..e6fa765 100644
--- a/src/Listener/Dca/MapDcaListener.php
+++ b/src/Listener/Dca/MapDcaListener.php
@@ -90,7 +90,7 @@ class MapDcaListener extends AbstractListener
public function saveLayerRelations($layerId, $dataContainer)
{
$new = array_filter(StringUtil::deserialize($layerId, true));
- $values = array();
+ $values = [];
$statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting');
$statement->bindValue('mid', $dataContainer->id);
@@ -108,7 +108,7 @@ class MapDcaListener extends AbstractListener
'tstamp' => time(),
'lid' => $layerId,
'mid' => $dataContainer->id,
- 'sorting' => $sorting
+ 'sorting' => $sorting,
];
$this->connection->insert('tl_leaflet_map_layer', $data);
diff --git a/src/Listener/Dca/MarkerDcaListener.php b/src/Listener/Dca/MarkerDcaListener.php
index 4fa565b..0ecb3f3 100644
--- a/src/Listener/Dca/MarkerDcaListener.php
+++ b/src/Listener/Dca/MarkerDcaListener.php
@@ -71,7 +71,7 @@ class MarkerDcaListener
*/
public function getIcons()
{
- $collection = IconModel::findAll(array('order' => 'title'));
+ $collection = IconModel::findAll(['order' => 'title']);
$builder = OptionsBuilder::fromCollection(
$collection,
function ($model) {
@@ -89,7 +89,7 @@ class MarkerDcaListener
*/
public function getPopups()
{
- $collection = PopupModel::findAll(array('order' => 'title'));
+ $collection = PopupModel::findAll(['order' => 'title']);
$builder = OptionsBuilder::fromCollection($collection, 'title');
return $builder->getOptions();
@@ -105,11 +105,11 @@ class MarkerDcaListener
*/
public function saveCoordinates($value, $dataContainer)
{
- $combined = array(
+ $combined = [
'latitude' => null,
'longitude' => null,
- 'altitude' => null
- );
+ 'altitude' => null,
+ ];
$values = trimsplit(',', $value);
$keys = array_keys($combined);
diff --git a/src/Listener/Dca/VectorDcaListener.php b/src/Listener/Dca/VectorDcaListener.php
index a8aec5d..d9a99bd 100644
--- a/src/Listener/Dca/VectorDcaListener.php
+++ b/src/Listener/Dca/VectorDcaListener.php
@@ -86,7 +86,7 @@ class VectorDcaListener extends AbstractListener
*/
public function getStyles()
{
- $collection = StyleModel::findAll(array('order' => 'title'));
+ $collection = StyleModel::findAll(['order' => 'title']);
return OptionsBuilder::fromCollection($collection, 'title')->getOptions();
}
@@ -98,7 +98,7 @@ class VectorDcaListener extends AbstractListener
*/
public function getIcons()
{
- $collection = IconModel::findAll(array('order' => 'title'));
+ $collection = IconModel::findAll(['order' => 'title']);
$builder = OptionsBuilder::fromCollection(
$collection,
function ($model) {
@@ -116,7 +116,7 @@ class VectorDcaListener extends AbstractListener
*/
public function getPopups()
{
- $collection = PopupModel::findAll(array('order' => 'title'));
+ $collection = PopupModel::findAll(['order' => 'title']);
$builder = OptionsBuilder::fromCollection($collection, 'title');
return $builder->getOptions();
diff --git a/src/Listener/GeoJsonListener.php b/src/Listener/GeoJsonListener.php
index c1f26f1..3719ea2 100644
--- a/src/Listener/GeoJsonListener.php
+++ b/src/Listener/GeoJsonListener.php
@@ -123,7 +123,7 @@ final class GeoJsonListener
public function enrichCircle(GeoJsonObject $feature, LeafletDefinition $definition)
{
if ($definition instanceof Circle && !$definition instanceof CircleMarker && $feature instanceof Feature) {
- $feature->setProperty('arguments', array($definition->getLatLng(), $definition->getRadius()));
+ $feature->setProperty('arguments', [$definition->getLatLng(), $definition->getRadius()]);
}
}
@@ -186,7 +186,7 @@ final class GeoJsonListener
if ($collection) {
$value = $collection->fetchEach('path');
} else {
- $value = array();
+ $value = [];
}
break;
diff --git a/src/Listener/HashSubscriber.php b/src/Listener/HashSubscriber.php
index bd4a9a8..ba375c0 100644
--- a/src/Listener/HashSubscriber.php
+++ b/src/Listener/HashSubscriber.php
@@ -27,12 +27,12 @@ class HashSubscriber implements EventSubscriberInterface
*/
public static function getSubscribedEvents()
{
- return array(
- GetHashEvent::NAME => array(
- array('getModelHash'),
- array('getFallback', -100)
- )
- );
+ return [
+ GetHashEvent::NAME => [
+ ['getModelHash'],
+ ['getFallback', -100],
+ ],
+ ];
}
/**
diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php
index 652bf14..21c7a05 100644
--- a/src/Listener/LoadAssetsListener.php
+++ b/src/Listener/LoadAssetsListener.php
@@ -127,12 +127,12 @@ class LoadAssetsListener
$assets = $this->libraries[$library];
if (!empty($assets['css'])) {
- list ($source, $type) = (array)$assets['css'];
+ list ($source, $type) = (array) $assets['css'];
$this->assets->addStylesheet($source, $type ?: Assets::TYPE_FILE);
}
if (!empty($assets['javascript'])) {
- list ($source, $type) = (array)$assets['javascript'];
+ list ($source, $type) = (array) $assets['javascript'];
$this->assets->addJavascript($source, $type ?: Assets::TYPE_FILE);
}
}
diff --git a/src/MapProvider.php b/src/MapProvider.php
index 483ee32..2fd944d 100644
--- a/src/MapProvider.php
+++ b/src/MapProvider.php
@@ -201,8 +201,8 @@ class MapProvider
$this->cache->save(
$cacheKey,
[
- 'assets' => $this->assets->toArray(),
- 'javascript' => $buffer
+ 'assets' => $this->assets->toArray(),
+ 'javascript' => $buffer,
],
(int) $model->cacheLifeTime
);
@@ -279,7 +279,7 @@ class MapProvider
throw new \RuntimeException('Bad request. Could not resolve query params');
}
- $data = array_combine(array('for', 'type', 'id', 'format', 'filter', 'values'), $data);
+ $data = array_combine(['for', 'type', 'id', 'format', 'filter', 'values'], $data);
$data = array_filter($data);
if (empty($data['for']) || $data['for'] != $identifier) {
diff --git a/src/Mapper/AbstractMapper.php b/src/Mapper/AbstractMapper.php
index 308418c..511da9d 100644
--- a/src/Mapper/AbstractMapper.php
+++ b/src/Mapper/AbstractMapper.php
@@ -156,9 +156,9 @@ abstract class AbstractMapper implements Mapper
Request $request = null,
$elementId = null
) {
- return array(
- $this->getElementId($model, $elementId)
- );
+ return [
+ $this->getElementId($model, $elementId),
+ ];
}
/**
diff --git a/src/Mapper/Control/LayersControlMapper.php b/src/Mapper/Control/LayersControlMapper.php
index 6ef2b0e..f9222be 100644
--- a/src/Mapper/Control/LayersControlMapper.php
+++ b/src/Mapper/Control/LayersControlMapper.php
@@ -49,8 +49,8 @@ class LayersControlMapper extends AbstractControlMapper
$elementId = null
) {
$arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId);
- $arguments[1] = array();
- $arguments[2] = array();
+ $arguments[1] = [];
+ $arguments[2] = [];
/** @var ControlModel $model */
$collection = $model->findActiveLayers();
diff --git a/src/Mapper/Control/LoadingControlMapper.php b/src/Mapper/Control/LoadingControlMapper.php
index f6a2986..8466a0e 100644
--- a/src/Mapper/Control/LoadingControlMapper.php
+++ b/src/Mapper/Control/LoadingControlMapper.php
@@ -80,8 +80,8 @@ class LoadingControlMapper extends AbstractControlMapper
if ($definition instanceof LoadingControl && !$definition->isSeparate() && $model->zoomControl) {
// Only assign if zoom control is activated and part of the map.
$control = ControlModel::findOneBy(
- array('active=1', 'type=?', 'pid=?', 'id=?'),
- array('zoom', $model->pid, $model->zoomControl)
+ ['active=1', 'type=?', 'pid=?', 'id=?'],
+ ['zoom', $model->pid, $model->zoomControl]
);
if ($control) {
diff --git a/src/Mapper/DefinitionMapper.php b/src/Mapper/DefinitionMapper.php
index e3e544f..331e4fe 100644
--- a/src/Mapper/DefinitionMapper.php
+++ b/src/Mapper/DefinitionMapper.php
@@ -34,7 +34,7 @@ class DefinitionMapper
*
* @var Mapper[][]
*/
- private $mappers = array();
+ private $mappers = [];
/**
* The event dispatcher.
@@ -48,7 +48,7 @@ class DefinitionMapper
*
* @var array
*/
- private $mapped = array();
+ private $mapped = [];
/**
* Construct.
@@ -84,7 +84,7 @@ class DefinitionMapper
*/
public function reset()
{
- $this->mapped = array();
+ $this->mapped = [];
return $this;
}
diff --git a/src/Mapper/Layer/GroupLayerMapper.php b/src/Mapper/Layer/GroupLayerMapper.php
index 8292aa2..2c6d67e 100644
--- a/src/Mapper/Layer/GroupLayerMapper.php
+++ b/src/Mapper/Layer/GroupLayerMapper.php
@@ -62,9 +62,9 @@ class GroupLayerMapper extends AbstractLayerMapper
}
$collection = LayerModel::findBy(
- array('pid=?', 'active=1'),
- array($model->id),
- array('order' => 'sorting')
+ ['pid=?', 'active=1'],
+ [$model->id],
+ ['order' => 'sorting']
);
if ($collection) {
diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php
index b5ca318..f4a0e54 100644
--- a/src/Mapper/Layer/MarkerClusterLayerMapper.php
+++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php
@@ -108,9 +108,9 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper
}
$collection = LayerModel::findBy(
- array('pid=?', 'active=1'),
- array($model->id),
- array('order' => 'sorting')
+ ['pid=?', 'active=1'],
+ [$model->id],
+ ['order' => 'sorting']
);
if ($collection) {
diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php
index 5bea0ea..34d8652 100644
--- a/src/Mapper/Layer/MarkersLayerMapper.php
+++ b/src/Mapper/Layer/MarkersLayerMapper.php
@@ -71,18 +71,18 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
$layer->setOption('boundsMode', $model->boundsMode);
}
- return array(
+ return [
$this->getElementId($model, $elementId),
RequestUrl::create($model->id, null, null, $request),
- array(),
- $layer
- );
+ [],
+ $layer,
+ ];
}
- return array(
+ return [
$this->getElementId($model, $elementId),
- RequestUrl::create($model->id, null, null, $request)
- );
+ RequestUrl::create($model->id, null, null, $request),
+ ];
}
return parent::buildConstructArguments($model, $mapper, $request, $elementId);
diff --git a/src/Mapper/Layer/ProviderLayerMapper.php b/src/Mapper/Layer/ProviderLayerMapper.php
index 7a98417..4b52a5d 100644
--- a/src/Mapper/Layer/ProviderLayerMapper.php
+++ b/src/Mapper/Layer/ProviderLayerMapper.php
@@ -92,10 +92,10 @@ class ProviderLayerMapper extends AbstractLayerMapper
Request $request = null,
$elementId = null
) {
- return array(
+ return [
$model->alias ?: ('layer_' . $model->id),
$model->tile_provider,
- $model->tile_provider_variant ?: null
- );
+ $model->tile_provider_variant ?: null,
+ ];
}
}
diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php
index ab79f4f..879b6fc 100644
--- a/src/Mapper/Layer/VectorsLayerMapper.php
+++ b/src/Mapper/Layer/VectorsLayerMapper.php
@@ -61,7 +61,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
$elementId = null
) {
if ($model->deferred) {
- $options = array();
+ $options = [];
if ($model->pointToLayer) {
$options['pointToLayer'] = new Expression($model->pointToLayer);
@@ -79,18 +79,18 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
$layer = new GeoJson($this->getElementId($model, $elementId));
$layer->setOptions($options);
- return array(
+ return [
$this->getElementId($model, $elementId),
RequestUrl::create($model->id, null, null, $request),
- array(),
- $layer
- );
+ [],
+ $layer,
+ ];
}
- return array(
+ return [
$this->getElementId($model, $elementId),
- RequestUrl::create($model->id, null, null, $request)
- );
+ RequestUrl::create($model->id, null, null, $request),
+ ];
}
return parent::buildConstructArguments($model, $mapper, $request, $elementId);
diff --git a/src/Mapper/MapMapper.php b/src/Mapper/MapMapper.php
index 05eb513..5ab4f04 100644
--- a/src/Mapper/MapMapper.php
+++ b/src/Mapper/MapMapper.php
@@ -50,8 +50,8 @@ class MapMapper extends AbstractMapper
->addOptions('center', 'zoom', 'zoomControl')
->addOptions('dragging', 'touchZoom', 'scrollWheelZoom', 'doubleClickZoom', 'boxZoom', 'tap', 'keyboard')
->addOptions('trackResize', 'closeOnClick', 'bounceAtZoomLimits')
- ->addConditionalOptions('adjustZoomExtra', array('minZoom', 'maxZoom', 'zoomSnap', 'zoomDelta'))
- ->addConditionalOptions('keyboard', array('keyboardPanOffset', 'keyboardZoomOffset'));
+ ->addConditionalOptions('adjustZoomExtra', ['minZoom', 'maxZoom', 'zoomSnap', 'zoomDelta'])
+ ->addConditionalOptions('keyboard', ['keyboardPanOffset', 'keyboardZoomOffset']);
}
/**
@@ -82,10 +82,10 @@ class MapMapper extends AbstractMapper
Request $request = null,
$elementId = null
) {
- return array(
+ return [
$this->getElementId($model, $elementId),
- $this->getElementId($model, $elementId)
- );
+ $this->getElementId($model, $elementId),
+ ];
}
/**
@@ -121,7 +121,7 @@ class MapMapper extends AbstractMapper
*/
private function buildControls(Map $map, MapModel $model, DefinitionMapper $mapper, Request $request = null)
{
- $collection = ControlModel::findActiveBy('pid', $model->id, array('order' => 'sorting'));
+ $collection = ControlModel::findActiveBy('pid', $model->id, ['order' => 'sorting']);
if (!$collection) {
return;
@@ -207,13 +207,13 @@ class MapMapper extends AbstractMapper
private function buildLocate(Map $map, MapModel $model)
{
if ($model->locate) {
- $options = array();
+ $options = [];
- $mapping = array(
+ $mapping = [
'setView' => 'locateSetView',
'watch' => 'locateWatch',
'enableHighAccuracy' => 'enableHighAccuracy',
- );
+ ];
foreach ($mapping as $option => $property) {
if ($model->$property) {
@@ -221,11 +221,11 @@ class MapMapper extends AbstractMapper
}
}
- $mapping = array(
+ $mapping = [
'maxZoom' => 'locateMaxZoom',
'timeout' => 'locateTimeout',
'maximumAge' => 'locateMaximumAge',
- );
+ ];
foreach ($mapping as $option => $property) {
if ($model->$property) {
diff --git a/src/Mapper/OptionsBuilder.php b/src/Mapper/OptionsBuilder.php
index 01522f4..c6b307b 100644
--- a/src/Mapper/OptionsBuilder.php
+++ b/src/Mapper/OptionsBuilder.php
@@ -9,6 +9,7 @@
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
* @filesource
*/
+
namespace Netzmacht\Contao\Leaflet\Mapper;
use Contao\Model;
@@ -30,14 +31,14 @@ class OptionsBuilder
*
* @var array
*/
- private $options = array();
+ private $options = [];
/**
* Conditional option mapping.
*
* @var array
*/
- private $conditional = array();
+ private $conditional = [];
/**
* Add a option mapping.
@@ -253,7 +254,7 @@ class OptionsBuilder
*/
private static function getDefaultOption($option, $definition)
{
- $keys = array('has', 'is', 'get');
+ $keys = ['has', 'is', 'get'];
$suffix = ucfirst($option);
foreach ($keys as $key) {
diff --git a/src/Mapper/Style/FixedStyleMapper.php b/src/Mapper/Style/FixedStyleMapper.php
index 16ad970..5441374 100644
--- a/src/Mapper/Style/FixedStyleMapper.php
+++ b/src/Mapper/Style/FixedStyleMapper.php
@@ -48,7 +48,7 @@ class FixedStyleMapper extends AbstractStyleMapper
->addConditionalOption('lineCap')
->addConditionalOption('lineJoin')
->addConditionalOption('dashArray')
- ->addConditionalOptions('fill', array('fillColor', 'fillOpacity'))
+ ->addConditionalOptions('fill', ['fillColor', 'fillOpacity'])
->addOption('fill');
}
}
diff --git a/src/Mapper/Type/ImageIconMapper.php b/src/Mapper/Type/ImageIconMapper.php
index 134b1e9..f312b13 100644
--- a/src/Mapper/Type/ImageIconMapper.php
+++ b/src/Mapper/Type/ImageIconMapper.php
@@ -95,14 +95,14 @@ class ImageIconMapper extends AbstractIconMapper
$definition->setIconUrl($file->path);
$file = new \File($file->path);
- $definition->setIconSize(array($file->width, $file->height));
+ $definition->setIconSize([$file->width, $file->height]);
if (!$model->iconAnchor) {
- $definition->setIconAnchor(array($file->width / 2, $file->height));
+ $definition->setIconAnchor([($file->width / 2), $file->height]);
}
if (!$model->popupAnchor) {
- $definition->setPopupAnchor(array(0, 8 - $file->height));
+ $definition->setPopupAnchor([0, (8 - $file->height)]);
}
}
}
@@ -137,10 +137,10 @@ class ImageIconMapper extends AbstractIconMapper
$definition->setShadowUrl($file->path);
$file = new \File($file->path);
- $definition->setShadowSize(array($file->width, $file->height));
+ $definition->setShadowSize([$file->width, $file->height]);
if (!$model->shadowAnchor) {
- $definition->setShadowAnchor(array($file->width / 2, $file->height));
+ $definition->setShadowAnchor([($file->width / 2), $file->height]);
}
}
}
diff --git a/src/Mapper/UI/MarkerMapper.php b/src/Mapper/UI/MarkerMapper.php
index 20a37b7..ba2ff2b 100644
--- a/src/Mapper/UI/MarkerMapper.php
+++ b/src/Mapper/UI/MarkerMapper.php
@@ -75,7 +75,7 @@ class MarkerMapper extends AbstractMapper
$elementId = null
) {
$arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId);
- $arguments[] = array($model->latitude, $model->longitude, $model->altitude ?: null) ?: null;
+ $arguments[] = [$model->latitude, $model->longitude, $model->altitude ?: null] ?: null;
return $arguments;
}
@@ -124,9 +124,9 @@ class MarkerMapper extends AbstractMapper
if ($model->customIcon) {
$iconModel = IconModel::findBy(
- array('id=?', 'active=1'),
- array($model->icon),
- array('return' => 'Model')
+ ['id=?', 'active=1'],
+ [$model->icon],
+ ['return' => 'Model']
);
if ($iconModel) {
diff --git a/src/Model/AbstractActiveModel.php b/src/Model/AbstractActiveModel.php
index a9aaf75..c1b39cf 100644
--- a/src/Model/AbstractActiveModel.php
+++ b/src/Model/AbstractActiveModel.php
@@ -29,7 +29,7 @@ abstract class AbstractActiveModel extends \Model
*
* @return \Model|null
*/
- public static function findActiveByPK($modelId, $options = array())
+ public static function findActiveByPK($modelId, $options = [])
{
return static::findOneBy('active=1 AND id', $modelId, $options);
}
@@ -43,7 +43,7 @@ abstract class AbstractActiveModel extends \Model
*
* @return Collection|null
*/
- public static function findActiveBy($column, $value, $options = array())
+ public static function findActiveBy($column, $value, $options = [])
{
if (is_array($column)) {
$column[] = 'active=1';
@@ -61,7 +61,7 @@ abstract class AbstractActiveModel extends \Model
*
* @return Collection|null
*/
- public static function findActives($options = array())
+ public static function findActives($options = [])
{
return static::findBy('active', '1', $options);
}
diff --git a/src/Model/LayerModel.php b/src/Model/LayerModel.php
index 1d09d95..7164d09 100644
--- a/src/Model/LayerModel.php
+++ b/src/Model/LayerModel.php
@@ -42,18 +42,18 @@ class LayerModel extends AbstractActiveModel
*
* @return Collection|null
*/
- public static function findMultipleByTypes(array $types, $options = array())
+ public static function findMultipleByTypes(array $types, $options = [])
{
if (empty($types)) {
return null;
}
- $options['column'] = array(
+ $options['column'] = [
sprintf(
'type IN (%s)',
substr(str_repeat('?,', count($types)), 0, -1)
- )
- );
+ ),
+ ];
$options['value'] = $types;
$options['return'] = 'Collection';
diff --git a/src/Model/MarkerModel.php b/src/Model/MarkerModel.php
index 9a91110..860bdd2 100644
--- a/src/Model/MarkerModel.php
+++ b/src/Model/MarkerModel.php
@@ -41,7 +41,7 @@ class MarkerModel extends AbstractActiveModel
public static function findByFilter($pid, Filter $filter = null)
{
if (!$filter) {
- return static::findActiveBy('pid', $pid, array('order' => 'sorting'));
+ return static::findActiveBy('pid', $pid, ['order' => 'sorting']);
}
switch ($filter->getName()) {
@@ -63,23 +63,23 @@ class MarkerModel extends AbstractActiveModel
*/
public static function findByBBoxFilter($pid, BboxFilter $filter)
{
- $columns = array(
+ $columns = [
'active=1',
'pid=?',
'latitude > ? AND latitude < ?',
- 'longitude > ? AND longitude < ?'
- );
+ 'longitude > ? AND longitude < ?',
+ ];
/** @var LatLngBounds $bounds */
$bounds = $filter->getValues()['bounds'];
- $values = array(
+ $values = [
$pid,
$bounds->getSouthWest()->getLatitude(),
$bounds->getNorthEast()->getLatitude(),
$bounds->getSouthWest()->getLongitude(),
- $bounds->getNorthEast()->getLongitude()
- );
+ $bounds->getNorthEast()->getLongitude(),
+ ];
- return static::findBy($columns, $values, array('order' => 'sorting'));
+ return static::findBy($columns, $values, ['order' => 'sorting']);
}
}
About
+
+
- + The Leaflet maps integration for Contao CMS is an Open Source Software license under the LGPL 3.0. + This extension is only exists because of great other Open Source Software which it heavenly depends on. +
++ This software ships with an visible attribution to netzmacht creative in the map attribution + control. + If you want to remove this attribution, you have to purchase a commercial license. + For more details visit the project + website.
-
-
- Fund a feature
-Contao Leaflet is not feature complete. Have a look at the list of planned feature and support them.
- +
+ >
+
+
+
+ netzmacht
+ David Molineus
+
+ DAB Bank München
+ IBAN: DE52701204008354237003
+ BIC: DABBDEMMXXX
+
-
-' . $this->javascript .''; ?>
+' . $this->javascript . ''; ?>
diff --git a/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5
index 3be0929..160b248 100644
--- a/src/Bundle/Resources/contao/templates/leaflet_map_html.html5
+++ b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5
@@ -1,6 +1,6 @@
+ L.contao.addMap('', function () {
+
+ return {map: map, layers: layers, controls: controls, icons: icons};
+ }());
diff --git a/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5 b/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5
index e0138dd..6c7ffbd 100644
--- a/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5
+++ b/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5
@@ -9,4 +9,4 @@
-
diff --git a/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5 b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
index 842d1f5..6375db0 100644
--- a/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
+++ b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
@@ -10,21 +10,21 @@
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
attribution: '© OpenStreetMap contributors'
}).addTo(map);
- var element = $('field; ?>');
+ var element = $('field; ?>');
var geocoder = L.Control.geocoder({
defaultMarkGeocode: false,
collapsed: false,
placeholder: ''
}).addTo(map);
- geocoder.on('markgeocode', function(event) {
+ geocoder.on('markgeocode', function (event) {
var container = document.createElement('div');
- var link = document.createElement('button');
- var result = event.geocode;
+ var link = document.createElement('button');
+ var result = event.geocode;
link.set('style', 'margin-left: 10px;');
link.appendText('');
- link.addEvent('click', function(e) {
+ link.addEvent('click', function (e) {
e.stop();
element.set('value', result.center.lat + ',' + result.center.lng);
@@ -37,7 +37,7 @@
map.removeLayer(this._geocodeMarker);
}
- map.fitBounds(result.bbox, { padding: [0, 70]});
+ map.fitBounds(result.bbox, {padding: [0, 70]});
map.panTo(result.center);
this._geocodeMarker = new L.Marker(result.center, {draggable: true})
diff --git a/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5 b/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5
index 61563ff..d62880d 100644
--- a/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5
+++ b/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5
@@ -9,5 +9,5 @@
Individual development
-If you have special requirements you can hire me for an individual development.
- +
+
-Support Contao Leaflet
+ +
+
-
+
+ Report issues
+If you found a bug, got some troubles or have a feature request - feel free to open an issue.
+ +
+
+ Contribute
+There are many ways you can contribute. Translations, + documentation or code contributions are welcome. +
+ +
+
Fund a feature
+Contao Leaflet is not feature complete. Have a look at the list of planned feature and support + them.
+ +
-
-Commercial license
-If you want to remove the attribution in the attribution control, you can purchase a commercial license.
- +
+
+
+
+ Individual development
+If you have special requirements you can hire me for an individual development.
+ +
+
Commercial license
+If you want to remove the attribution in the attribution control, you can purchase a commercial + license.
+ +
-
-
-
+ Credits
-| Name | -Version | -License | -Homepage | -
|---|---|---|---|
| Libraries | |||
| - | - | - | - |
| Graphics | -|||
| Farm Fresh-Web Icons | -3.9.2 | -CC BY 3.0 US | -fatcow.com/free-icons | -
| Web Blog Icons by SEM Labs | -3.9.2 | -CC BY 4.0 | -semlabs.co.uk | -
| Dependencies | |||
| - | - | - | - |
+
+
+
Credits
+| Name | +Version | +License | +Homepage | +
|---|---|---|---|
| Libraries | +|||
| + | + | + | + |
| Graphics | +|||
| Farm Fresh-Web Icons | +3.9.2 | +CC BY 3.0 US | +fatcow.com/free-icons | +
| Web Blog Icons by SEM Labs | +3.9.2 | +CC BY 4.0 | +semlabs.co.uk | +
| Dependencies | +|||
| + | + | + | + |