Prevent cacheKey is not set.

.composer-require-checker.json

@@ -0,0 +1,11 @@
+{
+  "symbol-whitelist": [
+    "null", "true", "false",
+    "static", "self", "parent",
+    "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
+    "array_insert",
+    "Contao\\ManagerPlugin\\Bundle\\BundlePluginInterface",
+    "Contao\\ManagerPlugin\\Bundle\\Config\\BundleConfig",
+    "Contao\\ManagerPlugin\\Bundle\\Parser\\ParserInterface"
+  ]
+}

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - "7.0"
   - "7.1"
+  - "7.2"
 
 env:
   - CONTAO_VERSION=contao/core-bundle ~4.4.0

CHANGELOG.md

@@ -2,10 +2,50 @@
 Changelog
 =========
 
+3.0.2 (2018-08-23)
+------------------
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.1...3.0.2)
+
+ - Run composer require checker and solve issues.
+ 
+3.0.1 (2018-06-20)
+------------------
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0...3.0.1)
+
+ - Fix broken dynamic bbox related data loading (#57) 
+
+3.0.0 (2018-01-05)
+------------------
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...3.0.0)
+
+ - Make hook/dca listener services public
+
+3.0.0-beta1 (2017-11-15) 
+------------------------
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...3.0.0-beta1)
+
+Enhancements
+
+  - Updated translations
+
+Bugfixes
+  
+  - Broken service definitions
+  - Broken file layer id 
+
+3.0.0-alpha2 
+------------
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...3.0.0-alpha3)
+
 3.0.0-alpha1 (2017-10-19)
 ------------------------
 
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...2.0.0-alpha2)
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...3.0.0-alpha2)
 
 Implemented enhancements
  

composer.json

@@ -7,7 +7,7 @@
     "leaflet"
   ],
   "type": "contao-bundle",
-  "license": "LGPL-3.0+",
+  "license": "LGPL-3.0-or-later",
   "authors": [
     {
       "name": "David Molineus",
@@ -23,18 +23,30 @@
   },
   "require": {
     "php": ">=7.0",
+    "ext-json": "*",
+    "ext-pdo": "*",
     "contao/core-bundle": "~4.4",
+    "doctrine/dbal": "^2.5",
+    "symfony/config": "~3.3 || ~4.0",
+    "symfony/event-dispatcher": "~3.3 || ~4.0",
+    "symfony/dependency-injection": "~3.3 || ~4.0",
+    "symfony/filesystem": "~3.3 || ~4.0",
+    "symfony/http-kernel": "~3.3 || ~4.0",
+    "symfony/translation": "~3.3 || ~4.0",
+    "symfony/templating": "~3.3 || ~4.0",
     "netzmacht/contao-leaflet-libraries": "^1.0",
+    "netzmacht/contao-leaflet-geocode-widget": "^1.2",
     "netzmacht/php-javascript-builder": "^1.0",
     "netzmacht/php-leaflet": "^1.0.2",
-    "netzmacht/contao-toolkit": "~3.0@beta",
-    "contao-community-alliance/meta-palettes": "^1.5",
+    "netzmacht/contao-toolkit": "~3.0",
+    "contao-community-alliance/meta-palettes": "^2.0 || ^1.5",
     "menatwork/contao-multicolumnwizard": "^3.2",
     "doctrine/cache": "^1.0"
   },
   "require-dev": {
     "phpcq/all-tasks": "^1.2",
-    "contao/manager-plugin": "^2.1"
+    "contao/manager-plugin": "^2.1",
+    "phpstan/phpstan": "^0.10.3"
   },
   "autoload": {
     "psr-4": {
@@ -48,16 +60,16 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "2.0.x-dev",
-      "dev-develop": "2.1.x-dev",
-      "dev-release/3.0.0": "3.0.x-dev"
+      "dev-master": "3.0.x-dev",
+      "dev-develop": "3.1.x-dev",
+      "dev-support/2.x": "2.0.x-dev"
     },
     "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin",
     "contao": {
       "transifex": {
         "project": "contao-leaflet-maps",
         "prefix": "core-",
-        "languages_cto": "module/languages",
+        "languages_cto": "src/Bundle/Resources/contao/languages",
         "languages_tx": ".tx"
       }
     }

src/Backend/About.php

@@ -12,6 +12,8 @@
 
 namespace Netzmacht\Contao\Leaflet\Backend;
 
+use Contao\BackendTemplate;
+
 /**
  * Credits backend module.
  *
@@ -26,7 +28,7 @@ class About
      */
     public function generate()
     {
-        $template = new \BackendTemplate('be_leaflet_about');
+        $template = new BackendTemplate('be_leaflet_about');
 
         $template->headline  = 'Leaftlet maps integration for Contao CMS';
         $template->libraries = $this->getLibraries();
@@ -57,9 +59,8 @@ class About
 
                 if ($library['homepage']) {
                     $library['homepage'] = sprintf(
-                        '<a href="%s" %s>%s</a>',
+                        '<a href="%s" target="_blank">%s</a>',
                         $library['homepage'],
-                        LINK_NEW_WINDOW,
                         preg_replace('#^(https?://(www)?)#i', '', $library['homepage'])
                     );
                 }

src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php

@@ -56,7 +56,7 @@ final class MarkersLabelRenderer extends AbstractLabelRenderer
     public function render(array $row, string $label, Translator $translator): string
     {
         $repository = $this->repositoryManager->getRepository(MarkerModel::class);
-        $count      = $repository->countBy(['pid=?'], [$row['pid']]);
+        $count      = $repository->countBy(['pid=?'], [$row['id']]);
         $label     .= sprintf(
             '<span class="tl_gray"> (%s %s)</span>',
             $count,

src/Bundle/Resources/config/listeners.yml

@@ -1,6 +1,7 @@
 services:
   netzmacht.contao_leaflet.listeners.dca.leaflet:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\LeafletDcaListener
+    public: true
     arguments:
       - '@netzmacht.contao_toolkit.repository_manager'
       - '@templating'
@@ -10,33 +11,38 @@ services:
 
   netzmacht.contao_leaflet.listeners.dca.validator:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\Validator
+    public: true
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@translator'
 
   netzmacht.contao_leaflet.listeners.dca.frontend_integration:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\FrontendIntegrationListener
+    public: true
     arguments:
       - '@netzmacht.contao_toolkit.repository_manager'
       - '@translator'
 
   netzmacht.contao_leaflet.listeners.dca.map:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener
+    public: true
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@database_connection'
       - '@netzmacht.contao_toolkit.repository_manager'
-      - '@netzmacht.contao_toolkit.repository_manager'
 
   netzmacht.contao_leaflet.listeners.dca.control:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener
+    public: true
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@database_connection'
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '%netzmacht.contao_leaflet.controls%'
 
   netzmacht.contao_leaflet.listeners.dca.layer:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\LayerDcaListener
+    public: true
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@database_connection'
@@ -51,12 +57,14 @@ services:
 
   netzmacht.contao_leaflet.listeners.dca.marker:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener
+    public: true
     arguments:
       - '@database_connection'
       - '@netzmacht.contao_toolkit.repository_manager'
 
   netzmacht.contao_leaflet.listeners.dca.vector:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener
+    public: true
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@netzmacht.contao_toolkit.repository_manager'
@@ -64,11 +72,13 @@ services:
 
   netzmacht.contao_leaflet.listeners.dca.icon:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener
+    public: true
     arguments:
       - '%netzmacht.contao_leaflet.icons%'
 
   netzmacht.contao_leaflet.listeners.dca.style:
-    class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener
+    class: Netzmacht\Contao\Leaflet\Listener\Dca\StyleDcaListener
+    public: true
     arguments:
       - '%netzmacht.contao_leaflet.styles%'
 
@@ -97,7 +107,9 @@ services:
 
   netzmacht.contao_leaflet.listeners.register_libraries:
     class: Netzmacht\Contao\Leaflet\Listener\RegisterLibrariesListener
+    public: true
     arguments:
       - '@netzmacht.contao_leaflet.libraries'
       - '@netzmacht.contao_leaflet.definition.builder'
-
+    tags:
+      - { name: 'contao.hook', hook: 'initializeSystem', method: 'onInitializeSystem' }

src/Bundle/Resources/config/services.yml

@@ -108,6 +108,7 @@ services:
 
   netzmacht.contao_leaflet.frontend.insert_tag:
     class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser
+    public: true
     arguments:
       - '@netzmacht.contao_leaflet.map.provider'
       - '%kernel.debug%'

src/Bundle/Resources/contao/config/config.php

@@ -50,7 +50,7 @@ array_insert(
 );
 
 if (TL_MODE === 'BE') {
-    $GLOBALS['TL_CSS'][] = 'bundles/netzmachtcontaoleaflet/css/backend_hacks.css';
+    $GLOBALS['TL_CSS'][] = 'bundles/netzmachtcontaoleaflet/css/backend_global.css';
 }
 
 /*
@@ -65,12 +65,3 @@ $GLOBALS['TL_MODELS']['tl_leaflet_marker']  = \Netzmacht\Contao\Leaflet\Model\Ma
 $GLOBALS['TL_MODELS']['tl_leaflet_popup']   = \Netzmacht\Contao\Leaflet\Model\PopupModel::class;
 $GLOBALS['TL_MODELS']['tl_leaflet_style']   = \Netzmacht\Contao\Leaflet\Model\StyleModel::class;
 $GLOBALS['TL_MODELS']['tl_leaflet_vector']  = \Netzmacht\Contao\Leaflet\Model\VectorModel::class;
-
-/*
- * Hooks.
- */
-
-$GLOBALS['TL_HOOKS']['initializeSystem'][] = [
-    'netzmacht.contao_leaflet.listeners.register_libraries',
-    'onInitializeSystem',
-];

src/Bundle/Resources/contao/dca/tl_leaflet_layer.php

@@ -718,14 +718,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
         'bounds'                         => [
             'label'         => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['bounds'],
             'exclude'       => true,
-            'inputType'     => 'text',
+            'inputType'     => 'leaflet_geocode',
             'save_callback' => [
             ],
             'eval'          => [
                 'maxlength'   => 255,
                 'multiple'    => true,
                 'size'        => 2,
-                'tl_class'    => 'long clr',
+                'tl_class'    => 'clr',
                 'nullIfEmpty' => true,
             ],
             'sql'           => 'mediumblob NULL',

src/Bundle/Resources/contao/dca/tl_leaflet_vector.php

@@ -347,13 +347,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
         'bounds'          => [
             'label'         => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['bounds'],
             'exclude'       => true,
-            'inputType'     => 'text',
+            'inputType'     => 'leaflet_geocode',
             'save_callback' => [],
             'eval'          => [
                 'maxlength'   => 255,
                 'multiple'    => true,
                 'size'        => 2,
-                'tl_class'    => 'long clr',
+                'tl_class'    => 'clr',
                 'nullIfEmpty' => true,
             ],
             'sql'           => 'mediumblob NULL',

src/Bundle/Resources/contao/languages/de/leaflet.php

@@ -8,12 +8,13 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2016-10-06T15:54:30+02:00
+ * last-updated: 2017-10-17T16:04:08+00:00
  */
 
 $GLOBALS['TL_LANG']['leaflet']['applyPosition']             = 'Position anwenden';
 $GLOBALS['TL_LANG']['leaflet']['invalidAlias']              = 'Ein ungültiger Alias wurde angegeben. Ein Alias darf nicht leer sein, mit einer Zahl beginnen oder Sonderzeichen enthalten (Unterstriche sind erlaubt).';
 $GLOBALS['TL_LANG']['leaflet']['invalidCoordinates']        = 'Ungültige Koordinatenwerte vorhanden.';
+$GLOBALS['TL_LANG']['leaflet']['searchPosition']            = 'Standort suchen';
 $GLOBALS['TL_LANG']['leaflet_control']['attribution']['0']  = 'Copyright-Leiste';
 $GLOBALS['TL_LANG']['leaflet_control']['attribution']['1']  = 'Das Kontrollelement zur Namensnennung erlaubt es, Urheber in einer kleinen Textbox auf der Karte anzuzeigen. Lesen Sie für weitere Details die <a href="http://leafletjs.com/reference.html#control-attribution" target="_blank">Leaflet-Dokumentation</a>.';
 $GLOBALS['TL_LANG']['leaflet_control']['fullscreen']['0']   = 'Fullscreen-Kontrollelement';

src/Bundle/Resources/contao/languages/de/tl_leaflet_control.php

@@ -8,7 +8,7 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2016-10-04T13:07:35+02:00
+ * last-updated: 2017-10-17T16:04:09+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_leaflet_control']['active']['0']             = 'Kontrollelement aktivieren';
@@ -21,6 +21,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_control']['attributions']['1']       = 'Hier kö
 $GLOBALS['TL_LANG']['tl_leaflet_control']['autoZIndex']['0']         = 'Automatischer Z-Index';
 $GLOBALS['TL_LANG']['tl_leaflet_control']['autoZIndex']['1']         = 'Falls aktiviert wird das Kontrollelement zu allen Layern in aufsteigender Reihenfolge einen z-index hinzufügen, damit die Reihenfolge auch beim an- und abschalten von Layern erhalten bleibt.';
 $GLOBALS['TL_LANG']['tl_leaflet_control']['base']['0']               = 'Basislayer';
+$GLOBALS['TL_LANG']['tl_leaflet_control']['base']['1']               = 'Basis-Layer werden mit Radio-Buttons umgeschaltet. Beachten Sie, dass alle Basis-Layer als Basis-Layer-Objekte übergeben werden sollten, aber nur ein einziger für die Initialisierung der Karte benutzt werden soll.';
 $GLOBALS['TL_LANG']['tl_leaflet_control']['bottomleft']['0']         = 'Links unten';
 $GLOBALS['TL_LANG']['tl_leaflet_control']['bottomleft']['1']         = 'Linker unterer Bereich der Karte';
 $GLOBALS['TL_LANG']['tl_leaflet_control']['bottomright']['0']        = 'Rechts unten';

src/Bundle/Resources/contao/languages/de/tl_leaflet_icon.php

@@ -8,7 +8,7 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2016-10-04T13:07:35+02:00
+ * last-updated: 2017-10-17T16:04:07+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['active']['0']            = 'Aktivieren Sie das Icon.';
@@ -30,6 +30,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_icon']['edit']['1']              = 'Icon ID %s b
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['icon']['0']              = 'Icon-CSS-Klasse';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['icon']['1']              = 'Icon-CSS-Klasse, beispielsweise <em>fa-envelope</em>';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['iconAnchor']['0']        = 'Icon-Anker';
+$GLOBALS['TL_LANG']['tl_leaflet_icon']['iconAnchor']['1']        = 'Die Koordinaten der "Spitze" des Schattens (relativ zu seiner oberen linken Ecke).';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['iconColor']['0']         = 'Iconfarbe';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['iconColor']['1']         = 'Definieren Sie hier eine Farbe für den Icon-Marker';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['iconImage']['0']         = 'Icon-Bild';
@@ -48,7 +49,10 @@ $GLOBALS['TL_LANG']['tl_leaflet_icon']['popupAnchor']['0']       = 'Popup-Anker'
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['popupAnchor']['1']       = 'Geben Sie die Koordinaten des Punktes an, von dem aus sich das Popup "öffnet". Die Koordinaten werden relativ zum Anker des Icons benutzt.';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['popups']['0']            = 'Popups verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['popups']['1']            = 'Popup-Icons verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_icon']['prefix']['0']            = 'Iconpräfix Klasse';
+$GLOBALS['TL_LANG']['tl_leaflet_icon']['prefix']['1']            = 'Iconpräfix Klasse, z.B. <em>fa</em>';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowAnchor']['0']      = 'Schatten-Anker';
+$GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowAnchor']['1']      = 'Die Koordinaten der "Spitze" des Schattens (relativ zu seiner oberen linken Ecke) (das gleiche wie der Symbol Anker, wenn nicht angegeben).';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowImage']['0']       = 'Schatten-Bild';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowImage']['1']       = 'Wählen Sie ein Bild für den Schatten aus.';
 $GLOBALS['TL_LANG']['tl_leaflet_icon']['shadowRetinaImage']['0'] = 'Retina-Schattenbild';

src/Bundle/Resources/contao/languages/de/tl_leaflet_map.php

@@ -8,11 +8,12 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2016-10-06T15:54:30+02:00
+ * last-updated: 2017-10-17T16:04:07+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds']['0']                    = 'Grenzen festlegen';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds']['1']                    = 'Falls aktiviert passt sich die karten an den Bereich der Datenlayer an, für die Auswirkungen auf die Kartengrenzen zugelassen sind.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['deferred']['0'] = 'Nach dem Laden des verzögerten Features';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['deferred']['1'] = 'Bestimmt ob die Kartengrenzen neu berechnet werden wenn ein Feature verzögert geladen wird.';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load']['0']     = 'bei Karteninitialisierung';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load']['1']     = 'Grenzen berechnen, wenn die Karte initialisiert wird. Alle statischen und bereits geladenen Features werden mit einbezogen.';
@@ -23,6 +24,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['alias']['1']                           =
 $GLOBALS['TL_LANG']['tl_leaflet_map']['behaviour_legend']                     = 'Verhalten';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits']['0']              = 'Zurückfedern bei Erreichen des Zoom-Limits';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits']['1']              = 'Deaktivieren Sie diese Einstellung, falls Sie verhindern möchten, dass außerhalb liegende Elemente der Karte beim Zoomen über die festgelegten minimalen / maximalen Zoomstufen hinaus angezeigt werden wenn mit zwei Fingern gezoomt wird.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding']['1']                   = 'Padding wird verwendet, um Grenzen zu setzen. Verwenden Sie kommagetrennte Werte. Wenn 2 Werte angegeben werden, ist die <em>Padding</em>-Option eingestellt. Wenn 4 Werte angegeben werden, ist <em>paddingTopLeft</em> und <em>paddingBottomRight</em> gesetzt.';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom']['0']                         = 'Zoomen durch Markierung';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom']['1']                         = 'legen Sie fest ob der Kartenausschnitt vergrößert werden kann indem Benutzer die Maus mit gedrückter Umschalttaste über die Karte ziehen.';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['cache']['0']                           = 'Cache aktivieren';
@@ -62,6 +64,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['layers']['1']                          =
 $GLOBALS['TL_LANG']['tl_leaflet_map']['layers_legend']                        = 'Standardlayer';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['locate']['0']                          = 'Nutzerposition ermitteln';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['locate']['1']                          = 'Initialer Kartenzoom. Diese Funktion versucht, den Benutzer mittels Geolocation-API zu orten.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom']['0']                   = 'Lokalisieren Sie den maximalen Zoom';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom']['1']                   = 'Max-Zoom bei der Aktualisierung der Kartenansicht.';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge']['0']                = 'Maximale Gültigkeit der Benutzerposition';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge']['1']                = 'Maximales Alter der Daten zum Aufenthaltsort in Millisekunden. Ansonsten wird der zwischengespeicherte Wert benutzt.';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView']['0']                   = 'Kartenmitte aktualisieren';

src/Bundle/Resources/contao/languages/de/tl_leaflet_marker.php

@@ -8,7 +8,7 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2016-10-06T15:54:30+02:00
+ * last-updated: 2017-10-17T16:04:07+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['active']['0']          = 'Marker aktivieren';
@@ -44,6 +44,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_marker']['icon']['1']            = 'Individuelle
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['icons']['0']           = 'Icons verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['icons']['1']           = 'Marker-Icons verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['ignoreForBounds']['0'] = 'Von Grenzen-Berechnung ausschließen.';
+$GLOBALS['TL_LANG']['tl_leaflet_marker']['ignoreForBounds']['1'] = 'Fügen Sie dieses Element nicht in die Berechnung ein.';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['keyboard']['0']        = 'Tatstaturnavigation';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['keyboard']['1']        = 'Legen Sie fest ob der Marker über die Tabulatortaste erreicht und mit der Eingabetaste geklickt werden kann.';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['new']['0']             = 'Marker erstellen';
@@ -62,5 +63,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_marker']['title_legend']         = 'Titel und Ty
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle']['0']          = 'Aktivierung umschalten';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle']['1']          = 'Aktivierung von Marker ID %s umschalten';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['tooltip']['0']         = 'Tooltip';
+$GLOBALS['TL_LANG']['tl_leaflet_marker']['tooltip']['1']         = 'Marker-Tooltip als Titelattribut gerendert.';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['zIndexOffset']['0']    = 'Z-Index-Offset';
+$GLOBALS['TL_LANG']['tl_leaflet_marker']['zIndexOffset']['1']    = 'Standardmäßig werden Markerbilder z-Index automatisch auf Grundlage der geografischen Breite festgelegt. Verwenden Sie diese Option, wenn Sie den Marker über allen anderen (oder darunter) platzieren möchten und einen hohen Wert wie 1000 (bzw. einen hohen negativen Wert) angeben.';
 

src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php

@@ -8,17 +8,19 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2016-10-04T13:07:35+02:00
+ * last-updated: 2017-10-17T16:04:07+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_leaflet_style']['active_legend']    = 'Aktivierung';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['alias']['0']       = 'Alias';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['alias']['1']       = 'Alias des Stils.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['color']['0']       = 'Linienfarbe';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['color']['1']       = 'Eigene Linienfarbe. Wenn dieses Feld leer ist wird die Standard-Linienfarbe benutzt. Erwartete Werte sind vollständige Hex-Codes (mit #).';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['config_legend']    = 'Konfiguration';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['copy']['0']        = 'Stil kopieren';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['copy']['1']        = 'Stil ID %s kopieren';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['dashArray']['0']   = 'Linienmuster';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['dashArray']['1']   = 'Geben Sie einen String ein, der für die <a href="https://developer.mozilla.org/en/SVG/Attribute/stroke-dasharray" target="_blank">Linienart</a> benutzt werden soll.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['delete']['0']      = 'Stil löschen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['delete']['1']      = 'Stil ID %s löschen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['edit']['0']        = 'Stil bearbeiten';
@@ -26,6 +28,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['edit']['1']        = 'Stil ID %s bearbe
 $GLOBALS['TL_LANG']['tl_leaflet_style']['fill']['0']        = 'Vektor füllen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['fill']['1']        = 'Bestimmen Sie, ob der Pfad gefüllt dargestellt werden soll.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['fillColor']['0']   = 'Füllfarbe';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['fillColor']['1']   = 'Eigene Linienfarbe. Wenn dieses Feld leer ist wird die Standard-Linienfarbe benutzt. Erwartete Werte sind vollständige Hex-Codes (mit #).';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['fillOpacity']['0'] = 'Transparenz der Füllung';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['fillOpacity']['1'] = 'Die Transparenz der Füllung kann einen Wert zwischen 0 und 1 annehmen.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['icons']['0']       = 'Icons verwalten';
@@ -35,6 +38,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['layersBtn']['1']   = 'Leaflet-Layer ver
 $GLOBALS['TL_LANG']['tl_leaflet_style']['lineCap']['0']     = 'Linienenden';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['lineCap']['1']     = 'Geben Sie einen Wert ein, der für die <a href="https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/stroke-linecap" target="_blank">Enden der Linie</a> benutzt werden soll,';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['lineJoin']['0']    = 'Linienverbindung';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['lineJoin']['1']    = 'Geben Sie einen String ein, der die <a href="https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/stroke-linejoin" target="_blank">Form der Ecken</a> definiert.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['new']['0']         = 'Stil erstellen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['new']['1']         = 'Neuen Stil erstellen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['opacity']['0']     = 'Linientransparenz';
@@ -44,6 +48,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['popups']['1']      = 'Popup-Icons verwa
 $GLOBALS['TL_LANG']['tl_leaflet_style']['show']['0']        = 'Details anzeigen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['show']['1']        = 'Details des Stils ID %s anzeigen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['stroke']['0']      = 'Linie ziehen';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['stroke']['1']      = 'Legt fest, ob eine Linie entlang des Pfades dargestellt werden soll. Deaktivieren Sie diese Einstellung um die Grenzen von Polygonen oder Kreisen unsichtbar zu schalten.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['title']['0']       = 'Titel';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['title']['1']       = 'Titel des Stils.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['title_legend']     = 'Titel und Typ';

src/Bundle/Resources/contao/templates/be_leaflet_about.html5

@@ -21,7 +21,7 @@
             </p>
         </div>
         <div class="right">
-            <a href="http://www.netzmacht.de" <?php echo LINK_NEW_WINDOW; ?>>
+            <a href="http://www.netzmacht.de" target="_blank">
                 <img src="bundles/netzmachtcontaoleaflet/img/logo.png"></a>
             <p>
                 <strong class="company">netzmacht </strong><br>

src/Bundle/Resources/public/css/backend_global.css

@@ -0,0 +1,8 @@
+
+#tl_navigation .tl_level_1_group .group-leaflet {
+    background: url(/bundles/netzmachtcontaoleaflet/img/leaflet.svg) 3px 2px no-repeat;
+}
+
+.tl_help_table a {
+    text-decoration: underline;
+}

src/Bundle/Resources/public/css/backend_hacks.css

@@ -1,3 +0,0 @@
-.tl_help_table a {
-    color: #77ac45
-}

src/Bundle/Resources/public/img/leaflet.svg

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="13"
+   height="12"
+   viewBox="0 0 13 12"
+   class="feather feather-map"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="leaflet.svg"
+   style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1127"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="1680"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <polygon
+     points="23,2 16,6 8,2 1,6 1,22 8,18 16,22 23,18 "
+     id="polygon2"
+     style="stroke:#91979c;stroke-opacity:1"
+     transform="matrix(0.54166667,0,0,0.54166667,0,-0.46604866)" />
+  <line
+     x1="4.3333335"
+     y1="0.61728501"
+     x2="4.3333335"
+     y2="9.2839518"
+     id="line4"
+     style="stroke:#91979c;stroke-width:1.08333337;stroke-opacity:1" />
+  <line
+     x1="8.6666689"
+     y1="2.7839513"
+     x2="8.6666689"
+     y2="11.450619"
+     id="line6"
+     style="fill:#91979c;fill-opacity:0;stroke:#91979c;stroke-width:1.08333337;stroke-opacity:1" />
+</svg>

src/Event/BuildDefinitionEvent.php

@@ -36,7 +36,7 @@ class BuildDefinitionEvent extends Event
     /**
      * The model.
      *
-     * @var \Model
+     * @var Model
      */
     private $model;
 
@@ -74,7 +74,7 @@ class BuildDefinitionEvent extends Event
     /**
      * Get the model.
      *
-     * @return \Model
+     * @return Model
      */
     public function getModel()
     {

src/Filter/FilterFactory.php

@@ -51,7 +51,7 @@ final class FilterFactory
     public function create(string $filter, string $values): Filter
     {
         if (isset($this->filters[$filter])) {
-            return call_user_func([$filter, 'fromRequest'], $values);
+            return call_user_func([$this->filters[$filter], 'fromRequest'], $values);
         }
 
         throw new \RuntimeException(sprintf('Creating filter failed. Unsupported filter "%s"', $filter));

src/Frontend/AbstractMapHybrid.php

@@ -18,6 +18,7 @@ use Contao\Database\Result;
 use Contao\Input;
 use Contao\Model;
 use Contao\Model\Collection;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\MapProvider;
 use Netzmacht\Contao\Leaflet\Model\MapModel;
 use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid;
@@ -127,8 +128,8 @@ abstract class AbstractMapHybrid extends AbstractHybrid
             $data['mapId']      = $mapId;
 
             $style  = '';
-            $height = deserialize($this->get('leaflet_height'), true);
-            $width  = deserialize($this->get('leaflet_width'), true);
+            $height = StringUtil::deserialize($this->get('leaflet_height'), true);
+            $width  = StringUtil::deserialize($this->get('leaflet_width'), true);
 
             if (!empty($width['value'])) {
                 $style .= 'width:' . $width['value'] . $width['unit'] . ';';

src/Frontend/RequestUrl.php

@@ -12,6 +12,8 @@
 
 namespace Netzmacht\Contao\Leaflet\Frontend;
 
+use Contao\Config;
+use Contao\Frontend;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
 use Netzmacht\Contao\Leaflet\Mapper\Request;
 
@@ -72,7 +74,7 @@ class RequestUrl implements \JsonSerializable
             $query .= '&f=' . $filter->getName() . '&v=' . $filter->toRequest();
         }
 
-        $url = \Config::get('websitePath') . '/' . \Frontend::addToUrl($query, false);
+        $url = Config::get('websitePath') . '/' . Frontend::addToUrl($query, false);
 
         return new static($url, $hash, $request);
     }

src/Listener/Dca/LayerDcaListener.php

@@ -517,9 +517,9 @@ class LayerDcaListener extends AbstractListener
     {
         return sprintf(
             '<a href="%s" title="%s">%s</a> ',
-            \Backend::addToUrl($href . '&amp;id=' . $row['id']),
+            Backend::addToUrl($href . '&amp;id=' . $row['id']),
             $title,
-            \Image::getHtml($icon, $label, $attributes)
+            Image::getHtml($icon, $label, $attributes)
         );
     }
 }

src/Listener/Dca/MarkerDcaListener.php

@@ -13,6 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Listener\Dca;
 
 use Contao\Controller;
+use Contao\StringUtil;
 use Doctrine\DBAL\Connection;
 use Netzmacht\Contao\Leaflet\Model\IconModel;
 use Netzmacht\Contao\Leaflet\Model\PopupModel;
@@ -113,7 +114,7 @@ class MarkerDcaListener
             'altitude'  => null,
         ];
 
-        $values = trimsplit(',', $value);
+        $values = StringUtil::trimsplit(',', $value);
         $keys   = array_keys($combined);
         $count  = count($values);
 

src/Listener/Dca/Validator.php

@@ -13,6 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Listener\Dca;
 
 use Contao\DataContainer;
+use Contao\StringUtil;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\LeafletPHP\Value\LatLng;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
@@ -116,7 +117,7 @@ class Validator
      */
     public function validateMultipleCoordinateSets($values, $dataContainer)
     {
-        $sets = deserialize($values, true);
+        $sets = StringUtil::deserialize($values, true);
         foreach ($sets as $lines) {
             $this->validateMultipleCoordinates($lines, $dataContainer);
         }

src/Listener/GeoJsonListener.php

@@ -16,6 +16,7 @@ namespace Netzmacht\Contao\Leaflet\Listener;
 
 use Contao\FilesModel;
 use Contao\Model;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent;
 use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
@@ -117,7 +118,7 @@ final class GeoJsonListener
     public function enrichObjects(GeoJsonObject $feature, LeafletDefinition $definition, $model)
     {
         if (($definition instanceof Marker || $definition instanceof Vector)
-            && $model instanceof \Model && $feature instanceof Feature) {
+            && $model instanceof Model && $feature instanceof Feature) {
             $this->setDataProperty($model, $feature);
             $this->setBoundsInformation($model, $feature);
         }
@@ -148,7 +149,7 @@ final class GeoJsonListener
      */
     public function setModelData(GeoJsonObject $feature, $model)
     {
-        if (!$model instanceof \Model || !$feature instanceof Feature
+        if (!$model instanceof Model || !$feature instanceof Feature
             || empty($this->featureModelProperties[$model->getTable()])) {
             return;
         }
@@ -169,12 +170,12 @@ final class GeoJsonListener
     /**
      * Parse the model value based on the config.
      *
-     * @param \Model $model    The model.
+     * @param Model $model    The model.
      * @param mixed $property The property config.
      *
      * @return array|mixed|null
      */
-    private function parseModelValue(\Model $model, &$property)
+    private function parseModelValue(Model $model, &$property)
     {
         if (is_array($property)) {
             list($property, $type) = $property;
@@ -183,7 +184,7 @@ final class GeoJsonListener
             switch ($type) {
                 case 'array':
                 case 'object':
-                    $value = deserialize($value, true);
+                    $value = StringUtil::deserialize($value, true);
                     break;
 
                 case 'file':
@@ -194,7 +195,7 @@ final class GeoJsonListener
 
                 case 'files':
                     $repository = $this->repositoryManager->getRepository(FilesModel::class);
-                    $collection = $repository->findMultipleByUuids(deserialize($value, true));
+                    $collection = $repository->findMultipleByUuids(StringUtil::deserialize($value, true));
 
                     if ($collection) {
                         $value = $collection->fetchEach('path');

src/Listener/HashSubscriber.php

@@ -12,6 +12,7 @@
 
 namespace Netzmacht\Contao\Leaflet\Listener;
 
+use Contao\Model;
 use Netzmacht\Contao\Leaflet\Event\GetHashEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -46,7 +47,7 @@ class HashSubscriber implements EventSubscriberInterface
     {
         $data = $event->getData();
 
-        if ($data instanceof \Model) {
+        if ($data instanceof Model) {
             $event->setHash($data->getTable() . '::' . $data->{$data->getPk()});
         }
     }

src/Listener/LoadAssetsListener.php

@@ -14,6 +14,7 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Listener;
 
+use Contao\File;
 use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets;
 use Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
@@ -117,7 +118,7 @@ class LoadAssetsListener
             // TODO: Cache it.
             // codingStandardsIgnoreEnd
 
-            $file = new \File('assets/leaflet/js/icons.js');
+            $file = new File('assets/leaflet/js/icons.js');
             $file->write($buffer);
             $file->close();
 

src/MapProvider.php

@@ -206,7 +206,10 @@ class MapProvider
             $model = $this->getModel($mapId);
         }
 
-        if ($model->cache) {
+        $cacheKey = null;
+        $doCache  = $model->cache;
+
+        if ($doCache) {
             $cacheKey = $this->getCacheKey($mapId, $filter, $elementId, $template, $style);
 
             if ($this->cache->contains($cacheKey)) {
@@ -219,7 +222,7 @@ class MapProvider
 
         $buffer = $this->doGenerate($model, $filter, $elementId, $template, $style);
 
-        if ($model->cache) {
+        if ($doCache) {
             $this->cache->save(
                 $cacheKey,
                 [

src/Mapper/Control/AttributionControlMapper.php

@@ -13,6 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Mapper\Control;
 
 use Contao\Model;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Mapper\Request;
 use Netzmacht\LeafletPHP\Definition;
@@ -68,7 +69,7 @@ class AttributionControlMapper extends AbstractControlMapper
             $parent->setAttributionControl(false);
         }
 
-        $attributions = deserialize($model->attributions, true);
+        $attributions = StringUtil::deserialize($model->attributions, true);
 
         foreach ($attributions as $attribution) {
             $definition->addAttribution($attribution);

src/Mapper/Layer/FileLayerMapper.php

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

src/Mapper/Layer/MarkersLayerMapper.php

@@ -170,7 +170,7 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
      * @param Model   $model   The layer model.
      * @param Request $request Optional building request.
      *
-     * @return \Model\Collection|null
+     * @return \Contao\Model\Collection|null
      */
     protected function loadMarkerModels(Model $model, Request $request = null)
     {

src/Mapper/Layer/OverpassLayerMapper.php

@@ -13,6 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
 
 use Contao\Model;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Definition\Layer\OverpassLayer;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Mapper\Request;
@@ -146,7 +147,7 @@ class OverpassLayerMapper extends AbstractLayerMapper
      */
     private function filterAmenityIconsConfig($amenityIconsConfig)
     {
-        $amenityIconsConfig = deserialize($amenityIconsConfig, true);
+        $amenityIconsConfig = StringUtil::deserialize($amenityIconsConfig, true);
         $amenityIconsMap    = [];
 
         foreach ($amenityIconsConfig as $config) {

src/Mapper/Layer/VectorsLayerMapper.php

@@ -188,11 +188,11 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
      * Add javascript callbacks.
      *
      * @param GeoJson $definition The definition.
-     * @param \Model  $model      The database model.
+     * @param Model   $model      The database model.
      *
      * @return void
      */
-    protected function addCallbacks(GeoJson $definition, \Model $model)
+    protected function addCallbacks(GeoJson $definition, Model $model)
     {
         if ($model->pointToLayer) {
             $definition->setPointToLayer(new Expression($model->pointToLayer));

src/Mapper/MapMapper.php

@@ -13,6 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Mapper;
 
 use Contao\Model;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Model\ControlModel;
 use Netzmacht\Contao\Leaflet\Model\MapModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
@@ -195,7 +196,7 @@ class MapMapper extends AbstractMapper
      */
     private function buildBoundsCalculation(Map $map, MapModel $model)
     {
-        $adjustBounds = deserialize($model->adjustBounds, true);
+        $adjustBounds = StringUtil::deserialize($model->adjustBounds, true);
 
         if (in_array('deferred', $adjustBounds)) {
             $map->setOption('adjustBounds', true);

src/Mapper/OptionsBuilder.php

@@ -131,7 +131,7 @@ class OptionsBuilder
      * Build options and conditional options.
      *
      * @param Definition $definition The definition being built.
-     * @param \Model     $model      The model.
+     * @param Model      $model      The model.
      *
      * @return $this
      */
@@ -147,7 +147,7 @@ class OptionsBuilder
      * Build options.
      *
      * @param Definition $definition The definition being built.
-     * @param \Model     $model      The model.
+     * @param Model      $model      The model.
      *
      * @return void
      */
@@ -160,11 +160,11 @@ class OptionsBuilder
      * Build conditional options.
      *
      * @param Definition $definition The definition being built.
-     * @param \Model     $model      The model.
+     * @param Model      $model      The model.
      *
      * @return void
      */
-    private function buildConditionals($definition, \Model $model)
+    private function buildConditionals($definition, Model $model)
     {
         foreach ($this->conditional as $column => $conditions) {
             foreach ($conditions as $value => $options) {

src/Mapper/Type/ImageIconMapper.php

@@ -12,6 +12,7 @@
 
 namespace Netzmacht\Contao\Leaflet\Mapper\Type;
 
+use Contao\File;
 use Contao\FilesModel;
 use Contao\Model;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
@@ -118,7 +119,7 @@ class ImageIconMapper extends AbstractIconMapper
             if ($file) {
                 $definition->setIconUrl($file->path);
 
-                $file = new \File($file->path);
+                $file = new File($file->path);
                 $definition->setIconSize([$file->width, $file->height]);
 
                 if (!$model->iconAnchor) {
@@ -162,7 +163,7 @@ class ImageIconMapper extends AbstractIconMapper
             if ($file) {
                 $definition->setShadowUrl($file->path);
 
-                $file = new \File($file->path);
+                $file = new File($file->path);
                 $definition->setShadowSize([$file->width, $file->height]);
 
                 if (!$model->shadowAnchor) {

src/Mapper/UI/PopupMapper.php

@@ -13,6 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Mapper\UI;
 
 use Contao\Model;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Mapper\AbstractMapper;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Mapper\Request;
@@ -76,9 +77,9 @@ class PopupMapper extends AbstractMapper
         if ($model->autoPan) {
             $padding = array_map(
                 function ($value) {
-                    return array_map('intval', trimsplit(',', $value));
+                    return array_map('intval', StringUtil::trimsplit(',', $value));
                 },
-                deserialize($model->autoPanPadding, true)
+                StringUtil::deserialize($model->autoPanPadding, true)
             );
 
             if ($padding[0] === $padding[1]) {

src/Mapper/Vector/MultiPolylineMapper.php

@@ -13,6 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Mapper\Vector;
 
 use Contao\Model;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Mapper\Request;
 use Netzmacht\LeafletPHP\Definition;
@@ -67,7 +68,7 @@ class MultiPolylineMapper extends AbstractVectorMapper
      */
     protected function createLatLngs(Polyline $definition, Model $model)
     {
-        foreach (deserialize($model->multiData, true) as $ring => $data) {
+        foreach (StringUtil::deserialize($model->multiData, true) as $ring => $data) {
             $latLngs = array_map(
                 function ($row) {
                     return LatLng::fromString($row);

src/Mapper/Vector/RectangleMapper.php

@@ -13,6 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Mapper\Vector;
 
 use Contao\Model;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Mapper\Request;
 use Netzmacht\LeafletPHP\Definition\Vector\Rectangle;
@@ -53,7 +54,7 @@ class RectangleMapper extends AbstractVectorMapper
             function ($latLng) {
                 return LatLng::fromString($latLng);
             },
-            deserialize($model->bounds, true)
+            StringUtil::deserialize($model->bounds, true)
         );
 
         $arguments   = parent::buildConstructArguments($model, $mapper, $request, $elementId);

src/Model/AbstractActiveModel.php

@@ -12,6 +12,7 @@
 
 namespace Netzmacht\Contao\Leaflet\Model;
 
+use Contao\Model;
 use Contao\Model\Collection;
 
 /**
@@ -19,7 +20,7 @@ use Contao\Model\Collection;
  *
  * @package Netzmacht\Contao\Leaflet\Model
  */
-abstract class AbstractActiveModel extends \Model
+abstract class AbstractActiveModel extends Model
 {
     /**
      * Find an active model by its model id.

src/Model/ControlModel.php

@@ -12,7 +12,8 @@
 
 namespace Netzmacht\Contao\Leaflet\Model;
 
-use Model\Collection;
+use Contao\Database;
+use Contao\Model\Collection;
 
 /**
  * Class ControlModel for the tl_leaflet_vector table.
@@ -42,7 +43,7 @@ LEFT JOIN tl_leaflet_control_layer c ON l.id = c.lid
 WHERE     c.cid=?
 SQL;
 
-        $result = \Database::getInstance()
+        $result = Database::getInstance()
             ->prepare($query)
             ->execute($this->id);
 
@@ -68,7 +69,7 @@ c ON      l.id = c.lid
 WHERE     c.cid=? AND l.active=1
 SQL;
 
-        $result = \Database::getInstance()
+        $result = Database::getInstance()
             ->prepare($query)
             ->execute($this->id);
 

src/Model/LayerModel.php

@@ -12,7 +12,7 @@
 
 namespace Netzmacht\Contao\Leaflet\Model;
 
-use Model\Collection;
+use Contao\Model\Collection;
 
 /**
  * Class LayerModel for the tl_leaflet_layer table.

src/Model/MapModel.php

@@ -12,7 +12,9 @@
 
 namespace Netzmacht\Contao\Leaflet\Model;
 
-use Model\Collection;
+use Contao\Database;
+use Contao\Model;
+use Contao\Model\Collection;
 
 /**
  * Class MapModel for the tl_leaflet_map table.
@@ -22,7 +24,7 @@ use Model\Collection;
  *
  * @package Netzmacht\Contao\Leaflet\Model
  */
-class MapModel extends \Model
+class MapModel extends Model
 {
     /**
      * Model table.
@@ -39,7 +41,7 @@ class MapModel extends \Model
     public function findLayers()
     {
         $query  = 'SELECT l.* FROM tl_leaflet_layer l LEFT JOIN tl_leaflet_map_layer m ON l.id = m.lid WHERE m.mid=?';
-        $result = \Database::getInstance()
+        $result = Database::getInstance()
             ->prepare($query)
             ->execute($this->id);
 
@@ -65,7 +67,7 @@ ON        l.id = m.lid
 WHERE     m.mid=? AND l.active=1
 SQL;
 
-        $result = \Database::getInstance()->prepare($query)->execute($this->id);
+        $result = Database::getInstance()->prepare($query)->execute($this->id);
 
         if ($result->numRows) {
             return Collection::createFromDbResult($result, 'tl_leaflet_layer');

src/Model/MarkerModel.php

@@ -36,7 +36,7 @@ class MarkerModel extends AbstractActiveModel
      * @param int    $pid    The parent id.
      * @param Filter $filter The filter.
      *
-     * @return \Model\Collection|null
+     * @return \Contao\Model\Collection|null
      */
     public static function findByFilter($pid, Filter $filter = null)
     {
@@ -59,7 +59,7 @@ class MarkerModel extends AbstractActiveModel
      * @param int        $pid    The layer id.
      * @param BboxFilter $filter The bbox filter.
      *
-     * @return \Model\Collection|null
+     * @return \Contao\Model\Collection|null
      */
     public static function findByBBoxFilter($pid, BboxFilter $filter)
     {