Prepare release

Add support for hofff/contao-consent-bridge #81
Prepare release
2020-08-28 17:19:04 +02:00 · 2020-08-28 17:14:33 +02:00 · 2020-08-28 16:57:52 +02:00 · 2020-08-28 16:56:11 +02:00 · 2020-08-28 16:46:58 +02:00 · 2020-08-10 16:56:58 +02:00
55 changed files with 911 additions and 2266 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [dmolineus]
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,18 @@
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - ant-optional
+
 language: php

 php:
-  - "7.1"
+  - "7.3"
  - "7.2"
+  - "7.1"
+  - "7.4snapshot"
+  - "nightly"

 env:
  - CONTAO_VERSION=contao/core-bundle ~4.4.0
@@ -11,10 +21,12 @@ env:

 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,79 @@ 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).

-## 3.1.1 - 2018-12-07
+## [Unreleased]

-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.0...3.1.1)
+## [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

@@ -42,43 +112,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix broken marker cluster layer (#60).


-## 3.0.4 - 2018-10-08
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.3...3.0.4)
+## [3.0.4] - 2018-10-08

 ### Fixed

 - Fix broken content element attributes (Missing class and custom id).

-## 3.0.3 - 2018-09-18
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.2...3.0.3)
+## [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
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.1...3.0.2)
+## [3.0.2] - 2018-08-23

 - Run composer require checker and solve issues.
 
-## 3.0.1 - 2018-06-20
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0...3.0.1)
+## [3.0.1] - 2018-06-20

 - Fix broken dynamic bbox related data loading (#57) 

-## 3.0.0 - 2018-01-05
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...3.0.0)
+## [3.0.0] - 2018-01-05

 - Make hook/dca listener services public

-## 3.0.0-beta1 - 2017-11-15
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...3.0.0-beta1)
+## [3.0.0-beta1] - 2017-11-15

 Enhancements

@@ -89,9 +147,7 @@ Bugfixes
  - Broken service definitions
  - Broken file layer id 

-## 3.0.0-alpha1 - 2017-10-19
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...3.0.0-alpha2)
+## [3.0.0-alpha2] - 2017-10-19

 Implemented enhancements
 
@@ -100,3 +156,19 @@ Implemented enhancements
 - 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.0...hotfix/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
--- a/README.md
+++ b/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.
@@ -38,6 +38,12 @@ 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
 ---------

--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,12 @@
 {
  "name": "netzmacht/contao-leaflet-maps",
+  "type": "contao-bundle",
  "description": "Contao Leaflet maps integration",
  "keywords": [
    "contao",
    "maps",
    "leaflet"
  ],
-  "type": "contao-bundle",
  "license": "LGPL-3.0-or-later",
  "authors": [
    {
@@ -16,39 +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.1",
    "ext-json": "*",
    "ext-pdo": "*",
+    "contao-community-alliance/meta-palettes": "^2.0 || ^1.11",
    "contao/core-bundle": "~4.4",
+    "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.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/dependency-injection": "~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",
-    "symfony/templating": "~3.3 || ~4.0",
-    "netzmacht/contao-leaflet-libraries": "^1.0",
-    "netzmacht/contao-leaflet-geocode-widget": "^1.2",
-    "netzmacht/php-javascript-builder": "^1.0",
-    "netzmacht/php-leaflet": "^1.0.2",
-    "netzmacht/contao-toolkit": "~3.0",
-    "netzmacht/contao-page-context": "~1.0",
-    "contao-community-alliance/meta-palettes": "^2.0 || ^1.5",
-    "menatwork/contao-multicolumnwizard": "^3.2",
-    "doctrine/cache": "^1.0",
-    "codefog/contao-widget_tree_picker": "^2.4"
+    "twig/twig": "^1.3.35 || ^2.0"
  },
  "require-dev": {
-    "phpcq/all-tasks": "^1.2",
    "contao/manager-plugin": "^2.1",
-    "phpstan/phpstan": "^0.10.3"
+    "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": {
@@ -60,20 +74,10 @@
      "vendor/phpcq/autoload-validation/hacks/contao-hack.php"
    ]
  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "3.1.x-dev",
-      "dev-develop": "3.2.x-dev",
-      "dev-support/2.x": "2.0.x-dev"
-    },
-    "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin",
-    "contao": {
-      "transifex": {
-        "project": "contao-leaflet-maps",
-        "prefix": "core-",
-        "languages_cto": "src/Bundle/Resources/contao/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/"
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -4,10 +4,10 @@
  "description": "Leaflet maps for Contao",
  "main": "gulpfile.js",
  "dependencies": {
-    "gulp": "^4.0.0",
-    "gulp-cli": "^2.0.1",
+    "gulp": "^4.0.2",
+    "gulp-cli": "^2.2.0",
    "gulp-concat": "^2.6.1",
-    "gulp-uglify": "^3.0.1",
+    "gulp-uglify": "^3.0.2",
    "promised-del": "^1.0.2"
  },
  "devDependencies": {},
--- a/src/Backend/Action/AboutAction.php
+++ b/src/Backend/Action/AboutAction.php
@@ -5,15 +5,15 @@
 *
 * @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\Action;

-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as Engine;
 use Symfony\Component\HttpFoundation\Response;
+use Twig\Environment;

 /**
 * Credits backend module.
@@ -23,11 +23,11 @@ use Symfony\Component\HttpFoundation\Response;
 final class AboutAction
 {
    /**
-     * Templating engine.
+     * Twig environment.
     *
-     * @var Engine
+     * @var Environment
     */
-    private $engine;
+    private $twig;

    /**
     * Project directory.
@@ -39,12 +39,12 @@ final class AboutAction
    /**
     * AboutAction constructor.
     *
-     * @param Engine $engine     Templating engine.
-     * @param string $projectDir Project directory.
+     * @param Environment $twig       Twig environment.
+     * @param string      $projectDir Project directory.
     */
-    public function __construct(Engine $engine, string $projectDir)
+    public function __construct(Environment $twig, string $projectDir)
    {
-        $this->engine     = $engine;
+        $this->twig       = $twig;
        $this->projectDir = $projectDir;
    }

@@ -62,7 +62,9 @@ final class AboutAction

        [$data['version'], $data['dependencies']] = $this->extractFromComposer();

-        return $this->engine->renderResponse('@NetzmachtContaoLeaflet/backend/about.html.twig', $data);
+        return new Response(
+            $this->twig->render('@NetzmachtContaoLeaflet/backend/about.html.twig', $data)
+        );
    }

    /**
--- a/src/Bundle/ConsentBridge/Plugin.php
+++ b/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);
+    }
+}
--- a/src/Bundle/Resources/config/listeners.yml
+++ b/src/Bundle/Resources/config/listeners.yml
@@ -51,8 +51,6 @@ services:
      - '@netzmacht.contao_toolkit.repository_manager'
      - '@translator'
      - '@netzmacht.contao_leaflet.layer_label_renderer'
-      - '@netzmacht.contao_toolkit.contao.backend_user'
-      - '@netzmacht.contao_toolkit.dca.listeners.state_button_callback'
      - '@netzmacht.contao_toolkit.contao.backend_adapter'
      - '%netzmacht.contao_leaflet.layers%'
      - '%netzmacht.contao_leaflet.providers%'
@@ -65,7 +63,6 @@ services:
    arguments:
      - '@database_connection'
      - '@netzmacht.contao_toolkit.repository_manager'
-      - '@netzmacht.contao_toolkit.contao.backend_user'

  netzmacht.contao_leaflet.listeners.dca.vector:
    class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener
@@ -73,52 +70,20 @@ services:
    arguments:
      - '@netzmacht.contao_toolkit.dca.manager'
      - '@netzmacht.contao_toolkit.repository_manager'
-      - '@netzmacht.contao_toolkit.contao.backend_user'
      - '%netzmacht.contao_leaflet.vectors%'

  netzmacht.contao_leaflet.listeners.dca.icon:
    class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener
    public: true
    arguments:
-      - '@netzmacht.contao_toolkit.contao.backend_user'
      - '%netzmacht.contao_leaflet.icons%'

  netzmacht.contao_leaflet.listeners.dca.style:
    class: Netzmacht\Contao\Leaflet\Listener\Dca\StyleDcaListener
    public: true
    arguments:
-      - '@netzmacht.contao_toolkit.contao.backend_user'
      - '%netzmacht.contao_leaflet.styles%'

-  netzmacht.contao_leaflet.listeners.dca.popup:
-    class: Netzmacht\Contao\Leaflet\Listener\Dca\PopupDcaListener
-    public: true
-    arguments:
-      - '@netzmacht.contao_toolkit.contao.backend_user'
-
-  netzmacht.contao_leaflet.listeners.dca.user:
-    class: Netzmacht\Contao\Leaflet\Listener\Dca\UserDcaListener
-    public: true
-    arguments:
-      - '@netzmacht.contao_toolkit.dca.manager'
-      - '@netzmacht.contao_leaflet.layer_label_renderer'
-      - '@translator'
-      - '%netzmacht.contao_leaflet.layers%'
-      -
-  netzmacht.contao_leaflet.listeners.dca.user_group:
-    class: Netzmacht\Contao\Leaflet\Listener\Dca\UserGroupDcaListener
-    public: true
-    arguments:
-      - '@netzmacht.contao_toolkit.dca.manager'
-      - '@netzmacht.contao_leaflet.layer_label_renderer'
-      - '@translator'
-      - '%netzmacht.contao_leaflet.layers%'
-
-  Netzmacht\Contao\Leaflet\Listener\Dca\OperationsListener:
-    public: true
-    arguments:
-      - '@netzmacht.contao_toolkit.contao.backend_user'
-
  netzmacht.contao_leaflet.listeners.geo_json_listener:
    class: Netzmacht\Contao\Leaflet\Listener\GeoJsonListener
    arguments:
--- a/src/Bundle/Resources/config/providers.yml
+++ b/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'
--- a/src/Bundle/Resources/config/services.yml
+++ b/src/Bundle/Resources/config/services.yml
@@ -128,11 +128,17 @@ services:
      - { 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:
-      - '@templating'
+      - '@twig'
      - '%kernel.project_dir%'
+
+  Netzmacht\Contao\Leaflet\Bundle\ConsentBridge\Plugin:
+    tags:
+      - { name: hofff_contao_consent_bridge.plugin }
--- a/src/Bundle/Resources/contao/config/config.php
+++ b/src/Bundle/Resources/contao/config/config.php
@@ -11,7 +11,7 @@
 */

 /*
- * Backend modules
+ * Backend module.
 */

 array_insert(
@@ -44,13 +44,12 @@ array_insert(
    ]
 );

-if (TL_MODE === 'BE') {
+if (defined('TL_MODE') && TL_MODE === 'BE') {
    $GLOBALS['TL_CSS'][] = 'bundles/netzmachtcontaoleaflet/css/backend_global.css';
 }

-
 /*
- * Models
+ * Models.
 */

 $GLOBALS['TL_MODELS']['tl_leaflet_control'] = \Netzmacht\Contao\Leaflet\Model\ControlModel::class;
@@ -61,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;
-
-
-/*
- * Permissions
- */
-
-$GLOBALS['TL_PERMISSIONS'][] = 'leaflet_layers';
-$GLOBALS['TL_PERMISSIONS'][] = 'leaflet_layer_permissions';
-$GLOBALS['TL_PERMISSIONS'][] = 'leaflet_tables';
--- a/src/Bundle/Resources/contao/dca/tl_content.php
+++ b/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'],
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php
+++ b/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' => [
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php
@@ -10,8 +10,6 @@
 * @filesource
 */

-use Netzmacht\Contao\Leaflet\Listener\Dca\OperationsListener;
-
 $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
    'config' => [
        'dataContainer'     => 'Table',
@@ -22,9 +20,6 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
                'alias' => 'unique',
            ],
        ],
-        'onload_callback'   => [
-            ['netzmacht.contao_leaflet.listeners.dca.icon', 'checkPermission'],
-        ],
        'onsubmit_callback' => [
            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
        ],
@@ -50,19 +45,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
                'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"',
            ],
            'styles' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['styles'],
-                'href'            => 'table=tl_leaflet_style',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/style.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'styleOperation'],
-
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['styles'],
+                'href'       => 'table=tl_leaflet_style',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/style.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'popups' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['popups'],
-                'href'            => 'table=tl_leaflet_popup',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/popup.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'popupOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['popups'],
+                'href'       => 'table=tl_leaflet_popup',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/popup.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'all'    => [
                'label'      => &$GLOBALS['TL_LANG']['MSC']['all'],
@@ -187,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',
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php
@@ -10,13 +10,14 @@
 * @filesource
 */

-use Netzmacht\Contao\Leaflet\Listener\Dca\OperationsListener;
-
 $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
    'config' => [
        'dataContainer'     => 'Table',
        'enableVersioning'  => true,
        'ctable'            => ['tl_leaflet_vector', 'tl_leaflet_marker'],
+        'ondelete_callback' => [
+            ['netzmacht.contao_leaflet.listeners.dca.layer', 'deleteRelations'],
+        ],
        'sql'               => [
            'keys' => [
                'id'    => 'primary',
@@ -25,12 +26,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
            ],
        ],
        'onload_callback'   => [
-            ['netzmacht.contao_leaflet.listeners.dca.layer', 'checkPermissions'],
            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'],
        ],
-        'ondelete_callback' => [
-            ['netzmacht.contao_leaflet.listeners.dca.layer', 'deleteRelations'],
-        ],
        'onsubmit_callback' => [
            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
        ],
@@ -51,25 +48,22 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
        ],
        'global_operations' => [
            'styles' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'],
-                'href'            => 'table=tl_leaflet_style',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/style.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'styleOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'],
+                'href'       => 'table=tl_leaflet_style',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/style.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'icons'  => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'],
-                'href'            => 'table=tl_leaflet_icon',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/icons.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'iconOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'],
+                'href'       => 'table=tl_leaflet_icon',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/icons.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'popups' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'],
-                'href'            => 'table=tl_leaflet_popup',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/popup.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'popupOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'],
+                'href'       => 'table=tl_leaflet_popup',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/popup.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'all'    => [
                'label'      => &$GLOBALS['TL_LANG']['MSC']['all'],
@@ -92,31 +86,27 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateVectorsButton'],
            ],
            'edit'    => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'],
-                'href'            => 'act=edit',
-                'icon'            => 'header.gif',
-                'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateEditButton'],
+                'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'],
+                'href'  => 'act=edit',
+                'icon'  => 'header.gif',
            ],
            'copy'    => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['copy'],
-                'href'            => 'act=copy',
-                'icon'            => 'copy.gif',
-                'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateCopyButton'],
+                'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['copy'],
+                'href'  => 'act=copy',
+                'icon'  => 'copy.gif',
            ],
            'cut'     => [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['cut'],
                'href'       => 'act=paste&amp;mode=cut',
                'icon'       => 'cut.gif',
                'attributes' => 'onclick="Backend.getScrollOffset()"',
-                'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateEditButton'],
            ],
            'delete'  => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['delete'],
-                'href'            => 'act=delete',
-                'icon'            => 'delete.gif',
-                'attributes'      => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['delete'],
+                'href'       => 'act=delete',
+                'icon'       => 'delete.gif',
+                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
                    . '\'))return false;Backend.getScrollOffset()"',
-                'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateDeleteButton'],
            ],
            'toggle'  => [
                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['toggle'],
@@ -124,8 +114,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                'attributes'      => 'onclick="Backend.getScrollOffset(); 
                    return ContaoLeafletAjaxRequest.toggleVisibility(this,%s)"',
                'button_callback' => [
-                    'netzmacht.contao_leaflet.listeners.dca.layer',
-                    'generateToggleButton',
+                    'netzmacht.contao_toolkit.dca.listeners.state_button_callback',
+                    'handleButtonCallback',
                ],
                'toolkit'         => [
                    'state_button' => [
@@ -242,8 +232,10 @@ $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'],
@@ -286,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',
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php
@@ -28,6 +28,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
        'onsubmit_callback' => [
            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
        ],
+        'oncopy_callback' => [
+            ['netzmacht.contao_leaflet.listeners.dca.map', 'copyLayerRelations'],
+        ],
    ],

    'list' => [
@@ -157,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',
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php
@@ -10,8 +10,6 @@
 * @filesource
 */

-use Netzmacht\Contao\Leaflet\Listener\Dca\OperationsListener;
-
 $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
    'config' => [
        'dataContainer'     => 'Table',
@@ -25,7 +23,6 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
            ],
        ],
        'onload_callback'   => [
-            ['netzmacht.contao_leaflet.listeners.dca.marker', 'checkPermissions'],
            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'],
        ],
        'onsubmit_callback' => [
@@ -48,18 +45,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
        ],
        'global_operations' => [
            'icons'  => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icons'],
-                'href'            => 'table=tl_leaflet_icon&id=',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/icons.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();" accesskey="e"',
-                'button_callback' => [OperationsListener::class, 'iconOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icons'],
+                'href'       => 'table=tl_leaflet_icon&id=',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/icons.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"',
            ],
            'popups' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popups'],
-                'href'            => 'table=tl_leaflet_popup',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/popup.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'popupOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popups'],
+                'href'       => 'table=tl_leaflet_popup',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/popup.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'all'    => [
                'label'      => &$GLOBALS['TL_LANG']['MSC']['all'],
@@ -165,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',
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php
@@ -10,8 +10,6 @@
 * @filesource
 */

-use Netzmacht\Contao\Leaflet\Listener\Dca\OperationsListener;
-
 $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
    'config' => [
        'dataContainer'     => 'Table',
@@ -22,9 +20,6 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
                'alias' => 'unique',
            ],
        ],
-        'onload_callback'   => [
-            ['netzmacht.contao_leaflet.listeners.dca.popup', 'checkPermission'],
-        ],
        'onsubmit_callback' => [
            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
        ],
@@ -50,18 +45,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
                'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"',
            ],
            'styles' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'],
-                'href'            => 'table=tl_leaflet_style',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/style.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'styleOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'],
+                'href'       => 'table=tl_leaflet_style',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/style.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'icons'  => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'],
-                'href'            => 'table=tl_leaflet_icon',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/icons.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'iconOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'],
+                'href'       => 'table=tl_leaflet_icon',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/icons.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'all'    => [
                'label'      => &$GLOBALS['TL_LANG']['MSC']['all'],
@@ -158,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',
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_style.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php
@@ -10,8 +10,6 @@
 * @filesource
 */

-use Netzmacht\Contao\Leaflet\Listener\Dca\OperationsListener;
-
 $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
    'config' => [
        'dataContainer'     => 'Table',
@@ -22,9 +20,6 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
                'alias' => 'unique',
            ],
        ],
-        'onload_callback'   => [
-            ['netzmacht.contao_leaflet.listeners.dca.style', 'checkPermission'],
-        ],
        'onsubmit_callback' => [
            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
        ],
@@ -50,18 +45,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
                'attributes' => 'onclick="Backend.getScrollOffset();" accesskey="e"',
            ],
            'icons'  => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_style']['icons'],
-                'href'            => 'table=tl_leaflet_icon',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/icons.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'iconOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_style']['icons'],
+                'href'       => 'table=tl_leaflet_icon',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/icons.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'popups' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'],
-                'href'            => 'table=tl_leaflet_popup',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/popup.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'popupOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'],
+                'href'       => 'table=tl_leaflet_popup',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/popup.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'all'    => [
                'label'      => &$GLOBALS['TL_LANG']['MSC']['all'],
@@ -152,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',
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php
@@ -10,8 +10,6 @@
 * @filesource
 */

-use Netzmacht\Contao\Leaflet\Listener\Dca\OperationsListener;
-
 $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
    'config' => [
        'dataContainer'     => 'Table',
@@ -47,18 +45,16 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
        ],
        'global_operations' => [
            'styles' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['styles'],
-                'href'            => 'table=tl_leaflet_style',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/style.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'styleOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['styles'],
+                'href'       => 'table=tl_leaflet_style',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/style.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'popups' => [
-                'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popups'],
-                'href'            => 'table=tl_leaflet_popup',
-                'icon'            => 'bundles/netzmachtcontaoleaflet/img/popup.png',
-                'attributes'      => 'onclick="Backend.getScrollOffset();"',
-                'button_callback' => [OperationsListener::class, 'popupOperation'],
+                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['popups'],
+                'href'       => 'table=tl_leaflet_popup',
+                'icon'       => 'bundles/netzmachtcontaoleaflet/img/popup.png',
+                'attributes' => 'onclick="Backend.getScrollOffset();"',
            ],
            'all'    => [
                'label'      => &$GLOBALS['TL_LANG']['MSC']['all'],
@@ -189,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',
--- a/src/Bundle/Resources/contao/dca/tl_module.php
+++ b/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'],
--- a/src/Bundle/Resources/contao/dca/tl_user.php
+++ b/src/Bundle/Resources/contao/dca/tl_user.php
@@ -1,68 +0,0 @@
-<?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);
-
-use Contao\CoreBundle\DataContainer\PaletteManipulator;
-
-PaletteManipulator::create()
-    ->addLegend('leaflet_legend', 'amg_legend', PaletteManipulator::POSITION_BEFORE)
-    ->addField(
-        ['leaflet_layers', 'leaflet_layer_permissions', 'leaflet_tables'],
-        'leaflet_legend',
-        PaletteManipulator::POSITION_APPEND
-    )
-    ->applyToPalette('extend', 'tl_user')
-    ->applyToPalette('custom', 'tl_user');
-
-
-$GLOBALS['TL_DCA']['tl_user']['fields']['leaflet_layers'] = [
-    'label'     => &$GLOBALS['TL_LANG']['tl_user']['leaflet_layers'],
-    'exclude'   => true,
-    'inputType' => 'treePicker',
-    'eval'      => [
-        'foreignTable'   => 'tl_leaflet_layer',
-        'titleField'     => 'title',
-        'searchField'    => 'title',
-        'managerHref'    => 'do=leaflet_layer',
-        'fieldType'      => 'checkbox',
-        'selectParents'  => true,
-        'multiple'       => true,
-        'pickerCallback' => ['netzmacht.contao_leaflet.listeners.dca.user', 'generateLayersRowLabel']
-    ],
-    'sql'       => 'blob NULL',
-];
-
-$GLOBALS['TL_DCA']['tl_user']['fields']['leaflet_tables'] = [
-    'label'     => &$GLOBALS['TL_LANG']['tl_user']['leaflet_tables'],
-    'exclude'   => true,
-    'inputType' => 'checkbox',
-    'options'   => ['tl_leaflet_style', 'tl_leaflet_icon', 'tl_leaflet_popup'],
-    'reference' => &$GLOBALS['TL_LANG']['MOD'],
-    'eval'      => [
-        'multiple' => true,
-    ],
-    'sql'       => 'mediumblob NULL',
-];
-
-$GLOBALS['TL_DCA']['tl_user']['fields']['leaflet_layer_permissions'] = [
-    'label'     => &$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions'],
-    'exclude'   => true,
-    'inputType' => 'checkbox',
-    'options'   => ['create', 'edit', 'delete', 'data'],
-    'reference' => &$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options'],
-    'eval'      => [
-        'helpwizard' => true,
-        'multiple' => true,
-    ],
-    'sql'       => 'mediumblob NULL',
-];
--- a/src/Bundle/Resources/contao/dca/tl_user_group.php
+++ b/src/Bundle/Resources/contao/dca/tl_user_group.php
@@ -1,67 +0,0 @@
-<?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);
-
-use Contao\CoreBundle\DataContainer\PaletteManipulator;
-
-PaletteManipulator::create()
-    ->addLegend('leaflet_legend', 'amg_legend', PaletteManipulator::POSITION_BEFORE)
-    ->addField(
-        ['leaflet_layers', 'leaflet_layer_permissions', 'leaflet_tables'],
-        'leaflet_legend',
-        PaletteManipulator::POSITION_APPEND
-    )
-    ->applyToPalette('default', 'tl_user_group');
-
-
-$GLOBALS['TL_DCA']['tl_user_group']['fields']['leaflet_layers'] = [
-    'label'     => &$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layers'],
-    'exclude'   => true,
-    'inputType' => 'treePicker',
-    'eval'      => [
-        'foreignTable'   => 'tl_leaflet_layer',
-        'titleField'     => 'title',
-        'searchField'    => 'title',
-        'managerHref'    => 'do=leaflet_layer',
-        'fieldType'      => 'checkbox',
-        'selectParents'  => true,
-        'multiple'       => true,
-        'pickerCallback' => ['netzmacht.contao_leaflet.listeners.dca.user_group', 'generateLayersRowLabel']
-    ],
-    'sql'       => 'blob NULL',
-];
-
-$GLOBALS['TL_DCA']['tl_user_group']['fields']['leaflet_tables'] = [
-    'label'     => &$GLOBALS['TL_LANG']['tl_user_group']['leaflet_tables'],
-    'exclude'   => true,
-    'inputType' => 'checkbox',
-    'options'   => ['tl_leaflet_style', 'tl_leaflet_icon', 'tl_leaflet_popup'],
-    'reference' => &$GLOBALS['TL_LANG']['MOD'],
-    'eval'      => [
-        'multiple' => true,
-    ],
-    'sql'       => 'mediumblob NULL',
-];
-
-$GLOBALS['TL_DCA']['tl_user_group']['fields']['leaflet_layer_permissions'] = [
-    'label'     => &$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions'],
-    'exclude'   => true,
-    'inputType' => 'checkbox',
-    'options'   => ['create', 'edit', 'delete', 'data'],
-    'reference' => &$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options'],
-    'eval'      => [
-        'helpwizard' => true,
-        'multiple' => true,
-    ],
-    'sql'       => 'mediumblob NULL',
-];
--- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php
+++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php
@@ -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';
--- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php
+++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php
@@ -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';
--- a/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php
+++ b/src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php
@@ -44,7 +44,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['new']['1']         = 'Neuen Stil erstel
 $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';
--- a/src/Bundle/Resources/contao/languages/en/modules.php
+++ b/src/Bundle/Resources/contao/languages/en/modules.php
@@ -22,8 +22,6 @@ $GLOBALS['TL_LANG']['MOD']['leaflet_about'][1] = 'About the Leaflet integration
 $GLOBALS['TL_LANG']['MOD']['tl_leaflet_map']     = 'Maps';
 $GLOBALS['TL_LANG']['MOD']['tl_leaflet_layer']   = 'Layers';
 $GLOBALS['TL_LANG']['MOD']['tl_leaflet_icon']    = 'Icons';
-$GLOBALS['TL_LANG']['MOD']['tl_leaflet_style']   = 'Styles';
-$GLOBALS['TL_LANG']['MOD']['tl_leaflet_popup']   = 'Popup';
 $GLOBALS['TL_LANG']['MOD']['tl_leaflet_marker']  = 'Markers';
 $GLOBALS['TL_LANG']['MOD']['tl_leaflet_control'] = 'Controls';

--- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php
+++ b/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';
@@ -149,6 +149,10 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormat'][0]                 = 'File
 $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>';
--- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php
+++ b/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';
--- a/src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php
+++ b/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';
--- a/src/Bundle/Resources/contao/languages/en/tl_user.php
+++ b/src/Bundle/Resources/contao/languages/en/tl_user.php
@@ -1,31 +0,0 @@
-<?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']['tl_user']['leaflet_legend'] = 'Leaflet Maps Permissions';
-
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layers'][0]            = 'Allowed map layers';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layers'][1]            = 'Please choose the allowed map layers.';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions'][0] = 'Layer permissions';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions'][1] = 'Please choose which permissions are allowed for the map layer.';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_tables'][0]            = 'Allows map tables';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_tables'][1]            = 'Please choose which tables are allowed.';
-
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options']['create'][0] = 'Create layers';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options']['create'][1] = 'Grant permission to create new layers.';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options']['edit'][0]   = 'Edit layers';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options']['edit'][1]   = 'Grant permission to edit layers.';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options']['delete'][0] = 'Delete layers';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options']['delete'][1] = 'Grant permission to delete layers.';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options']['data'][0]   = 'Edit data';
-$GLOBALS['TL_LANG']['tl_user']['leaflet_layer_permissions_options']['data'][1]   = 'Grant permission to edit data of a layer.';
--- a/src/Bundle/Resources/contao/languages/en/tl_user_group.php
+++ b/src/Bundle/Resources/contao/languages/en/tl_user_group.php
@@ -1,31 +0,0 @@
-<?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']['tl_user_group']['leaflet_legend'] = 'Leaflet Maps Permissions';
-
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layers'][0]            = 'Allowed map layers';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layers'][1]            = 'Please choose the allowed map layers.';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions'][0] = 'Layer permissions';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions'][1] = 'Please choose which permissions are allowed for the map layer.';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_tables'][0]            = 'Allows map tables';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_tables'][1]            = 'Please choose which tables are allowed.';
-
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options']['create'][0] = 'Create layers';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options']['create'][1] = 'Grant permission to create new layers.';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options']['edit'][0]   = 'Edit layers';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options']['edit'][1]   = 'Grant permission to edit layers.';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options']['delete'][0] = 'Delete layers';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options']['delete'][1] = 'Grant permission to delete layers.';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options']['data'][0]   = 'Edit data';
-$GLOBALS['TL_LANG']['tl_user_group']['leaflet_layer_permissions_options']['data'][1]   = 'Grant permission to edit data of a layer.';
--- a/src/Bundle/Resources/contao/public/.htaccess
+++ b/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>
--- a/src/Bundle/Resources/contao/templates/leaflet_consent_bridge_placeholder.html5
+++ b/src/Bundle/Resources/contao/templates/leaflet_consent_bridge_placeholder.html5
--- a/src/Bundle/Resources/public/css/backend_global.css
+++ b/src/Bundle/Resources/public/css/backend_global.css
@@ -1,6 +1,6 @@

 #tl_navigation .tl_level_1_group .group-leaflet {
-    background: url(/bundles/netzmachtcontaoleaflet/img/leaflet.svg) 3px 2px no-repeat;
+    background: url(../img/leaflet.svg) 3px 2px no-repeat;
 }

 .tl_help_table a {
--- a/src/Bundle/Resources/public/js/contao-leaflet.js
+++ b/src/Bundle/Resources/public/js/contao-leaflet.js
--- a/src/Bundle/Resources/views/backend/about.html.twig
+++ b/src/Bundle/Resources/views/backend/about.html.twig
@@ -2,6 +2,8 @@

 {% block headline %}{{ "MOD.leaflet_about.1"|trans({}, 'contao_modules') }}{% endblock %}

+{% block error %}{% endblock %}
+
 {% block main %}
    <div class="netzmacht-leaflet-credits">
        <div class="header">
--- a/src/Listener/Dca/AbstractUserDcaListener.php
+++ b/src/Listener/Dca/AbstractUserDcaListener.php
@@ -1,109 +0,0 @@
-<?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\Dca;
-
-use Contao\Image;
-use Contao\StringUtil;
-use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer;
-use Netzmacht\Contao\Leaflet\Model\LayerModel;
-use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
-use Netzmacht\Contao\Toolkit\Dca\Manager;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
-
-/**
- * Class AbstractUserDcaListener
- */
-abstract class AbstractUserDcaListener extends AbstractListener
-{
-    /**
-     * Layer label renderer.
-     *
-     * @var LayerLabelRenderer
-     */
-    private $labelRenderer;
-
-    /**
-     * Translator.
-     *
-     * @var Translator
-     */
-    private $translator;
-
-    /**
-     * Layers definitions.
-     *
-     * @var array
-     */
-    private $layers;
-
-    /**
-     * Constructor.
-     *
-     * @param Manager            $dcaManager    Dca manager.
-     * @param LayerLabelRenderer $labelRenderer Layer label renderer.
-     * @param Translator         $translator    Translator.
-     * @param array              $layers        Layers definition.
-     */
-    public function __construct(
-        Manager $dcaManager,
-        LayerLabelRenderer $labelRenderer,
-        Translator $translator,
-        array $layers
-    ) {
-        parent::__construct($dcaManager);
-
-        $this->labelRenderer = $labelRenderer;
-        $this->translator    = $translator;
-        $this->layers        = $layers;
-    }
-
-    /**
-     * Generate the layers row label.
-     *
-     * @param array $row Layer data row.
-     *
-     * @return string
-     */
-    public function generateLayersRowLabel(array $row): string
-    {
-        if (!empty($this->layers[$row['type']]['icon'])) {
-            $src = $this->layers[$row['type']]['icon'];
-        } else {
-            $src = 'iconPLAIN.gif';
-        }
-
-        $activeIcon   = $src;
-        $disabledIcon = preg_replace('/(\.[^\.]+)$/', '_1$1', $src);
-
-        if (!$row['active']) {
-            $src = $disabledIcon;
-        }
-
-        $alt        = $this->getFormatter(LayerModel::getTable())->formatValue('type', $row['type']);
-        $attributes = sprintf(
-            'class="list-icon" title="%s" data-icon="%s" data-icon-disabled="%s"',
-            StringUtil::specialchars(strip_tags($alt)),
-            $activeIcon,
-            $disabledIcon
-        );
-
-        $label  = $this->getFormatter(LayerModel::getTable())->formatValue('title', $row['title']);
-        $label .= sprintf(' <span class="tl_gray">[ID %s]</span>', $row['id']);
-        $icon   = Image::getHtml($src, $alt, $attributes);
-        $label  = $this->labelRenderer->render($row, $label, $this->translator);
-
-        return $icon . ' ' . $label;
-    }
-}
--- a/src/Listener/Dca/IconDcaListener.php
+++ b/src/Listener/Dca/IconDcaListener.php
@@ -14,10 +14,6 @@ declare(strict_types=1);

 namespace Netzmacht\Contao\Leaflet\Listener\Dca;

-use Contao\BackendUser;
-use Contao\CoreBundle\Exception\AccessDeniedException;
-use Netzmacht\Contao\Leaflet\Model\IconModel;
-
 /**
 * Class IconDcaListener.
 *
@@ -25,13 +21,6 @@ use Netzmacht\Contao\Leaflet\Model\IconModel;
 */
 class IconDcaListener
 {
-    /**
-     * Contao backend user.
-     *
-     * @var BackendUser
-     */
-    private $user;
-
    /**
     * Icon type options.
     *
@@ -42,33 +31,13 @@ class IconDcaListener
    /**
     * IconDcaListener constructor.
     *
-     * @param BackendUser $user  Backend user.
-     * @param array       $icons Icon type options.
+     * @param array $icons Icon type options.
     */
-    public function __construct(BackendUser $user, array $icons)
+    public function __construct(array $icons)
    {
-        $this->user  = $user;
        $this->icons = $icons;
    }

-    /**
-     * Check the permission.
-     *
-     * @return void
-     *
-     * @throws AccessDeniedException If user has not the permission.
-     */
-    public function checkPermission(): void
-    {
-        if ($this->user->hasAccess(IconModel::getTable(), 'leaflet_tables')) {
-            return;
-        }
-
-        throw new AccessDeniedException(
-            sprintf('Access denied to "%s" for user "%s"', IconModel::getTable(), $this->user->id)
-        );
-    }
-
    /**
     * Get icon options.
     *
--- a/src/Listener/Dca/LayerDcaListener.php
+++ b/src/Listener/Dca/LayerDcaListener.php
@@ -13,12 +13,9 @@
 namespace Netzmacht\Contao\Leaflet\Listener\Dca;

 use Contao\Backend;
-use Contao\BackendUser;
-use Contao\CoreBundle\Exception\AccessDeniedException;
 use Contao\CoreBundle\Framework\Adapter;
 use Contao\DataContainer;
 use Contao\Image;
-use Contao\Input;
 use Contao\StringUtil;
 use Doctrine\DBAL\Connection;
 use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer;
@@ -26,7 +23,6 @@ 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\Listener\Button\StateButtonCallbackListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
@@ -34,7 +30,7 @@ use Symfony\Component\Translation\TranslatorInterface as Translator;
 /**
 * Class Layer is the helper class for the tl_leaflet_layer dca.
 *
- * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @package Netzmacht\Contao\Leaflet\Dca
 */
 class LayerDcaListener extends AbstractListener
 {
@@ -80,13 +76,6 @@ class LayerDcaListener extends AbstractListener
     */
    private $translator;

-    /**
-     * Backend user.
-     *
-     * @var BackendUser
-     */
-    private $backendUser;
-
    /**
     * OSM amenities.
     *
@@ -115,28 +104,19 @@ class LayerDcaListener extends AbstractListener
     */
    private $backendAdapter;

-    /**
-     * State button callback listener.
-     *
-     * @var StateButtonCallbackListener
-     */
-    private $stateButtonCallbackListener;
-
    /**
     * Construct.
     *
-     * @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 BackendUser                 $backendUser                 Backend user.
-     * @param StateButtonCallbackListener $stateButtonCallbackListener State button callback listener.
-     * @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.
+     * @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)
     */
@@ -146,8 +126,6 @@ class LayerDcaListener extends AbstractListener
        RepositoryManager $repositoryManager,
        Translator $translator,
        LayerLabelRenderer $labelRenderer,
-        BackendUser $backendUser,
-        StateButtonCallbackListener $stateButtonCallbackListener,
        $backendAdapter,
        array $layers,
        array $tileProviders,
@@ -156,55 +134,15 @@ class LayerDcaListener extends AbstractListener
    ) {
        parent::__construct($manager);

-        $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;
-        $this->backendUser                 = $backendUser;
-        $this->stateButtonCallbackListener = $stateButtonCallbackListener;
-    }
-
-    /**
-     * Check the permissions.
-     *
-     * @param DataContainer $dataContainer Data container.
-     *
-     * @return void
-     *
-     * @throws AccessDeniedException If permissions are not granted.
-     */
-    public function checkPermissions(DataContainer $dataContainer): void
-    {
-        if ($this->backendUser->isAdmin) {
-            return;
-        }
-
-        $action     = Input::get('act');
-        $permission = $this->determinePermission($action);
-
-        if ($permission && !$this->backendUser->hasAccess($permission, 'leaflet_layer_permissions')) {
-            throw new AccessDeniedException(
-                sprintf('Permission "%s" not granted to access layer "%s"', $permission, $dataContainer->id)
-            );
-        }
-
-        $this->getDefinition()->set(['list', 'sorting', 'root'], $this->backendUser->leaflet_layers);
-
-        $layerId = $this->determineLayerId();
-        if ($layerId && !$this->backendUser->hasAccess($layerId, 'leaflet_layers')) {
-            throw new AccessDeniedException(
-                sprintf('User "%s" not allowed to access layer "%s"', $this->backendUser->id, $layerId)
-            );
-        }
-
-        if (!$this->backendUser->hasAccess(LayerModel::PERMISSION_CREATE, 'leaflet_layer_permissions')) {
-            $this->getDefinition()->set(['config', 'closed'], true);
-        }
+        $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;
    }

    /**
@@ -368,148 +306,6 @@ class LayerDcaListener extends AbstractListener
        return $buffer;
    }

-    /**
-     * Generate the edit button.
-     *
-     * @param array  $row        Current row.
-     * @param string $href       The button href.
-     * @param string $label      The button label.
-     * @param string $title      The button title.
-     * @param string $icon       The button icon.
-     * @param string $attributes Optional attributes.
-     *
-     * @return string
-     */
-    public function generateEditButton($row, $href, $label, $title, $icon, $attributes): string
-    {
-        if ($this->backendUser->hasAccess('edit', 'leaflet_layer_permissions')) {
-            return $this->generateButton($row, $href, $label, $title, $icon, $attributes);
-        }
-
-        return '';
-    }
-
-    /**
-     * Generate the cut button.
-     *
-     * @param array  $row        Current row.
-     * @param string $href       The button href.
-     * @param string $label      The button label.
-     * @param string $title      The button title.
-     * @param string $icon       The button icon.
-     * @param string $attributes Optional attributes.
-     *
-     * @return string
-     */
-    public function generateCutButton($row, $href, $label, $title, $icon, $attributes): string
-    {
-        if ($this->backendUser->hasAccess('edit', 'leaflet_layer_permissions')) {
-            return $this->generateButton($row, $href, $label, $title, $icon, $attributes);
-        }
-
-        return '';
-    }
-
-    /**
-     * Generate the copy button.
-     *
-     * @param array  $row        Current row.
-     * @param string $href       The button href.
-     * @param string $label      The button label.
-     * @param string $title      The button title.
-     * @param string $icon       The button icon.
-     * @param string $attributes Optional attributes.
-     *
-     * @return string
-     */
-    public function generateCopyButton($row, $href, $label, $title, $icon, $attributes): string
-    {
-        if ($this->backendUser->hasAccess('create', 'leaflet_layer_permissions')) {
-            return $this->generateButton($row, $href, $label, $title, $icon, $attributes);
-        }
-
-        return '';
-    }
-
-    /**
-     * Generate the toggle button.
-     *
-     * @param array         $row               Current data row.
-     * @param string|null   $href              Button link.
-     * @param string|null   $label             Button label.
-     * @param string|null   $title             Button title.
-     * @param string|null   $icon              Enabled button icon.
-     * @param string|null   $attributes        Html attributes as string.
-     * @param string        $tableName         Table name.
-     * @param array|null    $rootIds           Root ids.
-     * @param array|null    $childRecordIds    Child record ids.
-     * @param bool          $circularReference Circular reference flag.
-     * @param string|null   $previous          Previous button name.
-     * @param string|null   $next              Next button name.
-     * @param DataContainer $dataContainer     Data container driver.
-     *
-     * @return string
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     */
-    public function generateToggleButton(
-        array $row,
-        $href,
-        $label,
-        $title,
-        $icon,
-        $attributes,
-        string $tableName,
-        $rootIds,
-        $childRecordIds,
-        bool $circularReference,
-        $previous,
-        $next,
-        $dataContainer
-    ): string {
-        if ($this->backendUser->hasAccess('edit', 'leaflet_layer_permissions')) {
-            return $this->stateButtonCallbackListener->handleButtonCallback(
-                $row,
-                $href,
-                $label,
-                $title,
-                $icon,
-                $attributes,
-                $tableName,
-                $rootIds,
-                $childRecordIds,
-                $circularReference,
-                $previous,
-                $next,
-                $dataContainer
-            );
-        }
-
-        return '';
-    }
-
-    /**
-     * Generate the edit button.
-     *
-     * @param array  $row        Current row.
-     * @param string $href       The button href.
-     * @param string $label      The button label.
-     * @param string $title      The button title.
-     * @param string $icon       The button icon.
-     * @param string $attributes Optional attributes.
-     *
-     * @return string
-     */
-    public function generateDeleteButton($row, $href, $label, $title, $icon, $attributes): string
-    {
-        if ($this->backendUser->hasAccess('delete', 'leaflet_layer_permissions')) {
-            return $this->generateButton($row, $href, $label, $title, $icon, $attributes);
-        }
-
-        return '';
-    }
-
    /**
     * Generate the markers button.
     *
@@ -528,10 +324,6 @@ class LayerDcaListener extends AbstractListener
            return '';
        }

-        if (!$this->backendUser->hasAccess('data', 'leaflet_layer_permissions')) {
-            return '';
-        }
-
        return $this->generateButton($row, $href, $label, $title, $icon, $attributes);
    }

@@ -553,10 +345,6 @@ class LayerDcaListener extends AbstractListener
            return '';
        }

-        if (!$this->backendUser->hasAccess('data', 'leaflet_layer_permissions')) {
-            return '';
-        }
-
        return $this->generateButton($row, $href, $label, $title, $icon, $attributes);
    }

@@ -734,82 +522,4 @@ class LayerDcaListener extends AbstractListener
            Image::getHtml($icon, $label, $attributes)
        );
    }
-
-    /**
-     * Determine permission for current action.
-     *
-     * @param string|null $action Given action.
-     *
-     * @return string|null
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    private function determinePermission(?string $action): ?string
-    {
-        $permission = null;
-
-        switch ($action) {
-            case 'edit':
-            case 'toggle':
-            case 'editAll':
-            case 'overrideAll':
-            case 'cutAll':
-                return LayerModel::PERMISSION_EDIT;
-
-            case 'delete':
-            case 'deleteAll':
-                return LayerModel::PERMISSION_DELETE;
-
-            case 'copyAll':
-                return LayerModel::PERMISSION_CREATE;
-
-            case 'paste':
-                $mode = Input::get('mode');
-
-                switch ($mode) {
-                    case 'create':
-                        return LayerModel::PERMISSION_CREATE;
-
-                    case 'cut':
-                        return LayerModel::PERMISSION_EDIT;
-
-                    default:
-                        return $permission;
-                }
-
-                // Comment just to please phpcs
-            default:
-                return $permission;
-        }
-    }
-
-
-    /**
-     * Determine the layer id.
-     *
-     * @return int|null
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    private function determineLayerId(): ?int
-    {
-        // Check the current action
-        switch (Input::get('act')) {
-            case 'edit':
-            case 'delete':
-            case 'paste':
-            case 'show':
-                return (int) Input::get('id');
-
-            case 'editAll':
-            case 'deleteAll':
-            case 'overrideAll':
-            case 'cutAll':
-            case 'copyAll':
-                return (int) CURRENT_ID;
-
-            default:
-                return null;
-        }
-    }
 }
--- a/src/Listener/Dca/MapDcaListener.php
+++ b/src/Listener/Dca/MapDcaListener.php
@@ -25,10 +25,8 @@ use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
 use PDO;
-use function strlen;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
-use function var_dump;

 /**
 * Class Map is the helper class for the tl_leaflet_map dca.
@@ -228,4 +226,26 @@ class MapDcaListener extends AbstractListener
            ->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);
+        }
+    }
 }
--- a/src/Listener/Dca/MarkerDcaListener.php
+++ b/src/Listener/Dca/MarkerDcaListener.php
@@ -12,13 +12,10 @@

 namespace Netzmacht\Contao\Leaflet\Listener\Dca;

-use Contao\BackendUser;
-use Contao\CoreBundle\Exception\AccessDeniedException;
-use Contao\Input;
+use Contao\Controller;
 use Contao\StringUtil;
 use Doctrine\DBAL\Connection;
 use Netzmacht\Contao\Leaflet\Model\IconModel;
-use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\Contao\Leaflet\Model\PopupModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
@@ -44,48 +41,16 @@ class MarkerDcaListener
     */
    private $repositoryManager;

-    /**
-     * Backend user.
-     *
-     * @var BackendUser
-     */
-    private $backendUser;
-
    /**
     * MarkerDcaListener constructor.
     *
     * @param Connection        $connection        Database connection.
     * @param RepositoryManager $repositoryManager Repository manager.
-     * @param BackendUser       $backendUser       Backend user.
     */
-    public function __construct(Connection $connection, RepositoryManager $repositoryManager, BackendUser $backendUser)
+    public function __construct(Connection $connection, RepositoryManager $repositoryManager)
    {
        $this->connection        = $connection;
        $this->repositoryManager = $repositoryManager;
-        $this->backendUser       = $backendUser;
-    }
-
-    /**
-     * Check permissions.
-     *
-     * @return void
-     *
-     * @throws AccessDeniedException When permission is not granted.
-     */
-    public function checkPermissions(): void
-    {
-        if (!$this->backendUser->hasAccess(LayerModel::PERMISSION_DATA, 'leaflet_layer_permissions')) {
-            throw new AccessDeniedException(
-                sprintf('User "%s" not allowed to access layer data.', $this->backendUser->id)
-            );
-        }
-
-        $layerId = $this->determineLayerId();
-        if ($layerId && !$this->backendUser->hasAccess($layerId, 'leaflet_layers')) {
-            throw new AccessDeniedException(
-                sprintf('User "%s" not allowed to access layer "%s"', $this->backendUser->id, $layerId)
-            );
-        }
    }

    /**
@@ -200,25 +165,4 @@ class MarkerDcaListener

        return '';
    }
-
-    /**
-     * Determine the layer id.
-     *
-     * @return int|null
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    private function determineLayerId(): ?int
-    {
-        // Check the current action
-        switch (Input::get('act')) {
-            case '':
-            case 'create':
-            case 'select':
-                return (int) Input::get('id');
-
-            default:
-                return (int) CURRENT_ID;
-        }
-    }
 }
--- a/src/Listener/Dca/OperationsListener.php
+++ b/src/Listener/Dca/OperationsListener.php
@@ -1,169 +0,0 @@
-<?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\Dca;
-
-use Contao\Backend;
-use Contao\BackendUser;
-use Netzmacht\Contao\Leaflet\Model\IconModel;
-use Netzmacht\Contao\Leaflet\Model\PopupModel;
-use Netzmacht\Contao\Leaflet\Model\StyleModel;
-
-/**
- * Class OperationsListener
- */
-final class OperationsListener
-{
-    /**
-     * Backend user.
-     *
-     * @var BackendUser
-     */
-    private $user;
-
-    /**
-     * OperationsListener constructor.
-     *
-     * @param BackendUser $user Backend user.
-     */
-    public function __construct(BackendUser $user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * Generate the style operation.
-     *
-     * @param string $href       Button link.
-     * @param string $label      Button label.
-     * @param string $title      Button title.
-     * @param string $class      Button icon class.
-     * @param string $attributes Html attributes.
-     *
-     * @return string
-     */
-    public function styleOperation(
-        string $href,
-        string $label,
-        string $title,
-        string $class,
-        string $attributes
-    ): string {
-        return $this->renderIfPermissionIsGranted(StyleModel::getTable(), $href, $label, $title, $class, $attributes);
-    }
-
-    /**
-     * Generate the icon operation.
-     *
-     * @param string $href       Button link.
-     * @param string $label      Button label.
-     * @param string $title      Button title.
-     * @param string $class      Button icon class.
-     * @param string $attributes Html attributes.
-     *
-     * @return string
-     */
-    public function iconOperation(
-        string $href,
-        string $label,
-        string $title,
-        string $class,
-        string $attributes
-    ): string {
-        return $this->renderIfPermissionIsGranted(IconModel::getTable(), $href, $label, $title, $class, $attributes);
-    }
-
-    /**
-     * Generate the popup operation.
-     *
-     * @param string $href       Button link.
-     * @param string $label      Button label.
-     * @param string $title      Button title.
-     * @param string $class      Button icon class.
-     * @param string $attributes Html attributes.
-     *
-     * @return string
-     */
-    public function popupOperation(
-        string $href,
-        string $label,
-        string $title,
-        string $class,
-        string $attributes
-    ): string {
-        return $this->renderIfPermissionIsGranted(PopupModel::getTable(), $href, $label, $title, $class, $attributes);
-    }
-
-    /**
-     * Check if user has permission to access the leaflet table.
-     *
-     * @param string $permission The table permission.
-     *
-     * @return bool
-     */
-    private function hasPermission(string $permission): bool
-    {
-        return (bool) $this->user->hasAccess($permission, 'leaflet_tables');
-    }
-
-    /**
-     * Generate the style operation.
-     *
-     * @param string $permission Table permission to check.
-     * @param string $href       Button link.
-     * @param string $label      Button label.
-     * @param string $title      Button title.
-     * @param string $class      Button icon class.
-     * @param string $attributes Html attributes.
-     *
-     * @return string
-     */
-    private function renderIfPermissionIsGranted(
-        string $permission,
-        string $href,
-        string $label,
-        string $title,
-        string $class,
-        string $attributes
-    ): string {
-        if ($this->hasPermission($permission)) {
-            return $this->render($href, $label, $title, $class, $attributes);
-        }
-
-        return '';
-    }
-
-    /**
-     * Render a button.
-     *
-     * @param string $href       Button link.
-     * @param string $label      Button label.
-     * @param string $title      Button title.
-     * @param string $class      Button icon class.
-     * @param string $attributes Html attributes.
-     *
-     * @return string
-     */
-    private function render(string $href, string $label, string $title, string $class, string $attributes): string
-    {
-        return sprintf(
-            ' <a href="%s" title="%s" class="%s" %s>%s</a>',
-            Backend::addToUrl($href),
-            $title,
-            $class,
-            $attributes,
-            $label
-        );
-    }
-}
--- a/src/Listener/Dca/PopupDcaListener.php
+++ b/src/Listener/Dca/PopupDcaListener.php
@@ -1,60 +0,0 @@
-<?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\Dca;
-
-use Contao\BackendUser;
-use Contao\CoreBundle\Exception\AccessDeniedException;
-use Netzmacht\Contao\Leaflet\Model\PopupModel;
-
-/**
- * Class PopupDcaListener
- */
-final class PopupDcaListener
-{
-    /**
-     * Backend user.
-     *
-     * @var BackendUser
-     */
-    private $user;
-
-    /**
-     * PopupDcaListener constructor.
-     *
-     * @param BackendUser $user Backend user.
-     */
-    public function __construct(BackendUser $user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * Check the permission.
-     *
-     * @return void
-     *
-     * @throws AccessDeniedException If user has not the permission.
-     */
-    public function checkPermission(): void
-    {
-        if ($this->user->hasAccess(PopupModel::getTable(), 'leaflet_tables')) {
-            return;
-        }
-
-        throw new AccessDeniedException(
-            sprintf('Access denied to "%s" for user "%s"', PopupModel::getTable(), $this->user->id)
-        );
-    }
-}
--- a/src/Listener/Dca/StyleDcaListener.php
+++ b/src/Listener/Dca/StyleDcaListener.php
@@ -14,10 +14,6 @@ declare(strict_types=1);

 namespace Netzmacht\Contao\Leaflet\Listener\Dca;

-use Contao\BackendUser;
-use Contao\CoreBundle\Exception\AccessDeniedException;
-use Netzmacht\Contao\Leaflet\Model\StyleModel;
-
 /**
 * Class StyleDcaListener.
 *
@@ -25,13 +21,6 @@ use Netzmacht\Contao\Leaflet\Model\StyleModel;
 */
 class StyleDcaListener
 {
-    /**
-     * Backend user.
-     *
-     * @var BackendUser
-     */
-    private $user;
-
    /**
     * Style type options.
     *
@@ -42,31 +31,11 @@ class StyleDcaListener
    /**
     * StyleDcaListener constructor.
     *
-     * @param BackendUser $user   Backend user.
-     * @param array       $styles Styles options.
+     * @param array $styles Styles options.
     */
-    public function __construct(BackendUser $user, array $styles)
+    public function __construct(array $styles)
    {
        $this->icons = $styles;
-        $this->user  = $user;
-    }
-
-    /**
-     * Check the permission.
-     *
-     * @return void
-     *
-     * @throws AccessDeniedException If user has not the permission.
-     */
-    public function checkPermission(): void
-    {
-        if ($this->user->hasAccess(StyleModel::getTable(), 'leaflet_tables')) {
-            return;
-        }
-
-        throw new AccessDeniedException(
-            sprintf('Access denied to "%s" for user "%s"', StyleModel::getTable(), $this->user->id)
-        );
    }

    /**
--- a/src/Listener/Dca/UserDcaListener.php
+++ b/src/Listener/Dca/UserDcaListener.php
@@ -1,28 +0,0 @@
-<?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\Dca;
-
-/**
- * Class UserDcaListener
- */
-final class UserDcaListener extends AbstractUserDcaListener
-{
-    /**
-     * Data container name.
-     *
-     * @var string
-     */
-    protected static $name = 'tl_user';
-}
--- a/src/Listener/Dca/UserGroupDcaListener.php
+++ b/src/Listener/Dca/UserGroupDcaListener.php
@@ -1,28 +0,0 @@
-<?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\Dca;
-
-/**
- * Class UserGroupDcaListener
- */
-final class UserGroupDcaListener extends AbstractUserDcaListener
-{
-    /**
-     * Data container name.
-     *
-     * @var string
-     */
-    protected static $name = 'tl_user_group';
-}
--- a/src/Listener/Dca/VectorDcaListener.php
+++ b/src/Listener/Dca/VectorDcaListener.php
@@ -12,10 +12,6 @@

 namespace Netzmacht\Contao\Leaflet\Listener\Dca;

-use Contao\BackendUser;
-use Contao\CoreBundle\Exception\AccessDeniedException;
-use Contao\Input;
-use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\Contao\Leaflet\Model\PopupModel;
 use Netzmacht\Contao\Leaflet\Model\StyleModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
@@ -51,55 +47,19 @@ class VectorDcaListener extends AbstractListener
     */
    private $repositoryManager;

-    /**
-     * Backend user.
-     *
-     * @var BackendUser
-     */
-    private $backendUser;
-
    /**
     * Construct.
     *
     * @param Manager           $dcaManager        Data container manager.
     * @param RepositoryManager $repositoryManager Repository manager.
-     * @param BackendUser       $backendUser       Backend user.
     * @param array             $vectors           Vectors.
     */
-    public function __construct(
-        Manager $dcaManager,
-        RepositoryManager $repositoryManager,
-        BackendUser $backendUser,
-        array $vectors
-    ) {
+    public function __construct(Manager $dcaManager, RepositoryManager $repositoryManager, array $vectors)
+    {
        parent::__construct($dcaManager);

        $this->vectors           = $vectors;
        $this->repositoryManager = $repositoryManager;
-        $this->backendUser       = $backendUser;
-    }
-
-    /**
-     * Check permissions.
-     *
-     * @return void
-     *
-     * @throws AccessDeniedException When permission is not granted.
-     */
-    public function checkPermissions(): void
-    {
-        if (!$this->backendUser->hasAccess(LayerModel::PERMISSION_DATA, 'leaflet_layer_permissions')) {
-            throw new AccessDeniedException(
-                sprintf('User "%s" not allowed to access layer data.', $this->backendUser->id)
-            );
-        }
-
-        $layerId = $this->determineLayerId();
-        if ($layerId && !$this->backendUser->hasAccess($layerId, 'leaflet_layers')) {
-            throw new AccessDeniedException(
-                sprintf('User "%s" not allowed to access layer "%s"', $this->backendUser->id, $layerId)
-            );
-        }
    }

    /**
@@ -154,25 +114,4 @@ class VectorDcaListener extends AbstractListener

        return $builder->getOptions();
    }
-
-    /**
-     * Determine the layer id.
-     *
-     * @return int|null
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    private function determineLayerId(): ?int
-    {
-        // Check the current action
-        switch (Input::get('act')) {
-            case '':
-            case 'create':
-            case 'select':
-                return (int) Input::get('id');
-
-            default:
-                return (int) CURRENT_ID;
-        }
-    }
 }
--- a/src/Mapper/OptionsBuilder.php
+++ b/src/Mapper/OptionsBuilder.php
@@ -210,6 +210,10 @@ class OptionsBuilder
        foreach ($options as $option => $mapping) {
            $default = static::getDefaultOption($option, $definition);

+            if ($model->$mapping === null) {
+                continue;
+            }
+
            if ($model->$mapping === '1' || $model->$mapping === '') {
                if (((bool) $model->$mapping) !== $default) {
                    static::applyOption($option, $model->$mapping, $definition);
--- a/src/Mapper/Type/ImageIconMapper.php
+++ b/src/Mapper/Type/ImageIconMapper.php
@@ -71,16 +71,10 @@ class ImageIconMapper extends AbstractIconMapper
        Request $request = null,
        $elementId = null
    ) {
-        $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId);
-
-        if ($model->iconImage) {
-            $repository = $this->repositoryManager->getRepository(FilesModel::class);
-            $file       = $repository->findByUuid($model->iconImage);
-
-            if ($file) {
-                $arguments[] = $file->path;
-            }
-        }
+        $arguments   = parent::buildConstructArguments($model, $mapper, $request, $elementId);
+        $repository  = $this->repositoryManager->getRepository(FilesModel::class);
+        $file        = $repository->findByUuid($model->iconImage);
+        $arguments[] = $file ? $file->path : '';

        return $arguments;
    }
@@ -117,8 +111,6 @@ class ImageIconMapper extends AbstractIconMapper
            $file = $repository->findByUuid($model->iconImage);

            if ($file) {
-                $definition->setIconUrl($file->path);
-
                $file = new File($file->path);
                $definition->setIconSize([$file->width, $file->height]);

--- a/src/Model/ControlModel.php
+++ b/src/Model/ControlModel.php
@@ -41,6 +41,7 @@ SELECT    l.*, c.mode as controlMode
 FROM      tl_leaflet_layer l
 LEFT JOIN tl_leaflet_control_layer c ON l.id = c.lid
 WHERE     c.cid=?
+ORDER BY  c.sorting
 SQL;

        $result = Database::getInstance()
@@ -67,6 +68,7 @@ FROM      tl_leaflet_layer l
 LEFT JOIN tl_leaflet_control_layer
 c ON      l.id = c.lid
 WHERE     c.cid=? AND l.active=1
+ORDER BY  c.sorting
 SQL;

        $result = Database::getInstance()
--- a/src/Model/LayerModel.php
+++ b/src/Model/LayerModel.php
@@ -27,14 +27,6 @@ use Contao\Model\Collection;
 */
 class LayerModel extends AbstractActiveModel
 {
-    public const PERMISSION_EDIT = 'edit';
-
-    public const PERMISSION_CREATE = 'create';
-
-    public const PERMISSION_DELETE = 'delete';
-
-    public const PERMISSION_DATA = 'data';
-
    /**
     * Model table.
     *
--- a/src/Model/MarkerModel.php
+++ b/src/Model/MarkerModel.php
@@ -17,7 +17,6 @@ use Netzmacht\Contao\Leaflet\Filter\BboxFilter;
 use Netzmacht\Contao\Leaflet\Filter\DistanceFilter;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
 use Netzmacht\LeafletPHP\Value\LatLngBounds;
-use function var_dump;

 /**
 * Class MarkerModel for the tl_leaflet_marker table.
@@ -50,8 +49,8 @@ class MarkerModel extends AbstractActiveModel
                [
                    $table . '.active=1',
                    $table . '.pid=?',
-                    $table . '.latitude>0',
-                    $table . '.longitude>0',
+                    $table . '.latitude IS NOT NULL',
+                    $table . '.longitude IS NOT NULL',
                ],
                [$pid],
                ['order' => 'sorting']
Author	SHA1	Message	Date
David Molineus	6054def7aa	Prepare release	2020-08-28 17:19:04 +02:00
David Molineus	86026a473b	Add support for hofff/contao-consent-bridge #81	2020-08-28 17:14:33 +02:00
David Molineus	90c4621918	Prepare release	2020-08-28 16:57:52 +02:00
David Molineus	e5263a6315	Copy map layer relations (Fix #89 )	2020-08-28 16:56:11 +02:00
David Molineus	515a191a66	Bump npm dependencies and recompile js	2020-08-28 16:46:58 +02:00
David Molineus	f2f7e87fd3	Merge pull request #88 from fritzmg/patch-1 Use template_legend instead of templates_legend	2020-08-10 16:56:58 +02:00
Fritz Michael Gschwantner	4198b2b6cd	add author	2020-05-04 09:12:00 +01:00
Fritz Michael Gschwantner	fbd1ef81b0	use template_legend instead of templates_legend	2020-05-03 16:19:16 +01:00
Fritz Michael Gschwantner	92a376a307	use template_legend instead of template_legend	2020-05-03 16:18:33 +01:00
David Molineus	bf6a1f9db0	Add funding information	2020-01-03 09:21:09 +01:00
David Molineus	c523aed70d	Merge tag '3.1.6'	2020-01-03 09:09:21 +01:00
David Molineus	4795767a8b	Prepare the release	2020-01-03 09:08:59 +01:00
David Molineus	c0efdb058e	Fix potential security issue	2020-01-03 09:08:52 +01:00
David Molineus	a4547ffb17	Use relative icon path for the backend group icon (#83 )	2020-01-03 08:53:47 +01:00
David Molineus	a63c836535	Fix labels (See #83 )	2020-01-03 08:49:07 +01:00
David Molineus	711b06c6d3	Do not apply options which value is null	2020-01-03 08:43:21 +01:00
David Molineus	70b7d0ab9c	Fix release date	2019-08-26 09:04:19 +02:00
David Molineus	ea59841d6e	Merge tag '3.1.5'	2019-08-26 09:03:57 +02:00
David Molineus	64c332bc25	Update node packages and recompile	2019-08-26 09:03:32 +02:00
David Molineus	3db5aad6d3	Fix composer.json	2019-08-21 13:29:08 +02:00
David Molineus	cef9d7ff44	Use twig instead of templating engine to render about page This restores compatibility with Contao 4.8 without changing default configuration of the symfony framework bundle.	2019-08-21 13:27:11 +02:00
David Molineus	06dd3655c0	Merge tag '3.1.4'	2019-02-13 12:56:00 +01:00
David Molineus	3b066dfeb7	Prepare release.	2019-02-13 12:53:50 +01:00
David Molineus	697e8d2f5e	Drop unused function use statements.	2019-02-13 12:50:59 +01:00
David Molineus	a6c08ae8e5	Fix #71 : Using multiple edit to copy entities leads to invalid aliases. Do not copy aliases at all.	2019-02-13 12:46:19 +01:00
David Molineus	bb8f9e42dc	Fix #76 : Urls to packagist used packagist.com instead of packagist.org.	2019-02-13 12:35:00 +01:00
David Molineus	3be5da9176	Fix #75 : A non existing image of an image icon throws an exception.	2019-02-13 12:33:44 +01:00
David Molineus	55e4ed0702	Fix #74 : Markers with negative coordinates aren't displayed on the map.	2019-02-13 12:09:40 +01:00
David Molineus	d42e0e122f	Fix order changes in layer control element aren't applied (#72 ).	2019-02-13 12:06:30 +01:00
David Molineus	ac05d103f1	Normalize composer.json, add user documentation link to support section and to the readme (See #9 ).	2019-02-13 12:01:42 +01:00
David Molineus	cc9990cf4d	Test against PHP 7.4snapshot.	2019-02-13 11:54:33 +01:00
David Molineus	9643b2c196	Link version number to the github compare link.	2019-02-13 11:27:32 +01:00
David Molineus	4d55b012fd	Merge branch 'master' of github.com:netzmacht/contao-leaflet-maps	2019-01-10 16:42:31 +01:00
David Molineus	39a7207e23	Merge tag '3.1.3'	2019-01-10 16:41:33 +01:00
David Molineus	c4feeb1b38	Add missing error block.	2019-01-10 16:41:03 +01:00
David Molineus	cb3e9bc8b4	Make controller public as it's required by Symfony 4.	2019-01-10 16:39:43 +01:00
David Molineus	6a88ed380b	Update travis configuration for compatibility issues with phpcq v1.2.0. Test against PHP 7.3 as well.	2018-12-18 10:56:29 +01:00
David Molineus	59e671f8ea	Update CHANGELOG.md	2018-12-18 09:55:36 +01:00
David Molineus	b0df34b86e	Update CHANGELOG.md	2018-12-18 09:55:18 +01:00
David Molineus	4ea2adbb85	Merge tag '3.1.2'	2018-12-18 09:26:49 +01:00
David Molineus	dc5a0a081e	Complete implementation of tile providers.	2018-12-18 09:23:47 +01:00
David Molineus	79f6efd9f3	Update leaflet providers.	2018-12-17 17:01:08 +01:00
David Molineus	e7bede78b1	Drop not required .htaccess folder.	2018-12-17 15:21:05 +01:00
David Molineus	997e16891b	Add defined check.	2018-12-17 15:20:51 +01:00