Generate absolute urls for file layers

https://github.com/netzmacht/contao-leaflet-maps/issues/92

.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"
+  ]
+}

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [dmolineus]

.gitignore

@@ -25,4 +25,3 @@ build.properties
 
 # NPM
 node_modules
-package-lock.json

.travis.yml

@@ -1,18 +1,32 @@
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - ant-optional
+
 language: php
 
 php:
-  - "7.0"
+  - "7.3"
+  - "7.2"
   - "7.1"
+  - "7.4snapshot"
+  - "nightly"
 
 env:
   - CONTAO_VERSION=contao/core-bundle ~4.4.0
+  - CONTAO_VERSION=contao/core-bundle ~4.5.0
+  - CONTAO_VERSION=contao/core-bundle ~4.6.0
 
 matrix:
   exclude:
+  allow_failures:
+    - php: "nightly"
+    - php: "7.4snapshot"
 
-sudo: false
-
-install:
+before_script:
+  - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - travis_retry composer self-update && composer --version
   - travis_retry composer require $CONTAO_VERSION --no-update
   - travis_retry composer update --prefer-dist --no-interaction

CHANGELOG.md

@@ -0,0 +1,186 @@
+
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Fixed
+
+ - Remove template debug placeholders, it breaks generated javascript ([#93](https://github.com/netzmacht/contao-leaflet-maps/issues/93))
+ - Generate absolute urls for file layers ([#92](https://github.com/netzmacht/contao-leaflet-maps/issues/92)) 
+
+## [3.2.1] - 2020-09-02
+
+### Fixed
+
+ - Do not append javascript to the body anymore as consent tools might interrupt rendering
+
+## [3.2.0] - 2020-08-28
+
+### Added
+
+ - Add support for consent tools based on `hofff/contao-consent-bridge`
+
+## [3.1.7] - 2020-08-28
+
+### Fixed
+
+ - Duplicate map layer relations ([#89](https://github.com/netzmacht/contao-leaflet-maps/issues/89))
+
+## [3.1.6] - 2020-01-03
+
+### Fixed
+
+ - Do not add options which value is `NULL`
+ - Fix button labels ([#83](https://github.com/netzmacht/contao-leaflet-maps/issues/83))
+ - Fix potential security issue of symfony/dependency-injection (https://github.com/advisories/GHSA-pgwj-prpq-jpc2)
+
+### Changed 
+
+ - Use relative path for backend icon ([#82](https://github.com/netzmacht/contao-leaflet-maps/issues/82))
+
+
+## [3.1.5] - 2019-08-26
+
+### Fixed
+
+ - Use twig directly instead of templating component to restore Contao 4.8
+ 
+## [3.1.4] - 2019-02-13
+
+### Fixed
+
+ - Fix ordering changes in layer control element aren't recognized ([#72](https://github.com/netzmacht/contao-leaflet-maps/issues/72))
+ - Fix markers with negative coordinates aren't displayed ([#74](https://github.com/netzmacht/contao-leaflet-maps/issues/74))
+ - Fix image icon with non existing image throws exception ([#75](https://github.com/netzmacht/contao-leaflet-maps/issues/75))
+ - Fix invalid alias then using multiple edit. Aliases aren't copied anymore. ([#71](https://github.com/netzmacht/contao-leaflet-maps/issues/71))
+
+## [3.1.3] - 2019-01-10
+
+### Fixed
+
+ - Fix broken api routes in Contao 4.6/Symfony 4 (#69)
+ - Fix broken about.html.twig template. Error block was missing
+
+## 3.1.2 - 2018-12-18
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.1...3.1.2)
+
+### Fixed
+
+ - Fix broken MapBox integration: Access token is now required
+ - Fix broken OpenWeatherMap integration: Api key is now required
+ - Fix broken Thunderforest integration: Api key is now required
+
+### Added
+
+ - Add missing OpenPtMap of leaflet-providers
+ - Add missing OpenRailwayMap of leaflet-providers
+ - Add missing OpenFireMap of leaflet-providers
+ - Add missing SafeCast of leaflet-providers
+ - Add missing map types `normalNightTransit`, `normalNightTransitMobile`, `reducedDay`, `reducedNight`, 
+   `hybridDayTransit` and `hybridDayGrey` of HERE provider
+ - Add missing map types `Voyager`, `VoyagerNoLabels`, `VoyagerOnlyLabels` and `VoyagerLabelsUnder` of CartoDB provider
+ - Add missing Wikimedia of leaflet-providers
+ - Add missing GeoportailFrance of leaflet-providers
+ - Add missing OneMapSG of leaflet-providers
+
+## [3.1.1] - 2018-12-07
+
+### Fixed
+
+ - Fix missing marker cluster icon.
+ - Ignore markers without coordinates to prevent uncaught exception caused by invalid coordinates.
+
+## 3.1.0 - 2018-11-01
+
+[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.4...3.1.0)
+
+### Added
+
+ - Custom route to load map data.
+ - Add distance filter support for the marker layer (Bounds Mode "fit" has to be enabled).
+ - Add support for relative css units for map size definition (#59).
+ - Add hint that zoom level is probably required (#56).
+
+### Deprecated
+
+ - Deprecate `Netzmacht\Contao\Leaflet\Frontend\RequestUrl`. Use router to generate request url for layer data.
+ - Deprecate `Netzmacht\Contao\Leaflet\Frontend\DataController`. Use introduced endpoint to get map data.
+ 
+### Changed
+
+ - Require PHP 7.1.
+ - Rewritten about page using own route (#48).
+
+### Fixed
+
+ - Pressing enter on backend geocode control doesn't submit form anymore.
+ - Fix broken marker cluster layer (#60).
+
+
+## [3.0.4] - 2018-10-08
+
+### Fixed
+
+ - Fix broken content element attributes (Missing class and custom id).
+
+## [3.0.3] - 2018-09-18
+
+### Fixed
+
+ - Make alias generator services public for Contao 4.6/Symfony 4.0 compatibility.
+
+## [3.0.2] - 2018-08-23
+
+ - Run composer require checker and solve issues.
+ 
+## [3.0.1] - 2018-06-20
+
+ - Fix broken dynamic bbox related data loading (#57) 
+
+## [3.0.0] - 2018-01-05
+
+ - Make hook/dca listener services public
+
+## [3.0.0-beta1] - 2017-11-15
+
+Enhancements
+
+  - Updated translations
+
+Bugfixes
+  
+  - Broken service definitions
+  - Broken file layer id 
+
+## [3.0.0-alpha2] - 2017-10-19
+
+Implemented enhancements
+ 
+ - Refactor to a more service oriented architecture
+ - Use a proper template for the map templates (Customize templates has to be adjusted!)
+ - New file layer for gpx,kml,wkt,topojson,geojson files added
+ - Bypass filesystem cache in debug mode
+ - Changelog added
+
+[Unreleased]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.2.1...hotfix/3.2.2
+[3.2.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.2.0...3.2.1
+[3.2.0]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.7...3.2.0
+[3.1.7]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.6...3.1.7
+[3.1.6]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.5...3.1.6
+[3.1.5]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.4...3.1.5
+[3.1.4]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.3...3.1.4
+[3.1.3]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.2...3.1.3
+[3.1.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.0...3.1.1
+[3.0.4]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.3...3.0.4
+[3.0.3]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.2...3.0.3
+[3.0.2]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.1...3.0.2
+[3.0.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0...3.0.1
+[3.0.0]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...3.0.0
+[3.0.0-beta1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...3.0.0-beta1
+[3.0-0-alpha2]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...3.0.0-alpha2

README.md

@@ -2,9 +2,9 @@ Leaflet integration into Contao CMS
 ===================================
 
 [![Build Status](http://img.shields.io/travis/netzmacht/contao-leaflet-maps/master.svg?style=flat-square)](https://travis-ci.org/netzmacht/contao-leaflet-maps)
-[![Version](http://img.shields.io/packagist/v/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
-[![License](http://img.shields.io/packagist/l/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
-[![Downloads](http://img.shields.io/packagist/dt/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
+[![Version](http://img.shields.io/packagist/v/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
+[![License](http://img.shields.io/packagist/l/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
+[![Downloads](http://img.shields.io/packagist/dt/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
 [![Contao Community Alliance coding standard](http://img.shields.io/badge/cca-coding_standard-red.svg?style=flat-square)](https://github.com/contao-community-alliance/coding-standard)
 
 This extension provides a backend gui for integrating [Leaflet](http://leafletjs.com/) into the Contao CMS.
@@ -17,17 +17,19 @@ Features
 
  - Define Leaflet maps with multiple layers.
  - Manage map controls
-    - [Layers control](http://leafletjs.com/reference-1.0.0.html#control-layers)
-    - [Zoom control](http://leafletjs.com/reference-1.0.0.html#control-zoom)
-    - [Scale control]((http://leafletjs.com/reference-1.0.0.html#control-scale))
-    - [Attribution control](http://leafletjs.com/reference-1.0.0.html#control-attribution)
+    - [Layers control](http://leafletjs.com/reference-1.2.0.html#control-layers)
+    - [Zoom control](http://leafletjs.com/reference-1.2.0.html#control-zoom)
+    - [Scale control]((http://leafletjs.com/reference-1.2.0.html#control-scale))
+    - [Attribution control](http://leafletjs.com/reference-1.2.0.html#control-attribution)
     - [Loading control](https://github.com/ebrelsford/Leaflet.loading)
  - Manage layers 
     - [Tile provider](https://github.com/leaflet-extras/leaflet-providers)
-    - Markers - A set of [markers](http://leafletjs.com/reference-1.0.0.html#marker)
-    - Vectors - A set of [vectors](http://leafletjs.com/reference-1.0.0.html)
+    - Markers - A set of [markers](http://leafletjs.com/reference-1.2.0.html#marker)
+    - Vectors - A set of [vectors](http://leafletjs.com/reference-1.2.0.html)
     - Groups  - A group of layers
     - Reference - A link to another layer
+    - [Markercluster](https://github.com/Leaflet/Leaflet.markercluster)
+    - External geo data files (gpx,kml,wkt,geojson,topojson) 
  - Manage marker icons
  - Manage vector styles
  - Optional deferred ajax loading of layer data
@@ -36,11 +38,28 @@ Features
  - Autoloading of required assets.
  - [Layer for MetaModels](https://github.com/netzmacht/contao-leaflet-metamodels)
  
+
+Documentation
+-------------
+
+A basic [user documentation](http://leaflet-maps-for-contao.readthedocs.org/) written in German is available.
+ 
+Changelog
+---------
+
+View the [CHANGELOG.md](CHANGELOG.md) for the latest changes.
+
+Requirements
+------------
+ 
+ - Contao 4.4
+ - PHP >= 7.0
+ 
 Install
 -------
 
 ```
-$ php composer.phar require netzmacht/contao-leaflet-maps:~2.0
+$ php composer.phar require netzmacht/contao-leaflet-maps:~3.0
 ```
 
 Credits

composer.json

@@ -1,13 +1,13 @@
 {
   "name": "netzmacht/contao-leaflet-maps",
+  "type": "contao-bundle",
   "description": "Contao Leaflet maps integration",
   "keywords": [
     "contao",
     "maps",
     "leaflet"
   ],
-  "type": "contao-bundle",
-  "license": "LGPL-3.0+",
+  "license": "LGPL-3.0-or-later",
   "authors": [
     {
       "name": "David Molineus",
@@ -16,25 +16,53 @@
       "role": "Developer"
     }
   ],
-  "support": {
-    "email": "mail@netzmacht.de",
-    "issues": "https://github.com/netzmacht/contao-leaflet-maps/issues",
-    "source": "https://github.com/netzmacht/contao-leaflet-maps"
-  },
   "require": {
-    "php": ">=7.0",
+    "php": ">=7.1",
+    "ext-json": "*",
+    "ext-pdo": "*",
+    "contao-community-alliance/meta-palettes": "^2.0 || ^1.11",
     "contao/core-bundle": "~4.4",
-    "netzmacht/contao-leaflet-libraries": "^1.0",
+    "doctrine/cache": "^1.0",
+    "doctrine/dbal": "^2.5",
+    "menatwork/contao-multicolumnwizard": "^3.3",
+    "netzmacht/contao-leaflet-geocode-widget": "^1.2",
+    "netzmacht/contao-leaflet-libraries": "^1.3.4",
+    "netzmacht/contao-page-context": "~1.0",
+    "netzmacht/contao-toolkit": "~3.0",
     "netzmacht/php-javascript-builder": "^1.0",
-    "netzmacht/php-leaflet": "^1.0.1",
-    "netzmacht/contao-toolkit": "^3.0@dev",
-    "contao-community-alliance/meta-palettes": "^1.5",
-    "menatwork/contao-multicolumnwizard": "^3.2",
-    "doctrine/cache": "^1.0"
+    "netzmacht/php-leaflet": "^1.1.0",
+    "symfony/config": "~3.3 || ~4.0",
+    "symfony/dependency-injection": "^3.4.26 || ^4.1.12",
+    "symfony/event-dispatcher": "~3.3 || ~4.0",
+    "symfony/filesystem": "~3.3 || ~4.0",
+    "symfony/http-kernel": "~3.3 || ~4.0",
+    "symfony/twig-bundle": "~3.3 || ~4.0",
+    "symfony/translation": "~3.3 || ~4.0",
+    "twig/twig": "^1.3.35 || ^2.0"
   },
   "require-dev": {
-    "phpcq/all-tasks": "^1.2",
-    "contao/manager-plugin": "^2.1"
+    "contao/manager-plugin": "^2.1",
+    "hofff/contao-consent-bridge": "^1.0",
+    "phpcq/all-tasks": "^1.2"
+  },
+  "conflict": {
+    "hofff/contao-consent-bridge": "<1.0 || >= 2.0"
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "3.2.x-dev",
+      "dev-develop": "3.3.x-dev",
+      "dev-support/2.x": "2.0.x-dev"
+    },
+    "contao": {
+      "transifex": {
+        "project": "contao-leaflet-maps",
+        "prefix": "core-",
+        "languages_cto": "src/Bundle/Resources/contao/languages",
+        "languages_tx": ".tx"
+      }
+    },
+    "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin"
   },
   "autoload": {
     "psr-4": {
@@ -46,20 +74,10 @@
       "vendor/phpcq/autoload-validation/hacks/contao-hack.php"
     ]
   },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "2.0.x-dev",
-      "dev-develop": "2.1.x-dev",
-      "dev-release/3.0.0": "3.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_tx": ".tx"
-      }
-    }
+  "support": {
+    "email": "mail@netzmacht.de",
+    "issues": "https://github.com/netzmacht/contao-leaflet-maps/issues",
+    "source": "https://github.com/netzmacht/contao-leaflet-maps",
+    "docs": "http://leaflet-maps-for-contao.readthedocs.org/"
   }
 }

gulpfile.js

@@ -1,28 +1,35 @@
-var gulp       = require('gulp');
-var del        = require('del');
-var uglify     = require('gulp-uglify');
-var concat     = require('gulp-concat');
+const { series, src, watch, dest, parallel, task} = require('gulp');
+const del             = require('promised-del');
+const uglify          = require('gulp-uglify');
+const concat          = require('gulp-concat');
 
 var paths = {
     minified: 'contao-leaflet.js',
-    scripts:  ['js/*.js'],
+    scripts:  ['js/vendor/*.js', 'js/*.js'],
     dest:     'src/Bundle/Resources/public/js'
 };
 
-gulp.task('clear', function() {
-    del([paths.dest + '/' + paths.minified]);
-});
+function clean () {
+    return del([paths.dest + '/' + paths.minified]);
+}
 
-gulp.task('scripts', ['clear'], function() {
-    return gulp.src(paths.scripts)
+function build () {
+    return src(paths.scripts)
         .pipe(concat(paths.minified))
         .pipe(uglify())
-        .pipe(gulp.dest(paths.dest));
-});
+        .pipe(dest(paths.dest));
+}
 
+const buildTasks = series(clean, build);
 
-gulp.task('default', ['scripts']);
+function watchTask () {
+    watch(
+        paths.scripts,
+        buildTasks
+    )
+}
 
-gulp.task('watch', function() {
-   gulp.watch(paths.scripts, ['scripts']);
-});
+exports.clean   = clean;
+exports.watch   = watchTask;
+exports.build   = buildTasks;
+exports.default = buildTasks;

js/Contao.js

@@ -124,8 +124,23 @@ L.Contao = L.Evented.extend({
      * @param map         Pass a map object so that the data loading events are passed to the map.
      */
     load: function (hash, type, options, customLayer, map) {
-        var url   = this.createRequestUrl(hash, map),
-            layer = omnivore[type](url, options, customLayer);
+        var url = this.createRequestUrl(hash, map);
+
+        return this.loadFile(url, type, options, customLayer, map);
+    },
+
+    /**
+     * Load data from an url into a layer using omnivore.
+     *
+     * @param url         A file url.
+     * @param type        The response content format.
+     * @param options     Parser options
+     * @param customLayer optional custom layer.
+     * @param map         Pass a map object so that the data loading events are passed to the map.
+     */
+    loadUrl: function (url, type, options, customLayer, map) {
+        url = this.applyFilterToUrl(url, map);
+        var layer = omnivore[type](url, options, customLayer);
 
         if (map) {
             // Required because Control.Loading tries to get _leafet_id which is created here.
@@ -133,7 +148,7 @@ L.Contao = L.Evented.extend({
 
             // Add listener for map bounds changes.
             if (map.options.dynamicLoad && layer.options.boundsMode == 'fit') {
-                layer.options.requestHash = hash;
+                layer.options.requestUrl = url;
                 map.on('moveend', layer.refreshData, layer);
 
                 map.on('layerremove', function(e) {
@@ -158,6 +173,19 @@ L.Contao = L.Evented.extend({
         return layer;
     },
 
+    /**
+     * Load data from an url into a layer using omnivore.
+     *
+     * @param url         A file url.
+     * @param type        The response content format.
+     * @param options     Parser options
+     * @param customLayer optional custom layer.
+     * @param map         Pass a map object so that the data loading events are passed to the map.
+     */
+    loadFile: function (url, type, options, customLayer, map) {
+        return this.loadUrl(url, type, options, customLayer, map);
+    },
+
     /**
      * Point to layer callback. Adds a geo json point to the layer.
      *
@@ -299,6 +327,36 @@ L.Contao = L.Evented.extend({
         }
 
         return value;
+    },
+
+    /**
+     * Apply the filter to a request url.
+     *
+     * @param {string} url The request url.
+     * @param {L.Map}  map The map.
+     *
+     * @returns {string}
+     */
+    applyFilterToUrl: function (url, map) {
+        var value, query, bounds;
+
+        if (!map || !map.options.dynamicLoad) {
+            return url;
+        }
+
+        url = new URL(url);
+        query = new URLSearchParams(url.search);
+
+        bounds = map.getBounds();
+        value  = bounds.getSouth() + ',' + bounds.getWest();
+        value += ',' + bounds.getNorth() + ',' + bounds.getEast();
+
+        query.set('filter', 'bbox');
+        query.set('values', value);
+
+        url.search = query.toString();
+
+        return url.toString();
     }
 });
 

js/Mixin.GeoJSON.js

@@ -29,6 +29,6 @@ L.GeoJSON.include({
         });
 
         // TODO: Allow other data formats.
-        omnivore.geojson(L.contao.createRequestUrl(this.options.requestHash, e.target), null, dataLayer);
+        omnivore.geojson(L.contao.applyFilterToUrl(this.options.requestUrl, e.target), null, dataLayer);
     }
 });

package.json

@@ -4,10 +4,11 @@
   "description": "Leaflet maps for Contao",
   "main": "gulpfile.js",
   "dependencies": {
-    "del": "^3.0.0",
-    "gulp": "^3.9.1",
-    "gulp-concat": "^2.6.0",
-    "gulp-uglify": "^3.0.0"
+    "gulp": "^4.0.2",
+    "gulp-cli": "^2.2.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-uglify": "^3.0.2",
+    "promised-del": "^1.0.2"
   },
   "devDependencies": {},
   "scripts": {
@@ -23,7 +24,7 @@
     "Maps"
   ],
   "author": "netzmacht David Molineus",
-  "license": "LGPL-3.0",
+  "license": "LGPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/netzmacht/contao-leaflet-maps/issues"
   },

src/Backend/Action/AboutAction.php

@@ -5,35 +5,66 @@
  *
  * @package    contao-leaflet-maps
  * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @copyright  2014-2019 netzmacht David Molineus. All rights reserved.
  * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
  * @filesource
  */
 
-namespace Netzmacht\Contao\Leaflet\Backend;
+namespace Netzmacht\Contao\Leaflet\Backend\Action;
+
+use Symfony\Component\HttpFoundation\Response;
+use Twig\Environment;
 
 /**
  * Credits backend module.
  *
  * @package Netzmacht\Contao\Leaflet\Backend
  */
-class About
+final class AboutAction
 {
+    /**
+     * Twig environment.
+     *
+     * @var Environment
+     */
+    private $twig;
+
+    /**
+     * Project directory.
+     *
+     * @var string
+     */
+    private $projectDir;
+
+    /**
+     * AboutAction constructor.
+     *
+     * @param Environment $twig       Twig environment.
+     * @param string      $projectDir Project directory.
+     */
+    public function __construct(Environment $twig, string $projectDir)
+    {
+        $this->twig       = $twig;
+        $this->projectDir = $projectDir;
+    }
+
     /**
      * Generate the backend view.
      *
      * @return string
      */
-    public function generate()
+    public function __invoke(): Response
     {
-        $template = new \BackendTemplate('be_leaflet_about');
+        $data = [
+            'headline'  => 'Leaftlet maps integration for Contao CMS',
+            'libraries' => $this->getLibraries(),
+        ];
 
-        $template->headline  = 'Leaftlet maps integration for Contao CMS';
-        $template->libraries = $this->getLibraries();
+        [$data['version'], $data['dependencies']] = $this->extractFromComposer();
 
-        list($template->version, $template->dependencies) = $this->extractFromComposer();
-
-        return $template->parse();
+        return new Response(
+            $this->twig->render('@NetzmachtContaoLeaflet/backend/about.html.twig', $data)
+        );
     }
 
     /**
@@ -43,23 +74,22 @@ class About
      *
      * @SuppressWarnings(PHPMD.Superglobals)
      */
-    private function getLibraries()
+    private function getLibraries(): array
     {
         return array_map(
             function ($library) {
                 $library = array_merge(
-                    array(
+                    [
                         'homepage' => null,
                         'version'  => null,
-                    ),
+                    ],
                     $library
                 );
 
                 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'])
                     );
                 }
@@ -69,7 +99,7 @@ class About
             array_filter(
                 $GLOBALS['LEAFLET_LIBRARIES'],
                 function ($library) {
-                    return isset($library['name']) && isset($library['license']);
+                    return isset($library['name'], $library['license']);
                 }
             )
         );
@@ -80,36 +110,36 @@ class About
      *
      * @return array
      */
-    private function extractFromComposer()
+    private function extractFromComposer(): array
     {
-        $extFile  = TL_ROOT . '/vendor/netzmacht/contao-leaflet-maps/composer.json';
-        $lockFile = TL_ROOT . '/composer.lock';
+        $extFile  = $this->projectDir . '/vendor/netzmacht/contao-leaflet-maps/composer.json';
+        $lockFile = $this->projectDir . '/composer.lock';
 
         if (!file_exists($extFile) || !file_exists($lockFile)) {
-            return array();
+            return [];
         }
 
         $extension = json_decode(file_get_contents($extFile), true);
         $installed = json_decode(file_get_contents($lockFile), true);
-        $deps      = array();
+        $deps      = [];
         $version   = null;
 
         foreach ($installed['packages'] as $package) {
             if ($package['name'] === 'netzmacht/contao-leaflet-maps') {
                 $version = $package['version'];
             } elseif (isset($extension['require'][$package['name']])) {
-                $deps[] = array(
+                $deps[] = [
                     'name'     => $package['name'],
                     'version'  => $package['version'],
                     'license'  => !empty($package['license']) ? implode(', ', $package['license']) : '',
                     'homepage' => sprintf(
                         '<a href="https://packagist.org/packages/%s" target="_blank">Visit packagist</a>',
                         $package['name']
-                    )
-                );
+                    ),
+                ];
             }
         }
 
-        return array($version, $deps);
+        return [$version, $deps];
     }
 }

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

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Leaflet maps for Contao CMS.
+ *
+ * @package    contao-leaflet-maps
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
+ * @filesource
+ */
+
+declare(strict_types=1);
+
+namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
+
+use Contao\FilesModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
+use Symfony\Component\Translation\TranslatorInterface as Translator;
+
+/**
+ * Class FileLabelRenderer
+ *
+ * @package Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer
+ */
+class FileLabelRenderer extends AbstractLabelRenderer
+{
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
+    /**
+     * FileLabelRenderer constructor.
+     *
+     * @param RepositoryManager $repositoryManager Repository manager.
+     */
+    public function __construct(RepositoryManager $repositoryManager)
+    {
+        $this->repositoryManager = $repositoryManager;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getLayerType(): string
+    {
+        return 'file';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function render(array $row, string $label, Translator $translator): string
+    {
+        $repository = $this->repositoryManager->getRepository(FilesModel::class);
+        $file       = $repository->findByPk($row['file']);
+
+        if ($file) {
+            $label .= ' <span class="tl_gray">(' . $file->path . ')</span>';
+        }
+
+        return $label;
+    }
+}

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

@@ -15,6 +15,7 @@ declare(strict_types=1);
 namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
 use Netzmacht\Contao\Leaflet\Model\MarkerModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
@@ -24,6 +25,23 @@ use Symfony\Component\Translation\TranslatorInterface as Translator;
  */
 final class MarkersLabelRenderer extends AbstractLabelRenderer
 {
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
+    /**
+     * FileLabelRenderer constructor.
+     *
+     * @param RepositoryManager $repositoryManager Repository manager.
+     */
+    public function __construct(RepositoryManager $repositoryManager)
+    {
+        $this->repositoryManager = $repositoryManager;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -37,8 +55,9 @@ final class MarkersLabelRenderer extends AbstractLabelRenderer
      */
     public function render(array $row, string $label, Translator $translator): string
     {
-        $count  = MarkerModel::countBy('pid', $row['id']);
-        $label .= sprintf(
+        $repository = $this->repositoryManager->getRepository(MarkerModel::class);
+        $count      = $repository->countBy(['pid=?'], [$row['id']]);
+        $label     .= sprintf(
             '<span class="tl_gray"> (%s %s)</span>',
             $count,
             $translator->trans('countEntries', [], 'contao_tl_leaflet_layer')

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

@@ -29,7 +29,7 @@ final class OverpassLabelRenderer extends AbstractLabelRenderer
      */
     protected function getLayerType(): string
     {
-        return 'vectors';
+        return 'overpass';
     }
 
     /**

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

@@ -15,6 +15,7 @@ declare(strict_types=1);
 namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
 use Netzmacht\Contao\Leaflet\Model\LayerModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
@@ -24,12 +25,29 @@ use Symfony\Component\Translation\TranslatorInterface as Translator;
  */
 final class ReferenceLabelRenderer extends AbstractLabelRenderer
 {
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
+    /**
+     * FileLabelRenderer constructor.
+     *
+     * @param RepositoryManager $repositoryManager Repository manager.
+     */
+    public function __construct(RepositoryManager $repositoryManager)
+    {
+        $this->repositoryManager = $repositoryManager;
+    }
+
     /**
      * {@inheritdoc}
      */
     protected function getLayerType(): string
     {
-        return 'vectors';
+        return 'reference';
     }
 
     /**
@@ -37,7 +55,8 @@ final class ReferenceLabelRenderer extends AbstractLabelRenderer
      */
     public function render(array $row, string $label, Translator $translator): string
     {
-        $reference = LayerModel::findByPk($row['reference']);
+        $repository = $this->repositoryManager->getRepository(LayerModel::class);
+        $reference  = $repository->find((int) $row['reference']);
 
         if ($reference) {
             $label .= '<span class="tl_gray"> (' . $reference->title . ')</span>';

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

@@ -15,6 +15,7 @@ declare(strict_types=1);
 namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
 use Netzmacht\Contao\Leaflet\Model\VectorModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
@@ -24,6 +25,23 @@ use Symfony\Component\Translation\TranslatorInterface as Translator;
  */
 final class VectorsLabelRenderer extends AbstractLabelRenderer
 {
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
+    /**
+     * FileLabelRenderer constructor.
+     *
+     * @param RepositoryManager $repositoryManager Repository manager.
+     */
+    public function __construct(RepositoryManager $repositoryManager)
+    {
+        $this->repositoryManager = $repositoryManager;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -37,8 +55,9 @@ final class VectorsLabelRenderer extends AbstractLabelRenderer
      */
     public function render(array $row, string $label, Translator $translator): string
     {
-        $count  = VectorModel::countBy('pid', $row['id']);
-        $label .= sprintf(
+        $repository = $this->repositoryManager->getRepository(VectorModel::class);
+        $count      = $repository->countBy(['pid=?'], [$row['id']]);
+        $label     .= sprintf(
             '<span class="tl_gray"> (%s %s)</span>',
             $count,
             $translator->trans('countEntries', [], 'contao_tl_leaflet_layer')

src/Bundle/ConsentBridge/Plugin.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Leaflet maps for Contao CMS.
+ *
+ * @package    contao-leaflet-maps
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
+ * @filesource
+ */
+
+declare(strict_types=1);
+
+namespace Netzmacht\Contao\Leaflet\Bundle\ConsentBridge;
+
+use Hofff\Contao\Consent\Bridge\Bridge;
+use Hofff\Contao\Consent\Bridge\Plugin as ConsentBridgePlugin;
+use Hofff\Contao\Consent\Bridge\Render\RenderInformation;
+
+/**
+ * Consent Bridge plugin for leaflet.
+ */
+final class Plugin implements ConsentBridgePlugin
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function load(Bridge $bridge): void
+    {
+        $renderInformation = RenderInformation::autoRenderWithPlaceholder('leaflet_consent_bridge_placeholder');
+
+        $bridge
+            ->supportContentElement('leaflet', $renderInformation)
+            ->supportFrontendModule('leaflet', $renderInformation);
+    }
+}

src/Bundle/ContaoManager/Plugin.php

@@ -18,15 +18,20 @@ use Contao\CoreBundle\ContaoCoreBundle;
 use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
 use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
 use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
+use Contao\ManagerPlugin\Routing\RoutingPluginInterface;
 use Netzmacht\Contao\Leaflet\Bundle\NetzmachtContaoLeafletBundle;
+use Netzmacht\Contao\PageContext\NetzmachtContaoPageContextBundle;
 use Netzmacht\Contao\Toolkit\Bundle\NetzmachtContaoToolkitBundle;
+use Symfony\Component\Config\Loader\LoaderResolverInterface;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * Contao manager plugin.
  *
  * @package Netzmacht\Contao\Leaflet\ContaoManager
  */
-class Plugin implements BundlePluginInterface
+class Plugin implements BundlePluginInterface, RoutingPluginInterface
 {
     /**
      * {@inheritdoc}
@@ -35,8 +40,27 @@ class Plugin implements BundlePluginInterface
     {
         return [
             BundleConfig::create(NetzmachtContaoLeafletBundle::class)
-                ->setLoadAfter([ContaoCoreBundle::class, NetzmachtContaoToolkitBundle::class])
-                ->setReplace(['leaflet'])
+                ->setLoadAfter(
+                    [
+                        ContaoCoreBundle::class,
+                        NetzmachtContaoToolkitBundle::class,
+                        NetzmachtContaoPageContextBundle::class
+                    ]
+                )
+                ->setReplace(['leaflet']),
         ];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRouteCollection(LoaderResolverInterface $resolver, KernelInterface $kernel): ?RouteCollection
+    {
+        $loader = $resolver->resolve(__DIR__ . '/../Resources/config/routing.yml');
+        if (!$loader) {
+            return null;
+        }
+
+        return $loader->load(__DIR__ . '/../Resources/config/routing.yml');
+    }
 }

src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php

@@ -33,7 +33,7 @@ class NetzmachtContaoLeafletExtension extends Extension
     {
         $loader = new YamlFileLoader(
             $container,
-            new FileLocator(dirname(__DIR__) .'/Resources/config')
+            new FileLocator(dirname(__DIR__) . '/Resources/config')
         );
 
         // Common config, services and listeners
@@ -49,5 +49,13 @@ class NetzmachtContaoLeafletExtension extends Extension
         $loader->load('mappers.yml');
         $loader->load('encoders.yml');
         $loader->load('layers.yml');
+
+        if (!$container->hasDefinition('netzmacht.contao_leaflet.cache')) {
+            if ($container->getParameter('kernel.debug')) {
+                $container->setAlias('netzmacht.contao_leaflet.cache', 'netzmacht.contao_leaflet.cache.debug');
+            } else {
+                $container->setAlias('netzmacht.contao_leaflet.cache', 'netzmacht.contao_leaflet.cache.default');
+            }
+        }
     }
 }

src/Bundle/NetzmachtContaoLeafletBundle.php

@@ -14,9 +14,9 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Bundle;
 
-use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterLibrariesPass;
 use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterDefinitionMapperPass;
 use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterEncodersPass;
+use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterLibrariesPass;
 use Netzmacht\Contao\Toolkit\Bundle\DependencyInjection\Compiler\AddTaggedServicesAsArgumentPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;

src/Bundle/Resources/config/config.yml

@@ -38,6 +38,13 @@ parameters:
     - 'circle'
     - 'circleMarker'
 
+  netzmacht.contao_leaflet.file_formats:
+    gpx: ['gpx']
+    kml: ['kml']
+    wkt: ['wkt']
+    geojson: ['json', 'geojson']
+    topojson: ['json', 'topojson']
+
   # When creating a GeoJSON feature of a map object a feature.properties.model object is passed.
   # Define the properties you always want to set.
   #

src/Bundle/Resources/config/encoders.yml

@@ -42,6 +42,6 @@ services:
       - { name: netzmacht.contao_leaflet.encoder }
 
   netzmacht.contao_leaflet.encoder.subscriber:
-    class: Netzmacht\Contao\Leaflet\Subscriber\EncoderSubscriber
+    class: Netzmacht\Contao\Leaflet\Encoder\Subscriber\EncoderSubscriber
     tags:
       - { name: netzmacht.contao_leaflet.encoder }

src/Bundle/Resources/config/layers.yml

@@ -32,7 +32,7 @@ parameters:
 
     markercluster:
       children: true
-      icon: 'bundles/netzmachtcontaoleaflet/img/markercluster.png'
+      icon: 'bundles/netzmachtcontaoleaflet/img/cluster.png'
 
     tile:
       children: false
@@ -45,6 +45,12 @@ parameters:
         extend: true
         fit:    true
 
+    file:
+      children: false
+      icon: 'bundles/netzmachtcontaoleaflet/img/file.png'
+      boundsMode:
+        extend: true
+
 services:
   _defaults:
     public: false
@@ -56,6 +62,8 @@ services:
 
   netzmacht.contao_leaflet.layer_label_renderer.markers:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\MarkersLabelRenderer
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }
 
@@ -71,10 +79,21 @@ services:
 
   netzmacht.contao_leaflet.layer_label_renderer.reference:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ReferenceLabelRenderer
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }
 
   netzmacht.contao_leaflet.layer_label_renderer.vectors:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\VectorsLabelRenderer
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
+    tags:
+      - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }
+
+  netzmacht.contao_leaflet.layer_label_renderer.file:
+    class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\FileLabelRenderer
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }

src/Bundle/Resources/config/listeners.yml

@@ -1,75 +1,99 @@
 services:
   netzmacht.contao_leaflet.listeners.dca.leaflet:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\LeafletDcaListener
+    public: true
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
+      - '@templating'
       - '@filesystem'
+      - '@netzmacht.contao_toolkit.contao.system_adapter'
       - '%netzmacht.contao_leaflet.cache_dir%'
 
   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'
+      - '@translator'
+      - '@session'
 
   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'
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@translator'
       - '@netzmacht.contao_leaflet.layer_label_renderer'
+      - '@netzmacht.contao_toolkit.contao.backend_adapter'
       - '%netzmacht.contao_leaflet.layers%'
       - '%netzmacht.contao_leaflet.providers%'
       - '%netzmacht.contao_leaflet.amenities%'
+      - '%netzmacht.contao_leaflet.file_formats%'
 
   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'
       - '%netzmacht.contao_leaflet.vectors%'
 
   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%'
 
-  netzmacht.contao_leaflet.listeners.geo_json_subscriber:
-    class: Netzmacht\Contao\Leaflet\Subscriber\GeoJsonSubscriber
+  netzmacht.contao_leaflet.listeners.geo_json_listener:
+    class: Netzmacht\Contao\Leaflet\Listener\GeoJsonListener
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '%netzmacht.contao_leaflet.feature_model_properties%'
     tags:
-      - { name: 'kernel.event_subscriber' }
+      - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.mapper.convert_to_geojson', method: 'handle' }
 
   netzmacht.contao_leaflet.listeners.hash_subscriber:
-    class: Netzmacht\Contao\Leaflet\Subscriber\HashSubscriber
+    class: Netzmacht\Contao\Leaflet\Listener\HashSubscriber
     tags:
       - { name: 'kernel.event_subscriber' }
 
@@ -78,13 +102,26 @@ services:
     arguments:
       - '@netzmacht.contao_leaflet.map.assets'
       - '@netzmacht.contao_leaflet.definition.mapper'
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.libraries'
     tags:
       - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.get_javascript', method: 'onGetJavascriptEvent' }
 
   netzmacht.contao_leaflet.listeners.register_libraries:
     class: Netzmacht\Contao\Leaflet\Listener\RegisterLibrariesListener
+    public: true
     arguments:
-     - '@netzmacht.contao_leaflet.libraries'
-     - '@netzmacht.contao_leaflet.definition.builder'
+      - '@netzmacht.contao_leaflet.libraries'
+      - '@netzmacht.contao_leaflet.definition.builder'
+    tags:
+      - { name: 'contao.hook', hook: 'initializeSystem', method: 'onInitializeSystem' }
 
+  netzmacht.contao_leaflet.listeners.backend_menu:
+    class: Netzmacht\Contao\Leaflet\Listener\Backend\UserNavigationListener
+    arguments:
+      - '@request_stack'
+      - '@router'
+      - '@translator'
+      - '@netzmacht.contao_toolkit.assets_manager'
+    tags:
+      - { name: 'contao.hook', hook: 'getUserNavigation', method: '__invoke'}

src/Bundle/Resources/config/mappers.yml

@@ -9,6 +9,8 @@ services:
   # Map mapper
   netzmacht.contao_leaflet.mapper.map:
     class: Netzmacht\Contao\Leaflet\Mapper\MapMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 
@@ -28,26 +30,38 @@ services:
 
   netzmacht.contao_leaflet.mapper.markers_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkersLayerMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
+      - '@router'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 
   netzmacht.contao_leaflet.mapper.group_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\GroupLayerMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 
   netzmacht.contao_leaflet.mapper.vectors_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\VectorsLayerMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
+      - '@router'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 
   netzmacht.contao_leaflet.mapper.reference_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\ReferenceLayerMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 
   netzmacht.contao_leaflet.mapper.overpass_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\OverpassLayerMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 
@@ -55,9 +69,17 @@ services:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkerClusterLayerMapper
     arguments:
       - '@netzmacht.contao_leaflet.map.assets'
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
-      - { name: netzmacht.contao_leflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
+  netzmacht.contao_leaflet.mapper.file_layer:
+    class: Netzmacht\Contao\Leaflet\Mapper\Layer\FileLayerMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
+      - '@netzmacht.contao_toolkit.contao.environment_adapter'
+    tags:
+      - { name: netzmacht.contao_leaflet.mapper }
 
   # Control mappers
   netzmacht.contao_leaflet.mapper.zoom_control:
@@ -82,6 +104,8 @@ services:
 
   netzmacht.contao_leaflet.mapper.loading_control:
     class: Netzmacht\Contao\Leaflet\Mapper\Control\LoadingControlMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 
@@ -95,6 +119,7 @@ services:
   netzmacht.contao_leaflet.mapper.polyline:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolylineMapper
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
@@ -102,6 +127,7 @@ services:
   netzmacht.contao_leaflet.mapper.multi_polyline:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolylineMapper
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
@@ -109,6 +135,7 @@ services:
   netzmacht.contao_leaflet.mapper.polygon:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolygonMapper
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
@@ -116,6 +143,7 @@ services:
   netzmacht.contao_leaflet.mapper.multi_polygon:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolygonMapper
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
@@ -123,6 +151,7 @@ services:
   netzmacht.contao_leaflet.mapper.circle:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMapper
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
@@ -130,6 +159,7 @@ services:
   netzmacht.contao_leaflet.mapper.circle_mapper:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMarkerMapper
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
@@ -137,6 +167,7 @@ services:
   netzmacht.contao_leaflet.mapper.rectangle_mapper:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\RectangleMapper
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
@@ -150,6 +181,8 @@ services:
 
   netzmacht.contao_leaflet.mapper.image_icon:
     class: Netzmacht\Contao\Leaflet\Mapper\Type\ImageIconMapper
+    arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 
@@ -171,6 +204,7 @@ services:
   netzmacht.contao_leaflet.mapper.marker:
     class: Netzmacht\Contao\Leaflet\Mapper\UI\MarkerMapper
     arguments:
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }

src/Bundle/Resources/config/providers.yml

@@ -1,13 +1,22 @@
 parameters:
   netzmacht.contao_leaflet.providers:
     OpenStreetMap:
-      variants: ['Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH']
+      variants: ['Mapnik', 'BlackAndWhite', 'DE', 'CH', 'France', 'HOT', 'BZH']
 
     OpenSeaMap: []
 
     OpenTopoMap: []
 
+    OpenPtMap: []
+
+    OpenRailwayMap: []
+
+    OpenFireMap: []
+
+    SafeCast: []
+
     Thunderforest:
+      class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\ThunderforestProvider'
       variants:
         - 'OpenCycleMap'
         - 'Transport'
@@ -16,6 +25,9 @@ parameters:
         - 'Landscape'
         - 'Outdoors'
         - 'Pioneer'
+      options:
+        apiKey: 'tile_provider_key'
+      fields: ['tile_provider_key']
 
     OpenMapSurfer:
       variants: ['Roads', 'AdminBounds', 'Grayscale']
@@ -26,7 +38,8 @@ parameters:
     MapBox:
       class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\MapBoxProvider'
       options:
-        key: 'tile_provider_key'
+        accessToken: 'tile_provider_key'
+      fields: ['tile_provider_key']
 
     Stamen:
       variants:
@@ -56,6 +69,7 @@ parameters:
         - 'WorldGrayCanvas'
 
     OpenWeatherMap:
+      class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\OpenWeatherMapProvider'
       variants:
         - 'Clouds'
         - 'CloudsClassic'
@@ -68,6 +82,9 @@ parameters:
         - 'Wind'
         - 'Temperature'
         - 'Snow'
+      options:
+        apiKey: 'tile_provider_key'
+      fields: ['tile_provider_key']
 
     HERE:
       class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\HereProvider'
@@ -83,12 +100,18 @@ parameters:
         - 'normalNightMobile'
         - 'normalNightGrey'
         - 'normalNightGreyMobile'
+        - 'normalNightTransit'
+        - 'normalNightTransitMobile'
+        - 'reducedDay'
+        - 'reducedNight'
         - 'basicMap'
         - 'mapLabels'
         - 'trafficFlow'
         - 'carnavDayGrey'
         - 'hybridDay'
         - 'hybridDayMobile'
+        - 'hybridDayTransit'
+        - 'hybridDayGrey'
         - 'pedestrianDay'
         - 'pedestrianNight'
         - 'satelliteDay'
@@ -123,6 +146,10 @@ parameters:
         - 'DarkMatter'
         - 'DarkMatterNoLabels'
         - 'DarkMatterOnlyLabels'
+        - 'Voyager'
+        - 'VoyagerNoLabels'
+        - 'VoyagerOnlyLabels'
+        - 'VoyagerLabelsUnder'
 
     HikeBike:
       variants:
@@ -155,3 +182,20 @@ parameters:
         - 'ModisTerraChlorophyll'
 
     NLS: []
+
+    Wikimedia: []
+
+    GeoportailFrance:
+      variants:
+        - 'parcels'
+        - 'ignMaps'
+        - 'maps'
+        - 'orthos'
+
+    OneMapSG:
+      variants:
+        - 'Default'
+        - 'Night'
+        - 'Original'
+        - 'Grey'
+        - 'LandLot'

src/Bundle/Resources/config/routing.yml

@@ -0,0 +1,18 @@
+leaflet_layer:
+  path: /leaflet/api/layer/{layerId}
+  controller: Netzmacht\Contao\Leaflet\Frontend\Action\LayerDataAction
+  defaults:
+    _leaflet_scope: page
+    _format: geojson
+    _scope: frontend
+  requirements:
+    _format: geojson
+    context: \w+
+    contextId: \d+
+
+leaflet_backend_about:
+  path: /contao/leaflet/about
+  controller: Netzmacht\Contao\Leaflet\Backend\Action\AboutAction
+  defaults:
+    _scope: backend
+    _backend_module: leaflet_about

src/Bundle/Resources/config/services.yml

@@ -15,6 +15,8 @@ services:
       - '@netzmacht.contao_leaflet.map.assets'
       - '@netzmacht.contao_leaflet.cache'
       - '@netzmacht.contao_leaflet.frontend.data_controller'
+      - '@netzmacht.contao_toolkit.repository_manager'
+      - '@templating'
 
   netzmacht.contao_leaflet.libraries:
     class: Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration
@@ -26,9 +28,6 @@ services:
     arguments:
       - '%netzmacht.contao_leaflet.filters%'
 
-  netzmacht.contao_leaflet.cache:
-    alias: 'netzmacht.contao_leaflet.cache.default'
-
   netzmacht.contao_leaflet.cache.default:
     class: Doctrine\Common\Cache\FilesystemCache
     arguments:
@@ -75,18 +74,24 @@ services:
 
   netzmacht.contao_leaflet.definition.alias_generator.factory_default:
     class: Netzmacht\Contao\Leaflet\Alias\DefaultAliasGeneratorFactory
+    public: true
     arguments:
       - '@database_connection'
 
   netzmacht.contao_leaflet.definition.alias_generator.factory_parent:
     class: Netzmacht\Contao\Leaflet\Alias\ParentAliasGeneratorFactory
+    public: true
     arguments:
       - '@database_connection'
 
   netzmacht.contao_leaflet.frontend.element_factory:
     class: Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElementFactory
     arguments:
-      - '@service_container'
+      - '@templating'
+      - '@translator'
+      - '@netzmacht.contao_leaflet.map.provider'
+      - '@netzmacht.contao_toolkit.repository_manager'
+      - '@netzmacht.contao_toolkit.contao.input_adapter'
     tags:
       - { name: 'netzmacht.contao_toolkit.component.content_element_factory' }
       - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'includes' }
@@ -94,13 +99,18 @@ services:
   netzmacht.contao_leaflet.frontend.module_factory:
     class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory
     arguments:
-      - '@service_container'
+      - '@templating'
+      - '@translator'
+      - '@netzmacht.contao_leaflet.map.provider'
+      - '@netzmacht.contao_toolkit.repository_manager'
+      - '@netzmacht.contao_toolkit.contao.input_adapter'
     tags:
       - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' }
       - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: 'includes' }
 
   netzmacht.contao_leaflet.frontend.insert_tag:
     class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser
+    public: true
     arguments:
       - '@netzmacht.contao_leaflet.map.provider'
       - '%kernel.debug%'
@@ -112,3 +122,23 @@ services:
     arguments:
       - '@netzmacht.contao_leaflet.filter_factory'
       - '%kernel.debug%'
+
+  Netzmacht\Contao\Leaflet\Frontend\PageIdDeterminator:
+    tags:
+      - { name: Netzmacht\Contao\PageContext\Request\PageIdDeterminator }
+
+  Netzmacht\Contao\Leaflet\Frontend\Action\LayerDataAction:
+    public: true
+    arguments:
+      - '@netzmacht.contao_leaflet.map.provider'
+      - '@netzmacht.contao_leaflet.filter_factory'
+
+  Netzmacht\Contao\Leaflet\Backend\Action\AboutAction:
+    public: true
+    arguments:
+      - '@twig'
+      - '%kernel.project_dir%'
+
+  Netzmacht\Contao\Leaflet\Bundle\ConsentBridge\Plugin:
+    tags:
+      - { name: hofff_contao_consent_bridge.plugin }

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

@@ -17,44 +17,37 @@
 array_insert(
     $GLOBALS['BE_MOD'],
     1,
-    array(
-        'leaflet' => array
-        (
-            'leaflet_map' => array
-            (
-                'tables' => array
-                (
+    [
+        'leaflet' => [
+            'leaflet_map'   => [
+                'tables'     => [
                     'tl_leaflet_map',
                     'tl_leaflet_control',
-                ),
+                ],
                 'icon'       => 'bundles/netzmachtcontaoleaflet/img/map.png',
                 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/backend.css',
-            ),
-            'leaflet_layer' => array
-            (
-                'tables' => array
-                (
+            ],
+            'leaflet_layer' => [
+                'tables'     => [
                     'tl_leaflet_layer',
                     'tl_leaflet_marker',
                     'tl_leaflet_vector',
                     'tl_leaflet_icon',
                     'tl_leaflet_style',
                     'tl_leaflet_popup',
-                ),
+                ],
                 'icon'       => 'bundles/netzmachtcontaoleaflet/img/layers.png',
                 'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/backend.css',
-                'javascript' => 'bundles/netzmachtcontaoleaflet/js/backend.js'
-            ),
-            'leaflet_about' => array
-            (
-                'callback'   => Netzmacht\Contao\Leaflet\Backend\About::class,
-                'icon'       => 'bundles/netzmachtcontaoleaflet/img/about.png',
-                'stylesheet' => 'bundles/netzmachtcontaoleaflet/css/about.css',
-            )
-        )
-    )
+                'javascript' => 'bundles/netzmachtcontaoleaflet/js/backend.js',
+            ],
+        ],
+    ]
 );
 
+if (defined('TL_MODE') && TL_MODE === 'BE') {
+    $GLOBALS['TL_CSS'][] = 'bundles/netzmachtcontaoleaflet/css/backend_global.css';
+}
+
 /*
  * Models.
  */
@@ -67,12 +60,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_content.php

@@ -5,6 +5,7 @@
  *
  * @package    contao-leaflet-maps
  * @author     David Molineus <david.molineus@netzmacht.de>
+ * @author     Fritz Michael Gschwantner <fmg@inspiredminds.at>
  * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
  * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
  * @filesource
@@ -13,7 +14,7 @@
 $GLOBALS['TL_DCA']['tl_content']['metapalettes']['leaflet'] = [
     'type'      => ['type', 'headline'],
     'leaflet'   => ['leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height'],
-    'templates' => [':hide', 'customTpl', 'leaflet_template'],
+    'template'  => [':hide', 'customTpl', 'leaflet_template'],
     'protected' => [':hide', 'protected'],
     'expert'    => [':hide', 'guests', 'cssID', 'space'],
     'invisible' => [':hide', 'invisible', 'start', 'start'],
@@ -49,7 +50,7 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_mapId'] = [
 $GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_width'] = [
     'label'     => &$GLOBALS['TL_LANG']['tl_content']['leaflet_width'],
     'inputType' => 'inputUnit',
-    'options'   => ['px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'],
+    'options'   => $GLOBALS['TL_CSS_UNITS'],
     'search'    => false,
     'exclude'   => true,
     'eval'      => ['rgxp' => 'digit', 'tl_class' => 'clr w50'],
@@ -60,7 +61,7 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_width'] = [
 $GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_height'] = [
     'label'     => &$GLOBALS['TL_LANG']['tl_content']['leaflet_height'],
     'inputType' => 'inputUnit',
-    'options'   => ['px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'],
+    'options'   => $GLOBALS['TL_CSS_UNITS'],
     'search'    => false,
     'exclude'   => true,
     'eval'      => ['rgxp' => 'digit', 'tl_class' => 'w50'],

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

@@ -164,6 +164,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
                 'maxlength'   => 255,
                 'tl_class'    => 'w50',
                 'nullIfEmpty' => true,
+                'doNotCopy'   => true,
             ],
             'toolkit'       => [
                 'alias_generator' => [

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

@@ -179,7 +179,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -217,6 +217,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 'pointToLayer',
             ],
         ],
+
+        'file extends default' => [
+            '+config' => ['boundsMode', 'fileFormat'],
+            '+expert' => [
+                'onEachFeature',
+                'pointToLayer',
+            ],
+        ],
     ],
 
     'metasubselectpalettes' => [
@@ -224,8 +232,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'provider' => ['tile_provider', 'tile_provider_variant'],
         ],
         'tile_provider' => [
-            'MapBox' => ['tile_provider_key'],
-            'HERE'   => ['tile_provider_key', 'tile_provider_code'],
+            'MapBox'         => ['tile_provider_key'],
+            'HERE'           => ['tile_provider_key', 'tile_provider_code'],
+            'OpenWeatherMap' => ['tile_provider_key'],
+            'Thunderforest'  => ['tile_provider_key'],
+        ],
+        'fileFormat'    => [
+            '!' => ['file'],
         ],
     ],
 
@@ -265,7 +278,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval' => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'nullIfEmpty' => true,
+                'doNotCopy'   => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
@@ -707,14 +727,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',
@@ -853,5 +873,37 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             ],
             'sql'       => 'mediumtext NULL',
         ],
+        'fileFormat'                     => [
+            'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'],
+            'exclude'          => true,
+            'inputType'        => 'select',
+            'filter'           => true,
+            'eval'             => [
+                'mandatory'          => true,
+                'tl_class'           => 'w50',
+                'includeBlankOption' => true,
+                'submitOnChange'     => true,
+                'chosen'             => true,
+                'helpwizard'         => true,
+            ],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getFileFormats'],
+            'reference'        => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats'],
+            'sql'              => "varchar(32) NOT NULL default ''",
+        ],
+        'file'                           => [
+            'label'         => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'],
+            'exclude'       => true,
+            'inputType'     => 'fileTree',
+            'load_callback' => [
+                ['netzmacht.contao_leaflet.listeners.dca.layer', 'prepareFileWidget'],
+            ],
+            'eval'          => [
+                'filesOnly' => true,
+                'fieldType' => 'radio',
+                'mandatory' => true,
+                'tl_class'  => 'clr',
+            ],
+            'sql'           => 'binary(16) NULL',
+        ],
     ],
 ];

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

@@ -23,10 +23,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
         ],
         'onload_callback'   => [
             ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'],
+            ['netzmacht.contao_leaflet.listeners.dca.map', 'addIncompleteConfigurationWarning'],
         ],
         'onsubmit_callback' => [
             ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
+        'oncopy_callback' => [
+            ['netzmacht.contao_leaflet.listeners.dca.map', 'copyLayerRelations'],
+        ],
     ],
 
     'list' => [
@@ -156,7 +160,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -23,7 +23,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
             ],
         ],
         'onload_callback'   => [
-            ['netzmacht.contao_leaflet.listeners.dca.marker', 'initialize'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'],
         ],
         'onsubmit_callback' => [
             ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
@@ -160,7 +160,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -151,7 +151,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -145,7 +145,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

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

@@ -185,7 +185,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
@@ -347,13 +354,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/dca/tl_module.php

@@ -5,6 +5,7 @@
  *
  * @package    contao-leaflet-maps
  * @author     David Molineus <david.molineus@netzmacht.de>
+ * @author     Fritz Michael Gschwantner <fmg@inspiredminds.at>
  * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
  * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
  * @filesource
@@ -13,7 +14,7 @@
 $GLOBALS['TL_DCA']['tl_module']['metapalettes']['leaflet'] = [
     'type'      => ['name', 'type', 'headline'],
     'leaflet'   => ['leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height', 'leaflet_template'],
-    'templates' => [':hide', 'customTpl'],
+    'template'  => [':hide', 'customTpl'],
     'protected' => [':hide', 'protected'],
     'expert'    => [':hide', 'guests', 'cssID', 'space'],
     'invisible' => [':hide', 'invisible', 'start', 'start'],
@@ -49,7 +50,7 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_mapId'] = [
 $GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_width'] = [
     'label'     => &$GLOBALS['TL_LANG']['tl_module']['leaflet_width'],
     'inputType' => 'inputUnit',
-    'options'   => ['px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'],
+    'options'   => $GLOBALS['TL_CSS_UNITS'],
     'search'    => false,
     'exclude'   => true,
     'eval'      => ['rgxp' => 'digit', 'tl_class' => 'clr w50'],
@@ -60,7 +61,7 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_width'] = [
 $GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_height'] = [
     'label'     => &$GLOBALS['TL_LANG']['tl_module']['leaflet_height'],
     'inputType' => 'inputUnit',
-    'options'   => ['px', '%', 'em', 'pt', 'pc', 'in', 'cm', 'mm'],
+    'options'   => $GLOBALS['TL_CSS_UNITS'],
     'search'    => false,
     'exclude'   => true,
     'eval'      => ['rgxp' => 'digit', 'tl_class' => 'w50'],

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

@@ -3,17 +3,18 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @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/modules.php

@@ -3,8 +3,8 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *

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

@@ -3,8 +3,8 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *

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

@@ -3,12 +3,12 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @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

@@ -3,12 +3,12 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @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_layer.php

@@ -3,8 +3,8 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
@@ -58,7 +58,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer']['1']        = 'Ba
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['iconCreateFunction']['0']         = 'Cluster-Icon-Funktion erstellen';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['iconCreateFunction']['1']         = 'Diese Funktion wird zum Erstellen des Cluster-Icons benutzt.';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['icons']['0']                      = 'Icons verwalten';
-$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons']['1']                      = 'Stile verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons']['1']                      = 'Icon-Stile verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['map']['0']                        = 'Karten verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['map']['1']                        = 'Leaflet-Karten verwalten.';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['markerCluster']['0']              = 'Marker-Cluster';
@@ -83,7 +83,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteafter']['1']                 = 'Na
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteinto']['1']                  = 'In Layer %s einfügen';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['polygonOptions']['0']             = 'Polygon-Optionen';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['popups']['0']                     = 'Popups verwalten';
-$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups']['1']                     = 'Popup-Icons verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups']['1']                     = 'Marker Popups verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['reference']['0']                  = 'Referenz';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['reference']['1']                  = 'Wählen Sie den Referenzlayer aus. Ansonsten wird dasselbe JavaScript-Objekt benutzt.';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['removeOutsideVisibleBounds']['0'] = 'Entfernen, wenn außerhalb der sichtbaren Begrenzung';

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

@@ -3,16 +3,17 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @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

@@ -3,12 +3,12 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @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_popup.php

@@ -3,8 +3,8 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
@@ -35,8 +35,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_popup']['delete']['0']         = 'Popup löschen
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['delete']['1']         = 'Popup ID %s  löschen';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['edit']['0']           = 'Popup bearbeiten';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['edit']['1']           = 'Popup ID %s  bearbeiten';
-$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons']['0']          = 'Popups verwalten';
-$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons']['1']          = 'Marker-Popups verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons']['0']          = 'Icons verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons']['1']          = 'Marker-Icons verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['keepInView']['0']     = 'Im Sichtfeld behalten';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['keepInView']['1']     = 'Aktivieren Sie diese Einstellung um ein herausschieben des Popups aus dem sichbaren Bereich zu verhindern.';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn']['0']      = 'Layer verwalten';

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

@@ -3,22 +3,24 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @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,15 +38,17 @@ $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';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['opacity']['1']     = 'Die Transparenz des Striches kann einen Wert zwischen 0 und 1 annehmen.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['popups']['0']      = 'Popups verwalten';
-$GLOBALS['TL_LANG']['tl_leaflet_style']['popups']['1']      = 'Popup-Icons verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['popups']['1']      = 'Popup-Stile verwalten';
 $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/languages/de/tl_leaflet_vector.php

@@ -3,8 +3,8 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *

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

@@ -3,8 +3,8 @@
  * Translations are managed using Transifex. To create a new translation
  * or to help to maintain an existing one, please register at transifex.com.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
+ * @link    http://help.transifex.com/intro/translating.html
+ * @link    https://www.transifex.com/projects/p/contao-leaflet-maps/language/de/
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *

src/Bundle/Resources/contao/languages/en/default.php

@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Leaflet maps for Contao CMS.
+ *
+ * @package    contao-leaflet-maps
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2014-2018 netzmacht David Molineus. All rights reserved.
+ * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
+ * @filesource
+ */
+
+declare(strict_types=1);
+
+$GLOBALS['TL_LANG']['ERR']['leafletMissingZoomLevel'] = 'No zoom level defined. Only leave it empty on purpose (Zoom level might by initialized by bounds adjustments). Otherwise no map will be shown.';

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

@@ -39,6 +39,8 @@ $GLOBALS['TL_LANG']['leaflet_layer']['tile'][0]          = 'Tile layer';
 $GLOBALS['TL_LANG']['leaflet_layer']['tile'][1]          = 'Tile layer with full config options.';
 $GLOBALS['TL_LANG']['leaflet_layer']['overpass'][0]      = 'Overpass API';
 $GLOBALS['TL_LANG']['leaflet_layer']['overpass'][1]      = 'Overpass API data layer.';
+$GLOBALS['TL_LANG']['leaflet_layer']['file'][0]          = 'File';
+$GLOBALS['TL_LANG']['leaflet_layer']['file'][1]          = 'Geo data from a file (gpx,kml,wkt).';
 
 $GLOBALS['TL_LANG']['leaflet_vector']['polyline'][0]      = 'Polyline';
 $GLOBALS['TL_LANG']['leaflet_vector']['polyline'][1]      = 'Polyline overlay. For more details read the <a href="http://leafletjs.com/reference.html#polyline" target="_blank">Leaflet documentation</a>.';

src/Bundle/Resources/contao/languages/en/modules.php

@@ -25,8 +25,8 @@ $GLOBALS['TL_LANG']['MOD']['tl_leaflet_icon']    = 'Icons';
 $GLOBALS['TL_LANG']['MOD']['tl_leaflet_marker']  = 'Markers';
 $GLOBALS['TL_LANG']['MOD']['tl_leaflet_control'] = 'Controls';
 
-$GLOBALS['TL_LANG']['FMD']['leaflet'][0]       = 'Leaflet Map';
-$GLOBALS['TL_LANG']['FMD']['leaflet'][1]       = 'Integrate leaflet map as frontend module.';
+$GLOBALS['TL_LANG']['FMD']['leaflet'][0] = 'Leaflet Map';
+$GLOBALS['TL_LANG']['FMD']['leaflet'][1] = 'Integrate leaflet map as frontend module.';
 
-$GLOBALS['TL_LANG']['CTE']['leaflet'][0]       = 'Leaflet Map';
-$GLOBALS['TL_LANG']['CTE']['leaflet'][1]       = 'Integrate leaflet map as content element.';
+$GLOBALS['TL_LANG']['CTE']['leaflet'][0] = 'Leaflet Map';
+$GLOBALS['TL_LANG']['CTE']['leaflet'][1] = 'Integrate leaflet map as content element.';

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

@@ -99,5 +99,5 @@ $GLOBALS['TL_LANG']['tl_leaflet_control']['topright'][1]    = 'Top right of the
 
 $GLOBALS['TL_LANG']['tl_leaflet_control']['base'][0]    = 'Base layer';
 $GLOBALS['TL_LANG']['tl_leaflet_control']['base'][1]    = 'Base layers will be switched with radio buttons. Note that all base layers should be passed in the base layers object, but only one should be added to the map during map instantiation';
-$GLOBALS['TL_LANG']['tl_leaflet_control']['overlay'][0]    = 'Overlay';
-$GLOBALS['TL_LANG']['tl_leaflet_control']['overlay'][1]    = 'Overlays will be switched with checkboxes.';
+$GLOBALS['TL_LANG']['tl_leaflet_control']['overlay'][0] = 'Overlay';
+$GLOBALS['TL_LANG']['tl_leaflet_control']['overlay'][1] = 'Overlays will be switched with checkboxes.';

src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php

@@ -21,7 +21,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['map'][1]    = 'Manage leaflet maps';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'][0]  = 'Manage icons';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'][1]  = 'Manage marker icons';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'][0] = 'Manage popups';
-$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'][1] = 'Manage popups icons';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'][1] = 'Manage popups styles';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'][0] = 'Manage styles';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'][1] = 'Manage vector styles';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['new'][0]    = 'Create layer';
@@ -145,12 +145,31 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'][0]                    = 'Amen
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'][1]                    = 'OSM amenity.';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'][1]                = 'Icon';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'][0]                = 'Icon style';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'][0]                 = 'File formats';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'][1]                 = 'Choose which file format is used.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'][0]                       = 'File';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['file'][1]                       = 'Choose a file containing geodata. Supported formats are: %s.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_key'][0]          = 'API key / Access token';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_key'][1]          = 'Please define the API key / access token which is required for this tile provider.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_code'][0]         = 'App code';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['tile_provider_code'][1]         = 'Please define the required app code for this tile provider.';
 
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer'][0]   = 'Layer group';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer'][1]   = 'Basic layer group. <br> See <a href="http://leafletjs.com/reference.html#layergroup" target="_blank">http://leafletjs.com/reference.html#layergroup</a>';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['feature'][0] = 'Feature group';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['feature'][1] = 'Extended layer group with events and popup support. <br>See <a href="http://leafletjs.com/reference.html#featuregroup" target="_blank">http://leafletjs.com/reference.html#featuregroup</a>';
 
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['gpx'][0]      = 'GPX';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['gpx'][1]      = 'GPS Exchange format. <a href="https://github.com/mapbox/togeojson#gpx-feature-support" target="_blank">Read the documentation</a> for more information.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['kml'][0]      = 'KML';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['kml'][1]      = 'Keyhole Markup Language. <a href="https://github.com/mapbox/togeojson#kml-feature-support" target="_blank">Read the documentation</a> for more information.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['wkt'][0]      = 'WKT';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['wkt'][1]      = 'Well-known text  <a href="https://github.com/mapbox/togeojson#kml-feature-support" target="_blank">Read the documentation</a> for more information.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['topojson'][0] = 'TopoJSON';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['topojson'][1] = 'TopoJSON is a topological geospatial data interchange format based on GeoJSON. <a href="https://github.com/topojson/topojson#api-reference" target="_blank">Read the documentation</a> for more information.';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['geojson'][0]  = 'GeoJSON';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['geojson'][1]  = 'GeoJSON is a format for encoding a variety of geographic data structures. <a href="https://github.com/mapbox/wellknown" target="_blank">Read the documentation</a> for more information.';
+
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteinto'][1]  = 'Paste into layer %s';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteafter'][1] = 'Paste after layer %s';
 

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

@@ -18,91 +18,91 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['layers_legend']      = 'Default layers';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['expert_legend']      = 'Expert settings';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['behaviour_legend']   = 'Behaviour';
 
-$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][0]                = 'Create map';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][1]                = 'Create new map';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][0]               = 'Edit map';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][1]               = 'Edit map ID %s';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][0]               = 'Copy map';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][1]               = 'Copy map ID %s';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][0]           = 'Manage controls';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][1]           = 'Manage controls of map ID %s';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][0]             = 'Delete map';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][1]             = 'Delete map ID %s';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][0]               = 'Show details';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][1]               = 'Show map ID %s details';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][0]      = 'Create map';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][1]      = 'Create new map';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][0]     = 'Edit map';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][1]     = 'Edit map ID %s';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][0]     = 'Copy map';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][1]     = 'Copy map ID %s';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][0] = 'Manage controls';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][1] = 'Manage controls of map ID %s';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][0]   = 'Delete map';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][1]   = 'Delete map ID %s';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][0]     = 'Show details';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][1]     = 'Show map ID %s details';
 
-$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][0]               = 'Title';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][1]               = 'Title of the map.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][0]               = 'Alias';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][1]               = 'Alias of the map.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][0]              = 'Center';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][1]              = 'Initial geographical center of the map. Comma separated coordinates.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][0]            = 'Dragging';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][1]            = 'Whether the map be draggable with mouse/touch or not.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][0]           = 'Touch zoom';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][1]           = 'Whether the map can be zoomed by touch-dragging with two fingers.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][0]     = 'Scroll wheel zoom';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][1]     = 'Whether the map can be zoomed by using the mouse wheel.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][0]     = 'Double click zoom';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][1]     = 'Whether the map can be zoomed in by double clicking on it and zoomed out by double clicking while holding shift.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][0]             = 'Box zoom';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][1]             = 'Whether the map can be zoomed to a rectangular area specified by dragging the mouse while pressing shift.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][0]                 = 'Instant taps';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][1]                 = 'Enables mobile hacks for supporting instant taps.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][0]         = 'Track window resize';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][1]         = 'Whether the map automatically handles browser window resize to update itself.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][0]        = 'Close popup on click';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][1]        = 'Disable if you don\'t want popups to close when user clicks the map';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][0]            = 'Keyboard navigation';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][1]            = 'Makes the map focusable and allows users to navigate the map with keyboard arrows and +/- keys';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][0]   = 'Keyboard pan offset';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][1]   = 'Amount of pixels to pan when pressing an arrow key.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][0]  = 'Keyboard zoom offset';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][1]  = 'Number of zoom levels to change when pressing + or - key.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][0]                = 'Zoom level';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][1]                = 'Initial map zoom.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][0]             = 'Minimum zoom level';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][1]             = 'Minimum zoom level of the map. Overrides any minZoom set on map layers.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][0]             = 'Maximum zoom level';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][1]             = 'Maximum zoom level of the map. This overrides any maxZoom set on map layers.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][0]            = 'Zoom snap';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][1]            = 'Forces the map\'s zoom level to always be a multiple of the number. Default is 1.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][0]           = 'Zoom delta';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][1]           = 'Controls how much the map\'s zoom level will change after zoom in or zoom out.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][0]         = 'Add default zoom control';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][1]         = 'Whether the zoom control is added to the map by default.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][0]  = 'Bounce at zoom limits';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][1]  = 'Disable if you don\'t want the map to zoom beyond min/max zoom and then bounce back when pinch-zooming';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][0]             = 'Extra options';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][1]             = 'Add extra map options as valid json. See <a href="http://leafletjs.com/reference.html#map-options">http://leafletjs.com/reference.html#map-options</a>';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][0]     = 'Adjust extra zoom settings';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][1]     = 'Enable if you want to adjust minimum and maximum zoom as well';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][0]              = 'Default layers';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][1]              = 'Inital visible layers of the map. For optional layers use the layers control.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][0]        = 'Adjust bounds';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][1]        = 'If enabled the map will fit into bounds of data layers which are marked to affect the map bounds.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][0]              = 'Locate user position';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][1]              = 'Initial map zoom.Tries to locate the user using the Geolocation API.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][0]         = 'Watch continuously';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][1]         = 'If true, starts continous watching of location changes ';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][0]       = 'Update map center';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][1]       = 'If enabled, automatically sets the map view to the user location. Otherwise only the <em>locationfound</em> event is triggered.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][0]       = 'Locate max zoom';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][1]       = 'Max zoom when setting updating map view.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][0]       = 'Locate timeout';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][1]       = 'Number of milliseconds to wait for a response from geolocation.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][0]  = 'High accuracy';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][1]  = 'Enables high accuracy, see <a href="http://dev.w3.org/geo/api/spec-source.html#high-accuracy" target="_blank">description in the W3C spec</a>.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][0]    = 'Locate maximum age';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][1]    = 'Maximum age of detected location in milliseconds. Use cached value if time has not passed.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][0]         = 'Load data dynamically in bounds';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][1]         = 'If enabled the map requests data from the layers for the current bounds only and make a new request if bounds has changed.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][0]       = 'Bounds padding';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][1]       = 'Padding being used then applying bounds. Use comma separated values. If 2 values are given the <em>padding</em> option is set. If 4 values are given <em>paddingTopLeft</em> and <em>paddingBottomRight</em> is set.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][0]               = 'Enable cache';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][1]               = 'If enabled the generated map javascript is cached.';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][0]       = 'Cache lifetime';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][1]       = 'Indicates how long a cache entry is valid in seconds.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][0]              = 'Title';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][1]              = 'Title of the map.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][0]              = 'Alias';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][1]              = 'Alias of the map.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][0]             = 'Center';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][1]             = 'Initial geographical center of the map. Comma separated coordinates.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][0]           = 'Dragging';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][1]           = 'Whether the map be draggable with mouse/touch or not.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][0]          = 'Touch zoom';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][1]          = 'Whether the map can be zoomed by touch-dragging with two fingers.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][0]    = 'Scroll wheel zoom';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][1]    = 'Whether the map can be zoomed by using the mouse wheel.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][0]    = 'Double click zoom';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][1]    = 'Whether the map can be zoomed in by double clicking on it and zoomed out by double clicking while holding shift.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][0]            = 'Box zoom';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][1]            = 'Whether the map can be zoomed to a rectangular area specified by dragging the mouse while pressing shift.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][0]                = 'Instant taps';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][1]                = 'Enables mobile hacks for supporting instant taps.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][0]        = 'Track window resize';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][1]        = 'Whether the map automatically handles browser window resize to update itself.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][0]       = 'Close popup on click';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][1]       = 'Disable if you don\'t want popups to close when user clicks the map';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][0]           = 'Keyboard navigation';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][1]           = 'Makes the map focusable and allows users to navigate the map with keyboard arrows and +/- keys';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][0]  = 'Keyboard pan offset';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][1]  = 'Amount of pixels to pan when pressing an arrow key.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][0] = 'Keyboard zoom offset';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][1] = 'Number of zoom levels to change when pressing + or - key.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][0]               = 'Zoom level';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][1]               = 'Initial map zoom.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][0]            = 'Minimum zoom level';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][1]            = 'Minimum zoom level of the map. Overrides any minZoom set on map layers.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][0]            = 'Maximum zoom level';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][1]            = 'Maximum zoom level of the map. This overrides any maxZoom set on map layers.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][0]           = 'Zoom snap';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][1]           = 'Forces the map\'s zoom level to always be a multiple of the number. Default is 1.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][0]          = 'Zoom delta';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][1]          = 'Controls how much the map\'s zoom level will change after zoom in or zoom out.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][0]        = 'Add default zoom control';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][1]        = 'Whether the zoom control is added to the map by default.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][0] = 'Bounce at zoom limits';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][1] = 'Disable if you don\'t want the map to zoom beyond min/max zoom and then bounce back when pinch-zooming';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][0]            = 'Extra options';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][1]            = 'Add extra map options as valid json. See <a href="http://leafletjs.com/reference.html#map-options">http://leafletjs.com/reference.html#map-options</a>';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][0]    = 'Adjust extra zoom settings';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][1]    = 'Enable if you want to adjust minimum and maximum zoom as well';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][0]             = 'Default layers';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][1]             = 'Inital visible layers of the map. For optional layers use the layers control.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][0]       = 'Adjust bounds';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][1]       = 'If enabled the map will fit into bounds of data layers which are marked to affect the map bounds.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][0]             = 'Locate user position';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][1]             = 'Initial map zoom.Tries to locate the user using the Geolocation API.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][0]        = 'Watch continuously';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][1]        = 'If true, starts continous watching of location changes ';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][0]      = 'Update map center';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][1]      = 'If enabled, automatically sets the map view to the user location. Otherwise only the <em>locationfound</em> event is triggered.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][0]      = 'Locate max zoom';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][1]      = 'Max zoom when setting updating map view.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][0]      = 'Locate timeout';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][1]      = 'Number of milliseconds to wait for a response from geolocation.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][0] = 'High accuracy';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][1] = 'Enables high accuracy, see <a href="http://dev.w3.org/geo/api/spec-source.html#high-accuracy" target="_blank">description in the W3C spec</a>.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][0]   = 'Locate maximum age';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][1]   = 'Maximum age of detected location in milliseconds. Use cached value if time has not passed.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][0]        = 'Load data dynamically in bounds';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][1]        = 'If enabled the map requests data from the layers for the current bounds only and make a new request if bounds has changed.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][0]      = 'Bounds padding';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][1]      = 'Padding being used then applying bounds. Use comma separated values. If 2 values are given the <em>padding</em> option is set. If 4 values are given <em>paddingTopLeft</em> and <em>paddingBottomRight</em> is set.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][0]              = 'Enable cache';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][1]              = 'If enabled the generated map javascript is cached.';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][0]      = 'Cache lifetime';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][1]      = 'Indicates how long a cache entry is valid in seconds.';
 
 $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load'][0]     = 'At map initialization';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load'][1]     = 'Calculate bounds when the map is initialized. All static and already loaded deferred featured are included.';

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

@@ -14,7 +14,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_marker']['title_legend']   = 'Title and type';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['content_legend'] = 'Content';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['config_legend']  = 'Configuration';
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['active_legend']  = 'Activation';
-$GLOBALS['TL_LANG']['tl_leaflet_marker']['expert_legend']      = 'Expert settings';
+$GLOBALS['TL_LANG']['tl_leaflet_marker']['expert_legend']  = 'Expert settings';
 
 
 $GLOBALS['TL_LANG']['tl_leaflet_marker']['new'][0]    = 'Create marker';

src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php

@@ -19,8 +19,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn'][0] = 'Manage layers';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn'][1] = 'Manage leaflet layers';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'][0]    = 'Manage styles';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'][1]    = 'Manage vector styles';
-$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'][0]     = 'Manage popups';
-$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'][1]     = 'Manage marker popups';
+$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'][0]     = 'Manage icons';
+$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'][1]     = 'Manage marker icons';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['new'][0]       = 'Create popup';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['new'][1]       = 'Create new popup';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['edit'][0]      = 'Edit popup';

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

@@ -19,7 +19,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['layersBtn'][1] = 'Manage leaflet layers
 $GLOBALS['TL_LANG']['tl_leaflet_style']['icons'][0]     = 'Manage icons';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['icons'][1]     = 'Manage marker icons';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['popups'][0]    = 'Manage popups';
-$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'][1]    = 'Manage popups icons';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'][1]    = 'Manage popups styles';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['new'][0]       = 'Create style';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['new'][1]       = 'Create new style';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['edit'][0]      = 'Edit style';

src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php

@@ -15,7 +15,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_vector']['active_legend'] = 'Activation';
 $GLOBALS['TL_LANG']['tl_leaflet_vector']['config_legend'] = 'Configuration';
 $GLOBALS['TL_LANG']['tl_leaflet_vector']['data_legend']   = 'Vector data';
 $GLOBALS['TL_LANG']['tl_leaflet_vector']['popup_legend']  = 'Popup';
-$GLOBALS['TL_LANG']['tl_leaflet_vector']['expert_legend']      = 'Expert settings';
+$GLOBALS['TL_LANG']['tl_leaflet_vector']['expert_legend'] = 'Expert settings';
 
 
 $GLOBALS['TL_LANG']['tl_leaflet_vector']['new'][0]    = 'Create vector';

src/Bundle/Resources/contao/public/.htaccess

@@ -1,7 +0,0 @@
-<IfModule !mod_authz_core.c>
-  Order allow,deny
-  Allow from all
-</IfModule>
-<IfModule mod_authz_core.c>
-  Require all granted
-</IfModule>

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

@@ -1,125 +0,0 @@
-<div class="netzmacht-leaflet-credits">
-<div class="header">
-    <h1 class="sub_headline"><?php echo $this->headline; ?> <small><?php echo $this->version; ?></small></h1>
-</div>
-
-<div class="tl_box block row">
-    <h2>About</h2>
-    <div class="left">
-        <p>
-            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.
-        </p>
-        <p>
-            This software ships with an visible attribution to <em>netzmacht creative</em> in the map attribution control.
-            If you want to remove this attribution, you have to purchase a commercial license.
-            For more details visit the <a href="https://netzmacht.de/contao-leaflet" target="_blank">project website</a>.
-        </p>
-    </div>
-    <div class="right">
-        <a href="http://www.netzmacht.de" <?php echo LINK_NEW_WINDOW; ?>>
-        <img src="bundles/netzmachtcontaoleaflet/img/logo.png"></a>
-        <p>
-            <strong class="company">netzmacht </strong><br>
-            David Molineus<br>
-        </p>
-        <p>
-            DAB Bank München<br>
-            IBAN: DE52701204008354237003<br>
-            BIC: DABBDEMMXXX
-        </p>
-        <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-            <input type="hidden" name="cmd" value="_s-xclick">
-            <input type="hidden" name="hosted_button_id" value="YWMA95YS3FT6U">
-            <input type="image" src="https://www.paypalobjects.com/en_GB/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal – The safer, easier way to pay online.">
-            <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
-        </form>
-    </div>
-</div>
-
-<div class="tl_box">
-    <h2>Support Contao Leaflet</h2>
-
-    <div class="row">
-        <div class="col">
-            <h3>Report issues</h3>
-            <p>If you found a bug, got some troubles or have a feature request - feel free to open an issue.</p>
-            <p><a href="http://github.com/netzmacht/contao-leaflet-maps/issues" class="btn"  target="_blank">Issue tracker</a> </p>
-        </div>
-        <div class="col">
-            <h3>Contribute</h3>
-            <p>There are many ways you can con&shy;tribute. Translations,
-                docu&shy;mentation or code contributions are welcome.
-            </p>
-            <p><a href="https://netzmacht/contao-leaflet/contribute.html" class="btn" target="_blank">Contribute</a> </p>
-        </div>
-        <div class="col">
-            <h3>Fund a feature</h3>
-            <p>Contao Leaflet is not feature complete. Have a look at the list of planned feature and support them.</p>
-            <p><a href="https://netzmacht/contao-leaflet/planned-features.html" class="btn"  target="_blank">Planned features</a> </p>
-        </div>
-    </div>
-    <div class="row">
-
-        <div class="col">
-            <h3>Individual development</h3>
-            <p>If you have special requirements you can hire me for an individual development.</p>
-            <p><a href="https://netzmacht/contao-leaflet/contact.html" class="btn" target="_blank">Contact</a> </p>
-        </div>
-        <div class="col">
-            <h3>Commercial license</h3>
-            <p>If you want to remove the attribution in the attribution control, you can purchase a commercial license.</p>
-            <p><a href="https://netzmacht/contao-leaflet/commercial-license.html" class="btn" target="_blank">Purchase license</a> </p>
-        </div>
-    </div>
-</div>
-
-<div class="tl_box">
-    <h2>Credits</h2>
-    <table class="tl_listing">
-        <tr>
-            <th>Name</th>
-            <th>Version</th>
-            <th>License</th>
-            <th>Homepage</th>
-        </tr>
-    <?php if ($this->libraries): ?>
-        <tr><th colspan="4" class="subtitle">Libraries</th> </tr>
-    <?php endif; ?>
-    <?php foreach ($this->libraries as $library): ?>
-        <tr>
-            <td><?php echo $library['name']; ?></td>
-            <td><?php echo $library['version']; ?></td>
-            <td><?php echo $library['license']; ?></td>
-            <td><?php echo $library['homepage']; ?></td>
-        </tr>
-    <?php endforeach; ?>
-        <tr>
-            <th class="subtitle" colspan="4">Graphics</th>
-        </tr>
-        <tr>
-            <td>Farm Fresh-Web Icons</td>
-            <td>3.9.2</td>
-            <td><a href="http://creativecommons.org/licenses/by/3.0/us/" target="_blank">CC BY 3.0 US</a></td>
-            <td><a href="http://www.fatcow.com/free-icons" target="_blank">fatcow.com/free-icons</a></td>
-        </tr>
-        <tr>
-            <td>Web Blog Icons by SEM Labs</td>
-            <td>3.9.2</td>
-            <td><a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC BY 4.0</a></td>
-            <td><a href="http://semlabs.co.uk/" target="_blank">semlabs.co.uk</a></td>
-        </tr>
-    <?php if ($this->dependencies): ?>
-        <tr><th colspan="4" class="subtitle">Dependencies</th> </tr>
-    <?php endif; ?>
-    <?php foreach ($this->dependencies as $dep): ?>
-        <tr>
-            <td><?php echo $dep['name']; ?></td>
-            <td><?php echo $dep['version']; ?></td>
-            <td><?php echo $dep['license']; ?></td>
-            <td><?php echo $dep['homepage']; ?></td>
-        </tr>
-    <?php endforeach; ?>
-    </table>
-</div>
-</div>

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

@@ -1,8 +1,8 @@
-<?php $GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/leaflet/leaflet.css'; ?>
-<?php $GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.css'; ?>
+<?php $GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/leaflet/leaflet.min.css'; ?>
+<?php $GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.min.css'; ?>
 
 <?php $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/libs/leaflet/leaflet.js'; ?>
-<?php $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.js'; ?>
+<?php $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.min.js'; ?>
 
 <div id="map_<?php echo $this->field; ?>" style="margin-top: 5px; width: calc(100% - 28px); height: 300px"></div>
 <script>
@@ -10,25 +10,32 @@
     L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
         attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
     }).addTo(map);
-    var element  = $('<?php echo $this->field; ?>');
+    var element = $('<?php echo $this->field; ?>');
     var geocoder = L.Control.geocoder({
         defaultMarkGeocode: false,
         collapsed: false,
         placeholder: '<?php echo $GLOBALS['TL_LANG']['leaflet']['searchPosition']; ?>'
     }).addTo(map);
 
-    geocoder.on('markgeocode', function(event) {
+    document.querySelector('.leaflet-control-geocoder input').addEventListener('keydown', function (event) {
+        if (event.keyCode === 13) {
+            event.preventDefault();
+        }
+    });
+
+    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('<?php echo $GLOBALS['TL_LANG']['leaflet']['applyPosition']; ?>');
-        link.addEvent('click', function(e) {
+        link.addEvent('click', function (e) {
             e.stop();
 
             element.set('value', result.center.lat + ',' + result.center.lng);
-        });
+            this._geocodeMarker.closePopup();
+        }.bind(this));
 
         container.appendHTML(result.html || result.name);
         container.appendChild(link);
@@ -37,7 +44,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})

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

@@ -9,5 +9,5 @@
 
 </div>
 <!-- indexer::continue -->
-<?php $GLOBALS['TL_BODY'][] = '<script>' . $this->javascript .'</script>'; ?>
+<script><?= $this->javascript ?></script>
 

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

@@ -1,6 +1,7 @@
-<div id="<?php echo $mapId; ?>" style="<?php echo $style; ?>"></div>
+<div id="<?= $this->mapId ?>" style="<?= $this->style ?>"></div>
 <script>
-L.contao.addMap('<?php echo $mapId; ?>', function() {
-<?php echo $javascript; ?>
-return { map: map, layers: layers, controls: controls, icons: icons };
-}());</script>
+    L.contao.addMap('<?= $this->mapId ?>', function () {
+        <?= $this->javascript ?>
+        return {map: map, layers: layers, controls: controls, icons: icons};
+    }());
+</script>

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

@@ -1,5 +1,5 @@
-L.contao.addMap('<?php echo $mapId; ?>', function() {
-<?php echo $javascript; ?>
+L.contao.addMap('<?= $this->mapId ?>', function() {
+<?= $this->javascript ?>
 
 return { map: map, layers: layers, controls: controls, icons: icons };
 }());

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

@@ -9,4 +9,4 @@
 
 </div>
 <!-- indexer::continue -->
-<?php $GLOBALS['TL_BODY'][] = '<script>' . $this->javascript .'</script>'; ?>
+<script><?= $this->javascript ?></script>

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 {

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;
 }
 

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

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

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/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') {

src/Bundle/Resources/views/backend/about.html.twig

@@ -0,0 +1,132 @@
+{% extends "@ContaoCore/Backend/be_page.html.twig" %}
+
+{% block headline %}{{ "MOD.leaflet_about.1"|trans({}, 'contao_modules') }}{% endblock %}
+
+{% block error %}{% endblock %}
+
+{% block main %}
+    <div class="netzmacht-leaflet-credits">
+        <div class="header">
+            <h1 class="sub_headline">{{ headline }}
+                <small>{{ version }}</small>
+            </h1>
+        </div>
+
+        <div class="tl_box block row">
+            <h2>About</h2>
+            <p>
+                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.
+            </p>
+            <p>
+                This software ships with an visible attribution to <em>netzmacht creative</em> in the map attribution
+                control.
+                If you want to remove this attribution, you have to purchase a commercial license.
+                For more details visit the <a href="https://netzmacht.de/contao-leaflet" target="_blank">project
+                    website</a>.
+            </p>
+        </div>
+
+        <div class="tl_box">
+            <h2>Support Contao Leaflet</h2>
+
+            <div class="row">
+                <div class="col">
+                    <h3>Report issues</h3>
+                    <p>If you found a bug, got some troubles or have a feature request - feel free to open an issue.</p>
+                    <p><a href="https://github.com/netzmacht/contao-leaflet-maps/issues" class="btn" target="_blank">Issue
+                            tracker</a></p>
+                </div>
+                <div class="col">
+                    <h3>Contribute</h3>
+                    <p>There are many ways you can con&shy;tribute. Translations,
+                        docu&shy;mentation or code contributions are welcome.
+                    </p>
+                    <p><a href="https://netzmacht.de/contao-leaflet/contribute.html" class="btn" target="_blank">Contribute</a>
+                    </p>
+                </div>
+                <div class="col">
+                    <h3>Fund a feature</h3>
+                    <p>Contao Leaflet is not feature complete. Have a look at the list of planned feature and support
+                        them.</p>
+                    <p><a href="https://github.com/netzmacht/contao-leaflet-maps/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement" class="btn" target="_blank">Planned
+                            features</a></p>
+                </div>
+            </div>
+            <div class="row">
+
+                <div class="col">
+                    <h3>Individual development</h3>
+                    <p>If you have special requirements you can hire me for an individual development.</p>
+                    <p><a href="https://netzmacht.de/contao-leaflet/contact.html" class="btn" target="_blank">Contact</a></p>
+                </div>
+                <div class="col">
+                    <h3>Commercial license</h3>
+                    <p>If you want to remove the attribution in the attribution control, you can purchase a commercial
+                        license.</p>
+                    <p><a href="https://netzmacht.de/contao-leaflet/commercial-license.html" class="btn" target="_blank">Purchase
+                            license</a></p>
+                </div>
+            </div>
+        </div>
+
+        <div class="tl_box">
+            <h2>Credits</h2>
+            <table class="tl_listing">
+                <tr>
+                    <th>Name</th>
+                    <th>Version</th>
+                    <th>License</th>
+                    <th>Homepage</th>
+                </tr>
+                {% if libraries %}
+                <tr>
+                    <th colspan="4" class="subtitle">Libraries</th>
+                </tr>
+                {% endif %}
+                {% for library in libraries %}
+                <tr>
+                    <td>{{ library.name }}</td>
+                    <td>{{ library.version }}</td>
+                    <td>{{ library.license|raw }}</td>
+                    <td>{{ library.homepage|raw }}</td>
+                </tr>
+                {% endfor %}
+                <tr>
+                    <td>url-polyfill</td>
+                    <td>v1.1.0</td>
+                    <td><a href="https://github.com/lifaon74/url-polyfill/blob/master/LICENSE" target="_blank">MIT</a></td>
+                    <td><a href="https://github.com/lifaon74/url-polyfill" target="_blank">github.com/lifaon74/url-polyfill</a></td>
+                </tr>
+                <tr>
+                    <th class="subtitle" colspan="4">Graphics</th>
+                </tr>
+                <tr>
+                    <td>Farm Fresh-Web Icons</td>
+                    <td>3.9.2</td>
+                    <td><a href="http://creativecommons.org/licenses/by/3.0/us/" target="_blank">CC BY 3.0 US</a></td>
+                    <td><a href="http://www.fatcow.com/free-icons" target="_blank">fatcow.com/free-icons</a></td>
+                </tr>
+                <tr>
+                    <td>Web Blog Icons by SEM Labs</td>
+                    <td>3.9.2</td>
+                    <td><a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC BY 4.0</a></td>
+                    <td><a href="http://semlabs.co.uk/" target="_blank">semlabs.co.uk</a></td>
+                </tr>
+                {% if dependencies %}
+                <tr>
+                    <th colspan="4" class="subtitle">Dependencies</th>
+                </tr>
+                {% endif %}
+                {% for dep in dependencies %}
+                <tr>
+                    <td>{{ dep.name }}</td>
+                    <td>{{ dep.version }}</td>
+                    <td>{{ dep.license|raw }}</td>
+                    <td>{{ dep.homepage|raw }}</td>
+                </tr>
+                {% endfor %}
+            </table>
+        </div>
+    </div>
+{% endblock %}

src/Encoder/ContaoAssets.php

@@ -44,7 +44,7 @@ class ContaoAssets implements Assets
     private $cache = [
         'stylesheets' => [],
         'javascripts' => [],
-        'map' => []
+        'map'         => [],
     ];
 
     /**

src/Encoder/Subscriber/EncoderSubscriber.php

@@ -10,14 +10,13 @@
  * @filesource
  */
 
-namespace Netzmacht\Contao\Leaflet\Subscriber;
+namespace Netzmacht\Contao\Leaflet\Encoder\Subscriber;
 
 use Netzmacht\Contao\Leaflet\Frontend\RequestUrl;
-use Netzmacht\JavascriptBuilder\Encoder;
-use Netzmacht\JavascriptBuilder\Flags;
-use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeValueEvent;
-use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeReferenceEvent;
 use Netzmacht\JavascriptBuilder\Exception\EncodeValueFailed;
+use Netzmacht\JavascriptBuilder\Flags;
+use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeReferenceEvent;
+use Netzmacht\JavascriptBuilder\Symfony\Event\EncodeValueEvent;
 use Netzmacht\LeafletPHP\Definition\Type\Icon;
 use Netzmacht\LeafletPHP\Plugins\Omnivore\OmnivoreLayer;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -34,13 +33,13 @@ class EncoderSubscriber implements EventSubscriberInterface
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            EncodeValueEvent::NAME => array(
-                array('encodeIcons', 1000),
-                array('loadLayer', 100),
-            ),
-            EncodeReferenceEvent::NAME => array('referenceIcon', 100),
-        );
+        return [
+            EncodeValueEvent::NAME     => [
+                ['encodeIcons', 1000],
+                ['loadLayer', 100],
+            ],
+            EncodeReferenceEvent::NAME => ['referenceIcon', 100],
+        ];
     }
 
     /**
@@ -90,16 +89,15 @@ class EncoderSubscriber implements EventSubscriberInterface
     {
         $value    = $event->getValue();
         $encoder  = $event->getEncoder();
-        $template = 'L.contao.load(%s, %s, %s, %s, map);';
+        $template = 'L.contao.%s(%s, %s, %s, %s, map);';
+        $method   = 'loadUrl';
 
         if ($value instanceof OmnivoreLayer) {
             $url = $value->getUrl();
 
             if ($url instanceof RequestUrl) {
-                $url = $url->getHash();
-            } elseif (strpos($url, '/') !== false) {
-                // Slash found, not a Contao leaflet hash, do not replace encoding.
-                return;
+                $url    = $url->getHash();
+                $method = 'load';
             }
 
             if ($value->getCustomLayer()) {
@@ -112,6 +110,7 @@ class EncoderSubscriber implements EventSubscriberInterface
             $event->addLine(
                 sprintf(
                     $template,
+                    $method,
                     $encoder->encodeValue($url),
                     $encoder->encodeValue(strtolower(str_replace('Omnivore.', '', $value->getType()))),
                     $encoder->encodeArray($value->getOptions(), JSON_FORCE_OBJECT),

src/Event/BuildDefinitionEvent.php

@@ -12,7 +12,8 @@
 
 namespace Netzmacht\Contao\Leaflet\Event;
 
-use Netzmacht\Contao\Leaflet\Request\Request;
+use Contao\Model;
+use Netzmacht\Contao\Leaflet\Mapper\Request;
 use Netzmacht\LeafletPHP\Definition;
 use Symfony\Component\EventDispatcher\Event;
 
@@ -35,7 +36,7 @@ class BuildDefinitionEvent extends Event
     /**
      * The model.
      *
-     * @var \Model
+     * @var Model
      */
     private $model;
 
@@ -50,10 +51,10 @@ class BuildDefinitionEvent extends Event
      * Construct.
      *
      * @param Definition   $definition The leaflet definition.
-     * @param \Model       $model      The definition model.
+     * @param Model        $model      The definition model.
      * @param Request|null $request    Building request.
      */
-    public function __construct(Definition $definition, \Model $model, Request $request = null)
+    public function __construct(Definition $definition, Model $model, Request $request = null)
     {
         $this->definition = $definition;
         $this->model      = $model;
@@ -73,7 +74,7 @@ class BuildDefinitionEvent extends Event
     /**
      * Get the model.
      *
-     * @return \Model
+     * @return Model
      */
     public function getModel()
     {

src/Filter/BboxFilter.php

@@ -68,7 +68,7 @@ class BboxFilter implements Filter
      */
     public function getValues()
     {
-        return array('bounds' => $this->bounds);
+        return ['bounds' => $this->bounds];
     }
 
     /**

src/Filter/DistanceFilter.php

@@ -88,9 +88,29 @@ class DistanceFilter implements Filter
      */
     public function getValues()
     {
-        return array(
+        return [
             'radius' => $this->radius,
-            'center' => $this->center
-        );
+            'center' => $this->center,
+        ];
+    }
+
+    /**
+     * Get the center coordinate.
+     *
+     * @return LatLng
+     */
+    public function getCenter(): LatLng
+    {
+        return $this->center;
+    }
+
+    /**
+     * Get the distance radius.
+     *
+     * @return int
+     */
+    public function getRadius(): int
+    {
+        return $this->radius;
     }
 }

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

@@ -14,14 +14,15 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Frontend;
 
-use Contao\Config;
 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;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Symfony\Component\Templating\EngineInterface as TemplateEngine;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
 
@@ -42,42 +43,42 @@ abstract class AbstractMapHybrid extends AbstractHybrid
     /**
      * The user input.
      *
-     * @var \Input
+     * @var Input
      */
     private $input;
 
     /**
-     * The Contao config.
+     * Repository manager.
      *
-     * @var \Config
+     * @var RepositoryManager
      */
-    private $config;
+    private $repositoryManager;
 
     /**
      * HybridTrait constructor.
      *
-     * @param Result|Model|Collection $model          Component model.
-     * @param TemplateEngine          $templateEngine Template engine.
-     * @param Translator              $translator     Translator.
-     * @param MapProvider             $mapProvider    Map provider.
-     * @param Input                   $input          Request Input.
-     * @param Config                  $config         Config.
-     * @param string                  $column         Column in which the element appears.
+     * @param Result|Model|Collection $model             Component model.
+     * @param TemplateEngine          $templateEngine    Template engine.
+     * @param Translator              $translator        Translator.
+     * @param MapProvider             $mapProvider       Map provider.
+     * @param RepositoryManager       $repositoryManager Repository manager.
+     * @param Input                   $input             Request Input.
+     * @param string                  $column            Column in which the element appears.
      */
     public function __construct(
         $model,
         TemplateEngine $templateEngine,
         Translator $translator,
         MapProvider $mapProvider,
+        RepositoryManager $repositoryManager,
         $input,
-        $config,
         $column = null
     ) {
         parent::__construct($model, $templateEngine, $translator, $column);
 
-        $this->mapProvider = $mapProvider;
-        $this->input       = $input;
-        $this->config      = $config;
+        $this->mapProvider       = $mapProvider;
+        $this->input             = $input;
+        $this->repositoryManager = $repositoryManager;
     }
 
     /**
@@ -90,7 +91,8 @@ abstract class AbstractMapHybrid extends AbstractHybrid
         $this->mapProvider->handleAjaxRequest($this->getIdentifier());
 
         if (TL_MODE === 'BE') {
-            $model      = MapModel::findByPk($this->get('leaflet_map'));
+            $repository = $this->repositoryManager->getRepository(MapModel::class);
+            $model      = $repository->find((int) $this->get('leaflet_map'));
             $parameters = [
                 'title' => $this->get('headline'),
             ];
@@ -117,6 +119,8 @@ abstract class AbstractMapHybrid extends AbstractHybrid
      */
     protected function prepareTemplateData(array $data): array
     {
+        $data = parent::prepareTemplateData($data);
+
         try {
             $template = $this->get('leaflet_template') ?: 'leaflet_map_js';
             $mapId    = $this->getIdentifier();
@@ -126,8 +130,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/Action/LayerDataAction.php

@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * Leaflet maps for Contao CMS.
+ *
+ * @package    contao-leaflet-maps
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2014-2018 netzmacht David Molineus. All rights reserved.
+ * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
+ * @filesource
+ */
+
+declare(strict_types=1);
+
+namespace Netzmacht\Contao\Leaflet\Frontend\Action;
+
+use Netzmacht\Contao\Leaflet\Filter\Filter;
+use Netzmacht\Contao\Leaflet\Filter\FilterFactory;
+use Netzmacht\Contao\Leaflet\MapProvider;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * Request action which handles request for layer data
+ */
+final class LayerDataAction
+{
+    /**
+     * Map provider.
+     *
+     * @var MapProvider
+     */
+    private $mapProvider;
+
+    /**
+     * Filter factory.
+     *
+     * @var FilterFactory
+     */
+    private $filterFactory;
+
+    /**
+     * LayerDataAction constructor.
+     *
+     * @param MapProvider   $mapProvider   Map provider.
+     * @param FilterFactory $filterFactory Filter factory.
+     */
+    public function __construct(MapProvider $mapProvider, FilterFactory $filterFactory)
+    {
+        $this->mapProvider   = $mapProvider;
+        $this->filterFactory = $filterFactory;
+    }
+
+    /**
+     * Handle the request.
+     *
+     * @param int     $layerId The layer id.
+     * @param string  $_format The requested output format.
+     * @param Request $request The request.
+     *
+     * @return Response
+     *
+     * @throws BadRequestHttpException When unsupported format is given.
+     *
+     * @SuppressWarnings(PHPMD.CamelCaseParameterName)
+     * @SuppressWarnings(PHPMD.CamelCaseVariableName)
+     */
+    public function __invoke(int $layerId, string $_format, Request $request): Response
+    {
+        $filter = $this->createFilter($request);
+        $data   = $this->mapProvider->getFeatureCollection($layerId, $filter);
+
+        if ($_format === 'geojson') {
+            $response = new JsonResponse($data);
+            $response->setEncodingOptions(JSON_UNESCAPED_SLASHES);
+
+            return $response;
+        }
+
+        throw new BadRequestHttpException(sprintf('Unsupported format "%s"', $_format));
+    }
+
+    /**
+     * Create the filter if defined in the request.
+     *
+     * @param Request $request The request.
+     *
+     * @return Filter|null
+     */
+    private function createFilter(Request $request): ?Filter
+    {
+        if (!$request->query->has('filter')) {
+            return null;
+        }
+
+        $filter = (string) $request->query->get('filter');
+        $values = (string) $request->query->get('values');
+
+        return $this->filterFactory->create($filter, $values);
+    }
+}

src/Frontend/ContentElement/MapElementFactory.php

@@ -14,9 +14,15 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Frontend\ContentElement;
 
+use Contao\Config;
+use Contao\CoreBundle\Framework\Adapter;
+use Contao\Input;
+use Netzmacht\Contao\Leaflet\MapProvider;
 use Netzmacht\Contao\Toolkit\Component\Component;
 use Netzmacht\Contao\Toolkit\Component\ComponentFactory;
-use Psr\Container\ContainerInterface as Container;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
+use Symfony\Component\Templating\EngineInterface as TemplateEngine;
+use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
  * Class MapElementFactory
@@ -26,20 +32,61 @@ use Psr\Container\ContainerInterface as Container;
 class MapElementFactory implements ComponentFactory
 {
     /**
-     * Dependency container.
+     * Template engine.
      *
-     * @var Container
+     * @var TemplateEngine
      */
-    private $container;
+    private $templating;
+
+    /**
+     * Translator.
+     *
+     * @var Translator
+     */
+    private $translator;
+
+    /**
+     * Map provider.
+     *
+     * @var MapProvider
+     */
+    private $mapProvider;
+
+    /**
+     * Input adapter.
+     *
+     * @var Input|Adapter
+     */
+    private $input;
+
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
 
     /**
      * MapElementFactory constructor.
      *
-     * @param Container $container Dependency container.
+     * @param TemplateEngine    $engine            Template engine.
+     * @param Translator        $translator        Translator.
+     * @param MapProvider       $mapProvider       Map provider.
+     * @param RepositoryManager $repositoryManager Repository manager.
+     * @param Input|Adapter     $input             Input adapter.
      */
-    public function __construct(Container $container)
-    {
-        $this->container = $container;
+    public function __construct(
+        TemplateEngine $engine,
+        Translator $translator,
+        MapProvider $mapProvider,
+        RepositoryManager $repositoryManager,
+        $input
+    ) {
+        $this->templating        = $engine;
+        $this->translator        = $translator;
+        $this->mapProvider       = $mapProvider;
+        $this->input             = $input;
+        $this->repositoryManager = $repositoryManager;
     }
 
     /**
@@ -57,11 +104,11 @@ class MapElementFactory implements ComponentFactory
     {
         return new MapElement(
             $model,
-            $this->container->get('templating'),
-            $this->container->get('translator'),
-            $this->container->get('netzmacht.contao_leaflet.map.provider'),
-            $this->container->get('netzmacht.contao_toolkit.contao.input_adapter'),
-            $this->container->get('netzmacht.contao_toolkit.contao.config_adapter'),
+            $this->templating,
+            $this->translator,
+            $this->mapProvider,
+            $this->repositoryManager,
+            $this->input,
             $column
         );
     }

src/Frontend/DataController.php

@@ -12,14 +12,18 @@
 
 namespace Netzmacht\Contao\Leaflet\Frontend;
 
+use const E_USER_DEPRECATED;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
 use Netzmacht\Contao\Leaflet\Filter\FilterFactory;
 use Netzmacht\Contao\Leaflet\MapProvider;
+use function trigger_error;
 
 /**
  * The data controller handles ajax request for sub data.
  *
  * @package Netzmacht\Contao\Leaflet\Frontend
+ *
+ * @deprecated
  */
 class DataController
 {
@@ -28,13 +32,13 @@ class DataController
      *
      * @var array
      */
-    private $input = array(
+    private $input = [
         'format' => 'geojson',
         'type'   => 'layer',
         'id'     => null,
         'filter' => null,
-        'values' => null
-    );
+        'values' => null,
+    ];
 
     /**
      * Debug mode.
@@ -60,6 +64,13 @@ class DataController
     {
         $this->debugMode     = $debugMode;
         $this->filterFactory = $filterFactory;
+
+        // @codingStandardsIgnoreStart
+        @trigger_error(
+            'Deprecated since 3.1.0 and will be removed in 4.0.0 - Use properly route instead.',
+            E_USER_DEPRECATED
+        );
+        // @codingStandardsIgnoreEnd
     }
 
     /**
@@ -140,9 +151,9 @@ class DataController
             default:
                 $error = true;
 
-                return array($data, $error);
+                return [$data, $error];
         }
 
-        return array($data, $error);
+        return [$data, $error];
     }
 }

src/Frontend/Module/MapModuleFactory.php

@@ -14,9 +14,15 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Frontend\Module;
 
+use Contao\Config;
+use Contao\CoreBundle\Framework\Adapter;
+use Contao\Input;
+use Netzmacht\Contao\Leaflet\MapProvider;
 use Netzmacht\Contao\Toolkit\Component\Component;
 use Netzmacht\Contao\Toolkit\Component\ComponentFactory;
-use Psr\Container\ContainerInterface as Container;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
+use Symfony\Component\Templating\EngineInterface as TemplateEngine;
+use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
  * Class MapElementFactory
@@ -26,20 +32,61 @@ use Psr\Container\ContainerInterface as Container;
 class MapModuleFactory implements ComponentFactory
 {
     /**
-     * Dependency container.
+     * Template engine.
      *
-     * @var Container
+     * @var TemplateEngine
      */
-    private $container;
+    private $templating;
 
     /**
-     * MapModuleFactory constructor.
+     * Translator.
      *
-     * @param Container $container Dependency container.
+     * @var Translator
      */
-    public function __construct(Container $container)
-    {
-        $this->container = $container;
+    private $translator;
+
+    /**
+     * Map provider.
+     *
+     * @var MapProvider
+     */
+    private $mapProvider;
+
+    /**
+     * Input adapter.
+     *
+     * @var Input|Adapter
+     */
+    private $input;
+
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
+    /**
+     * MapElementFactory constructor.
+     *
+     * @param TemplateEngine    $engine            Template engine.
+     * @param Translator        $translator        Translator.
+     * @param MapProvider       $mapProvider       Map provider.
+     * @param RepositoryManager $repositoryManager Repository manager.
+     * @param Input|Adapter     $input             Input adapter.
+     */
+    public function __construct(
+        TemplateEngine $engine,
+        Translator $translator,
+        MapProvider $mapProvider,
+        RepositoryManager $repositoryManager,
+        $input
+    ) {
+        $this->templating        = $engine;
+        $this->translator        = $translator;
+        $this->mapProvider       = $mapProvider;
+        $this->input             = $input;
+        $this->repositoryManager = $repositoryManager;
     }
 
     /**
@@ -57,11 +104,11 @@ class MapModuleFactory implements ComponentFactory
     {
         return new MapModule(
             $model,
-            $this->container->get('templating'),
-            $this->container->get('translator'),
-            $this->container->get('netzmacht.contao_leaflet.map.provider'),
-            $this->container->get('netzmacht.contao_toolkit.contao.input_adapter'),
-            $this->container->get('netzmacht.contao_toolkit.contao.config_adapter'),
+            $this->templating,
+            $this->translator,
+            $this->mapProvider,
+            $this->repositoryManager,
+            $this->input,
             $column
         );
     }

src/Frontend/PageIdDeterminator.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Leaflet maps for Contao CMS.
+ *
+ * @package    contao-leaflet-maps
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2014-2018 netzmacht David Molineus. All rights reserved.
+ * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
+ * @filesource
+ */
+
+declare(strict_types=1);
+
+namespace Netzmacht\Contao\Leaflet\Frontend;
+
+use Netzmacht\Contao\PageContext\Exception\DeterminePageIdFailed;
+use Netzmacht\Contao\PageContext\Request\PageIdDeterminator as PageContextPageIdDeterminator;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Class ApiPageIdDeterminator
+ */
+final class PageIdDeterminator implements PageContextPageIdDeterminator
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function match(Request $request): bool
+    {
+        return ($request->attributes->get('_leaflet_scope') === 'page' && $request->query->get('context') === 'page');
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws DeterminePageIdFailed When no context id is given.
+     */
+    public function determinate(Request $request): int
+    {
+        if (!$request->query->has('contextId')) {
+            throw new DeterminePageIdFailed('Could not determine page id for from request.');
+        }
+
+        return $request->query->getInt('contextId');
+    }
+}

src/Frontend/RequestUrl.php

@@ -12,13 +12,17 @@
 
 namespace Netzmacht\Contao\Leaflet\Frontend;
 
+use Contao\Config;
+use Contao\Frontend;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
-use Netzmacht\Contao\Leaflet\Request\Request;
+use Netzmacht\Contao\Leaflet\Mapper\Request;
 
 /**
  * Class RequestUrl creates the request url.
  *
  * @package Netzmacht\Contao\Leaflet\Request
+ *
+ * @deprecated
  */
 class RequestUrl implements \JsonSerializable
 {
@@ -57,12 +61,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;
@@ -72,7 +76,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);
     }
@@ -87,6 +91,13 @@ class RequestUrl implements \JsonSerializable
     {
         $this->url  = $url;
         $this->hash = $hash;
+
+        // @codingStandardsIgnoreStart
+        @trigger_error(
+            'Deprecated since 3.1.0 and will be removed in 4.0.0. Use The router instead.',
+            E_USER_DEPRECATED
+        );
+        // @codingStandardsIgnoreEnd
     }
 
     /**

src/Frontend/ValueFilter.php

@@ -73,6 +73,8 @@ class ValueFilter
      */
     public function filter($value)
     {
-        return $this->getReplacer()->replace($value);
+        $value = $this->getReplacer()->replace($value, false);
+
+        return $value;
     }
 }

src/Listener/Backend/UserNavigationListener.php

@@ -0,0 +1,107 @@
+<?php
+
+/**
+ * Leaflet maps for Contao CMS.
+ *
+ * @package    contao-leaflet-maps
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2014-2018 netzmacht David Molineus. All rights reserved.
+ * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
+ * @filesource
+ */
+
+declare(strict_types=1);
+
+namespace Netzmacht\Contao\Leaflet\Listener\Backend;
+
+use Contao\CoreBundle\Event\MenuEvent;
+use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\RouterInterface as Router;
+use Symfony\Component\Translation\TranslatorInterface as Translator;
+
+/**
+ * Class BackendMenuListener adds backend entries to the navigation.
+ */
+final class UserNavigationListener
+{
+    /**
+     * Request stack.
+     *
+     * @var RequestStack
+     */
+    private $requestStack;
+
+    /**
+     * Router.
+     *
+     * @var Router
+     */
+    private $router;
+
+    /**
+     * Translator.
+     *
+     * @var Translator
+     */
+    private $translator;
+
+    /**
+     * Assets manager.
+     *
+     * @var AssetsManager
+     */
+    private $assets;
+
+    /**
+     * BackendUserNavigationListener constructor.
+     *
+     * @param RequestStack  $requestStack Request stack.
+     * @param Router        $router       Router.
+     * @param Translator    $translator   Translator.
+     * @param AssetsManager $assets       Assets manager.
+     */
+    public function __construct(
+        RequestStack $requestStack,
+        Router $router,
+        Translator $translator,
+        AssetsManager $assets
+    ) {
+        $this->requestStack = $requestStack;
+        $this->router       = $router;
+        $this->translator   = $translator;
+        $this->assets       = $assets;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param array $modules Backend navigation modules.
+     *
+     * @return array
+     */
+    public function __invoke(array $modules): array
+    {
+        if (!isset($modules['leaflet'])) {
+            return $modules;
+        }
+
+        $request  = $this->requestStack->getCurrentRequest();
+        $isActive = $request && $request->attributes->get('_backend_module') === 'leaflet_about';
+
+        $modules['leaflet']['modules']['leaflet_about'] = [
+            'label'    => $this->translator->trans('MOD.leaflet_about.0', [], 'contao_modules'),
+            'title'    => $this->translator->trans('MOD.leaflet_about.1', [], 'contao_modules'),
+            'href'     => $this->router->generate('leaflet_backend_about'),
+            'icon'     => 'bundles/netzmachtcontaoleaflet/img/about.png',
+            'class'    => 'navigation leaflet_about',
+            'isActive' => $isActive,
+        ];
+
+        if ($isActive) {
+            $this->assets->addStylesheet('bundles/netzmachtcontaoleaflet/css/about.css');
+        }
+
+        return $modules;
+    }
+}

src/Listener/Dca/ControlDcaListener.php

@@ -14,11 +14,12 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca;
 
 use Contao\StringUtil;
 use Doctrine\DBAL\Connection;
+use Netzmacht\Contao\Leaflet\Model\ControlModel;
+use Netzmacht\Contao\Leaflet\Model\LayerModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
-use Netzmacht\Contao\Leaflet\Model\ControlModel;
-use Netzmacht\Contao\Leaflet\Model\LayerModel;
 
 /**
  * Class Control is the helper for the tl_leaflet_control dca.
@@ -48,19 +49,32 @@ class ControlDcaListener extends AbstractListener
      */
     private $types;
 
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
     /**
      * Construct.
      *
-     * @param Manager    $manager    Data container manager.
-     * @param Connection $connection Database connection.
-     * @param array      $types      Control types.
+     * @param Manager           $manager           Data container manager.
+     * @param Connection        $connection        Database connection.
+     * @param RepositoryManager $repositoryManager Repository manager.
+     * @param array             $types             Control types.
      */
-    public function __construct(Manager $manager, Connection $connection, array $types)
-    {
+    public function __construct(
+        Manager $manager,
+        Connection $connection,
+        RepositoryManager $repositoryManager,
+        array $types
+    ) {
         parent::__construct($manager);
 
-        $this->connection = $connection;
-        $this->types      = $types;
+        $this->connection        = $connection;
+        $this->types             = $types;
+        $this->repositoryManager = $repositoryManager;
     }
 
     /**
@@ -96,7 +110,8 @@ class ControlDcaListener extends AbstractListener
      */
     public function getLayers()
     {
-        $collection = LayerModel::findAll();
+        $repository = $this->repositoryManager->getRepository(LayerModel::class);
+        $collection = $repository->findAll();
 
         return OptionsBuilder::fromCollection($collection, 'title')
             ->asTree()
@@ -110,7 +125,8 @@ class ControlDcaListener extends AbstractListener
      */
     public function getZoomControls()
     {
-        $collection = ControlModel::findBy('type', 'zoom', array('order' => 'title'));
+        $repository = $this->repositoryManager->getRepository(ControlModel::class);
+        $collection = $repository->findBy(['type=?'], ['zoom'], ['order' => 'title']);
 
         return OptionsBuilder::fromCollection($collection, 'title')->getOptions();
     }
@@ -166,7 +182,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 +193,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'],
                     ]
                 );
 

src/Listener/Dca/FrontendIntegrationListener.php

@@ -14,8 +14,12 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Listener\Dca;
 
-use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
+use Contao\Image;
+use Contao\RequestToken;
+use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Model\MapModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
+use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
@@ -32,14 +36,23 @@ final class FrontendIntegrationListener
      */
     private $translator;
 
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
     /**
      * FrontendIntegration constructor.
      *
-     * @param Translator $translator Translator.
+     * @param RepositoryManager $repositoryManager Repository manager.
+     * @param Translator        $translator        Translator.
      */
-    public function __construct(Translator $translator)
+    public function __construct(RepositoryManager $repositoryManager, Translator $translator)
     {
-        $this->translator = $translator;
+        $this->translator        = $translator;
+        $this->repositoryManager = $repositoryManager;
     }
 
     /**
@@ -49,7 +62,8 @@ final class FrontendIntegrationListener
      */
     public function getMaps(): array
     {
-        $collection = MapModel::findAll();
+        $repository = $this->repositoryManager->getRepository(MapModel::class);
+        $collection = $repository->findAll(['order' => 'title']);
 
         return OptionsBuilder::fromCollection($collection, 'title')->getOptions();
     }
@@ -74,11 +88,13 @@ final class FrontendIntegrationListener
             '<a href="%s%s&amp;popup=1&amp;rt=%s" %s>%s</a>',
             'contao/main.php?do=leaflet_map&amp;table=tl_leaflet_map&amp;act=edit&amp;id=',
             $dataContainer->value,
-            \RequestToken::get(),
+            RequestToken::get(),
             sprintf(
                 $pattern,
-                specialchars($this->translator->trans('editalias.1', [$dataContainer->value], 'contao_tl_content')),
-                specialchars(
+                StringUtil::specialchars(
+                    $this->translator->trans('editalias.1', [$dataContainer->value], 'contao_tl_content')
+                ),
+                StringUtil::specialchars(
                     str_replace(
                         "'",
                         "\\'",
@@ -86,7 +102,7 @@ final class FrontendIntegrationListener
                     )
                 )
             ),
-            \Image::getHtml(
+            Image::getHtml(
                 'alias.gif',
                 $this->translator->trans('editalias.0', [$dataContainer->value], 'contao_tl_content'),
                 'style="vertical-align:top"'

src/Listener/Dca/LayerDcaListener.php

@@ -12,17 +12,19 @@
 
 namespace Netzmacht\Contao\Leaflet\Listener\Dca;
 
-use Contao\Controller;
+use Contao\Backend;
+use Contao\CoreBundle\Framework\Adapter;
+use Contao\DataContainer;
 use Contao\Image;
-use Contao\RequestToken;
 use Contao\StringUtil;
 use Doctrine\DBAL\Connection;
 use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer;
 use Netzmacht\Contao\Leaflet\Model\IconModel;
+use Netzmacht\Contao\Leaflet\Model\LayerModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
-use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
@@ -52,7 +54,14 @@ class LayerDcaListener extends AbstractListener
      * @var Connection
      */
     private $connection;
-    
+
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
     /**
      * Tile providers configuration.
      *
@@ -81,36 +90,59 @@ class LayerDcaListener extends AbstractListener
      */
     private $labelRenderer;
 
+    /**
+     * File formats.
+     *
+     * @var array
+     */
+    private $fileFormats;
+
+    /**
+     * Backend adapter.
+     *
+     * @var Backend|Adapter
+     */
+    private $backendAdapter;
+
     /**
      * Construct.
      *
-     * @param Manager            $manager       Data container manager.
-     * @param Connection         $connection    Database connection.
-     * @param Translator         $translator    Translator.
-     * @param LayerLabelRenderer $labelRenderer Layer label renderer.
-     * @param array              $layers        Leaflet layer configuration.
-     * @param array              $tileProviders Tile providers.
-     * @param array              $amenities     OSM amenities.
+     * @param Manager            $manager           Data container manager.
+     * @param Connection         $connection        Database connection.
+     * @param RepositoryManager  $repositoryManager Repository manager.
+     * @param Translator         $translator        Translator.
+     * @param LayerLabelRenderer $labelRenderer     Layer label renderer.
+     * @param Adapter|Backend    $backendAdapter    Backend adapter.
+     * @param array              $layers            Leaflet layer configuration.
+     * @param array              $tileProviders     Tile providers.
+     * @param array              $amenities         OSM amenities.
+     * @param array              $fileFormats       File formats.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Manager $manager,
         Connection $connection,
+        RepositoryManager $repositoryManager,
         Translator $translator,
         LayerLabelRenderer $labelRenderer,
+        $backendAdapter,
         array $layers,
         array $tileProviders,
-        array $amenities
+        array $amenities,
+        array $fileFormats
     ) {
         parent::__construct($manager);
 
-        Controller::loadLanguageFile('leaflet_layer');
-
-        $this->connection    = $connection;
-        $this->layers        = $layers;
-        $this->tileProviders = $tileProviders;
-        $this->translator    = $translator;
-        $this->amenities     = $amenities;
-        $this->labelRenderer = $labelRenderer;
+        $this->connection        = $connection;
+        $this->layers            = $layers;
+        $this->tileProviders     = $tileProviders;
+        $this->translator        = $translator;
+        $this->amenities         = $amenities;
+        $this->labelRenderer     = $labelRenderer;
+        $this->fileFormats       = $fileFormats;
+        $this->repositoryManager = $repositoryManager;
+        $this->backendAdapter    = $backendAdapter;
     }
 
     /**
@@ -149,7 +181,7 @@ class LayerDcaListener extends AbstractListener
             return $this->tileProviders[$dataContainer->activeRecord->tile_provider]['variants'];
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -205,7 +237,8 @@ class LayerDcaListener extends AbstractListener
             )
         );
 
-        $collection = LayerModel::findMultipleByTypes($types);
+        $repository = $this->repositoryManager->getRepository(LayerModel::class);
+        $collection = $repository->findMultipleByTypes($types);
         $builder    = OptionsBuilder::fromCollection(
             $collection,
             'id',
@@ -232,43 +265,42 @@ 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'] : '')
-            . '&rt=' . RequestToken::get()
+        $pasteAfterUrl = $this->backendAdapter->addToUrl(
+            'act=' . $children['mode'] . '&mode=1&pid=' . $row['id']
+            . (!is_array($children['id']) ? '&id=' . $children['id'] : '')
         );
 
         $buffer = sprintf(
             '<a href="%s" title="%s" onclick="Backend.getScrollOffset()">%s</a> ',
             $pasteAfterUrl,
-            specialchars($this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table)),
-            \Image::getHtml(
+            StringUtil::specialchars($this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table)),
+            Image::getHtml(
                 'pasteafter.gif',
                 $this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table)
             )
         );
 
         if (!empty($this->layers[$row['type']]['children'])) {
-            $pasteIntoUrl = \Controller::addToUrl(
+            $pasteIntoUrl = $this->backendAdapter->addToUrl(
                 sprintf(
                     'act=%s&amp;mode=2&amp;pid=%s%s',
                     $children['mode'],
                     $row['id'],
-                    !is_array($children['id']) ? '&amp;id='.$children['id'] : ''
-                ) . '&amp;rt=' . RequestToken::get()
+                    !is_array($children['id']) ? '&amp;id=' . $children['id'] : ''
+                )
             );
 
             $buffer .= sprintf(
                 '<a href="%s" title="%s" onclick="Backend.getScrollOffset()">%s</a> ',
                 $pasteIntoUrl,
-                specialchars($this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table)),
-                \Image::getHtml(
+                StringUtil::specialchars($this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table)),
+                Image::getHtml(
                     'pasteinto.gif',
                     $this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table)
                 )
             );
         } elseif ($row['id'] > 0) {
-            $buffer .= \Image::getHtml('pasteinto_.gif');
+            $buffer .= Image::getHtml('pasteinto_.gif');
         }
 
         return $buffer;
@@ -337,7 +369,7 @@ class LayerDcaListener extends AbstractListener
             $statement->bindValue('lid', $dataContainer->id);
             $statement->execute();
 
-            $undo['data'] = deserialize($undo['data'], true);
+            $undo['data'] = StringUtil::deserialize($undo['data'], true);
 
             while ($row = $statement->fetch()) {
                 $undo['data']['tl_leaflet_map_layer'][] = $row;
@@ -365,7 +397,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) {
@@ -389,7 +421,8 @@ class LayerDcaListener extends AbstractListener
      */
     public function getLayers($dataContainer)
     {
-        $collection = LayerModel::findBy('id !', $dataContainer->id);
+        $repository = $this->repositoryManager->getRepository(LayerModel::class);
+        $collection = $repository->findBy(['tl_leaflet_layer.id!=?'], [$dataContainer->id]);
 
         return OptionsBuilder::fromCollection($collection, 'title')
             ->asTree()
@@ -413,7 +446,8 @@ class LayerDcaListener extends AbstractListener
      */
     public function getIcons()
     {
-        $collection = IconModel::findAll(array('order' => 'title'));
+        $repository = $this->repositoryManager->getRepository(IconModel::class);
+        $collection = $repository->findAll(['order' => 'title']);
         $builder    = OptionsBuilder::fromCollection(
             $collection,
             function ($model) {
@@ -424,6 +458,49 @@ class LayerDcaListener extends AbstractListener
         return $builder->getOptions();
     }
 
+    /**
+     * Get the file formats.
+     *
+     * @return array
+     */
+    public function getFileFormats(): array
+    {
+        return array_keys($this->fileFormats);
+    }
+
+    /**
+     * Prepare the file widget.
+     *
+     * @param mixed         $value         Given value.
+     * @param DataContainer $dataContainer Data container driver.
+     *
+     * @return mixed
+     */
+    public function prepareFileWidget($value, $dataContainer)
+    {
+        if ($dataContainer->activeRecord) {
+            $fileFormat = $dataContainer->activeRecord->fileFormat;
+
+            if (isset($this->fileFormats[$fileFormat])) {
+                $definition = $this->getDefinition();
+                $definition->set(
+                    ['fields', $dataContainer->field, 'eval', 'extensions'],
+                    implode(',', $this->fileFormats[$fileFormat])
+                );
+
+                $definition->set(
+                    ['fields', $dataContainer->field, 'label', 1],
+                    sprintf(
+                        $definition->get(['fields', $dataContainer->field, 'label', 1]),
+                        implode(', ', $this->fileFormats[$fileFormat])
+                    )
+                );
+            }
+        }
+
+        return $value;
+    }
+
     /**
      * Generate a button.
      *
@@ -440,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/LeafletDcaListener.php

@@ -12,11 +12,14 @@
 
 namespace Netzmacht\Contao\Leaflet\Listener\Dca;
 
-use Contao\Controller;
+use Contao\CoreBundle\Framework\Adapter;
 use Contao\DataContainer;
+use Contao\System;
 use Netzmacht\Contao\Leaflet\Model\LayerModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\LeafletPHP\Value\LatLng;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Templating\EngineInterface as TemplateEngine;
 
 /**
  * Class Leaflet is the base helper providing different methods.
@@ -39,16 +42,48 @@ class LeafletDcaListener
      */
     private $cacheDir;
 
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
+    /**
+     * Template engine.
+     *
+     * @var TemplateEngine
+     */
+    private $templateEngine;
+
+    /**
+     * System adapter.
+     *
+     * @var Adapter|System
+     */
+    private $systemAdapter;
+
     /**
      * LeafletCallbacks constructor.
      *
-     * @param Filesystem $fileSystem File system.
-     * @param string     $cacheDir   Cache dir.
+     * @param RepositoryManager $repositoryManager Repository manager.
+     * @param TemplateEngine    $templateEngine    Template engine.
+     * @param Filesystem        $fileSystem        File system.
+     * @param Adapter|System    $systemAdapter     Contao system adapter.
+     * @param string            $cacheDir          Cache dir.
      */
-    public function __construct(Filesystem $fileSystem, string $cacheDir)
-    {
-        $this->fileSystem = $fileSystem;
-        $this->cacheDir   = $cacheDir;
+    public function __construct(
+        RepositoryManager $repositoryManager,
+        TemplateEngine $templateEngine,
+        Filesystem $fileSystem,
+        $systemAdapter,
+        string $cacheDir
+    ) {
+        $this->repositoryManager = $repositoryManager;
+        $this->templateEngine    = $templateEngine;
+        $this->fileSystem        = $fileSystem;
+        $this->systemAdapter     = $systemAdapter;
+        $this->cacheDir          = $cacheDir;
     }
 
     /**
@@ -58,7 +93,7 @@ class LeafletDcaListener
      */
     public function loadLanguageFile()
     {
-        Controller::loadLanguageFile('leaflet');
+        $this->systemAdapter->loadLanguageFile('leaflet');
     }
 
     /**
@@ -80,17 +115,17 @@ class LeafletDcaListener
      */
     public function getGeocoder($dataContainer)
     {
-        $template        = new \BackendTemplate('be_leaflet_geocode');
-        $template->field = 'ctrl_' . $dataContainer->field;
+        $data['field'] = 'ctrl_' . $dataContainer->field;
 
         try {
-            $latLng           = LatLng::fromString($dataContainer->value);
-            $template->marker = json_encode($latLng);
+            $latLng         = LatLng::fromString($dataContainer->value);
+            $data['marker'] = json_encode($latLng);
         } catch (\Exception $e) {
             // LatLng throws an exception of value could not be created. Just let the value empty when.
+            $data['marker'] = null;
         }
 
-        return $template->parse();
+        return $this->templateEngine->render('toolkit:be:be_leaflet_geocode.html5', $data);
     }
 
     /**
@@ -100,8 +135,9 @@ class LeafletDcaListener
      */
     public function getLayers()
     {
-        $options    = array();
-        $collection = LayerModel::findBy('pid', '0', array('order' => 'title'));
+        $options    = [];
+        $repository = $this->repositoryManager->getRepository(LayerModel::class);
+        $collection = $repository->findBy(['pid=?'], ['0'], ['order' => 'title']);
 
         if ($collection) {
             foreach ($collection as $model) {

src/Listener/Dca/MapDcaListener.php

@@ -15,13 +15,18 @@ declare(strict_types=1);
 namespace Netzmacht\Contao\Leaflet\Listener\Dca;
 
 use Contao\DataContainer;
+use Contao\Input;
 use Contao\StringUtil;
 use Doctrine\DBAL\Connection;
 use Netzmacht\Contao\Leaflet\Model\LayerModel;
+use Netzmacht\Contao\Leaflet\Model\MapModel;
+use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
 use PDO;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
  * Class Map is the helper class for the tl_leaflet_map dca.
@@ -44,17 +49,77 @@ class MapDcaListener extends AbstractListener
      */
     private $connection;
 
+    /**
+     * Repository manager.
+     *
+     * @var RepositoryManager
+     */
+    private $repositoryManager;
+
+    /**
+     * Translator.
+     *
+     * @var Translator
+     */
+    private $translator;
+
+    /**
+     * Session.
+     *
+     * @var Session
+     */
+    private $session;
+
     /**
      * Construct.
      *
-     * @param Manager    $manager    Data container manager.
-     * @param Connection $connection Database connection.
+     * @param Manager           $manager           Data container manager.
+     * @param Connection        $connection        Database connection.
+     * @param RepositoryManager $repositoryManager Repository manager.
+     * @param Translator        $translator        Translator.
+     * @param Session           $session           Session.
      */
-    public function __construct(Manager $manager, Connection $connection)
-    {
+    public function __construct(
+        Manager $manager,
+        Connection $connection,
+        RepositoryManager $repositoryManager,
+        Translator $translator,
+        Session $session
+    ) {
         parent::__construct($manager);
 
-        $this->connection = $connection;
+        $this->connection        = $connection;
+        $this->repositoryManager = $repositoryManager;
+        $this->translator        = $translator;
+        $this->session           = $session;
+    }
+
+    /**
+     * Add warnings for incomplete configurations.
+     *
+     * @param DataContainer $dataContainer The data container driver.
+     *
+     * @return void
+     */
+    public function addIncompleteConfigurationWarning($dataContainer): void
+    {
+        if (Input::get('act') !== 'edit') {
+            return;
+        }
+
+        $repository = $this->repositoryManager->getRepository(MapModel::class);
+        $map        = $repository->find((int) $dataContainer->id);
+
+        if (!$map) {
+            return;
+        }
+
+        if ($map->zoom === null || $map->zoom === '') {
+            $this->session->getFlashBag()->add(
+                'contao.BE.info',
+                $this->translator->trans('ERR.leafletMissingZoomLevel', [], 'contao_default')
+            );
+        }
     }
 
     /**
@@ -90,7 +155,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 +173,7 @@ class MapDcaListener extends AbstractListener
                     'tstamp'  => time(),
                     'lid'     => $layerId,
                     'mid'     => $dataContainer->id,
-                    'sorting' => $sorting
+                    'sorting' => $sorting,
                 ];
 
                 $this->connection->insert('tl_leaflet_map_layer', $data);
@@ -150,16 +215,37 @@ class MapDcaListener extends AbstractListener
     /**
      * Get all layers except of the current layer.
      *
-     * @param DataContainer $dataContainer The dataContainer driver.
-     *
      * @return array
      */
-    public function getLayers($dataContainer)
+    public function getLayers()
     {
-        $collection = LayerModel::findBy('id !', $dataContainer->id);
+        $repository = $this->repositoryManager->getRepository(LayerModel::class);
+        $collection = $repository->findAll(['order' => 'title']);
 
         return OptionsBuilder::fromCollection($collection, 'title')
             ->asTree()
             ->getOptions();
     }
+
+    /**
+     * Copy layer relations if a map is duplicated.
+     *
+     * @param string|int    $insertId      Insert id of the new map.
+     * @param DataContainer $dataContainer Data container driver.
+     *
+     * @return void
+     */
+    public function copyLayerRelations($insertId, DataContainer $dataContainer): void
+    {
+        $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting');
+        $statement->bindValue('mid', $dataContainer->id);
+        $statement->execute();
+
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            unset($row['id']);
+            $row['tstamp'] = time();
+            $row['mid']    = $insertId;
+            $this->connection->insert('tl_leaflet_map_layer', $row);
+        }
+    }
 }