Prepare release

Use template_legend instead of templates_legend

.github/FUNDING.yml

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

CHANGELOG.md

@@ -6,7 +6,34 @@ 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.5] - 2019-08-21
+## [Unreleased]
+
+## [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
 
@@ -130,7 +157,12 @@ Implemented enhancements
  - Bypass filesystem cache in debug mode
  - Changelog added
 
-[3.1.4]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.2...3.1.4
+[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

composer.json

@@ -32,7 +32,7 @@
     "netzmacht/php-javascript-builder": "^1.0",
     "netzmacht/php-leaflet": "^1.1.0",
     "symfony/config": "~3.3 || ~4.0",
-    "symfony/dependency-injection": "~3.3 || ~4.0",
+    "symfony/dependency-injection": "^3.4.26 || ^4.1.12",
     "symfony/event-dispatcher": "~3.3 || ~4.0",
     "symfony/filesystem": "~3.3 || ~4.0",
     "symfony/http-kernel": "~3.3 || ~4.0",
@@ -42,12 +42,16 @@
   },
   "require-dev": {
     "contao/manager-plugin": "^2.1",
+    "hofff/contao-consent-bridge": "^1.0",
     "phpcq/all-tasks": "^1.2"
   },
+  "conflict": {
+    "hofff/contao-consent-bridge": "<1.0 || >= 2.0"
+  },
   "extra": {
     "branch-alias": {
-      "dev-master": "3.1.x-dev",
-      "dev-develop": "3.2.x-dev",
+      "dev-master": "3.2.x-dev",
+      "dev-develop": "3.3.x-dev",
       "dev-support/2.x": "2.0.x-dev"
     },
     "contao": {

src/Bundle/ConsentBridge/Plugin.php

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

src/Bundle/Resources/config/services.yml

@@ -138,3 +138,7 @@ services:
     arguments:
       - '@twig'
       - '%kernel.project_dir%'
+
+  Netzmacht\Contao\Leaflet\Bundle\ConsentBridge\Plugin:
+    tags:
+      - { name: hofff_contao_consent_bridge.plugin }

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'],

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' => [

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'],

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

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

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

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

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

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

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

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

src/Bundle/Resources/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 {

src/Bundle/Resources/public/js/contao-leaflet.js

@@ -1 +1 @@
-!function(t){function o(e){var t={next:function(){var t=e.shift();return{done:void 0===t,value:t}}};return n&&(t[Symbol.iterator]=function(){return t}),t}function i(t){return encodeURIComponent(t).replace(/%20/g,"+")}function r(t){return decodeURIComponent(t).replace(/\+/g," ")}var s,e,n=function(){try{return!!Symbol.iterator}catch(t){return!1}}();"URLSearchParams"in t&&"a=1"===new URLSearchParams("?a=1").toString()||((e=(s=function(t){if(Object.defineProperty(this,"_entries",{writable:!0,value:{}}),"string"==typeof t)""!==t&&this._fromString(t);else if(t instanceof s){var n=this;t.forEach(function(t,e){n.append(e,t)})}else{if(null===t||"object"!=typeof t)throw new TypeError("Unsupported input's type for URLSearchParams");if("[object Array]"===Object.prototype.toString.call(t))for(var e=0;e<t.length;e++){var o=t[e];if("[object Array]"!==Object.prototype.toString.call(o)&&2===o.length)throw new TypeError("Expected [string, any] as entry at index "+e+" of URLSearchParams's input");this.append(o[0],o[1])}else for(var i in t)t.hasOwnProperty(i)&&this.append(i,t[i])}}).prototype).append=function(t,e){t in this._entries?this._entries[t].push(String(e)):this._entries[t]=[String(e)]},e.delete=function(t){delete this._entries[t]},e.get=function(t){return t in this._entries?this._entries[t][0]:null},e.getAll=function(t){return t in this._entries?this._entries[t].slice(0):[]},e.has=function(t){return t in this._entries},e.set=function(t,e){this._entries[t]=[String(e)]},e.forEach=function(t,e){var n;for(var o in this._entries)if(this._entries.hasOwnProperty(o)){n=this._entries[o];for(var i=0;i<n.length;i++)t.call(e,n[i],o,this)}},e.keys=function(){var n=[];return this.forEach(function(t,e){n.push(e)}),o(n)},e.values=function(){var e=[];return this.forEach(function(t){e.push(t)}),o(e)},e.entries=function(){var n=[];return this.forEach(function(t,e){n.push([e,t])}),o(n)},n&&(e[Symbol.iterator]=e.entries),e.toString=function(){var n=[];return this.forEach(function(t,e){n.push(i(e)+"="+i(t))}),n.join("&")},t.URLSearchParams=s);var a=URLSearchParams.prototype;"function"!=typeof a.sort&&(a.sort=function(){var n=this,o=[];this.forEach(function(t,e){o.push([e,t]),n._entries||n.delete(e)}),o.sort(function(t,e){return t[0]<e[0]?-1:t[0]>e[0]?1:0}),n._entries&&(n._entries={});for(var t=0;t<o.length;t++)this.append(o[t][0],o[t][1])}),"function"!=typeof a._fromString&&Object.defineProperty(a,"_fromString",{enumerable:!1,configurable:!1,writable:!1,value:function(t){if(this._entries)this._entries={};else{var n=this;this.searchParams.forEach(function(t,e){n.delete(e)})}for(var e,o=(t=t.replace(/^\?/,"")).split("&"),i=0;i<o.length;i++)e=o[i].split("="),this.append(r(e[0]),1<e.length?r(e[1]):"")}})}("undefined"!=typeof global?global:"undefined"!=typeof window?window:"undefined"!=typeof self?self:this),function(h){var e,n;function t(t,e){"string"!=typeof t&&(t=String(t));var n,o=document;if(e&&(void 0===h.location||e!==h.location.href)){(n=(o=document.implementation.createHTMLDocument("")).createElement("base")).href=e,o.head.appendChild(n);try{if(0!==n.href.indexOf(e))throw new Error(n.href)}catch(t){throw new Error("URL unable to set base "+e+" due to "+t)}}var i=o.createElement("a");if(i.href=t,n&&(o.body.appendChild(i),i.href=i.href),":"===i.protocol||!/:/.test(i.href))throw new TypeError("Invalid URL");Object.defineProperty(this,"_anchorElement",{value:i});var r=new URLSearchParams(this.search),s=!0,a=!0,p=this;["append","delete","set"].forEach(function(t){var e=r[t];r[t]=function(){e.apply(r,arguments),s&&(a=!1,p.search=r.toString(),a=!0)}}),Object.defineProperty(this,"searchParams",{value:r,enumerable:!0});var u=void 0;Object.defineProperty(this,"_updateSearchParams",{enumerable:!1,configurable:!1,writable:!1,value:function(){this.search!==u&&(u=this.search,a&&(s=!1,this.searchParams._fromString(this.search),s=!0))}})}if(function(){try{var t=new URL("b","http://a");return t.pathname="c%20d","http://a/c%20d"===t.href&&t.searchParams}catch(t){return!1}}()||(e=h.URL,n=t.prototype,["hash","host","hostname","port","protocol"].forEach(function(t){!function(e){Object.defineProperty(n,e,{get:function(){return this._anchorElement[e]},set:function(t){this._anchorElement[e]=t},enumerable:!0})}(t)}),Object.defineProperty(n,"search",{get:function(){return this._anchorElement.search},set:function(t){this._anchorElement.search=t,this._updateSearchParams()},enumerable:!0}),Object.defineProperties(n,{toString:{get:function(){var t=this;return function(){return t.href}}},href:{get:function(){return this._anchorElement.href.replace(/\?$/,"")},set:function(t){this._anchorElement.href=t,this._updateSearchParams()},enumerable:!0},pathname:{get:function(){return this._anchorElement.pathname.replace(/(^\/?)/,"/")},set:function(t){this._anchorElement.pathname=t},enumerable:!0},origin:{get:function(){var t={"http:":80,"https:":443,"ftp:":21}[this._anchorElement.protocol],e=this._anchorElement.port!=t&&""!==this._anchorElement.port;return this._anchorElemeLine truncated
+L.Contao=L.Evented.extend({statics:{ATTRIBUTION:' | <a href="https://netzmacht.de/contao-leaflet" title="Powered by Leaflet extension for Contao CMS developed by netzmacht David Molineus">netzmacht</a>'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return void 0===this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o<t.length;o++){var e="extraMarkers.icon"===t[o].type?L.ExtraMarkers.icon(t[o].options):L[t[o].type](t[o].options);this.addIcon(t[o].id,e)}},getIcon:function(t){return void 0===this.icons[t]?null:this.icons[t]},load:function(t,o,e,n,i){var s=this.createRequestUrl(t,i);return this.loadFile(s,o,e,n,i)},loadUrl:function(t,o,e,n,i){t=this.applyFilterToUrl(t,i);var s=omnivore[o](t,e,n);return i&&(L.stamp(s),i.options.dynamicLoad&&"fit"==s.options.boundsMode&&(s.options.requestUrl=t,i.on("moveend",s.refreshData,s),i.on("layerremove",function(t){t.layer===s&&i.off("moveend",s.updateBounds,s)})),i.fire("dataloading",{layer:s}),s.on("ready",function(){i.calculateFeatureBounds(s),i.fire("dataload",{layer:s})}),s.on("error",function(){i.fire("dataload",{layer:s})})),s},loadFile:function(t,o,e,n,i){return this.loadUrl(t,o,e,n,i)},pointToLayer:function(t,o){var e,n="marker",i=null;return t.properties&&(t.properties.bounds=!0,t.properties.type&&(n=t.properties.type),t.properties.arguments&&(i=L[n].apply(L[n],t.properties.arguments),L.Util.setOptions(i,t.properties.options))),null===i&&(i=L[n](o,t.properties.options)),t.properties&&(t.properties.radius&&i.setRadius(t.properties.radius),!t.properties.icon||(e=this.getIcon(t.properties.icon))&&i.setIcon(e),this.bindPopupFromFeature(i,t)),this.fire("point:added",{marker:i,feature:t,latlng:o,type:n}),i},onEachFeature:function(t,o){t.properties&&(L.Util.setOptions(o,t.properties.options),this.bindPopupFromFeature(o,t),this.fire("feature:added",{feature:t,layer:o}))},bindPopupFromFeature:function(t,o){o.properties&&(o.properties.popup?t.bindPopup(o.properties.popup,o.properties.popupOptions):o.properties.popupContent&&t.bindPopup(o.properties.popupContent,o.properties.popupOptions))},setGeoJsonListeners:function(t){t&&t.prototype&&(t.prototype.options={pointToLayer:this.pointToLayer.bind(this),onEachFeature:this.onEachFeature.bind(this)})},createRequestUrl:function(t,o){var e,n="leaflet",i=document.location.search.substr(1).split("&");if(t=encodeURIComponent(t),""==i)t=document.location.pathname+"?"+[n,t].join("=");else{for(var s,r=i.length;r--;)if((s=i[r].split("="))[0]==n){s[1]=t,i[r]=s.join("=");break}r<0&&(i[i.length]=[n,t].join("=")),t=document.location.pathname+"?"+i.join("&")}return o&&o.options.dynamicLoad&&(t+="&f=bbox&v=",t+=(e=o.getBounds()).getSouth()+","+e.getWest(),t+=","+e.getNorth()+","+e.getEast()),t},applyFilterToUrl:function(t,o){var e,n,i;return o&&o.options.dynamicLoad?(t=new URL(t),n=new URLSearchParams(t.search),e=(i=o.getBounds()).getSouth()+","+i.getWest(),e+=","+i.getNorth()+","+i.getEast(),n.set("filter","bbox"),n.set("values",e),t.search=n.toString(),t.toString()):t}}),L.contao=new L.Contao,L.Control.Attribution.addInitHook(function(){this.options.prefix+=L.Contao.ATTRIBUTION}),L.Control.Attribution.include({setPrefix:function(t){return-1===t.indexOf(L.Contao.ATTRIBUTION)&&(t+=L.Contao.ATTRIBUTION),this.options.prefix=t,this._update(),this}}),L.GeoJSON.include({refreshData:function(t){var o=L.geoJson(),e=this;o.on("ready",function(){for(var t=e.getLayers(),o=0;o<t.length;o++)e.removeLayer(t[o]);for(t=this.getLayers(),o=0;o<t.length;o++)this.removeLayer(t[o]),e.addLayer(t[o])}),omnivore.geojson(L.contao.applyFilterToUrl(this.options.requestUrl,t.target),null,o)}}),L.Map.include({_dynamicBounds:null,calculateFeatureBounds:function(t,o){if(t){if(!this.options.adjustBounds&&!o)return;this._scanForBounds(t)}else this.eachLayer(this._scanForBounds,this);this._dynamicBounds&&this.fitBounds(this._dynamicBounds,this.getBoundsOptions())},getBoundsOptions:function(){return options={},this.options.boundsPadding?options.padding=this.options.boundsPadding:(this.options.boundsPaddingTopLeft&&(options.paddingTopLeft=this.options.boundsPaddingTopLeft),this.options.boundsPaddingBottomRight&&(options.paddingBottomRight=this.options.boundsPaddingBottomRight)),options},_scanForBounds:function(t){var o;!t.feature||t.feature.properties&&t.feature.properties.ignoreForBounds?L.MarkerClusterGroup&&t instanceof L.MarkerClusterGroup&&t.options.boundsMode&&"extend"==t.options.boundsMode?(o=t.getBounds()).isValid()&&(this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o.getSouthWest(),o.getNorthEast())):(!t.options||t.options&&t.options.boundsMode&&!t.options.ignoreForBounds)&&t.eachLayer&&t.eachLayer(this._scanForBounds,this):t.getBounds?(Line truncated

src/Listener/Dca/MapDcaListener.php

@@ -226,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);
+        }
+    }
 }

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