Generate absolute urls for file layers

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

.github/FUNDING.yml

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

CHANGELOG.md

@@ -8,6 +8,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+ - Remove template debug placeholders, it breaks generated javascript ([#93](https://github.com/netzmacht/contao-leaflet-maps/issues/93))
+ - Generate absolute urls for file layers ([#92](https://github.com/netzmacht/contao-leaflet-maps/issues/92)) 
+
+## [3.2.1] - 2020-09-02
+
+### Fixed
+
+ - Do not append javascript to the body anymore as consent tools might interrupt rendering
+
+## [3.2.0] - 2020-08-28
+
+### Added
+
+ - Add support for consent tools based on `hofff/contao-consent-bridge`
+
+## [3.1.7] - 2020-08-28
+
+### Fixed
+
+ - Duplicate map layer relations ([#89](https://github.com/netzmacht/contao-leaflet-maps/issues/89))
+
 ## [3.1.6] - 2020-01-03
 
 ### Fixed
@@ -145,7 +168,10 @@ Implemented enhancements
  - Bypass filesystem cache in debug mode
  - Changelog added
 
-[Unreleased]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.6...hotfix/3.1.7
+[Unreleased]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.2.1...hotfix/3.2.2
+[3.2.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.2.0...3.2.1
+[3.2.0]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.7...3.2.0
+[3.1.7]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.6...3.1.7
 [3.1.6]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.5...3.1.6
 [3.1.5]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.4...3.1.5
 [3.1.4]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.3...3.1.4

composer.json

@@ -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/mappers.yml

@@ -77,6 +77,7 @@ services:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\FileLayerMapper
     arguments:
       - '@netzmacht.contao_toolkit.repository_manager'
+      - '@netzmacht.contao_toolkit.contao.environment_adapter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 

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/templates/ce_leaflet_map.html5

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

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

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

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/MapProvider.php

@@ -385,11 +385,15 @@ class MapProvider
         ];
 
         $content = $this->templateEngine->render($templateReference, $parameters);
-        $event   = new GetJavascriptEvent($definition, $content);
+        $content = preg_replace(
+            ['/^<!-- TEMPLATE (START): .+ -->\n*/', '/\n*<!-- TEMPLATE (END): .+ -->$/'],
+            '',
+            $content
+        );
+
+        $event = new GetJavascriptEvent($definition, $content);
         $this->eventDispatcher->dispatch($event::NAME, $event);
 
-        $buffer = $event->getJavascript();
-
-        return $buffer;
+        return $event->getJavascript();
     }
 }

src/Mapper/Layer/FileLayerMapper.php

@@ -14,6 +14,8 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
 
+use Contao\CoreBundle\Framework\Adapter;
+use Contao\Environment;
 use Contao\FilesModel;
 use Contao\Model;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
@@ -58,16 +60,25 @@ class FileLayerMapper extends AbstractLayerMapper
      */
     private $repositoryManager;
 
+    /**
+     * Environment.
+     *
+     * @var Adapter<Environment>
+     */
+    private $environmentAdapter;
+
     /**
      * Construct.
      *
-     * @param RepositoryManager $repositoryManager Repository manager.
+     * @param RepositoryManager    $repositoryManager  Repository manager.
+     * @param Adapter<Environment> $environmentAdapter Environment adapter.
      */
-    public function __construct(RepositoryManager $repositoryManager)
+    public function __construct(RepositoryManager $repositoryManager, Adapter $environmentAdapter)
     {
-        $this->repositoryManager = $repositoryManager;
-
         parent::__construct();
+
+        $this->repositoryManager  = $repositoryManager;
+        $this->environmentAdapter = $environmentAdapter;
     }
 
     /**
@@ -103,25 +114,26 @@ class FileLayerMapper extends AbstractLayerMapper
         $layerId = $this->getElementId($model, $elementId);
 
         if ($fileModel instanceof FilesModel && $fileModel->type === 'file') {
+            $url = $this->environmentAdapter->get('url') . '/' . $fileModel->path;
             switch ($model->fileFormat) {
                 case 'gpx':
-                    $layer = new Gpx($layerId, $fileModel->path);
+                    $layer = new Gpx($layerId, $url);
                     break;
 
                 case 'kml':
-                    $layer = new Kml($layerId, $fileModel->path);
+                    $layer = new Kml($layerId, $url);
                     break;
 
                 case 'wkt':
-                    $layer = new Wkt($layerId, $fileModel->path);
+                    $layer = new Wkt($layerId, $url);
                     break;
 
                 case 'geojson':
-                    $layer = new OmnivoreGeoJson($layerId, $fileModel->path);
+                    $layer = new OmnivoreGeoJson($layerId, $url);
                     break;
 
                 case 'topojson':
-                    $layer = new TopoJson($layerId, $fileModel->path);
+                    $layer = new TopoJson($layerId, $url);
                     break;
 
                 default: