Generate absolute urls for file layers

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

CHANGELOG.md

@@ -8,6 +8,17 @@ 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
@@ -157,7 +168,8 @@ Implemented enhancements
  - Bypass filesystem cache in debug mode
  - Changelog added
 
-[Unreleased]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.2.0...hotfix/3.2.1
+[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

package-lock.json

@@ -1278,9 +1278,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "1.3.5",
+      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
     },
     "interpret": {
       "version": "1.4.0",

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/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/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 $event->getJavascript();
-
-        return $buffer;
     }
 }

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: